x
/
mogan
Code Issues Proposed changes

Merge "Add partitions to server API object"

This commit is contained in:
Jenkins 2017-09-15 03:00:15 +00:00 committed by Gerrit Code Review
parent bea9ff15e0 279100a520
commit 5949568d06
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mogan/api/controllers/v1/servers.py
View File

@ -459,6 +459,9 @@ class Server(base.APIBase):
key_name = wtypes.text
"""The ssh key name of the server"""
partitions = types.jsontype
"""The partitions of the server"""
def __init__(self, **kwargs):
super(Server, self).__init__(**kwargs)
self.fields = []

2
mogan/tests/functional/api/v1/test_servers.py
View File

@ -206,7 +206,7 @@ class TestServers(v1_test.APITestV1):
resps = self.get_json('/servers/detail',
headers=headers)['servers']
self.assertEqual(4, len(resps))
self.assertEqual(17, len(resps[0].keys()))
self.assertEqual(18, len(resps[0].keys()))
self.assertEqual('test_server_0', resps[0]['name'])
self.assertEqual('just test server 0', resps[0]['description'])
self.assertEqual('building', resps[0]['status'])