Merge "Client support for "destroy_after_deletion" in cluster del nodes"

senlinclient/tests/unit/v1/test_shell.py

@@ -1061,7 +1061,8 @@ class ShellTest(testtools.TestCase):
         service = mock.Mock()
         args = {
             'id': 'cluster_id',
-            'nodes': 'node1,node2'
+            'nodes': 'node1,node2',
+            'destroy_after_deletion': False
         }
         args = self._make_args(args)
         node_ids = ['node1', 'node2']
@@ -1070,8 +1071,10 @@ class ShellTest(testtools.TestCase):
 
         sh.do_cluster_node_del(service, args)
 
-        service.cluster_del_nodes.assert_called_once_with('cluster_id',
-                                                          node_ids)
+        service.cluster_del_nodes.assert_called_once_with(
+            'cluster_id',
+            node_ids,
+            destroy_after_deletion=False)
 
     def test_do_cluster_resize(self):
         service = mock.Mock()

senlinclient/v1/shell.py

@@ -884,6 +884,10 @@ def do_cluster_node_add(service, args):
 @utils.arg('-n', '--nodes', metavar='<NODES>', required=True,
            help=_('ID of nodes to be deleted; multiple nodes can be separated '
                   'with ",".'))
+@utils.arg('-d', '--destroy-after-deletion', metavar='<BOOLEAN>',
+           required=False, default=False,
+           help=_('Whether nodes should be destroyed after deleted. '
+                  'Default is False.'))
 @utils.arg('id', metavar='<CLUSTER>',
            help=_('Name or ID of cluster to operate on.'))
 def do_cluster_node_del(service, args):
@@ -891,7 +895,10 @@ def do_cluster_node_del(service, args):
     show_deprecated('senlin cluster-node-del',
                     'openstack cluster node members del')
     node_ids = args.nodes.split(',')
-    resp = service.cluster_del_nodes(args.id, node_ids)
+    destroy = args.destroy_after_deletion
+    destroy = strutils.bool_from_string(destroy, strict=True)
+    kwargs = {"destroy_after_deletion": destroy}
+    resp = service.cluster_del_nodes(args.id, node_ids, **kwargs)
     print('Request accepted by action: %s' % resp['action'])