RND-622 Add --recursive to cfy uninstall (#1482)

* RND-622 Add --recursive to `cfy uninstall`

* update the mock assertion

Author: tehasdf

cloudify_cli/cli/cfy.py

@@ -1922,6 +1922,12 @@ def __init__(self):
             required=False,
             help=helptexts.EVALUATE_FUNCTIONS,
         )
+        self.recursive_delete = click.option(
+            '--recursive',
+            default=False,
+            is_flag=True,
+            help=helptexts.RECURSIVE_DELETE,
+        )
 
     def common_options(self, f):
         """A shorthand for applying commonly used arguments.
@@ -1988,16 +1994,11 @@ def agent_filters(self, f):
             is_flag=True,
             help=helptexts.AGENT_ALL_STATES,
         )
-        self.recursive_delete = click.option(
-            '--recursive',
-            default=False,
-            is_flag=True,
-            help=helptexts.RECURSIVE_DELETE,
-        )
 
         # we add separate --node-instance-id, --node-id and --deployment-id
         # arguments, but only expose a agents_filter = {'node_id': ..} dict
         # to the decorated function
+
         def _filters_deco(f):
             @wraps(f)
             def _inner(*args, **kwargs):

cloudify_cli/commands/uninstall.py

@@ -26,6 +26,7 @@
 @cfy.argument('deployment-id')
 @cfy.options.workflow_id('uninstall')
 @cfy.options.force(help=helptexts.FORCE_CONCURRENT_EXECUTION)
+@cfy.options.recursive_delete
 @cfy.options.parameters
 @cfy.options.allow_custom_parameters
 @cfy.options.timeout()
@@ -39,6 +40,7 @@ def manager(ctx,
             deployment_id,
             workflow_id,
             force,
+            recursive,
             parameters,
             allow_custom_parameters,
             timeout,
@@ -57,6 +59,8 @@ def manager(ctx,
     # if no workflow was supplied, execute the `uninstall` workflow
     workflow_id = workflow_id or DEFAULT_UNINSTALL_WORKFLOW
 
+    if recursive:
+        parameters['recursive'] = True
     ctx.invoke(
         executions.manager_start,
         workflow_id=workflow_id,
@@ -79,7 +83,9 @@ def manager(ctx,
         deployments.manager_delete,
         deployment_id=deployment_id,
         force=force,
-        tenant_name=tenant_name)
+        tenant_name=tenant_name,
+        recursive=recursive,
+    )
     ctx.invoke(
         blueprints.delete,
         blueprint_id=blueprint_id,

cloudify_cli/tests/commands/test_uninstall.py

@@ -91,7 +91,8 @@ def test_deployments_delete_arguments(self, deployments_delete_mock, *_):
         deployments_delete_mock.assert_called_with(
             deployment_id=u'did',
             force=False,
-            tenant_name=None
+            tenant_name=None,
+            recursive=False,
         )
 
     @patch('cloudify_cli.env.get_rest_client')