openstack
/
neutron
Code Issues Proposed changes

Merge "Pecan: set tenant_id field when project_id set"

This commit is contained in:
Jenkins 2017-09-06 10:05:44 +00:00 committed by Gerrit Code Review
parent f27782dd9b bf36f8c934
commit c11a4038d9
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/pecan_wsgi/controllers/utils.py
View File

@ -140,6 +140,10 @@ class NeutronPecanController(object):
self._mandatory_fields = set([field for (field, data) in
self.resource_info.items() if
data.get('required_by_policy')])
if 'tenant_id' in self._mandatory_fields:
# ensure that project_id is queried in the database when
# tenant_id is required
self._mandatory_fields.add('project_id')
else:
self._mandatory_fields = set()
self.allow_pagination = allow_pagination

11
neutron/tests/functional/pecan_wsgi/test_controllers.py
View File

@ -359,6 +359,17 @@ class TestResourceController(TestRootController):
def test_get_collection_without_fields_selector(self):
self._test_get_collection_with_fields_selector(fields=[])
def test_project_id_in_mandatory_fields(self):
# ports only specifies that tenant_id is mandatory, but project_id
# should still be passed to the plugin.
mock_get = mock.patch.object(self.plugin, 'get_ports',
return_value=[]).start()
self.app.get(
'/v2.0/ports.json?fields=id',
headers={'X-Project-Id': 'tenid'}
)
self.assertIn('project_id', mock_get.mock_calls[-1][2]['fields'])
def test_get_item_with_fields_selector(self):
item_resp = self.app.get(
'/v2.0/ports/%s.json?fields=id&fields=name' % self.port['id'],