Merge lp:~vishvananda/nova/clean-compute into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

This branch fixes two outstanding bugs in compute. It also fixes a bad method signature in network and removes an unused method in cloud.

[Eric Day (eday)]

ec2/cloud.py can have 'import rpc' removed now... \o/

otherwise, lgtm

review: Needs Fixing

[Vish Ishaya (vishvananda)]

done

[lp:~vishvananda/nova/clean-compute]

570. By Vish Ishaya on 2011-01-14

removed rpc in cloud

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Eric Day (eday)]

review: Approve

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2011-01-14 07:49:41 +0000
+++ nova/api/ec2/cloud.py	2011-01-14 19:38:41 +0000
@@ -37,7 +37,6 @@
 from nova import flags
 from nova import log as logging
 from nova import network
-from nova import rpc
 from nova import utils
 from nova import volume
 from nova.compute import instance_types
@@ -130,15 +129,6 @@
                     result[key] = [line]
         return result
 
-    def _trigger_refresh_security_group(self, context, security_group):
-        nodes = set([instance['host'] for instance in security_group.instances
-                       if instance['host'] is not None])
-        for node in nodes:
-            rpc.cast(context,
-                     '%s.%s' % (FLAGS.compute_topic, node),
-                     {"method": "refresh_security_group",
-                      "args": {"security_group_id": security_group.id}})
-
     def _get_availability_zone_by_host(self, context, host):
         services = db.service_get_all_by_host(context, host)
         if len(services) > 0:
@@ -522,13 +512,7 @@
         # instance_id is passed in as a list of instances
         ec2_id = instance_id[0]
         instance_id = ec2_id_to_id(ec2_id)
-        instance_ref = self.compute_api.get(context, instance_id)
-        output = rpc.call(context,
-                          '%s.%s' % (FLAGS.compute_topic,
-                                     instance_ref['host']),
-                          {"method": "get_console_output",
-                           "args": {"instance_id": instance_ref['id']}})
-
+        output = self.compute_api.get_console_output(context, instance_id)
         now = datetime.datetime.utcnow()
         return {"InstanceId": ec2_id,
                 "Timestamp": now,
 
=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-01-14 17:24:45 +0000
+++ nova/compute/api.py	2011-01-14 19:38:41 +0000
@@ -21,6 +21,7 @@
 """
 
 import datetime
+import re
 import time
 
 from nova import db
@@ -397,23 +398,23 @@
 
     def get_ajax_console(self, context, instance_id):
         """Get a url to an AJAX Console"""
-
         instance = self.get(context, instance_id)
-
-        output = rpc.call(context,
-                          '%s.%s' % (FLAGS.compute_topic,
-                                     instance['host']),
-                          {'method': 'get_ajax_console',
-                           'args': {'instance_id': instance['id']}})
-
+        output = self._call_compute_message('get_ajax_console',
+                                            context,
+                                            instance_id)
         rpc.cast(context, '%s' % FLAGS.ajax_console_proxy_topic,
                  {'method': 'authorize_ajax_console',
                   'args': {'token': output['token'], 'host': output['host'],
                   'port': output['port']}})
-
         return {'url': '%s?token=%s' % (FLAGS.ajax_console_proxy_url,
                 output['token'])}
 
+    def get_console_output(self, context, instance_id):
+        """Get console output for an an instance"""
+        return self._call_compute_message('get_console_output',
+                                          context,
+                                          instance_id)
+
     def lock(self, context, instance_id):
         """lock the instance with instance_id"""
         self._cast_compute_message('lock_instance', context, instance_id)
 
=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-01-12 08:47:54 +0000
+++ nova/network/manager.py	2011-01-14 19:38:41 +0000
@@ -239,8 +239,8 @@
         """Get the network host for the current context."""
         raise NotImplementedError()
 
-    def create_networks(self, context, num_networks, network_size, cidr_v6,
-                        *args, **kwargs):
+    def create_networks(self, context, cidr, num_networks, network_size,
+                        cidr_v6, *args, **kwargs):
         """Create networks based on parameters."""
         raise NotImplementedError()