From 841082f486962409ad796dec8f40a4d5a603ea03 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 7 Sep 2016 07:42:24 +0100 Subject: [PATCH] Update the Mistral action names These were renamed in a previous commit, once the usages here have been updated they can be removed. Partial-Bug: #1625641 Depends-On: I247747c7d641a70f320faf109c15745d00d62ff3 Change-Id: I3f5f63751503ece0db9d703f28e9720011e81a1b --- .../tests/v1/test_overcloud_parameters.py | 2 +- tripleoclient/tests/v1/test_overcloud_plan.py | 14 +++++++------- tripleoclient/v1/overcloud_plan.py | 4 ++-- tripleoclient/workflows/parameters.py | 2 +- tripleoclient/workflows/plan_management.py | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tripleoclient/tests/v1/test_overcloud_parameters.py b/tripleoclient/tests/v1/test_overcloud_parameters.py index ac6a63417..52399d2ba 100644 --- a/tripleoclient/tests/v1/test_overcloud_parameters.py +++ b/tripleoclient/tests/v1/test_overcloud_parameters.py @@ -57,7 +57,7 @@ class TestSetParameters(utils.TestCommand): # Verify self.workflow.action_executions.create.assert_called_once_with( - 'tripleo.update_parameters', + 'tripleo.parameters.update', { 'container': 'overcast', 'parameters': data.get('parameter_defaults', data) diff --git a/tripleoclient/tests/v1/test_overcloud_plan.py b/tripleoclient/tests/v1/test_overcloud_plan.py index 0ece494a8..9a7dd2f30 100644 --- a/tripleoclient/tests/v1/test_overcloud_plan.py +++ b/tripleoclient/tests/v1/test_overcloud_plan.py @@ -33,7 +33,7 @@ class TestOvercloudPlanList(utils.TestCommand): result = self.cmd.take_action(None) self.workflow.action_executions.create.assert_called_once_with( - 'tripleo.list_plans') + 'tripleo.plan.list') self.assertEqual(0, len(result[1])) @@ -43,7 +43,7 @@ class TestOvercloudPlanList(utils.TestCommand): result = self.cmd.take_action(None) self.workflow.action_executions.create.assert_called_once_with( - 'tripleo.list_plans') + 'tripleo.plan.list') self.assertEqual(1, len(result[0])) self.assertEqual([('test-plan-1',), ('test-plan-2',)], result[1]) @@ -68,7 +68,7 @@ class TestOvercloudDeletePlan(utils.TestCommand): self.cmd.take_action(parsed_args) self.workflow.action_executions.create.assert_called_once_with( - 'tripleo.delete_plan', input={'container': 'test-plan'}) + 'tripleo.plan.delete', input={'container': 'test-plan'}) def test_delete_multiple_plans(self): argslist = ['test-plan1', 'test-plan2'] @@ -81,9 +81,9 @@ class TestOvercloudDeletePlan(utils.TestCommand): self.cmd.take_action(parsed_args) self.workflow.action_executions.create.assert_has_calls( - [mock.call('tripleo.delete_plan', + [mock.call('tripleo.plan.delete', input={'container': 'test-plan1'}), - mock.call('tripleo.delete_plan', + mock.call('tripleo.plan.delete', input={'container': 'test-plan2'})]) @@ -183,7 +183,7 @@ class TestOvercloudCreatePlan(utils.TestCommand): # Verify self.workflow.action_executions.create.assert_called_once_with( - 'tripleo.create_container', {"container": "overcast"} + 'tripleo.plan.create_container', {"container": "overcast"} ) self.workflow.executions.create.assert_called_once_with( @@ -216,7 +216,7 @@ class TestOvercloudCreatePlan(utils.TestCommand): # Verify self.workflow.action_executions.create.assert_called_once_with( - 'tripleo.create_container', {"container": "overcast"} + 'tripleo.plan.create_container', {"container": "overcast"} ) self.workflow.executions.create.assert_called_once_with( diff --git a/tripleoclient/v1/overcloud_plan.py b/tripleoclient/v1/overcloud_plan.py index e4e21b835..32cfe3423 100644 --- a/tripleoclient/v1/overcloud_plan.py +++ b/tripleoclient/v1/overcloud_plan.py @@ -32,7 +32,7 @@ class ListPlans(command.Lister): workflow_client = self.app.client_manager.workflow_engine execution = workflow_client.action_executions.create( - 'tripleo.list_plans') + 'tripleo.plan.list') try: json_results = json.loads(execution.output)['result'] @@ -69,7 +69,7 @@ class DeletePlan(command.Command): for plan in parsed_args.plans: print("Deleting plan %s..." % plan) execution = workflow_client.action_executions.create( - 'tripleo.delete_plan', input={'container': plan}) + 'tripleo.plan.delete', input={'container': plan}) try: json_results = json.loads(execution.output)['result'] diff --git a/tripleoclient/workflows/parameters.py b/tripleoclient/workflows/parameters.py index 1f385106e..518837982 100644 --- a/tripleoclient/workflows/parameters.py +++ b/tripleoclient/workflows/parameters.py @@ -14,7 +14,7 @@ from tripleoclient.workflows import base def update_parameters(workflow_client, **input_): - return base.call_action(workflow_client, 'tripleo.update_parameters', + return base.call_action(workflow_client, 'tripleo.parameters.update', **input_) diff --git a/tripleoclient/workflows/plan_management.py b/tripleoclient/workflows/plan_management.py index 4c2527139..c94793d45 100644 --- a/tripleoclient/workflows/plan_management.py +++ b/tripleoclient/workflows/plan_management.py @@ -89,11 +89,11 @@ def update_deployment_plan(clients, **workflow_input): def list_deployment_plans(workflow_client, **input_): - return base.call_action(workflow_client, 'tripleo.list_plans', **input_) + return base.call_action(workflow_client, 'tripleo.plan.list', **input_) def create_container(workflow_client, **input_): - return base.call_action(workflow_client, 'tripleo.create_container', + return base.call_action(workflow_client, 'tripleo.plan.create_container', **input_)