From 0a2d839f1b8b1bc67c3fd3bf5ecc0c4c5ab36b0e Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 10 Nov 2011 21:06:05 -0500 Subject: Converting consoles calls to use instance objects Related to blueprint internal-uuids Change-Id: I39da4d98ff64e8db22eecb1966f6506e8f14361e --- nova/api/ec2/cloud.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nova/api') diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 393df2870..de9b9e660 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -951,8 +951,8 @@ class CloudController(object): else: ec2_id = instance_id instance_id = ec2utils.ec2_id_to_id(ec2_id) - output = self.compute_api.get_console_output( - context, instance_id=instance_id) + instance = self.compute_api.get(context, instance_id) + output = self.compute_api.get_console_output(context, instance) now = utils.utcnow() return {"InstanceId": ec2_id, "Timestamp": now, @@ -961,15 +961,15 @@ class CloudController(object): def get_ajax_console(self, context, instance_id, **kwargs): ec2_id = instance_id[0] instance_id = ec2utils.ec2_id_to_id(ec2_id) - return self.compute_api.get_ajax_console(context, - instance_id=instance_id) + instance = self.compute_api.get(context, instance_id) + return self.compute_api.get_ajax_console(context, instance) def get_vnc_console(self, context, instance_id, **kwargs): """Returns vnc browser url. Used by OS dashboard.""" ec2_id = instance_id instance_id = ec2utils.ec2_id_to_id(ec2_id) - return self.compute_api.get_vnc_console(context, - instance_id=instance_id) + instance = self.compute_api.get(context, instance_id) + return self.compute_api.get_vnc_console(context, instance) def describe_volumes(self, context, volume_id=None, **kwargs): if volume_id: -- cgit