fix some glitches due to someone removing instanc.internal_id (not that I mind)

remove accidental change to nova-combined script 

3 files changed, 14 insertions, 17 deletions

diff --git a/nova/console/api.py b/nova/console/api.py
index 54317e3b3..93e28ad64 100644
--- a/nova/console/api.py
+++ b/nova/console/api.py
@@ -36,20 +36,16 @@ class ConsoleAPI(base.Base):
     def __init__(self, **kwargs):
         super(ConsoleAPI, self).__init__(**kwargs)
 
-    def get_consoles(self, context, instance_internal_id):
-        instance = self.db.instance_get_by_internal_id(context,
-                                                       instance_internal_id)
-        return self.db.console_get_all_by_instance(context, instance['id'])
+    def get_consoles(self, context, instance_id):
+        return self.db.console_get_all_by_instance(context, instance_id)
 
-    def get_console(self, context, instance_internal_id, console_id):
-        return self.db.console_get(context, console_id, instance_internal_id)
+    def get_console(self, context, instance_id, console_id):
+        return self.db.console_get(context, console_id, instance_id)
 
-    def delete_console(self, context, instance_internal_id, console_id):
-        instance = self.db.instance_get_by_internal_id(context,
-                                                       instance_internal_id)
+    def delete_console(self, context, instance_id, console_id):
         console = self.db.console_get(context,
                                       console_id,
-                                      instance['id'])
+                                      instance_id)
         pool = console['pool']
         rpc.cast(context,
                  self.db.queue_get_for(context,
@@ -58,9 +54,8 @@ class ConsoleAPI(base.Base):
                  {"method": "remove_console",
                   "args": {"console_id": console['id']}})
 
-    def create_console(self, context, instance_internal_id):
-        instance = self.db.instance_get_by_internal_id(context,
-                                                       instance_internal_id)
+    def create_console(self, context, instance_id):
+        instance = self.db.instance_get(context, instance_id)
         #NOTE(mdragon): If we wanted to return this the console info
         #               here, as we would need to do a call.
         #               They can just do an index later to fetch
@@ -69,7 +64,7 @@ class ConsoleAPI(base.Base):
         rpc.cast(context,
                  self._get_console_topic(context, instance['host']),
                  {"method": "add_console",
-                  "args": {"instance_id": instance['id']}})
+                  "args": {"instance_id": instance_id}})
 
     def _get_console_topic(self, context, instance_host):
         topic = self.db.queue_get_for(context,
diff --git a/nova/console/driver.py b/nova/console/driver.py
index d2dafb1f3..c4cf5e5e9 100644
--- a/nova/console/driver.py
+++ b/nova/console/driver.py
@@ -19,6 +19,8 @@
 ConsoleProxy base class that all ConsoleProxies should inherit from
 """
 
+import os
+
 from nova import exception
 
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 7b70566eb..6f4d068f1 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1918,7 +1918,7 @@ def console_get(context, console_id, instance_id=None):
         query = query.filter_by(instance_id=instance_id)
     result = query.options(joinedload('pool')).first()
     if not result:
-        idesc = _(" on instance %(instance_id)s") if instance_id else ""
-        raise exception.NotFound(_("No console with id %(instance)s") %
-                                  {'instance': idesc})
+        idesc = (_("on instance %s") % instance_id)  if instance_id else ""
+        raise exception.NotFound(_("No console with id %(console_id)s %(instance)s") %
+                                  {'instance': idesc, 'console_id': console_id})
     return result