diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-03 22:48:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-03 22:48:03 +0000 |
| commit | d4aab5b28209c15ba9ff3f09ba93ce262c8cd99c (patch) | |
| tree | 7083a935fef281f68db263f9e1cf51161b89a641 | |
| parent | 4726e3d8e1f6700dd19f5ec72a249d5c2dfb1efd (diff) | |
| parent | 12d9a5a38b9968f488b26822dc082ecbc484bbe9 (diff) | |
| download | nova-d4aab5b28209c15ba9ff3f09ba93ce262c8cd99c.tar.gz nova-d4aab5b28209c15ba9ff3f09ba93ce262c8cd99c.tar.xz nova-d4aab5b28209c15ba9ff3f09ba93ce262c8cd99c.zip | |
Merge "Make sure cloudpipe extension can retrieve network"
| -rw-r--r-- | nova/api/openstack/compute/contrib/cloudpipe.py | 7 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_cloudpipe.py | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index b5d87477e..dcdc87d16 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -98,6 +98,13 @@ class CloudpipeController(object): ips = [ip for ip in vif.fixed_ips() if ip['version'] == 4] if ips: rv['internal_ip'] = ips[0]['address'] + # NOTE(vish): Currently network_api.get does an owner check on + # project_id. This is probably no longer necessary + # but rather than risk changes in the db layer, + # we are working around it here by changing the + # project_id in the context. This can be removed + # if we remove the project_id check in the db. + elevated.project_id = project_id network = self.network_api.get(elevated, vif['network']['id']) if network: vpn_ip = network['vpn_public_address'] diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py index a2323d909..531590cb3 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py @@ -34,7 +34,7 @@ FLAGS = flags.FLAGS def fake_vpn_instance(): return {'id': 7, 'image_ref': FLAGS.vpn_image_id, 'vm_state': 'active', 'created_at': utils.parse_strtime('1981-10-20T00:00:00.000000'), - 'uuid': 7777, 'project_id': 'fake'} + 'uuid': 7777, 'project_id': 'other'} def compute_api_get_all_empty(context): @@ -76,7 +76,7 @@ class CloudpipeTest(test.TestCase): compute_api_get_all) req = fakes.HTTPRequest.blank('/v2/fake/os-cloudpipe') res_dict = self.controller.index(req) - response = {'cloudpipes': [{'project_id': 'fake', + response = {'cloudpipes': [{'project_id': 'other', 'instance_id': 7777, 'created_at': '1981-10-20T00:00:00Z'}]} self.assertEqual(res_dict, response) @@ -84,6 +84,7 @@ class CloudpipeTest(test.TestCase): def test_cloudpipe_list(self): def network_api_get(context, network_id): + self.assertEqual(context.project_id, 'other') return {'vpn_public_address': '127.0.0.1', 'vpn_public_port': 22} @@ -99,7 +100,7 @@ class CloudpipeTest(test.TestCase): compute_api_get_all) req = fakes.HTTPRequest.blank('/v2/fake/os-cloudpipe') res_dict = self.controller.index(req) - response = {'cloudpipes': [{'project_id': 'fake', + response = {'cloudpipes': [{'project_id': 'other', 'internal_ip': '192.168.1.100', 'public_ip': '127.0.0.1', 'public_port': 22, |