diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-07 18:45:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-07 18:45:46 +0000 |
| commit | f088bdfd1cabcb5d03f473d20d7e76e3287acd9c (patch) | |
| tree | a0f414fa677913bdb77738ee22ff219c645b400e /nova/tests | |
| parent | cf34a6015762a82780f86004a76439e1e21340f8 (diff) | |
| parent | 8db54f3bd590e71c6c6e383c928aa82fc28b3379 (diff) | |
Merge "Don't query nova-network on startup."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_cloudpipe.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py index f6e1fbcb6..c082e315f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py @@ -15,9 +15,9 @@ from lxml import etree -from nova.api.openstack import common from nova.api.openstack.compute.contrib import cloudpipe from nova.api.openstack import wsgi +from nova.compute import utils as compute_utils from nova import db from nova import flags from nova import test @@ -65,11 +65,11 @@ class CloudpipeTest(test.TestCase): def test_cloudpipe_list_no_network(self): - def common_get_nw_info_for_instance(context, instance): + def fake_get_nw_info_for_instance(instance): return {} - self.stubs.Set(common, "get_nw_info_for_instance", - common_get_nw_info_for_instance) + self.stubs.Set(compute_utils, "get_nw_info_for_instance", + fake_get_nw_info_for_instance) self.stubs.Set(self.controller.compute_api, "get_all", compute_api_get_all) req = fakes.HTTPRequest.blank('/v2/fake/os-cloudpipe') @@ -86,12 +86,12 @@ class CloudpipeTest(test.TestCase): return {'vpn_public_address': '127.0.0.1', 'vpn_public_port': 22} - def common_get_nw_info_for_instance(context, instance): + def fake_get_nw_info_for_instance(instance): return fake_network.fake_get_instance_nw_info(self.stubs, spectacular=True) - self.stubs.Set(common, "get_nw_info_for_instance", - common_get_nw_info_for_instance) + self.stubs.Set(compute_utils, "get_nw_info_for_instance", + fake_get_nw_info_for_instance) self.stubs.Set(self.controller.network_api, "get", network_api_get) self.stubs.Set(self.controller.compute_api, "get_all", |