diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-29 04:06:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-29 04:06:20 +0000 |
| commit | 6a239cb7a2ea05a9382ed71469ca770afbb12212 (patch) | |
| tree | 336324bb46e752ee05d1e58b18358404a046f092 /nova/tests | |
| parent | 02b872625b94c3c63674d8c64b23f80215b04a15 (diff) | |
| parent | a043978419c600ee1e93baa0b83879e2c45c13f8 (diff) | |
Merge "Add authorization checks to flavormanage extension"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_flavor_manage.py | 24 | ||||
| -rw-r--r-- | nova/tests/policy.json | 1 |
2 files changed, 4 insertions, 21 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py index 1346e63d6..432632458 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py @@ -85,23 +85,14 @@ class FlavorManageTest(test.TestCase): super(FlavorManageTest, self).tearDown() def test_delete(self): - req = fakes.HTTPRequest.blank( - '/v2/123/flavor/delete/1234', - use_admin_context=True) - + req = fakes.HTTPRequest.blank('/v2/123/flavors/1234') res = self.controller._delete(req, id) self.assertEqual(res.status_int, 202) + # subsequent delete should fail self.assertRaises(webob.exc.HTTPNotFound, self.controller._delete, req, "failtest") - req = fakes.HTTPRequest.blank( - '/v2/123/flavor/delete/1234', - use_admin_context=False) - - res = self.controller._delete(req, id) - self.assertEqual(res.status_int, 403) - def test_create(self): body = { "flavor": { @@ -115,16 +106,7 @@ class FlavorManageTest(test.TestCase): } } - req = fakes.HTTPRequest.blank( - '/v2/123/flavor/create/', - use_admin_context=True) - + req = fakes.HTTPRequest.blank('/v2/123/flavors') res = self.controller._create(req, body) for key in body["flavor"]: self.assertEquals(res["flavor"][key], body["flavor"][key]) - - req = fakes.HTTPRequest.blank( - '/v2/123/flavor/create/', - use_admin_context=False) - res = self.controller._create(req, body) - self.assertEqual(res.status_int, 403) diff --git a/nova/tests/policy.json b/nova/tests/policy.json index 5c1fb71fe..2f40ff8b0 100644 --- a/nova/tests/policy.json +++ b/nova/tests/policy.json @@ -81,6 +81,7 @@ "compute_extension:disk_config": [], "compute_extension:extended_status": [], "compute_extension:flavorextraspecs": [], + "compute_extension:flavormanage": [], "compute_extension:floating_ip_dns": [], "compute_extension:floating_ip_pools": [], "compute_extension:floating_ips": [], |