From 5c74862a08a82b7db3e11fbcbec63293ea903e00 Mon Sep 17 00:00:00 2001
From: Ken Pepple <ken.pepple@gmail.com>
Date: Mon, 28 Mar 2011 23:11:42 -0700
Subject: make all openstack status uppercase

---
 nova/api/openstack/views/servers.py      | 4 ++--
 nova/tests/api/openstack/test_servers.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 4e7f62eb3..6b471a0f4 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -72,12 +72,12 @@ class ViewBuilder(object):
             'id': int(inst['id']),
             'name': inst['display_name'],
             'addresses': self.addresses_builder.build(inst),
-            'status': power_mapping[inst.get('state')]}
+            'status': power_mapping[inst.get('state')].upper()}
 
         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'.upper()
 
         # Return the metadata as a dictionary
         metadata = {}
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 989385a8c..27cbd28c1 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -738,7 +738,7 @@ class ServersTest(test.TestCase):
                 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))
-- 
cgit