diff --git a/senlinclient/tests/unit/v1/test_client.py b/senlinclient/tests/unit/v1/test_client.py index 2c5ea967..af9b2f9e 100644 --- a/senlinclient/tests/unit/v1/test_client.py +++ b/senlinclient/tests/unit/v1/test_client.py @@ -201,19 +201,19 @@ class ClientTest(testtools.TestCase): mock_conn.return_value = self.conn sc = client.Client() - res = sc.delete_cluster('FAKE_ID') + 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) + 'FAKE_ID', True, True) def test_delete_cluster_ignore_missing(self, mock_conn): mock_conn.return_value = self.conn sc = client.Client() - res = sc.delete_cluster('FAKE_ID', False) + res = sc.delete_cluster('FAKE_ID', True, False) self.assertEqual(self.service.delete_cluster.return_value, res) self.service.delete_cluster.assert_called_once_with( - 'FAKE_ID', False) + 'FAKE_ID', True, False) def test_cluster_add_nodes(self, mock_conn): mock_conn.return_value = self.conn @@ -369,10 +369,10 @@ class ClientTest(testtools.TestCase): mock_conn.return_value = self.conn sc = client.Client() - res = sc.delete_node('FAKE_ID') + 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) + 'FAKE_ID', True, True) def test_check_node(self, mock_conn): mock_conn.return_value = self.conn @@ -395,10 +395,10 @@ class ClientTest(testtools.TestCase): mock_conn.return_value = self.conn sc = client.Client() - res = sc.delete_node('FAKE_ID', False) + res = sc.delete_node('FAKE_ID', True, False) self.assertEqual(self.service.delete_node.return_value, res) self.service.delete_node.assert_called_once_with( - 'FAKE_ID', False) + 'FAKE_ID', True, False) def test_receivers(self, mock_conn): mock_conn.return_value = self.conn diff --git a/senlinclient/v1/client.py b/senlinclient/v1/client.py index 5df478b2..c039296a 100644 --- a/senlinclient/v1/client.py +++ b/senlinclient/v1/client.py @@ -198,13 +198,14 @@ class Client(object): """ return self.service.update_cluster(cluster, **attrs) - def delete_cluster(self, cluster, ignore_missing=True): + def delete_cluster(self, cluster, force_delete=False, ignore_missing=True): """Delete cluster Doc link: https://developer.openstack.org/api-ref/clustering/#delete-cluster """ - return self.service.delete_cluster(cluster, ignore_missing) + return self.service.delete_cluster(cluster, force_delete, + ignore_missing) def cluster_add_nodes(self, cluster, nodes): """Add a node to cluster @@ -380,13 +381,13 @@ class Client(object): """ return self.service.update_node(node, **attrs) - def delete_node(self, node, ignore_missing=True): + def delete_node(self, node, force_delete=False, ignore_missing=True): """Delete node Doc link: https://developer.openstack.org/api-ref/clustering/#delete-node """ - return self.service.delete_node(node, ignore_missing) + return self.service.delete_node(node, force_delete, ignore_missing) def check_node(self, node, **params): """Check node's health status