openstack
/
neutron
Code Issues Proposed changes

Merge "Filter placement API endpoint by type too" into stable/queens

This commit is contained in:
Zuul 2019-08-27 18:08:06 +00:00 committed by Gerrit Code Review
parent fb82e454bb 2a51cbb871
commit 1482a8e44c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/services/segments/placement_client.py
View File

@ -39,6 +39,7 @@ class PlacementAPIClient(object):
"""Client class for placement ReST API.""" """Client class for placement ReST API."""
ks_filter = {'service_type': 'placement', ks_filter = {'service_type': 'placement',
'interface': cfg.CONF.placement.endpoint_type,
'region_name': cfg.CONF.placement.region_name} 'region_name': cfg.CONF.placement.region_name}
def __init__(self): def __init__(self):

7
neutron/tests/unit/extensions/test_segment.py
View File

@ -2167,6 +2167,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with( self.mock_request.assert_called_once_with(
expected_url, 'POST', expected_url, 'POST',
endpoint_filter={'region_name': mock.ANY, endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'}, 'service_type': 'placement'},
json=expected_payload) json=expected_payload)
@ -2177,6 +2178,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with( self.mock_request.assert_called_once_with(
expected_url, 'DELETE', expected_url, 'DELETE',
endpoint_filter={'region_name': mock.ANY, endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'}) 'service_type': 'placement'})
def test_create_inventory(self): def test_create_inventory(self):
@ -2187,6 +2189,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with( self.mock_request.assert_called_once_with(
expected_url, 'POST', expected_url, 'POST',
endpoint_filter={'region_name': mock.ANY, endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'}, 'service_type': 'placement'},
json=expected_payload) json=expected_payload)
@ -2199,6 +2202,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with( self.mock_request.assert_called_once_with(
expected_url, 'GET', expected_url, 'GET',
endpoint_filter={'region_name': mock.ANY, endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'}) 'service_type': 'placement'})
def _test_get_inventory_not_found(self, details, expected_exception): def _test_get_inventory_not_found(self, details, expected_exception):
@ -2230,6 +2234,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with( self.mock_request.assert_called_once_with(
expected_url, 'PUT', expected_url, 'PUT',
endpoint_filter={'region_name': mock.ANY, endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'}, 'service_type': 'placement'},
json=expected_payload) json=expected_payload)
@ -2250,6 +2255,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with( self.mock_request.assert_called_once_with(
expected_url, 'PUT', expected_url, 'PUT',
endpoint_filter={'region_name': mock.ANY, endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'}, 'service_type': 'placement'},
json=expected_payload, json=expected_payload,
headers={'openstack-api-version': 'placement 1.1'}) headers={'openstack-api-version': 'placement 1.1'})
@ -2261,6 +2267,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with( self.mock_request.assert_called_once_with(
expected_url, 'GET', expected_url, 'GET',
endpoint_filter={'region_name': mock.ANY, endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'}, 'service_type': 'placement'},
headers={'openstack-api-version': 'placement 1.1'}) headers={'openstack-api-version': 'placement 1.1'})