summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorChris Yeoh <cyeoh@au1.ibm.com>2013-06-17 10:47:55 +0930
committerChris Yeoh <cyeoh@au1.ibm.com>2013-06-17 10:47:55 +0930
commiteaf50114d9c23519f3a11fe57e31c49ff42d36a8 (patch)
treebb99dd5306faa6cd70c17f3cf0d63a364a7fdaff /nova
parentd147af21db2db77f578e527883cf2c68abc56496 (diff)
downloadnova-eaf50114d9c23519f3a11fe57e31c49ff42d36a8.tar.gz
nova-eaf50114d9c23519f3a11fe57e31c49ff42d36a8.tar.xz
nova-eaf50114d9c23519f3a11fe57e31c49ff42d36a8.zip
Port server_diagnostics extension to v3 API Part1
This changeset only copies the v2 files (implementation and test) into the appropriate v3 directories unchanged. The copy as-is will not be loaded by either the v2 or v3 extension loaders. The second changeset will then make the changes required for it to work as a v3 extension. This is being done in order to make reviewing of extension porting easier as gerrit will display only what is actually changed for v3 rather than entirely new files Implements blueprint nova-v3-api Change-Id: I52f906948b5873cf3fdfff14270c7384ee5e7b9f
Diffstat (limited to 'nova')
-rw-r--r--nova/api/openstack/compute/plugins/v3/server_diagnostics.py67
-rw-r--r--nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py84
2 files changed, 151 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/plugins/v3/server_diagnostics.py b/nova/api/openstack/compute/plugins/v3/server_diagnostics.py
new file mode 100644
index 000000000..7711eb653
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/server_diagnostics.py
@@ -0,0 +1,67 @@
+# Copyright 2011 OpenStack Foundation
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import webob.exc
+
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+from nova import compute
+from nova import exception
+
+
+authorize = extensions.extension_authorizer('compute', 'server_diagnostics')
+sd_nsmap = {None: wsgi.XMLNS_V11}
+
+
+class ServerDiagnosticsTemplate(xmlutil.TemplateBuilder):
+ def construct(self):
+ root = xmlutil.TemplateElement('diagnostics')
+ elem = xmlutil.SubTemplateElement(root, xmlutil.Selector(0),
+ selector=xmlutil.get_items)
+ elem.text = 1
+ return xmlutil.MasterTemplate(root, 1, nsmap=sd_nsmap)
+
+
+class ServerDiagnosticsController(object):
+ @wsgi.serializers(xml=ServerDiagnosticsTemplate)
+ def index(self, req, server_id):
+ context = req.environ["nova.context"]
+ authorize(context)
+ compute_api = compute.API()
+ try:
+ instance = compute_api.get(context, server_id)
+ except exception.NotFound():
+ raise webob.exc.HTTPNotFound(_("Instance not found"))
+
+ return compute_api.get_diagnostics(context, instance)
+
+
+class Server_diagnostics(extensions.ExtensionDescriptor):
+ """Allow Admins to view server diagnostics through server action."""
+
+ name = "ServerDiagnostics"
+ alias = "os-server-diagnostics"
+ namespace = ("http://docs.openstack.org/compute/ext/"
+ "server-diagnostics/api/v1.1")
+ updated = "2011-12-21T00:00:00+00:00"
+
+ def get_resources(self):
+ parent_def = {'member_name': 'server', 'collection_name': 'servers'}
+ #NOTE(bcwaldon): This should be prefixed with 'os-'
+ ext = extensions.ResourceExtension('diagnostics',
+ ServerDiagnosticsController(),
+ parent=parent_def)
+ return [ext]
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
new file mode 100644
index 000000000..783275ea2
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_server_diagnostics.py
@@ -0,0 +1,84 @@
+# Copyright 2011 Eldar Nugaev
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from lxml import etree
+
+from nova.api.openstack import compute
+from nova.api.openstack.compute.contrib import server_diagnostics
+from nova.api.openstack import wsgi
+from nova.compute import api as compute_api
+from nova.openstack.common import jsonutils
+from nova import test
+from nova.tests.api.openstack import fakes
+
+
+UUID = 'abc'
+
+
+def fake_get_diagnostics(self, _context, instance_uuid):
+ return {'data': 'Some diagnostic info'}
+
+
+def fake_instance_get(self, _context, instance_uuid):
+ if instance_uuid != UUID:
+ raise Exception("Invalid UUID")
+ return {'uuid': instance_uuid}
+
+
+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'))
+
+ def test_get_diagnostics(self):
+ req = fakes.HTTPRequest.blank('/fake/servers/%s/diagnostics' % UUID)
+ res = req.get_response(self.router)
+ output = jsonutils.loads(res.body)
+ self.assertEqual(output, {'data': 'Some diagnostic info'})
+
+
+class TestServerDiagnosticsXMLSerializer(test.TestCase):
+ namespace = wsgi.XMLNS_V11
+
+ def _tag(self, elem):
+ tagname = elem.tag
+ self.assertEqual(tagname[0], '{')
+ tmp = tagname.partition('}')
+ namespace = tmp[0][1:]
+ self.assertEqual(namespace, self.namespace)
+ return tmp[2]
+
+ def test_index_serializer(self):
+ serializer = server_diagnostics.ServerDiagnosticsTemplate()
+ exemplar = dict(diag1='foo', diag2='bar')
+ text = serializer.serialize(exemplar)
+
+ tree = etree.fromstring(text)
+
+ self.assertEqual('diagnostics', self._tag(tree))
+ self.assertEqual(len(tree), len(exemplar))
+ for child in tree:
+ tag = self._tag(child)
+ self.assertTrue(tag in exemplar)
+ self.assertEqual(child.text, exemplar[tag])