Merge "Map server power state num to meanful string"

Author: Jenkins

openstackclient/compute/v2/server.py

@@ -155,6 +155,11 @@ def _prep_server_detail(compute_client, server):
     if 'tenant_id' in info:
         info['project_id'] = info.pop('tenant_id')
 
+    # Map power state num to meanful string
+    if 'OS-EXT-STS:power_state' in info:
+        info['OS-EXT-STS:power_state'] = _format_servers_list_power_state(
+            info['OS-EXT-STS:power_state'])
+
     # Remove values that are long and not too useful
     info.pop('links', None)
 

openstackclient/tests/compute/v2/fakes.py

@@ -472,7 +472,8 @@ def create_one_server(attrs=None, methods=None):
             },
             'flavor': {
                 'id': 'flavor-id-' + uuid.uuid4().hex,
-            }
+            },
+            'OS-EXT-STS:power_state': 1,
         }
 
         # Overwrite default attributes.

openstackclient/tests/compute/v2/test_server.py

@@ -89,6 +89,7 @@ def run_method_with_servers(self, method_name, server_count):
 class TestServerCreate(TestServer):
 
     columns = (
+        'OS-EXT-STS:power_state',
         'addresses',
         'flavor',
         'id',
@@ -100,6 +101,8 @@ class TestServerCreate(TestServer):
 
     def datalist(self):
         datalist = (
+            server._format_servers_list_power_state(
+                getattr(self.new_server, 'OS-EXT-STS:power_state')),
             '',
             self.flavor.name + ' (' + self.new_server.flavor.get('id') + ')',
             self.new_server.id,
@@ -1475,6 +1478,8 @@ def test_prep_server_detail(self, find_resource):
             'image': u'%s (%s)' % (_image.name, _image.id),
             'project_id': u'tenant-id-xxx',
             'properties': '',
+            'OS-EXT-STS:power_state': server._format_servers_list_power_state(
+                getattr(_server, 'OS-EXT-STS:power_state')),
         }
 
         # Call _prep_server_detail().