openstack/nova
Code Issues Proposed changes

Merge "ServerGroupsV213SampleJsonTest should actually test v2.13"

Browse Source
This commit is contained in:
Jenkins 2016-01-22 11:12:48 +00:00 committed by Gerrit Code Review
commit 8101d14625
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/api_samples/os-server-groups/v2.13/server-groups-get-resp.json
View File

@ -5,7 +5,7 @@
"policies": ["anti-affinity"],
"members": [],
"metadata": {},
"project_id": "c7c9f4f175e247acb56c108fd724d667",
"project_id": "openstack",
"user_id": "fake"
}
}

2
doc/api_samples/os-server-groups/v2.13/server-groups-list-resp.json
View File

@ -6,7 +6,7 @@
"policies": ["anti-affinity"],
"members": [],
"metadata": {},
"project_id": "c7c9f4f175e247acb56c108fd724d667",
"project_id": "openstack",
"user_id": "fake"
}
]

2
doc/api_samples/os-server-groups/v2.13/server-groups-post-resp.json
View File

@ -5,7 +5,7 @@
"policies": ["anti-affinity"],
"members": [],
"metadata": {},
"project_id": "c7c9f4f175e247acb56c108fd724d667",
"project_id": "openstack",
"user_id": "fake"
}
}

2
nova/tests/functional/api_sample_tests/api_sample_base.py
View File

@ -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,

2
nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-get-resp.json.tpl
View File

@ -5,7 +5,7 @@
"policies": ["anti-affinity"],
"members": [],
"metadata": {},
"project_id": "c7c9f4f175e247acb56c108fd724d667",
"project_id": "openstack",
"user_id": "fake"
}
}

2
nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-list-resp.json.tpl
View File

@ -6,7 +6,7 @@
"policies": ["anti-affinity"],
"members": [],
"metadata": {},
"project_id": "c7c9f4f175e247acb56c108fd724d667",
"project_id": "openstack",
"user_id": "fake"
}
]

2
nova/tests/functional/api_sample_tests/api_samples/os-server-groups/v2.13/server-groups-post-resp.json.tpl
View File

@ -5,7 +5,7 @@
"policies": ["anti-affinity"],
"members": [],
"metadata": {},
"project_id": "c7c9f4f175e247acb56c108fd724d667",
"project_id": "openstack",
"user_id": "fake"
}
}

8
nova/tests/functional/api_sample_tests/test_server_groups.py
View File

@ -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'})
]