From 42dfb994083449f4d8b395af413ee1a195f3a8ef Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 21 Apr 2011 13:42:23 -0500
Subject: forgot to save

---
 nova/compute/api.py | 17 -----------------
 nova/network/api.py |  1 -
 2 files changed, 18 deletions(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index b700c5005..082fb9935 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -68,23 +68,6 @@ class API(base.Base):
         self.hostname_factory = hostname_factory
         super(API, self).__init__(**kwargs)
 
-    def get_network_topic(self, context, instance_id):
-        """Get the network topic for an instance."""
-        try:
-            instance = self.get(context, instance_id)
-        except exception.NotFound:
-            LOG.warning(_("Instance %d was not found in get_network_topic"),
-                        instance_id)
-            raise
-
-        host = instance['host']
-        if not host:
-            raise exception.Error(_("Instance %d has no host") % instance_id)
-        topic = self.db.queue_get_for(context, FLAGS.compute_topic, host)
-        return rpc.call(context,
-                        topic,
-                        {"method": "get_network_topic", "args": {'fake': 1}})
-
     def _check_injected_file_quota(self, context, injected_files):
         """
         Enforce quota limits on injected files
diff --git a/nova/network/api.py b/nova/network/api.py
index 7dbb29b3c..4fccccf3e 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -131,7 +131,6 @@ class API(base.Base):
         """
         args = kwargs
         args['instance'] = pickle.dumps(instance)
-        host = self.network_manager.get_network_host(context)
         rval = rpc.call(context, self.get_network_topic(context),
                         {'method': 'allocate_for_instance',
                          'args': args}),
-- 
cgit