Merge lp:~ken-pepple/nova/lp741965 into lp:~hudson-openstack/nova/trunk

[Ken Pepple]

fixes incorrect case of OpenStack API status response

[Naveed Massjouni (ironcamel)]

In servers._build_detail(), why not upper case the values of the power_mapping dict.

And line 14 could be:
    inst_dict['status'] = 'RESIZE-CONFIRM'

[Josh Kearney (jk0)]

I'd have to agree with Naveed on this -- once that is changed, it will be good to go.

review: Needs Fixing

[Jay Pipes (jaypipes)]

test case? this is a perfect example of a bug that will happily re-appear if a test case is not added for it :)

review: Needs Fixing

[Ken Pepple (ken-pepple)]

so the thought process here was that by upcase-ing it at time of return it would catch any problems when people added powerstates later ... however, I've changed it to just making them capitals.

as to the tests, i caught the resize one, but thought we were just faking the others in wsgi_app(). fixed.

[Josh Kearney (jk0)]

Thanks Ken, looks great!

review: Approve

[Jay Pipes (jaypipes)]

sweet. thx Ken!

review: Approve

=== modified file 'nova/api/openstack/views/servers.py'
--- nova/api/openstack/views/servers.py	2011-03-24 14:15:50 +0000
+++ nova/api/openstack/views/servers.py	2011-04-04 16:46:30 +0000
@@ -57,16 +57,16 @@
     def _build_detail(self, inst):
         """Returns a detailed model of a server."""
         power_mapping = {
-            None: 'build',
-            power_state.NOSTATE: 'build',
-            power_state.RUNNING: 'active',
-            power_state.BLOCKED: 'active',
-            power_state.SUSPENDED: 'suspended',
-            power_state.PAUSED: 'paused',
-            power_state.SHUTDOWN: 'active',
-            power_state.SHUTOFF: 'active',
-            power_state.CRASHED: 'error',
-            power_state.FAILED: 'error'}
+            None: 'BUILD',
+            power_state.NOSTATE: 'BUILD',
+            power_state.RUNNING: 'ACTIVE',
+            power_state.BLOCKED: 'ACTIVE',
+            power_state.SUSPENDED: 'SUSPENDED',
+            power_state.PAUSED: 'PAUSED',
+            power_state.SHUTDOWN: 'ACTIVE',
+            power_state.SHUTOFF: 'ACTIVE',
+            power_state.CRASHED: 'ERROR',
+            power_state.FAILED: 'ERROR'}
 
         inst_dict = {
             'id': int(inst['id']),
@@ -77,7 +77,7 @@
         ctxt = nova.context.get_admin_context()
         compute_api = nova.compute.API()
         if compute_api.has_finished_migration(ctxt, inst['id']):
-            inst_dict['status'] = 'resize-confirm'
+            inst_dict['status'] = 'RESIZE-CONFIRM'
 
         # Return the metadata as a dictionary
         metadata = {}

=== modified file 'nova/tests/api/openstack/test_servers.py'
--- nova/tests/api/openstack/test_servers.py	2011-03-31 19:45:36 +0000
+++ nova/tests/api/openstack/test_servers.py	2011-04-04 16:46:30 +0000
@@ -631,6 +631,7 @@
             self.assertEqual(s['name'], 'server%d' % i)
             self.assertEqual(s['imageId'], '10')
             self.assertEqual(s['flavorId'], '1')
+            self.assertEqual(s['status'], 'BUILD')
             self.assertEqual(s['metadata']['seq'], i)
 
     def test_get_all_server_details_v1_1(self):
@@ -644,6 +645,7 @@
             self.assertEqual(s['name'], 'server%d' % i)
             self.assertEqual(s['imageRef'], 'http://localhost/v1.1/images/10')
             self.assertEqual(s['flavorRef'], 'http://localhost/v1.1/flavors/1')
+            self.assertEqual(s['status'], 'BUILD')
             self.assertEqual(s['metadata']['seq'], i)
 
     def test_get_all_server_details_with_host(self):
@@ -917,7 +919,7 @@
                 fake_migration_get)
         res = req.get_response(fakes.wsgi_app())
         body = json.loads(res.body)
-        self.assertEqual(body['server']['status'], 'resize-confirm')
+        self.assertEqual(body['server']['status'], 'RESIZE-CONFIRM')
 
     def test_confirm_resize_server(self):
         req = self.webreq('/1/action', 'POST', dict(confirmResize=None))