diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-14 10:47:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-14 10:47:49 +0000 |
| commit | 37bca2b85c588fe7c89160492d5d8c1db5cebe3b (patch) | |
| tree | 9aba24ef77c88d8edd7a2cb85afaf21573dc2a22 | |
| parent | c8acec30e6e5bc23d432ea940395680ac1304b58 (diff) | |
| parent | e6759c5a786891ce48fb00a72711476f67757273 (diff) | |
| download | tuskar-ui-37bca2b85c588fe7c89160492d5d8c1db5cebe3b.tar.gz | |
Merge "Fix node list"
| -rw-r--r-- | tuskar_ui/api/node.py | 3 | ||||
| -rw-r--r-- | tuskar_ui/test/api_tests/node_tests.py | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tuskar_ui/api/node.py b/tuskar_ui/api/node.py index 5864c3f1..31e96775 100644 --- a/tuskar_ui/api/node.py +++ b/tuskar_ui/api/node.py @@ -229,7 +229,8 @@ class Node(base.APIResourceWrapper): server = servers_dict.get(n.instance_uuid, None) nodes_with_instance.append(cls(n, instance=server, request=request)) - return nodes_with_instance + return [cls.get(request, node.uuid) + for node in nodes_with_instance] return [cls.get(request, node.uuid) for node in nodes] @classmethod diff --git a/tuskar_ui/test/api_tests/node_tests.py b/tuskar_ui/test/api_tests/node_tests.py index ea92b6a7..2589caab 100644 --- a/tuskar_ui/test/api_tests/node_tests.py +++ b/tuskar_ui/test/api_tests/node_tests.py @@ -97,9 +97,15 @@ class NodeAPITests(test.APITestCase): node = self.ironicclient_nodes.first() nodes = self.ironicclient_nodes.list() - with mock_ironicclient(node=node, nodes=nodes), mock.patch( + with mock_ironicclient( + node=node, + nodes=nodes + ), mock.patch( 'openstack_dashboard.api.nova.server_list', return_value=(instances, None), + ), mock.patch( + 'openstack_dashboard.api.nova.server_get', + return_value=instances[0], ): ret_val = api.node.Node.list(self.request) |