openstack/manila-tempest-plugin
Code Issues Proposed changes

Merge "Verify request ID in all manila responses"

Browse Source
This commit is contained in:
Zuul
2019-03-25 18:39:39 +00:00
committed by Gerrit Code Review
parent 9743939c6c 5782a70412
commit 53927a9459
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
manila_tempest_tests/services/share/v2/json/shares_client.py
View File

@@ -55,25 +55,38 @@ class SharesV2Client(shares_client.SharesClient):
new_headers = headers new_headers = headers
return new_headers return new_headers
def verify_request_id(self, response):
response_headers = [r.lower() for r in response.keys()]
assert_msg = ("Response is missing request ID. Response "
"headers are: %s") % response
assert 'x-compute-request-id' in response_headers, assert_msg
# Overwrite all http verb calls to inject the micro version header # Overwrite all http verb calls to inject the micro version header
def post(self, url, body, headers=None, extra_headers=False, def post(self, url, body, headers=None, extra_headers=False,
version=LATEST_MICROVERSION): version=LATEST_MICROVERSION):
headers = self.inject_microversion_header(headers, version, headers = self.inject_microversion_header(headers, version,
extra_headers=extra_headers) extra_headers=extra_headers)
return super(SharesV2Client, self).post(url, body, headers=headers) resp, body = super(SharesV2Client, self).post(url, body,
headers=headers)
self.verify_request_id(resp)
return resp, body
def get(self, url, headers=None, extra_headers=False, def get(self, url, headers=None, extra_headers=False,
version=LATEST_MICROVERSION): version=LATEST_MICROVERSION):
headers = self.inject_microversion_header(headers, version, headers = self.inject_microversion_header(headers, version,
extra_headers=extra_headers) extra_headers=extra_headers)
return super(SharesV2Client, self).get(url, headers=headers) resp, body = super(SharesV2Client, self).get(url, headers=headers)
self.verify_request_id(resp)
return resp, body
def delete(self, url, headers=None, body=None, extra_headers=False, def delete(self, url, headers=None, body=None, extra_headers=False,
version=LATEST_MICROVERSION): version=LATEST_MICROVERSION):
headers = self.inject_microversion_header(headers, version, headers = self.inject_microversion_header(headers, version,
extra_headers=extra_headers) extra_headers=extra_headers)
return super(SharesV2Client, self).delete(url, headers=headers, resp, body = super(SharesV2Client, self).delete(url, headers=headers,
body=body) body=body)
self.verify_request_id(resp)
return resp, body
def patch(self, url, body, headers=None, extra_headers=False, def patch(self, url, body, headers=None, extra_headers=False,
version=LATEST_MICROVERSION): version=LATEST_MICROVERSION):
@@ -85,19 +98,26 @@ class SharesV2Client(shares_client.SharesClient):
version=LATEST_MICROVERSION): version=LATEST_MICROVERSION):
headers = self.inject_microversion_header(headers, version, headers = self.inject_microversion_header(headers, version,
extra_headers=extra_headers) extra_headers=extra_headers)
return super(SharesV2Client, self).put(url, body, headers=headers) resp, body = super(SharesV2Client, self).put(url, body,
headers=headers)
self.verify_request_id(resp)
return resp, body
def head(self, url, headers=None, extra_headers=False, def head(self, url, headers=None, extra_headers=False,
version=LATEST_MICROVERSION): version=LATEST_MICROVERSION):
headers = self.inject_microversion_header(headers, version, headers = self.inject_microversion_header(headers, version,
extra_headers=extra_headers) extra_headers=extra_headers)
return super(SharesV2Client, self).head(url, headers=headers) resp, body = super(SharesV2Client, self).head(url, headers=headers)
self.verify_request_id(resp)
return resp, body
def copy(self, url, headers=None, extra_headers=False, def copy(self, url, headers=None, extra_headers=False,
version=LATEST_MICROVERSION): version=LATEST_MICROVERSION):
headers = self.inject_microversion_header(headers, version, headers = self.inject_microversion_header(headers, version,
extra_headers=extra_headers) extra_headers=extra_headers)
return super(SharesV2Client, self).copy(url, headers=headers) resp, body = super(SharesV2Client, self).copy(url, headers=headers)
self.verify_request_id(resp)
return resp, body
def reset_state(self, s_id, status="error", s_type="shares", def reset_state(self, s_id, status="error", s_type="shares",
headers=None, version=LATEST_MICROVERSION, headers=None, version=LATEST_MICROVERSION,