initial commit of vnc support

7 files changed, 219 insertions, 0 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 844ccbe5e..aa9c6824e 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -539,6 +539,12 @@ class CloudController(object):
         return self.compute_api.get_ajax_console(context,
                                                  instance_id=instance_id)
 
+    def get_vnc_console(self, context, instance_id, **kwargs):
+        ec2_id = instance_id
+        instance_id = ec2_id_to_id(ec2_id)
+        return self.compute_api.get_vnc_console(context,
+                                                instance_id=instance_id)
+
     def describe_volumes(self, context, volume_id=None, **kwargs):
         if volume_id:
             volumes = []
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."""
diff --git a/nova/flags.py b/nova/flags.py
index 8cf199b2f..4f2be82b6 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -281,6 +281,12 @@ DEFINE_string('ajax_console_proxy_url',
                in the form "http://127.0.0.1:8000"')
 DEFINE_string('ajax_console_proxy_port',
                8000, 'port that ajax_console_proxy binds')
+DEFINE_string('vnc_console_proxy_topic', 'vnc_proxy',
+              'the topic vnc proxy nodes listen on')
+DEFINE_string('vnc_console_proxy_url',
+              'http://127.0.0.1:6080',
+              'location of vnc console proxy, \
+               in the form "http://127.0.0.1:6080"')
 DEFINE_bool('verbose', False, 'show debug output')
 DEFINE_boolean('fake_rabbit', False, 'use a fake rabbit')
 DEFINE_bool('fake_network', False,
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index 88bfbc668..7b4c23211 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -101,5 +101,6 @@
             <target port='0'/>
         </serial>
 
+        <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='0.0.0.0'/>
     </devices>
 </domain>
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 4e0fd106f..4fca84639 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -511,6 +511,23 @@ class LibvirtConnection(object):
         subprocess.Popen(cmd, shell=True)
         return {'token': token, 'host': host, 'port': port}
 
+    @exception.wrap_exception
+    def get_vnc_console(self, instance):
+        def get_vnc_port_for_instance(instance_name):
+            virt_dom = self._conn.lookupByName(instance_name)
+            xml = virt_dom.XMLDesc(0)
+            dom = minidom.parseString(xml)
+
+            for graphic in dom.getElementsByTagName('graphics'):
+                if graphic.getAttribute('type') == 'vnc':
+                    return graphic.getAttribute('port')
+
+        port = get_vnc_port_for_instance(instance['name'])
+        token = str(uuid.uuid4())
+        host = instance['host']
+
+        return {'token': token, 'host': host, 'port': port}
+
     def _cache_image(self, fn, target, fname, cow=False, *args, **kwargs):
         """Wrapper for a method that creates an image that caches the image.
 
diff --git a/tools/euca-get-vnc-console b/tools/euca-get-vnc-console
new file mode 100755
index 000000000..bd2788f03
--- /dev/null
+++ b/tools/euca-get-vnc-console
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+# pylint: disable-msg=C0103
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+"""Euca add-on to use vnc console"""
+
+import getopt
+import os
+import sys
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
+import boto
+import nova
+from boto.ec2.connection import EC2Connection
+from euca2ools import Euca2ool, InstanceValidationError, Util, ConnectionFailed
+
+usage_string = """
+Retrieves a url to an vnc console terminal
+
+euca-get-vnc-console [-h, --help] [--version] [--debug] instance_id
+
+REQUIRED PARAMETERS
+
+instance_id: unique identifier for the instance show the console output for.
+
+OPTIONAL PARAMETERS
+
+"""
+
+
+# This class extends boto to add VNCConsole functionality
+class NovaEC2Connection(EC2Connection):
+
+    def get_vnc_console(self, instance_id):
+        """
+        Retrieves a console connection for the specified instance.
+
+        :type instance_id: string
+        :param instance_id: The instance ID of a running instance on the cloud.
+
+        :rtype: :class:`VNCConsole`
+        """
+
+        class VNCConsole:
+            def __init__(self, parent=None):
+                self.parent = parent
+                self.instance_id = None
+                self.url = None
+
+            def startElement(self, name, attrs, connection):
+                return None
+
+            def endElement(self, name, value, connection):
+                if name == 'instanceId':
+                    self.instance_id = value
+                elif name == 'url':
+                    self.url = value
+                else:
+                    setattr(self, name, value)
+
+        params = {}
+        return self.get_object('GetVNCConsole',
+                               {'InstanceId': instance_id}, VNCConsole)
+
+
+def override_connect_ec2(aws_access_key_id=None,
+                         aws_secret_access_key=None, **kwargs):
+    return NovaEC2Connection(aws_access_key_id,
+                             aws_secret_access_key, **kwargs)
+
+# override boto's connect_ec2 method, so that we can use NovaEC2Connection
+boto.connect_ec2 = override_connect_ec2
+
+
+def usage(status=1):
+    print usage_string
+    Util().usage()
+    sys.exit(status)
+
+
+def version():
+    print Util().version()
+    sys.exit()
+
+
+def display_console_output(console_output):
+    print console_output.instance_id
+    print console_output.timestamp
+    print console_output.output
+
+
+def display_vnc_console_output(console_output):
+    print console_output.url
+
+
+def main():
+    try:
+        euca = Euca2ool()
+    except Exception, e:
+        print e
+        usage()
+
+    instance_id = None
+
+    for name, value in euca.opts:
+        if name in ('-h', '--help'):
+            usage(0)
+        elif name == '--version':
+            version()
+        elif name == '--debug':
+            debug = True
+
+    for arg in euca.args:
+        instance_id = arg
+        break
+
+    if instance_id:
+        try:
+            euca.validate_instance_id(instance_id)
+        except InstanceValidationError:
+            print 'Invalid instance id'
+            sys.exit(1)
+
+        try:
+            euca_conn = euca.make_connection()
+        except ConnectionFailed, e:
+            print e.message
+            sys.exit(1)
+        try:
+            console_output = euca_conn.get_vnc_console(instance_id)
+        except Exception, ex:
+            euca.display_error_and_exit('%s' % ex)
+
+        display_vnc_console_output(console_output)
+    else:
+        print 'instance_id must be specified'
+        usage()
+
+if __name__ == "__main__":
+    main()