openstack
/
nova
Code Issues Proposed changes

Avoid PlacementFixture silently swallowing kwargs 

When using PlacementFixture, we can pass some arguments to the CRUD operators.
That said, given the fake methods use kwargs, the fixture won't raise a
TypeError if the parameter name is wrong like the reportclient would do.
Adding a new decorator for verifying it.

Change-Id: Icd3f9e16ac31ea7220052770390aaf4b38e1c469
This commit is contained in:
Balazs Gibizer 2019-11-20 12:34:51 +01:00 committed by Stephen Finucane
parent 157daff9e4
commit 42f42a396c
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nova/tests/functional/fixtures.py
View File

@ -92,28 +92,27 @@ class PlacementFixture(placement_fixtures.PlacementFixture):
self.api = PlacementApiClient(self)
@staticmethod
def _update_headers_with_version(headers, **kwargs):
version = kwargs.get("version")
def _update_headers_with_version(headers, version):
if version is not None:
# TODO(mriedem): Perform some version discovery at some point.
headers.update({
'OpenStack-API-Version': 'placement %s' % version
})
def _fake_get(self, *args, **kwargs):
(url,) = args[1:]
def _fake_get(self, client, url, version=None, global_request_id=None):
# TODO(sbauza): The current placement NoAuthMiddleware returns a 401
# in case a token is not provided. We should change that by creating
# a fake token so we could remove adding the header below.
headers = {'x-auth-token': self.token}
self._update_headers_with_version(headers, **kwargs)
self._update_headers_with_version(headers, version)
return self._client.get(
url,
endpoint_override=self.endpoint,
headers=headers)
def _fake_post(self, *args, **kwargs):
(url, data) = args[1:]
def _fake_post(
self, client, url, data, version=None, global_request_id=None
):
# NOTE(sdague): using json= instead of data= sets the
# media type to application/json for us. Placement API is
# more sensitive to this than other APIs in the OpenStack
@ -122,14 +121,15 @@ class PlacementFixture(placement_fixtures.PlacementFixture):
# in case a token is not provided. We should change that by creating
# a fake token so we could remove adding the header below.
headers = {'x-auth-token': self.token}
self._update_headers_with_version(headers, **kwargs)
self._update_headers_with_version(headers, version)
return self._client.post(
url, json=data,
endpoint_override=self.endpoint,
headers=headers)
def _fake_put(self, *args, **kwargs):
(url, data) = args[1:]
def _fake_put(
self, client, url, data, version=None, global_request_id=None
):
# NOTE(sdague): using json= instead of data= sets the
# media type to application/json for us. Placement API is
# more sensitive to this than other APIs in the OpenStack
@ -138,19 +138,20 @@ class PlacementFixture(placement_fixtures.PlacementFixture):
# in case a token is not provided. We should change that by creating
# a fake token so we could remove adding the header below.
headers = {'x-auth-token': self.token}
self._update_headers_with_version(headers, **kwargs)
self._update_headers_with_version(headers, version)
return self._client.put(
url, json=data,
endpoint_override=self.endpoint,
headers=headers)
def _fake_delete(self, *args, **kwargs):
(url,) = args[1:]
def _fake_delete(
self, client, url, version=None, global_request_id=None
):
# TODO(sbauza): The current placement NoAuthMiddleware returns a 401
# in case a token is not provided. We should change that by creating
# a fake token so we could remove adding the header below.
headers = {'x-auth-token': self.token}
self._update_headers_with_version(headers, **kwargs)
self._update_headers_with_version(headers, version)
return self._client.delete(
url,
endpoint_override=self.endpoint,