diff --git a/tripleoclient/tests/v1/overcloud_delete/test_overcloud_delete.py b/tripleoclient/tests/v1/overcloud_delete/test_overcloud_delete.py index 6c7390340..ebaccc21f 100644 --- a/tripleoclient/tests/v1/overcloud_delete/test_overcloud_delete.py +++ b/tripleoclient/tests/v1/overcloud_delete/test_overcloud_delete.py @@ -63,4 +63,4 @@ class TestDeleteOvercloud(fakes.TestDeployOvercloud): delete_deployment_plan_mock.assert_called_once_with( self.workflow, - input={'container': 'overcloud'}) + container='overcloud') diff --git a/tripleoclient/tests/v1/test_overcloud_plan.py b/tripleoclient/tests/v1/test_overcloud_plan.py index f7ab83fb7..415a1f202 100644 --- a/tripleoclient/tests/v1/test_overcloud_plan.py +++ b/tripleoclient/tests/v1/test_overcloud_plan.py @@ -69,7 +69,7 @@ class TestOvercloudDeletePlan(utils.TestCommand): delete_deployment_plan_mock.assert_called_once_with( self.workflow, - input={'container': 'test-plan'}) + container='test-plan') @mock.patch( 'tripleoclient.workflows.plan_management.delete_deployment_plan', @@ -82,8 +82,8 @@ class TestOvercloudDeletePlan(utils.TestCommand): self.cmd.take_action(parsed_args) expected = [ - mock.call(self.workflow, input={'container': 'test-plan1'}), - mock.call(self.workflow, input={'container': 'test-plan2'}), + mock.call(self.workflow, container='test-plan1'), + mock.call(self.workflow, container='test-plan2'), ] self.assertEqual(delete_deployment_plan_mock.call_args_list, expected) diff --git a/tripleoclient/tests/workflows/test_plan_management.py b/tripleoclient/tests/workflows/test_plan_management.py index acf34b5e6..cf133c84e 100644 --- a/tripleoclient/tests/workflows/test_plan_management.py +++ b/tripleoclient/tests/workflows/test_plan_management.py @@ -119,9 +119,9 @@ class TestPlanCreationWorkflows(utils.TestCommand): plan_management.delete_deployment_plan( self.workflow, - input={'container': 'overcloud'}) + container='overcloud') self.workflow.action_executions.create.assert_called_once_with( 'tripleo.plan.delete', - {'input': {'container': 'overcloud'}}, + {'container': 'overcloud'}, run_sync=True, save_result=True) diff --git a/tripleoclient/v1/overcloud_delete.py b/tripleoclient/v1/overcloud_delete.py index 436509d82..7a5f83406 100644 --- a/tripleoclient/v1/overcloud_delete.py +++ b/tripleoclient/v1/overcloud_delete.py @@ -70,7 +70,7 @@ class DeleteOvercloud(command.Command): try: plan_management.delete_deployment_plan( workflow_client, - input={'container': stack_name}) + container=stack_name) except Exception as err: raise oscexc.CommandError( "Error occurred while deleting plan {}".format(err)) @@ -83,7 +83,7 @@ class DeleteOvercloud(command.Command): if not parsed_args.yes: confirm = utils.prompt_user_for_confirmation( message=_("Are you sure you want to delete this overcloud " - "[y/N]?"), + "[y/N]? "), logger=self.log) if not confirm: raise oscexc.CommandError("Action not confirmed, exiting.") diff --git a/tripleoclient/v1/overcloud_plan.py b/tripleoclient/v1/overcloud_plan.py index d9843dd6a..191c56aa5 100644 --- a/tripleoclient/v1/overcloud_plan.py +++ b/tripleoclient/v1/overcloud_plan.py @@ -68,10 +68,9 @@ class DeletePlan(command.Command): for plan in parsed_args.plans: print("Deleting plan %s..." % plan) - workflow_input = {'container': plan} try: plan_management.delete_deployment_plan(workflow_client, - input=workflow_input) + container=plan) except Exception: self.log.exception("Error deleting plan")