From c54638e1785b33dd8340dd3362bc4443b593e4de Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Mon, 6 Apr 2015 09:22:23 +0900 Subject: [PATCH] Merge test_admin_actions between v2 and v2.1 Currently v2 and v2.1 have separate functional tests and their corresponding sample files. As v2 and v2.1 are supposed to be identical, there is overhead to maintain two set of functional tests and sample files. We can have one set of tests which can run for both v2 and v2.1. This commit merges admin actions functional tests. In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server plugin itself. So os-access-ip extension is enabled for v2.1 tests to run successfully. Change-Id: I0b942e038ae6b50837e246f76c1e592539f1761a --- .../admin-actions-inject-network-info.json | 3 -- .../admin-actions-reset-network.json | 3 -- .../admin-actions-reset-server-state.json | 5 --- ...admin-actions-inject-network-info.json.tpl | 3 -- .../admin-actions-reset-network.json.tpl | 3 -- .../admin-actions-reset-server-state.json.tpl | 5 --- .../admin-actions-reset-state.json.tpl | 5 --- nova/tests/functional/test_api_samples.py | 31 ------------------- .../tests/functional/v3/test_admin_actions.py | 18 +++++++++++ 9 files changed, 18 insertions(+), 58 deletions(-) delete mode 100644 doc/api_samples/os-admin-actions/admin-actions-inject-network-info.json delete mode 100644 doc/api_samples/os-admin-actions/admin-actions-reset-network.json delete mode 100644 doc/api_samples/os-admin-actions/admin-actions-reset-server-state.json delete mode 100644 nova/tests/functional/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl delete mode 100644 nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl delete mode 100644 nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl delete mode 100644 nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl diff --git a/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.json b/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.json deleted file mode 100644 index d47c1133a5..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-inject-network-info.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "injectNetworkInfo": null -} \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-network.json b/doc/api_samples/os-admin-actions/admin-actions-reset-network.json deleted file mode 100644 index 02730e7867..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-reset-network.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "resetNetwork": null -} \ No newline at end of file diff --git a/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.json b/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.json deleted file mode 100644 index 3e183fbfba..0000000000 --- a/doc/api_samples/os-admin-actions/admin-actions-reset-server-state.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "os-resetState": { - "state": "active" - } -} \ No newline at end of file diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl deleted file mode 100644 index 62e16737b0..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-inject-network-info.json.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{ - "injectNetworkInfo": null -} diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl deleted file mode 100644 index 7c79cb68a5..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-network.json.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{ - "resetNetwork": null -} diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl deleted file mode 100644 index 013aed4824..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-server-state.json.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{ - "os-resetState": { - "state": "active" - } -} diff --git a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl b/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl deleted file mode 100644 index 72d9478678..0000000000 --- a/nova/tests/functional/api_samples/os-admin-actions/admin-actions-reset-state.json.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{ - 'os-resetState': { - 'state': 'active' - } -} diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/test_api_samples.py index 6a387e1935..29ab47b4d0 100644 --- a/nova/tests/functional/test_api_samples.py +++ b/nova/tests/functional/test_api_samples.py @@ -799,37 +799,6 @@ class AvailabilityZoneJsonTest(ServersSampleBase): response, 202) -class AdminActionsSamplesJsonTest(ServersSampleBase): - extension_name = ("nova.api.openstack.compute.contrib.admin_actions." - "Admin_actions") - - def setUp(self): - """setUp Method for AdminActions api samples extension - - This method creates the server that will be used in each tests - """ - super(AdminActionsSamplesJsonTest, self).setUp() - self.uuid = self._post_server() - - def test_post_reset_network(self): - # Get api samples to reset server network request. - response = self._do_post('servers/%s/action' % self.uuid, - 'admin-actions-reset-network', {}) - self.assertEqual(response.status_code, 202) - - def test_post_inject_network_info(self): - # Get api samples to inject network info request. - response = self._do_post('servers/%s/action' % self.uuid, - 'admin-actions-inject-network-info', {}) - self.assertEqual(response.status_code, 202) - - def test_post_reset_state(self): - # get api samples to server reset state request. - response = self._do_post('servers/%s/action' % self.uuid, - 'admin-actions-reset-server-state', {}) - self.assertEqual(response.status_code, 202) - - class ConsoleAuthTokensSampleJsonTests(ServersSampleBase): ADMIN_API = True extends_name = ("nova.api.openstack.compute.contrib.consoles.Consoles") diff --git a/nova/tests/functional/v3/test_admin_actions.py b/nova/tests/functional/v3/test_admin_actions.py index f5d0514192..85f90915db 100644 --- a/nova/tests/functional/v3/test_admin_actions.py +++ b/nova/tests/functional/v3/test_admin_actions.py @@ -13,11 +13,29 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_config import cfg + from nova.tests.functional.v3 import test_servers +CONF = cfg.CONF +CONF.import_opt('osapi_compute_extension', + 'nova.api.openstack.compute.extensions') + class AdminActionsSamplesJsonTest(test_servers.ServersSampleBase): extension_name = "os-admin-actions" + # TODO(gmann): Overriding '_api_version' till all functional tests + # are merged between v2 and v2.1. After that base class variable + # itself can be changed to 'v2' + _api_version = 'v2' + extra_extensions_to_load = ["os-access-ips"] + + def _get_flags(self): + f = super(AdminActionsSamplesJsonTest, self)._get_flags() + f['osapi_compute_extension'] = CONF.osapi_compute_extension[:] + f['osapi_compute_extension'].append( + 'nova.api.openstack.compute.contrib.admin_actions.Admin_actions') + return f def setUp(self): """setUp Method for AdminActions api samples extension