Use single call in ExtendedStatus extension

Fixes bug 917400

Change-Id: I8bc78f5e5f03c1ea30e7ff23236774af48a2c059

1 files changed, 38 insertions, 11 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_extendedstatus.py b/nova/tests/api/openstack/compute/contrib/test_extendedstatus.py
index 738ab8290..2ac7d2f30 100644
--- a/nova/tests/api/openstack/compute/contrib/test_extendedstatus.py
+++ b/nova/tests/api/openstack/compute/contrib/test_extendedstatus.py
@@ -28,23 +28,35 @@ FLAGS = flags.FLAGS
 FLAGS.verbose = True
 
 
+UUID1 = '70f6db34-de8d-4fbd-aafb-4065bdfa6114'
+UUID2 = '65ba6da7-3b9a-4b71-bc08-f81fbdb72d1a'
+UUID3 = 'b55c356f-4c22-47ed-b622-cc6ba0f4b1ab'
+
+
 def fake_compute_get(*args, **kwargs):
-    return fakes.stub_instance(1, task_state="kayaking",
-                               vm_state="slightly crunchy",
-                               power_state="empowered")
+    return fakes.stub_instance(1, uuid=UUID3, task_state="kayaking",
+            vm_state="slightly crunchy", power_state="empowered")
+
+
+def fake_compute_get_all(*args, **kwargs):
+    return [
+        fakes.stub_instance(1, uuid=UUID1, task_state="task%s" % UUID1,
+                vm_state="vm%s" % UUID1, power_state="power%s" % UUID1),
+        fakes.stub_instance(2, uuid=UUID2, task_state="task%s" % UUID2,
+                vm_state="vm%s" % UUID2, power_state="power%s" % UUID2),
+    ]
 
 
 class ExtendedStatusTest(test.TestCase):
 
     def setUp(self):
         super(ExtendedStatusTest, self).setUp()
-        self.uuid = '70f6db34-de8d-4fbd-aafb-4065bdfa6114'
-        self.url = '/v2/fake/servers/%s' % self.uuid
         fakes.stub_out_nw_api(self.stubs)
         self.stubs.Set(compute.api.API, 'routing_get', fake_compute_get)
+        self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all)
 
-    def _make_request(self):
-        req = webob.Request.blank(self.url)
+    def _make_request(self, url):
+        req = webob.Request.blank(url)
         req.headers['Accept'] = 'application/json'
         res = req.get_response(fakes.wsgi_app())
         return res
@@ -54,8 +66,9 @@ class ExtendedStatusTest(test.TestCase):
         self.assertEqual(server.get('OS-EXT-STS:power_state'), power_state)
         self.assertEqual(server.get('OS-EXT-STS:task_state'), task_state)
 
-    def test_extended_status(self):
-        res = self._make_request()
+    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)
@@ -64,12 +77,26 @@ class ExtendedStatusTest(test.TestCase):
                                 power_state='empowered',
                                 task_state='kayaking')
 
-    def test_extended_status_no_instance_fails(self):
+    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 server in body['servers']:
+            sid = server['id']
+            self.assertServerStates(server,
+                                    vm_state='vm%s' % sid,
+                                    power_state='power%s' % sid,
+                                    task_state='task%s' % sid)
+
+    def test_no_instance_passthrough_404(self):
 
         def fake_compute_get(*args, **kwargs):
             raise exception.InstanceNotFound()
 
         self.stubs.Set(compute.api.API, 'routing_get', fake_compute_get)
-        res = self._make_request()
+        url = '/v2/fake/servers/70f6db34-de8d-4fbd-aafb-4065bdfa6115'
+        res = self._make_request(url)
 
         self.assertEqual(res.status_int, 404)