Merge "Add additional information to servers output."

3 files changed, 97 insertions, 0 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py b/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py
new file mode 100644
index 000000000..9944fc0e8
--- /dev/null
+++ b/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py
@@ -0,0 +1,95 @@
+# Copyright 2011 OpenStack LLC.
+# 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 json
+
+import webob
+
+from nova import compute
+from nova import exception
+from nova import flags
+from nova import test
+from nova.tests.api.openstack import fakes
+
+
+FLAGS = flags.FLAGS
+
+
+UUID1 = '00000000-0000-0000-0000-000000000001'
+UUID2 = '00000000-0000-0000-0000-000000000002'
+UUID3 = '00000000-0000-0000-0000-000000000003'
+
+
+def fake_compute_get(*args, **kwargs):
+    return fakes.stub_instance(1, uuid=UUID3, host="host-fake")
+
+
+def fake_compute_get_all(*args, **kwargs):
+    return [
+        fakes.stub_instance(1, uuid=UUID1, host="host-1"),
+        fakes.stub_instance(2, uuid=UUID2, host="host-2")
+    ]
+
+
+class ExtendedServerAttributesTest(test.TestCase):
+
+    def setUp(self):
+        super(ExtendedServerAttributesTest, self).setUp()
+        fakes.stub_out_nw_api(self.stubs)
+        self.stubs.Set(compute.api.API, 'get', fake_compute_get)
+        self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all)
+
+    def _make_request(self, url):
+        req = webob.Request.blank(url)
+        req.headers['Accept'] = 'application/json'
+        res = req.get_response(fakes.wsgi_app())
+        return res
+
+    def assertServerAttributes(self, server, host, instance_name):
+        self.assertEqual(server.get('OS-EXT-SRV-ATTR:host'), host)
+        self.assertEqual(server.get('OS-EXT-SRV-ATTR:instance_name'),
+                                    instance_name)
+
+    def test_show(self):
+        url = '/v2/fake/servers/%s' % UUID3
+        res = self._make_request(url)
+        body = json.loads(res.body)
+
+        self.assertEqual(res.status_int, 200)
+        self.assertServerAttributes(body['server'],
+                                host='host-fake',
+                                instance_name='instance-1')
+
+    def test_detail(self):
+        url = '/v2/fake/servers/detail'
+        res = self._make_request(url)
+        body = json.loads(res.body)
+
+        self.assertEqual(res.status_int, 200)
+        for i, server in enumerate(body['servers']):
+            self.assertServerAttributes(server,
+                                    host='host-%s' % (i + 1),
+                                    instance_name='instance-%s' % (i + 1))
+
+    def test_no_instance_passthrough_404(self):
+
+        def fake_compute_get(*args, **kwargs):
+            raise exception.InstanceNotFound()
+
+        self.stubs.Set(compute.api.API, 'get', fake_compute_get)
+        url = '/v2/fake/servers/70f6db34-de8d-4fbd-aafb-4065bdfa6115'
+        res = self._make_request(url)
+
+        self.assertEqual(res.status_int, 404)
diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index 1a281590f..5140472c6 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -161,6 +161,7 @@ class ExtensionControllerTest(ExtensionTestCase):
             "DeferredDelete",
             "DiskConfig",
             "ExtendedStatus",
+            "ExtendedServerAttributes",
             "FlavorExtraSpecs",
             "FlavorExtraData",
             "FlavorManage",
diff --git a/nova/tests/policy.json b/nova/tests/policy.json
index 4a6bf872a..c231bff60 100644
--- a/nova/tests/policy.json
+++ b/nova/tests/policy.json
@@ -88,6 +88,7 @@
     "compute_extension:createserverext": [],
     "compute_extension:deferred_delete": [],
     "compute_extension:disk_config": [],
+    "compute_extension:extended_server_attributes": [],
     "compute_extension:extended_status": [],
     "compute_extension:flavorextradata": [],
     "compute_extension:flavorextraspecs": [],