diff --git a/doc/api_samples/legacy_v2/os-server-list-multi-status/servers-list-resp.json b/doc/api_samples/legacy_v2/os-server-list-multi-status/servers-list-resp.json deleted file mode 100644 index 2cc75eef195f..000000000000 --- a/doc/api_samples/legacy_v2/os-server-list-multi-status/servers-list-resp.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "servers": [ - { - "id": "616fb98f-46ca-475e-917e-2563e5a8cd19", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/servers/616fb98f-46ca-475e-917e-2563e5a8cd19", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/616fb98f-46ca-475e-917e-2563e5a8cd19", - "rel": "bookmark" - } - ], - "name": "new-server-test" - } - ] -} \ No newline at end of file diff --git a/nova/tests/functional/api_sample_tests/legacy_v2/os-server-list-multi-status/servers-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/legacy_v2/os-server-list-multi-status/servers-list-resp.json.tpl deleted file mode 100644 index 8b97dc28d7df..000000000000 --- a/nova/tests/functional/api_sample_tests/legacy_v2/os-server-list-multi-status/servers-list-resp.json.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{ - "servers": [ - { - "id": "%(id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/servers/%(id)s", - "rel": "bookmark" - } - ], - "name": "new-server-test" - } - ] -} diff --git a/nova/tests/functional/api_sample_tests/legacy_v2/test_api_samples.py b/nova/tests/functional/api_sample_tests/legacy_v2/test_api_samples.py index 6742bd2ca593..5af98f47e328 100644 --- a/nova/tests/functional/api_sample_tests/legacy_v2/test_api_samples.py +++ b/nova/tests/functional/api_sample_tests/legacy_v2/test_api_samples.py @@ -167,19 +167,6 @@ class ServersSampleBase(ApiSampleTestBaseV2): self.__class__._use_common_server_api_samples = orig_value -class ServersSampleMultiStatusJsonTest(ServersSampleBase): - extension_name = '.'.join(('nova.api.openstack.compute.legacy_v2.contrib', - 'server_list_multi_status', - 'Server_list_multi_status')) - - def test_servers_list(self): - uuid = self._post_server() - response = self._do_get('servers?status=active&status=error') - subs = self._get_regexes() - subs['id'] = uuid - self._verify_response('servers-list-resp', subs, response, 200) - - class FlavorsSampleJsonTest(ApiSampleTestBaseV2): sample_dir = 'flavors' diff --git a/nova/tests/functional/api_sample_tests/test_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py index 2b3d798d9be4..bd3a604b7ca1 100644 --- a/nova/tests/functional/api_sample_tests/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -258,3 +258,24 @@ class ServerStartStopJsonTest(ServersSampleBase): def test_server_stop(self): uuid = self._post_server() self._test_server_action(uuid, 'os-stop', 'server-action-stop') + + +class ServersSampleMultiStatusJsonTest(ServersSampleBase): + sample_dir = 'servers' + extra_extensions_to_load = ["os-access-ips"] + _api_version = 'v2' + + def _get_flags(self): + f = super(ServersSampleMultiStatusJsonTest, self)._get_flags() + f['osapi_compute_extension'] = CONF.osapi_compute_extension[:] + f['osapi_compute_extension'].append( + 'nova.api.openstack.compute.legacy_v2.contrib.' + 'server_list_multi_status.Server_list_multi_status') + return f + + def test_servers_list(self): + uuid = self._post_server() + response = self._do_get('servers?status=active&status=error') + subs = self._get_regexes() + subs['id'] = uuid + self._verify_response('servers-list-resp', subs, response, 200)