openstack
/
watcher
Code Issues Proposed changes

Merge "Fix version header in the response"

This commit is contained in:
Zuul 2018-11-16 02:36:06 +00:00 committed by Gerrit Code Review
parent 8636770253 9f09abd6ec
commit 39113fd128
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
watcher/api/controllers/v1/__init__.py
View File

@ -250,7 +250,8 @@ class Controller(rest.RestController):
# assert that requested version is supported
self._check_version(v, pecan.response.headers)
pecan.response.headers[base.Version.string] = str(v)
pecan.response.headers[base.Version.string] = (
' '.join([versions.service_type_string(), str(v)]))
pecan.request.version = v
return super(Controller, self)._route(args, request)

12
watcher/tests/api/v1/test_microversions.py
View File

@ -52,7 +52,8 @@ class TestMicroversions(api_base.FunctionalTest):
return_json=False)
self.assertEqual(response.headers[H_MIN_VER], MIN_VER)
self.assertEqual(response.headers[H_MAX_VER], MAX_VER)
self.assertEqual(response.headers[H_RESP_VER], MIN_VER)
self.assertEqual(response.headers[H_RESP_VER],
' '.join([SERVICE_TYPE, MIN_VER]))
self.assertTrue(all(x in response.json.keys() for x in
self.controller_list_response))
@ -60,7 +61,8 @@ class TestMicroversions(api_base.FunctionalTest):
response = self.get_json('/', return_json=False)
self.assertEqual(response.headers[H_MIN_VER], MIN_VER)
self.assertEqual(response.headers[H_MAX_VER], MAX_VER)
self.assertEqual(response.headers[H_RESP_VER], MIN_VER)
self.assertEqual(response.headers[H_RESP_VER],
' '.join([SERVICE_TYPE, MIN_VER]))
self.assertTrue(all(x in response.json.keys() for x in
self.controller_list_response))
@ -72,7 +74,8 @@ class TestMicroversions(api_base.FunctionalTest):
return_json=False)
self.assertEqual(response.headers[H_MIN_VER], MIN_VER)
self.assertEqual(response.headers[H_MAX_VER], MAX_VER)
self.assertEqual(response.headers[H_RESP_VER], '1.1')
self.assertEqual(response.headers[H_RESP_VER],
' '.join([SERVICE_TYPE, '1.1']))
self.assertTrue(all(x in response.json.keys() for x in
self.controller_list_response))
@ -84,7 +87,8 @@ class TestMicroversions(api_base.FunctionalTest):
return_json=False)
self.assertEqual(response.headers[H_MIN_VER], MIN_VER)
self.assertEqual(response.headers[H_MAX_VER], MAX_VER)
self.assertEqual(response.headers[H_RESP_VER], MAX_VER)
self.assertEqual(response.headers[H_RESP_VER],
' '.join([SERVICE_TYPE, MAX_VER]))
self.assertTrue(all(x in response.json.keys() for x in
self.controller_list_response))