openstack/nova
Code Issues Proposed changes

Merge "Fix uuid related bug in console/api"

Browse Source
This commit is contained in:
Jenkins 2012-08-14 17:12:06 +00:00 committed by Gerrit Code Review
commit 9deb489a8b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nova/console/api.py
View File

@ -35,16 +35,13 @@ class API(base.Base):
super(API, self).__init__(**kwargs) super(API, self).__init__(**kwargs)
def get_consoles(self, context, instance_uuid): def get_consoles(self, context, instance_uuid):
instance_id = self._translate_uuid_if_necessary(context, instance_uuid)
return self.db.console_get_all_by_instance(context, instance_uuid) return self.db.console_get_all_by_instance(context, instance_uuid)
def get_console(self, context, instance_id, console_uuid): def get_console(self, context, instance_uuid, console_uuid):
instance_id = self._translate_uuid_if_necessary(context, instance_uuid) return self.db.console_get(context, console_uuid, instance_uuid)
return self.db.console_get(context, console_id, instance_uuid)
def delete_console(self, context, instance_id, console_uuid): def delete_console(self, context, instance_uuid, console_uuid):
instance_id = self._translate_uuid_if_necessary(context, instance_uuid) console = self.db.console_get(context, console_uuid, instance_uuid)
console = self.db.console_get(context, console_id, instance_uuid)
topic = rpc.queue_get_for(context, FLAGS.console_topic, topic = rpc.queue_get_for(context, FLAGS.console_topic,
pool['host']) pool['host'])
rpcapi = console_rpcapi.ConsoleAPI(topic=topic) rpcapi = console_rpcapi.ConsoleAPI(topic=topic)