diff options
| author | Chris Yeoh <cyeoh@au1.ibm.com> | 2013-06-04 21:57:18 +0930 |
|---|---|---|
| committer | Chris Yeoh <cyeoh@au1.ibm.com> | 2013-06-07 10:34:14 +0930 |
| commit | e3d7f1edf958ea9a76ab29d87677f70ffaef2bde (patch) | |
| tree | 417c56125b56d753b5fdf9fa07678de873806d69 /nova/tests | |
| parent | ca29b25a424098f2de3710ca7ec39b13eeff6b56 (diff) | |
Port rescue API to v3 Part 2
This patch contains the changes required to adapt the rescue
extension and the corresponding unittest to the v3 framework
Partially implements blueprint nova-v3-api
Change-Id: Iaa6d0cf7708b0887512db952b1e26ccde75d24ef
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/plugins/v3/test_rescue.py | 18 | ||||
| -rw-r--r-- | nova/tests/fake_policy.py | 1 |
2 files changed, 8 insertions, 11 deletions
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_rescue.py b/nova/tests/api/openstack/compute/plugins/v3/test_rescue.py index ea0a96cbf..75733e50f 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_rescue.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_rescue.py @@ -44,15 +44,11 @@ class RescueTest(test.TestCase): self.stubs.Set(compute.api.API, "get", fake_compute_get) self.stubs.Set(compute.api.API, "rescue", rescue) self.stubs.Set(compute.api.API, "unrescue", unrescue) - self.flags( - osapi_compute_extension=[ - 'nova.api.openstack.compute.contrib.select_extensions'], - osapi_compute_ext_list=['Rescue']) - self.app = fakes.wsgi_app(init_only=('servers',)) + self.app = fakes.wsgi_app_v3(init_only=('servers', 'os-rescue')) def test_rescue_with_preset_password(self): body = {"rescue": {"adminPass": "AABBCC112233"}} - req = webob.Request.blank('/v2/fake/servers/test_inst/action') + req = webob.Request.blank('/v3/servers/test_inst/action') req.method = "POST" req.body = jsonutils.dumps(body) req.headers["content-type"] = "application/json" @@ -64,7 +60,7 @@ class RescueTest(test.TestCase): def test_rescue_generates_password(self): body = dict(rescue=None) - req = webob.Request.blank('/v2/fake/servers/test_inst/action') + req = webob.Request.blank('/v3/servers/test_inst/action') req.method = "POST" req.body = jsonutils.dumps(body) req.headers["content-type"] = "application/json" @@ -81,7 +77,7 @@ class RescueTest(test.TestCase): raise exception.InstanceInvalidState('fake message') self.stubs.Set(compute.api.API, "rescue", fake_rescue) - req = webob.Request.blank('/v2/fake/servers/test_inst/action') + req = webob.Request.blank('/v3/servers/test_inst/action') req.method = "POST" req.body = jsonutils.dumps(body) req.headers["content-type"] = "application/json" @@ -91,7 +87,7 @@ class RescueTest(test.TestCase): def test_unrescue(self): body = dict(unrescue=None) - req = webob.Request.blank('/v2/fake/servers/test_inst/action') + req = webob.Request.blank('/v3/servers/test_inst/action') req.method = "POST" req.body = jsonutils.dumps(body) req.headers["content-type"] = "application/json" @@ -106,7 +102,7 @@ class RescueTest(test.TestCase): raise exception.InstanceInvalidState('fake message') self.stubs.Set(compute.api.API, "unrescue", fake_unrescue) - req = webob.Request.blank('/v2/fake/servers/test_inst/action') + req = webob.Request.blank('/v3/servers/test_inst/action') req.method = "POST" req.body = jsonutils.dumps(body) req.headers["content-type"] = "application/json" @@ -121,7 +117,7 @@ class RescueTest(test.TestCase): raise exception.InstanceNotRescuable('fake message') self.stubs.Set(compute.api.API, "rescue", fake_rescue) - req = webob.Request.blank('/v2/fake/servers/test_inst/action') + req = webob.Request.blank('/v3/servers/test_inst/action') req.method = "POST" req.body = jsonutils.dumps(body) req.headers["content-type"] = "application/json" diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py index 0ccbd368b..fbee402fa 100644 --- a/nova/tests/fake_policy.py +++ b/nova/tests/fake_policy.py @@ -166,6 +166,7 @@ policy_data = """ "compute_extension:quotas:delete": "", "compute_extension:quota_classes": "", "compute_extension:rescue": "", + "compute_extension:v3:os-rescue": "", "compute_extension:security_group_default_rules": "", "compute_extension:security_groups": "", "compute_extension:server_diagnostics": "", |