openstack/python-senlinclient
Code Issues Proposed changes

Merge "Fix cluster/node force delete parameter location error"

Browse Source
This commit is contained in:
Zuul 2018-01-10 05:17:35 +00:00 committed by Gerrit Code Review
commit 5230d3f075
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
senlinclient/tests/unit/v1/test_client.py
View File

@ -204,7 +204,7 @@ class ClientTest(testtools.TestCase):
res = sc.delete_cluster('FAKE_ID', True) res = sc.delete_cluster('FAKE_ID', True)
self.assertEqual(self.service.delete_cluster.return_value, res) self.assertEqual(self.service.delete_cluster.return_value, res)
self.service.delete_cluster.assert_called_once_with( 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): def test_delete_cluster_ignore_missing(self, mock_conn):
mock_conn.return_value = self.conn mock_conn.return_value = self.conn
@ -372,7 +372,7 @@ class ClientTest(testtools.TestCase):
res = sc.delete_node('FAKE_ID', True) res = sc.delete_node('FAKE_ID', True)
self.assertEqual(self.service.delete_node.return_value, res) self.assertEqual(self.service.delete_node.return_value, res)
self.service.delete_node.assert_called_once_with( self.service.delete_node.assert_called_once_with(
'FAKE_ID', True, True) 'FAKE_ID', True, False)
def test_check_node(self, mock_conn): def test_check_node(self, mock_conn):
mock_conn.return_value = self.conn mock_conn.return_value = self.conn

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

@ -363,9 +363,9 @@ class TestClusterDelete(TestCluster):
parsed_args = self.check_parser(self.cmd, arglist, []) parsed_args = self.check_parser(self.cmd, arglist, [])
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
self.mock_client.delete_cluster.assert_has_calls( self.mock_client.delete_cluster.assert_has_calls(
[mock.call('cluster1', True, False), [mock.call('cluster1', False, True),
mock.call('cluster2', True, False), mock.call('cluster2', False, True),
mock.call('cluster3', True, False)] mock.call('cluster3', False, True)]
) )
def test_cluster_delete_not_found(self): def test_cluster_delete_not_found(self):

6
senlinclient/tests/unit/v1/test_node.py
View File

@ -359,9 +359,9 @@ class TestNodeDelete(TestNode):
parsed_args = self.check_parser(self.cmd, arglist, []) parsed_args = self.check_parser(self.cmd, arglist, [])
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
self.mock_client.delete_node.assert_has_calls( self.mock_client.delete_node.assert_has_calls(
[mock.call('node1', True, False), [mock.call('node1', False, True),
mock.call('node2', True, False), mock.call('node2', False, True),
mock.call('node3', True, False)] mock.call('node3', False, True)]
) )
def test_node_delete_not_found(self): def test_node_delete_not_found(self):

10
senlinclient/v1/client.py
View File

@ -198,14 +198,14 @@ class Client(object):
""" """
return self.service.update_cluster(cluster, **attrs) 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 """Delete cluster
Doc link: Doc link:
https://developer.openstack.org/api-ref/clustering/#delete-cluster https://developer.openstack.org/api-ref/clustering/#delete-cluster
""" """
return self.service.delete_cluster(cluster, force_delete, return self.service.delete_cluster(cluster, ignore_missing,
ignore_missing) force_delete)
def cluster_add_nodes(self, cluster, nodes): def cluster_add_nodes(self, cluster, nodes):
"""Add a node to cluster """Add a node to cluster
@ -381,13 +381,13 @@ class Client(object):
""" """
return self.service.update_node(node, **attrs) 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 """Delete node
Doc link: Doc link:
https://developer.openstack.org/api-ref/clustering/#delete-node 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): def check_node(self, node, **params):
"""Check node's health status """Check node's health status

2
senlinclient/v1/cluster.py
View File

@ -359,7 +359,7 @@ class DeleteCluster(command.Command):
for cid in parsed_args.cluster: for cid in parsed_args.cluster:
try: try:
cluster = senlin_client.delete_cluster( cluster = senlin_client.delete_cluster(
cid, parsed_args.force_delete, False) cid, False, parsed_args.force_delete)
result[cid] = ('OK', cluster.location.split('/')[-1]) result[cid] = ('OK', cluster.location.split('/')[-1])
except Exception as ex: except Exception as ex:
result[cid] = ('ERROR', six.text_type(ex)) result[cid] = ('ERROR', six.text_type(ex))

2
senlinclient/v1/node.py
View File

@ -330,7 +330,7 @@ class DeleteNode(command.Command):
for nid in parsed_args.node: for nid in parsed_args.node:
try: try:
node = senlin_client.delete_node( node = senlin_client.delete_node(
nid, parsed_args.force_delete, False) nid, False, parsed_args.force_delete)
result[nid] = ('OK', node.location.split('/')[-1]) result[nid] = ('OK', node.location.split('/')[-1])
except Exception as ex: except Exception as ex:
result[nid] = ('ERROR', six.text_type(ex)) result[nid] = ('ERROR', six.text_type(ex))