From 4fbfee83c4d35cfeb3a5d2e0520d57a1f53fcff0 Mon Sep 17 00:00:00 2001 From: Yun Mao Date: Tue, 14 Aug 2012 11:44:41 -0400 Subject: [PATCH] Fix uuid related bug in console/api A number of variables are undefined while refactoring uuid in I4032419d66e9bbb17b770d8974a92a136bf9c5d2. self._translate_uuid_if_necessary is also no longer available. Those problems are fixed in this patch. Change-Id: Ifb88b4faa11b2ba8178a9a705ba6da1e4d9b4182 --- nova/console/api.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nova/console/api.py b/nova/console/api.py index ecbdbf2fa4b2..32004094a248 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)