diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-14 17:12:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-14 17:12:06 +0000 |
| commit | 9deb489a8ba5ca2417787ba5e5429a60cf1712c2 (patch) | |
| tree | 99d68c6405489ef098b0df5608ba370819bc9a4c | |
| parent | 345c7df8d955a1c08338a0a06305d4d88897eb44 (diff) | |
| parent | 4fbfee83c4d35cfeb3a5d2e0520d57a1f53fcff0 (diff) | |
| download | nova-9deb489a8ba5ca2417787ba5e5429a60cf1712c2.tar.gz nova-9deb489a8ba5ca2417787ba5e5429a60cf1712c2.tar.xz nova-9deb489a8ba5ca2417787ba5e5429a60cf1712c2.zip | |
Merge "Fix uuid related bug in console/api"
| -rw-r--r-- | nova/console/api.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nova/console/api.py b/nova/console/api.py index ecbdbf2fa..32004094a 100644 --- a/nova/console/api.py +++ b/nova/console/api.py @@ -35,16 +35,13 @@ class API(base.Base): super(API, self).__init__(**kwargs) 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) - def get_console(self, context, instance_id, console_uuid): - instance_id = self._translate_uuid_if_necessary(context, instance_uuid) - return self.db.console_get(context, console_id, instance_uuid) + def get_console(self, context, instance_uuid, console_uuid): + return self.db.console_get(context, console_uuid, instance_uuid) - def delete_console(self, context, instance_id, console_uuid): - instance_id = self._translate_uuid_if_necessary(context, instance_uuid) - console = self.db.console_get(context, console_id, instance_uuid) + def delete_console(self, context, instance_uuid, console_uuid): + console = self.db.console_get(context, console_uuid, instance_uuid) topic = rpc.queue_get_for(context, FLAGS.console_topic, pool['host']) rpcapi = console_rpcapi.ConsoleAPI(topic=topic) |