openstack
/
neutron
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-08-27 18:08:03 +00:00 committed by Gerrit Code Review
parent 89c608bc65 12861e3940
commit c618229f3c
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."""
ks_filter = {'service_type': 'placement',
'interface': cfg.CONF.placement.endpoint_type,
'region_name': cfg.CONF.placement.region_name}
def __init__(self):

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

@ -2364,6 +2364,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with(
expected_url, 'POST',
endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'},
json=expected_payload)
@ -2374,6 +2375,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with(
expected_url, 'DELETE',
endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'})
def test_create_inventory(self):
@ -2384,6 +2386,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with(
expected_url, 'POST',
endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'},
json=expected_payload)
@ -2396,6 +2399,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with(
expected_url, 'GET',
endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'})
def _test_get_inventory_not_found(self, details, expected_exception):
@ -2427,6 +2431,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with(
expected_url, 'PUT',
endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'},
json=expected_payload)
@ -2447,6 +2452,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with(
expected_url, 'PUT',
endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'},
json=expected_payload,
headers={'openstack-api-version': 'placement 1.1'})
@ -2458,6 +2464,7 @@ class PlacementAPIClientTestCase(base.DietTestCase):
self.mock_request.assert_called_once_with(
expected_url, 'GET',
endpoint_filter={'region_name': mock.ANY,
'interface': 'public',
'service_type': 'placement'},
headers={'openstack-api-version': 'placement 1.1'})