From 7c01430020ceabec765f388b70685808064cda3f Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 4 Jan 2011 16:22:47 -0800
Subject: some more cleanup

---
 nova/adminclient.py            | 24 ------------------------
 nova/api/ec2/admin.py          |  1 -
 nova/api/ec2/cloud.py          |  2 --
 nova/virt/libvirt.xml.template |  2 +-
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/nova/adminclient.py b/nova/adminclient.py
index c4e72b930..eabfce804 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -26,20 +26,6 @@ import httplib
 from nova import flags
 from boto.ec2.regioninfo import RegionInfo
 
-class ConsoleInfo(object):
-    def __init__(self, connection=None, endpoint=None):
-        self.connection = connection
-        self.endpoint = endpoint
-
-    def startElement(self, name, attrs, connection):
-        return None
-
-    def endElement(self, name, value, connection):
-        if name == 'url':
-            self.url = str(value)
-        if name == 'kind':
-            self.url = str(value)
-
 FLAGS = flags.FLAGS
 
 DEFAULT_CLC_URL = 'http://127.0.0.1:8773'
@@ -389,13 +375,3 @@ class NovaAdminClient(object):
 
     def get_hosts(self):
         return self.apiconn.get_list('DescribeHosts', {}, [('item', HostInfo)])
-
-    def create_console(self, instance_id, kind='ajax'):
-        """
-        Create a console
-        """
-        console = self.apiconn.get_object('CreateConsole', {'Kind': kind, 'InstanceId': instance_id}, ConsoleInfo)
-
-        if console.url != None:
-            return console
-
diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index e876724b1..fac01369e 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -183,4 +183,3 @@ class AdminController(object):
     def describe_host(self, _context, name, **_kwargs):
         """Returns status info for single node."""
         return host_dict(db.host_get(name))
-
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 20413e319..a59131ab5 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -774,8 +774,6 @@ class CloudController(object):
         return self._format_run_instances(context,
                                           instances[0]['reservation_id'])
 
-    def run_instances2(self, context, **kwargs):
-        return self.run_instances(context, kwargs)
     def terminate_instances(self, context, instance_id, **kwargs):
         """Terminate each instance in instance_id, which is a list of ec2 ids.
         instance_id is a kwarg so its name cannot be modified."""
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index 3317c9eca..2eb7d9488 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -72,7 +72,7 @@
             </filterref>
         </interface>
 
-        <!-- The order is significant here.  File is first -->
+        <!-- The order is significant here.  File must be defined first -->
         <serial type="file">
             <source path='${basepath}/console.log'/>
             <target port='1'/>
-- 
cgit