diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-30 00:33:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-30 00:33:26 +0000 |
| commit | 263fcb345407e9948343cc415cc7a0c345fd9eff (patch) | |
| tree | 8d071901ed6f2a55cafdf718924e6b93041f9346 /nova/tests | |
| parent | 43849d18fd2fa8a298840a73b7756f3a346f2e6c (diff) | |
| parent | c27267ae9cf38616d03bd2bfba81c4357c52a342 (diff) | |
| download | nova-263fcb345407e9948343cc415cc7a0c345fd9eff.tar.gz nova-263fcb345407e9948343cc415cc7a0c345fd9eff.tar.xz nova-263fcb345407e9948343cc415cc7a0c345fd9eff.zip | |
Merge "Port server_diagnostics extension to v3 API Part2"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py | 11 | ||||
| -rw-r--r-- | nova/tests/fake_policy.py | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py b/nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py index 783275ea2..61b78fea8 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py @@ -16,7 +16,7 @@ from lxml import etree from nova.api.openstack import compute -from nova.api.openstack.compute.contrib import server_diagnostics +from nova.api.openstack.compute.plugins.v3 import server_diagnostics from nova.api.openstack import wsgi from nova.compute import api as compute_api from nova.openstack.common import jsonutils @@ -41,18 +41,15 @@ class ServerDiagnosticsTest(test.TestCase): def setUp(self): super(ServerDiagnosticsTest, self).setUp() - self.flags(verbose=True, - osapi_compute_extension=[ - 'nova.api.openstack.compute.contrib.select_extensions'], - osapi_compute_ext_list=['Server_diagnostics']) self.stubs.Set(compute_api.API, 'get_diagnostics', fake_get_diagnostics) self.stubs.Set(compute_api.API, 'get', fake_instance_get) - self.router = compute.APIRouter(init_only=('servers', 'diagnostics')) + self.router = compute.APIRouterV3(init_only=('servers', 'os-server-diagnostics')) def test_get_diagnostics(self): - req = fakes.HTTPRequest.blank('/fake/servers/%s/diagnostics' % UUID) + req = fakes.HTTPRequestV3.blank( + '/servers/%s/os-server-diagnostics' % UUID) res = req.get_response(self.router) output = jsonutils.loads(res.body) self.assertEqual(output, {'data': 'Some diagnostic info'}) diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py index 490ef5bc5..decd65a43 100644 --- a/nova/tests/fake_policy.py +++ b/nova/tests/fake_policy.py @@ -178,6 +178,7 @@ policy_data = """ "compute_extension:security_group_default_rules": "", "compute_extension:security_groups": "", "compute_extension:server_diagnostics": "", + "compute_extension:v3:os-server-diagnostics": "", "compute_extension:server_password": "", "compute_extension:server_usage": "", "compute_extension:services": "", |