diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-11-10 21:06:05 -0500 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-11-11 13:33:56 -0500 |
| commit | 0a2d839f1b8b1bc67c3fd3bf5ecc0c4c5ab36b0e (patch) | |
| tree | ea9b3023f685fd925df76066564622204306185e /nova/compute | |
| parent | 6bd44ccb3a4bf8536f6bca9b81517d2b24c31f14 (diff) | |
Converting consoles calls to use instance objects
Related to blueprint internal-uuids
Change-Id: I39da4d98ff64e8db22eecb1966f6506e8f14361e
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 64884fbde..5996fe5e2 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1456,11 +1456,11 @@ class API(base.Base): """Write a file to the given instance.""" self._cast_compute_message('inject_file', context, instance_id) - def get_ajax_console(self, context, instance_id): + def get_ajax_console(self, context, instance): """Get a url to an AJAX Console.""" output = self._call_compute_message('get_ajax_console', context, - instance_id) + instance['id']) rpc.cast(context, '%s' % FLAGS.ajax_console_proxy_topic, {'method': 'authorize_ajax_console', 'args': {'token': output['token'], 'host': output['host'], @@ -1468,12 +1468,11 @@ class API(base.Base): return {'url': '%s/?token=%s' % (FLAGS.ajax_console_proxy_url, output['token'])} - def get_vnc_console(self, context, instance_id): + def get_vnc_console(self, context, instance): """Get a url to a VNC Console.""" - instance = self.get(context, instance_id) output = self._call_compute_message('get_vnc_console', context, - instance_id) + instance['id']) rpc.call(context, '%s' % FLAGS.vncproxy_topic, {'method': 'authorize_vnc_console', 'args': {'token': output['token'], @@ -1487,8 +1486,9 @@ class API(base.Base): 'hostignore', 'portignore')} - def get_console_output(self, context, instance_id): + def get_console_output(self, context, instance): """Get console output for an an instance.""" + instance_id = instance['id'] return self._call_compute_message('get_console_output', context, instance_id) |