diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-09 13:36:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-09 13:36:56 +0000 |
| commit | 3f5fd2f9e1b341bf9dfff8643a376430f1adbaba (patch) | |
| tree | db9efe1679b2c9b4614e8d976df965c1b9c3a27b | |
| parent | 4cd702c3610e4e6b40695ff9ea8eecf7c0735c68 (diff) | |
| parent | 809239ca1e404c8077dd2499eafc8d12bd21c4cd (diff) | |
| download | python-openstackclient-3f5fd2f9e1b341bf9dfff8643a376430f1adbaba.tar.gz | |
Merge "Map server power state num to meanful string"
| -rw-r--r-- | openstackclient/compute/v2/server.py | 5 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/fakes.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index bf9f0985..8c533158 100644 --- a/openstackclient/compute/v2/server.py +++ b/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) diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py index 23957738..b3f3fb49 100644 --- a/openstackclient/tests/compute/v2/fakes.py +++ b/openstackclient/tests/compute/v2/fakes.py @@ -472,7 +472,8 @@ class FakeServer(object): }, 'flavor': { 'id': 'flavor-id-' + uuid.uuid4().hex, - } + }, + 'OS-EXT-STS:power_state': 1, } # Overwrite default attributes. diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index 2e745457..903d0bff 100644 --- a/openstackclient/tests/compute/v2/test_server.py +++ b/openstackclient/tests/compute/v2/test_server.py @@ -89,6 +89,7 @@ class TestServer(compute_fakes.TestComputev2): 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 @@ class TestServerGeneral(TestServer): '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(). |