diff --git a/doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json b/doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json index e4f7f7d70742..4f9e2248fc79 100644 --- a/doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json +++ b/doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json @@ -5,7 +5,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "c7c9f4f175e247acb56c108fd724d667", + "project_id": "openstack", "user_id": "fake" } } diff --git a/doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json b/doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json index bc1dab68cab8..d330e4df4638 100644 --- a/doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json +++ b/doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json @@ -6,7 +6,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "c7c9f4f175e247acb56c108fd724d667", + "project_id": "openstack", "user_id": "fake" } ] diff --git a/doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json b/doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json index e4f7f7d70742..4f9e2248fc79 100644 --- a/doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json +++ b/doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json @@ -5,7 +5,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "c7c9f4f175e247acb56c108fd724d667", + "project_id": "openstack", "user_id": "fake" } } diff --git a/nova/tests/functional/api_sample_tests/api_sample_base.py b/nova/tests/functional/api_sample_tests/api_sample_base.py index 4d9b25c9c0a4..6c97e19a9306 100644 --- a/nova/tests/functional/api_sample_tests/api_sample_base.py +++ b/nova/tests/functional/api_sample_tests/api_sample_base.py @@ -58,7 +58,7 @@ CONF = cfg.CONF # microversions, then replace the ``scenarios`` class variable in that # test class with something like: # -# [("v2_11", {'api_major_version': 'v2.1', 'microversion', '2.11'})] +# [("v2_11", {'api_major_version': 'v2.1', 'microversion': '2.11'})] class ApiSampleTestBaseV21(testscenarios.WithScenarios, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl index 1bdfe9e1b7e0..d72a5418a6e7 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl @@ -5,7 +5,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "c7c9f4f175e247acb56c108fd724d667", + "project_id": "openstack", "user_id": "fake" } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl index 417b9a1a1b63..831276941273 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl @@ -6,7 +6,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "c7c9f4f175e247acb56c108fd724d667", + "project_id": "openstack", "user_id": "fake" } ] diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl index 1bdfe9e1b7e0..d72a5418a6e7 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl @@ -5,7 +5,7 @@ "policies": ["anti-affinity"], "members": [], "metadata": {}, - "project_id": "c7c9f4f175e247acb56c108fd724d667", + "project_id": "openstack", "user_id": "fake" } } diff --git a/nova/tests/functional/api_sample_tests/test_server_groups.py b/nova/tests/functional/api_sample_tests/test_server_groups.py index 1cb256881b7d..66f4db6b5f9f 100644 --- a/nova/tests/functional/api_sample_tests/test_server_groups.py +++ b/nova/tests/functional/api_sample_tests/test_server_groups.py @@ -78,7 +78,7 @@ class ServerGroupsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): self.assertEqual(204, response.status_code) -class ServerGroupsV213SampleJsonTest(api_sample_base.ApiSampleTestBaseV21): - extension_name = "os-server-groups" - request_api_version = '2.13' - scenarios = [('v2_13', {})] +class ServerGroupsV213SampleJsonTest(ServerGroupsSampleJsonTest): + scenarios = [ + ("v2_13", {'api_major_version': 'v2.1', 'microversion': '2.13'}) + ]