From 279100a5208d2d7aae43436ee8bc551f69f6a0d8 Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Thu, 14 Sep 2017 17:41:45 +0800 Subject: [PATCH] Add partitions to server API object Add partitions to make sure it returned with the API response. Change-Id: I11fa63df60785f79116fa40d5f3cd7427a003add --- mogan/api/controllers/v1/servers.py | 3 +++ mogan/tests/functional/api/v1/test_servers.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mogan/api/controllers/v1/servers.py b/mogan/api/controllers/v1/servers.py index f650643f..7d341e41 100644 --- a/mogan/api/controllers/v1/servers.py +++ b/mogan/api/controllers/v1/servers.py @@ -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 = [] diff --git a/mogan/tests/functional/api/v1/test_servers.py b/mogan/tests/functional/api/v1/test_servers.py index b3e4a044..15a0d6ad 100644 --- a/mogan/tests/functional/api/v1/test_servers.py +++ b/mogan/tests/functional/api/v1/test_servers.py @@ -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'])