initial commit of vnc support

2 files changed, 26 insertions, 0 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 625778b66..cec978d75 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -476,6 +476,23 @@ class API(base.Base):
         return {'url': '%s/?token=%s' % (FLAGS.ajax_console_proxy_url,
                 output['token'])}
 
+    def get_vnc_console(self, context, instance_id):
+        """Get a url to an AJAX Console"""
+        instance = self.get(context, instance_id)
+        output = self._call_compute_message('get_vnc_console',
+                                            context,
+                                            instance_id)
+        rpc.cast(context, '%s' % FLAGS.vnc_console_proxy_topic,
+                 {'method': 'authorize_vnc_console',
+                  'args': {'token': output['token'], 'host': output['host'],
+                  'port': output['port']}})
+
+        time.sleep(1)
+
+        return {'url': '%s/vnc_auto.html?token=%s&host=%s&port=%s' %
+                (FLAGS.vnc_console_proxy_url,
+                output['token'], 'hostignore', 'portignore')}
+
     def get_console_output(self, context, instance_id):
         """Get console output for an an instance"""
         return self._call_compute_message('get_console_output',
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index d659712ad..e53b36b34 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -557,6 +557,15 @@ class ComputeManager(manager.Manager):
 
         return self.driver.get_ajax_console(instance_ref)
 
+    @exception.wrap_exception
+    def get_vnc_console(self, context, instance_id):
+        """Return connection information for an vnc console"""
+        context = context.elevated()
+        LOG.debug(_("instance %s: getting vnc console"), instance_id)
+        instance_ref = self.db.instance_get(context, instance_id)
+
+        return self.driver.get_vnc_console(instance_ref)
+
     @checks_instance_lock
     def attach_volume(self, context, instance_id, volume_id, mountpoint):
         """Attach a volume to an instance."""