openstack/deb-python-senlinclient
Code Issues Proposed changes

Fix nodes display in cluster-show

Browse Source 
This patch fixes the problem caused by latest changes to openstacksdk
where 'nodes' was changed to 'node_ids'.

Closes-Bug: 1608325
Change-Id: Ie68a3af9103343b2e314d2e90d5b067cf3b8ed81
This commit is contained in:
tengqm
2016-07-31 22:08:48 -04:00
parent 3743dbc8b9
commit 69ba1c6d26
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
senlinclient/tests/unit/v1/test_cluster.py
View File

@@ -43,7 +43,7 @@ class TestClusterList(TestCluster):
"metadata": {}, "metadata": {},
"min_size": 0, "min_size": 0,
"name": "cluster1", "name": "cluster1",
"nodes": [ "node_ids": [
"b07c57c8-7ab2-47bf-bdf8-e894c0c601b9", "b07c57c8-7ab2-47bf-bdf8-e894c0c601b9",
"ecc23d3e-bb68-48f8-8260-c9cf6bcb6e61", "ecc23d3e-bb68-48f8-8260-c9cf6bcb6e61",
"da1e9c87-e584-4626-a120-022da5062dac" "da1e9c87-e584-4626-a120-022da5062dac"
@@ -158,7 +158,7 @@ class TestClusterShow(TestCluster):
"metadata": {}, "metadata": {},
"min_size": 0, "min_size": 0,
"name": "my_cluster", "name": "my_cluster",
"nodes": [], "node_ids": [],
"policies": [], "policies": [],
"profile_id": "edc63d0a-2ca4-48fa-9854-27926da76a4a", "profile_id": "edc63d0a-2ca4-48fa-9854-27926da76a4a",
"profile_name": "mystack", "profile_name": "mystack",
@@ -204,7 +204,7 @@ class TestClusterCreate(TestCluster):
"metadata": {}, "metadata": {},
"min_size": 0, "min_size": 0,
"name": "test_cluster", "name": "test_cluster",
"nodes": [], "node_ids": [],
"policies": [], "policies": [],
"profile_id": "edc63d0a-2ca4-48fa-9854-27926da76a4a", "profile_id": "edc63d0a-2ca4-48fa-9854-27926da76a4a",
"profile_name": "mystack", "profile_name": "mystack",
@@ -274,7 +274,7 @@ class TestClusterUpdate(TestCluster):
"metadata": {}, "metadata": {},
"min_size": 0, "min_size": 0,
"name": "test_cluster", "name": "test_cluster",
"nodes": [], "node_ids": [],
"policies": [], "policies": [],
"profile_id": "edc63d0a-2ca4-48fa-9854-27926da76a4a", "profile_id": "edc63d0a-2ca4-48fa-9854-27926da76a4a",
"profile_name": "mystack", "profile_name": "mystack",

2
senlinclient/tests/unit/v1/test_shell.py
View File

@@ -637,7 +637,7 @@ class ShellTest(testtools.TestCase):
service.get_cluster.return_value = cluster service.get_cluster.return_value = cluster
formatters = { formatters = {
'metadata': utils.json_formatter, 'metadata': utils.json_formatter,
'nodes': utils.list_formatter, 'node_ids': utils.list_formatter,
} }
cluster_dict = mock.Mock() cluster_dict = mock.Mock()
cluster.to_dict.return_value = cluster_dict cluster.to_dict.return_value = cluster_dict

2
senlinclient/v1/cluster.py
View File

@@ -133,7 +133,7 @@ def _show_cluster(senlin_client, cluster_id):
formatters = { formatters = {
'metadata': senlin_utils.json_formatter, 'metadata': senlin_utils.json_formatter,
'nodes': senlin_utils.list_formatter 'node_ids': senlin_utils.list_formatter
} }
data = cluster.to_dict() data = cluster.to_dict()
columns = sorted(list(six.iterkeys(data))) columns = sorted(list(six.iterkeys(data)))

2
senlinclient/v1/shell.py
View File

@@ -449,7 +449,7 @@ def _show_cluster(service, cluster_id):
formatters = { formatters = {
'metadata': utils.json_formatter, 'metadata': utils.json_formatter,
'nodes': utils.list_formatter, 'node_ids': utils.list_formatter,
} }
utils.print_dict(cluster.to_dict(), formatters=formatters) utils.print_dict(cluster.to_dict(), formatters=formatters)