From 37da9988e4dd376cf5caf29a947860e6b33195da Mon Sep 17 00:00:00 2001 From: "Yuanbin.Chen" Date: Tue, 9 Jan 2018 16:00:20 +0800 Subject: [PATCH] Fix cluster/node force delete parameter location error Change-Id: If879add2eba71b61988a94eb6497597b0d0cf3c3 Closes-Bug: 1742071 --- senlinclient/tests/unit/v1/test_client.py | 4 ++-- senlinclient/tests/unit/v1/test_cluster.py | 6 +++--- senlinclient/tests/unit/v1/test_node.py | 6 +++--- senlinclient/v1/client.py | 10 +++++----- senlinclient/v1/cluster.py | 2 +- senlinclient/v1/node.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/senlinclient/tests/unit/v1/test_client.py b/senlinclient/tests/unit/v1/test_client.py index af9b2f9e..99da1dc9 100644 --- a/senlinclient/tests/unit/v1/test_client.py +++ b/senlinclient/tests/unit/v1/test_client.py @@ -204,7 +204,7 @@ class ClientTest(testtools.TestCase): res = sc.delete_cluster('FAKE_ID', True) self.assertEqual(self.service.delete_cluster.return_value, res) self.service.delete_cluster.assert_called_once_with( - 'FAKE_ID', True, True) + 'FAKE_ID', True, False) def test_delete_cluster_ignore_missing(self, mock_conn): mock_conn.return_value = self.conn @@ -372,7 +372,7 @@ class ClientTest(testtools.TestCase): res = sc.delete_node('FAKE_ID', True) self.assertEqual(self.service.delete_node.return_value, res) self.service.delete_node.assert_called_once_with( - 'FAKE_ID', True, True) + 'FAKE_ID', True, False) def test_check_node(self, mock_conn): mock_conn.return_value = self.conn diff --git a/senlinclient/tests/unit/v1/test_cluster.py b/senlinclient/tests/unit/v1/test_cluster.py index 35153a47..66046286 100644 --- a/senlinclient/tests/unit/v1/test_cluster.py +++ b/senlinclient/tests/unit/v1/test_cluster.py @@ -363,9 +363,9 @@ class TestClusterDelete(TestCluster): parsed_args = self.check_parser(self.cmd, arglist, []) self.cmd.take_action(parsed_args) self.mock_client.delete_cluster.assert_has_calls( - [mock.call('cluster1', True, False), - mock.call('cluster2', True, False), - mock.call('cluster3', True, False)] + [mock.call('cluster1', False, True), + mock.call('cluster2', False, True), + mock.call('cluster3', False, True)] ) def test_cluster_delete_not_found(self): diff --git a/senlinclient/tests/unit/v1/test_node.py b/senlinclient/tests/unit/v1/test_node.py index ed036728..bbe472c1 100644 --- a/senlinclient/tests/unit/v1/test_node.py +++ b/senlinclient/tests/unit/v1/test_node.py @@ -359,9 +359,9 @@ class TestNodeDelete(TestNode): parsed_args = self.check_parser(self.cmd, arglist, []) self.cmd.take_action(parsed_args) self.mock_client.delete_node.assert_has_calls( - [mock.call('node1', True, False), - mock.call('node2', True, False), - mock.call('node3', True, False)] + [mock.call('node1', False, True), + mock.call('node2', False, True), + mock.call('node3', False, True)] ) def test_node_delete_not_found(self): diff --git a/senlinclient/v1/client.py b/senlinclient/v1/client.py index c039296a..b3b7b86c 100644 --- a/senlinclient/v1/client.py +++ b/senlinclient/v1/client.py @@ -198,14 +198,14 @@ class Client(object): """ return self.service.update_cluster(cluster, **attrs) - def delete_cluster(self, cluster, force_delete=False, ignore_missing=True): + def delete_cluster(self, cluster, ignore_missing=True, force_delete=False): """Delete cluster Doc link: https://developer.openstack.org/api-ref/clustering/#delete-cluster """ - return self.service.delete_cluster(cluster, force_delete, - ignore_missing) + return self.service.delete_cluster(cluster, ignore_missing, + force_delete) def cluster_add_nodes(self, cluster, nodes): """Add a node to cluster @@ -381,13 +381,13 @@ class Client(object): """ return self.service.update_node(node, **attrs) - def delete_node(self, node, force_delete=False, ignore_missing=True): + def delete_node(self, node, ignore_missing=True, force_delete=False): """Delete node Doc link: https://developer.openstack.org/api-ref/clustering/#delete-node """ - return self.service.delete_node(node, force_delete, ignore_missing) + return self.service.delete_node(node, ignore_missing, force_delete) def check_node(self, node, **params): """Check node's health status diff --git a/senlinclient/v1/cluster.py b/senlinclient/v1/cluster.py index 4eb33a59..5015eb6c 100644 --- a/senlinclient/v1/cluster.py +++ b/senlinclient/v1/cluster.py @@ -359,7 +359,7 @@ class DeleteCluster(command.Command): for cid in parsed_args.cluster: try: cluster = senlin_client.delete_cluster( - cid, parsed_args.force_delete, False) + cid, False, parsed_args.force_delete) result[cid] = ('OK', cluster.location.split('/')[-1]) except Exception as ex: result[cid] = ('ERROR', six.text_type(ex)) diff --git a/senlinclient/v1/node.py b/senlinclient/v1/node.py index 772f0620..2de32a61 100644 --- a/senlinclient/v1/node.py +++ b/senlinclient/v1/node.py @@ -330,7 +330,7 @@ class DeleteNode(command.Command): for nid in parsed_args.node: try: node = senlin_client.delete_node( - nid, parsed_args.force_delete, False) + nid, False, parsed_args.force_delete) result[nid] = ('OK', node.location.split('/')[-1]) except Exception as ex: result[nid] = ('ERROR', six.text_type(ex))