diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-11 21:53:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-11 21:53:35 +0000 |
| commit | 45af0a0ac8ed37be9e62fd5a92dbe96517da0517 (patch) | |
| tree | 5dae8901521e98409da45cd1337aedf1cc96eaa9 /nova/api | |
| parent | bf7b89d577a9fbe8d25c3db2deae926d852d8bcc (diff) | |
| parent | 0a2d839f1b8b1bc67c3fd3bf5ecc0c4c5ab36b0e (diff) | |
Merge "Converting consoles calls to use instance objects"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 12 |
1 files changed, 6 insertions, 6 deletions
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: |