diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-16 12:39:35 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-16 12:39:35 -0400 |
| commit | 8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8 (patch) | |
| tree | 6fcdcea61420089517dc4b0976cc6114e847387f /nova | |
| parent | a458a5a6987f151403aa8d4fbc9440396712e3d7 (diff) | |
| download | nova-8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8.tar.gz nova-8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8.tar.xz nova-8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8.zip | |
Fix things not quite merged perfectly -- all tests now pass
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 | ||||
| -rw-r--r-- | nova/tests/network_unittest.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 7a9b5f5cf..c04e722cc 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -556,7 +556,7 @@ class CloudController(object): # NOTE(vish): Right now we don't really care if the ip is # disassociated. We may need to worry about # checking this later. Perhaps in the scheduler? - network_topic = yield self._get_network_topic(context) + network_topic = self._get_network_topic(context) rpc.cast(network_topic, {"method": "disassociate_floating_ip", "args": {"context": None, diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index dc5277f02..da65b50a2 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -28,7 +28,7 @@ from nova import flags from nova import test from nova import utils from nova.auth import manager -from nova.endpoint import api +from nova.api.ec2 import context FLAGS = flags.FLAGS @@ -49,7 +49,7 @@ class NetworkTestCase(test.TrialTestCase): self.user = self.manager.create_user('netuser', 'netuser', 'netuser') self.projects = [] self.network = utils.import_object(FLAGS.network_manager) - self.context = api.APIRequestContext(None, project=None, user=self.user) + self.context = context.APIRequestContext(project=None, user=self.user) for i in range(5): name = 'project%s' % i self.projects.append(self.manager.create_project(name, |