Merge "Don't set list_type to dict for server groups." into stable/train
This commit is contained in:
@@ -170,7 +170,7 @@ class Server(resource.Resource, metadata.MetadataMixin, resource.TagMixin):
|
||||
type=list, list_type=dict)
|
||||
#: The UUIDs of the server groups to which the server belongs.
|
||||
#: Currently this can contain at most one entry.
|
||||
server_groups = resource.Body('server_groups', type=list, list_type=dict)
|
||||
server_groups = resource.Body('server_groups', type=list)
|
||||
#: The state this server is in. Valid values include ``ACTIVE``,
|
||||
#: ``BUILDING``, ``DELETED``, ``ERROR``, ``HARD_REBOOT``, ``PASSWORD``,
|
||||
#: ``PAUSED``, ``REBOOT``, ``REBUILD``, ``RESCUED``, ``RESIZED``,
|
||||
|
||||
@@ -105,6 +105,7 @@ EXAMPLE = {
|
||||
'name': 'default'
|
||||
}
|
||||
],
|
||||
'server_groups': ['3caf4187-8010-491f-b6f5-a4a68a40371e'],
|
||||
'status': 'ACTIVE',
|
||||
'tags': [],
|
||||
'tenant_id': '6f70656e737461636b20342065766572',
|
||||
@@ -207,6 +208,7 @@ class TestServer(base.TestCase):
|
||||
self.assertEqual(EXAMPLE['name'], sot.name)
|
||||
self.assertEqual(EXAMPLE['progress'], sot.progress)
|
||||
self.assertEqual(EXAMPLE['tenant_id'], sot.project_id)
|
||||
self.assertEqual(EXAMPLE['server_groups'], sot.server_groups)
|
||||
self.assertEqual(EXAMPLE['status'], sot.status)
|
||||
self.assertEqual(EXAMPLE['updated'], sot.updated_at)
|
||||
self.assertEqual(EXAMPLE['user_id'], sot.user_id)
|
||||
|
||||
Reference in New Issue
Block a user