Merge "Fix abnormal display with openstack database instance list"

This commit is contained in:
Zuul 2017-12-08 20:15:25 +00:00 committed by Gerrit Code Review
commit 73102087d7
3 changed files with 10 additions and 5 deletions

View File

@ -31,7 +31,7 @@ def set_attributes_for_print(instances):
setattr(instance, 'datastore_version',
instance.datastore['version'])
setattr(instance, 'datastore', instance.datastore['type'])
return instances
return instances
def set_attributes_for_print_detail(instance):

View File

@ -87,6 +87,10 @@ class FakeInstances(object):
def get_instances_1234(self):
return instances.Instance(None, self.fake_instances[0])
def get_instances(self):
return [instances.Instance(None, fake_instance)
for fake_instance in self.fake_instances]
class FakeDatabases(object):
fake_databases = [{'name': 'fakedb1'}]

View File

@ -32,13 +32,14 @@ class TestInstanceList(TestInstances):
}
columns = database_instances.ListDatabaseInstances.columns
values = ('1234', 'test-member-1', 'mysql', '5.6', 'ACTIVE', '02', 2,
'regionOne')
values = [('1234', 'test-member-1', 'mysql', '5.6', 'ACTIVE', '02', 2,
'regionOne'), ('5678', 'test-member-2', 'mysql', '5.6',
'ACTIVE', '2', 2, 'regionOne')]
def setUp(self):
super(TestInstanceList, self).setUp()
self.cmd = database_instances.ListDatabaseInstances(self.app, None)
self.data = [self.fake_instances.get_instances_1234()]
self.data = self.fake_instances.get_instances()
self.instance_client.list.return_value = common.Paginated(self.data)
def test_instance_list_defaults(self):
@ -46,7 +47,7 @@ class TestInstanceList(TestInstances):
columns, data = self.cmd.take_action(parsed_args)
self.instance_client.list.assert_called_once_with(**self.defaults)
self.assertEqual(self.columns, columns)
self.assertEqual([self.values], data)
self.assertEqual(self.values, data)
class TestInstanceShow(TestInstances):