openstack/shade
Code Issues Proposed changes

Remove shared=False from get_internal_network

Browse Source 
It turns out internal networks can be shared (as in BlueBox) Removing
the shared=False from the internal network search produces correct
results.

Change-Id: I40ba45d8fc78a0d10a44503ed5b7daf91924e441
This commit is contained in:
Monty Taylor
2015-10-14 09:32:05 -04:00
parent 94461a4f30
commit c22cc1f972
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shade/__init__.py
View File

@@ -1143,7 +1143,6 @@ class OpenStackCloud(object):
self._internal_network_stamp,
filters={
'router:external': False,
'shared': False
})
self._internal_network_stamp = True
return self._internal_networks

4
shade/tests/unit/test_meta.py
View File

@@ -146,7 +146,7 @@ class TestMeta(testtools.TestCase):
self.assertEqual(PRIVATE_V4, meta.get_server_private_ip(srv, cloud))
mock_has_service.assert_called_with('network')
mock_search_networks.assert_called_with(
filters={'router:external': False, 'shared': False}
filters={'router:external': False}
)
@mock.patch.object(shade.OpenStackCloud, 'get_image_name')
@@ -189,7 +189,7 @@ class TestMeta(testtools.TestCase):
self.assertEqual(PRIVATE_V4, srv['private_v4'])
mock_has_service.assert_called_with('volume')
mock_search_networks.assert_called_with(
filters={'router:external': False, 'shared': False}
filters={'router:external': False}
)
@mock.patch.object(shade.OpenStackCloud, 'has_service')