x/python-moganclient
Code Issues Proposed changes

Format server partitions output

Browse Source 
Change-Id: Ib3b16d1f90509ec161b12cb73b51ff13b0256f2d
This commit is contained in:
Zhenguo Niu 2017-09-14 17:49:20 +08:00
parent a473f6a541
commit 6307baa3f5
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
moganclient/osc/v1/manageable_server.py
View File

@ -138,6 +138,7 @@ class ManageServer(command.ShowOne):
data._info.update(
{
'properties': utils.format_dict(data._info.pop('metadata')),
'partitions': utils.format_dict(data._info.pop('partitions')),
'flavor': cli_utils.flavor_formatter(
bc_client, data._info.pop('flavor_uuid')),
'image': cli_utils.image_formatter(

2
moganclient/osc/v1/server.py
View File

@ -247,6 +247,7 @@ class CreateServer(command.ShowOne):
data._info.update(
{
'properties': utils.format_dict(data._info.pop('metadata')),
'partitions': utils.format_dict(data._info.pop('partitions')),
'image': '%s (%s)' % (image_data.name, image_data.id),
'flavor': '%s (%s)' % (flavor_data.name, flavor_data.uuid)
},
@ -456,6 +457,7 @@ class ShowServer(command.ShowOne):
data._info.update(
{
'properties': utils.format_dict(data._info.pop('metadata')),
'partitions': utils.format_dict(data._info.pop('partitions')),
'addresses': cli_utils.addresses_formatter(
network_client,
data._info.pop('addresses')),

3
moganclient/tests/unit/fakes.py
View File

@ -273,7 +273,8 @@ class FakeServer(object):
dashed=False),
"availability_zone": "zone-name-" + uuidutils.generate_uuid(
dashed=False),
'metadata': {}
'metadata': {},
'partitions': {}
}
# Overwrite default attributes.

2
moganclient/tests/unit/osc/v1/test_manageable_server.py
View File

@ -38,6 +38,7 @@ class TestManageableServer(test_base.TestBaremetalComputeV1):
'links',
'name',
'node_uuid',
'partitions',
'properties',
'updated_at',
'uuid')
@ -170,6 +171,7 @@ class TestServerManage(TestManageableServer):
fk_server.links,
fk_server.name,
fk_server.node_uuid,
utils.format_dict(fk_server.partitions),
utils.format_dict(fk_server.metadata),
fk_server.updated_at,
fk_server.uuid)

2
moganclient/tests/unit/osc/v1/test_server.py
View File

@ -40,6 +40,7 @@ class TestServer(test_base.TestBaremetalComputeV1):
'max_count',
'min_count',
'name',
'partitions',
'properties',
'updated_at',
'uuid')
@ -140,6 +141,7 @@ class TestServerCreate(TestServer):
1,
1,
fk_server.name,
utils.format_dict(fk_server.partitions),
utils.format_dict(fk_server.metadata),
fk_server.updated_at,
fk_server.uuid)