From 622802052e49725ec9fc3b9c427847b3a1f15f0c Mon Sep 17 00:00:00 2001
From: Dougal Matthews <dougal@redhat.com>
Date: Thu, 30 Apr 2015 15:43:54 +0100
Subject: [PATCH] Implement Plan remove Role for the OpenStack client

Change-Id: I51741dac1e118c99d7878095269dc738726b03bc
---
 tuskarclient/osc/v2/plan.py             | 20 ++++++++++++++++++++
 tuskarclient/tests/osc/v2/test_plans.py | 17 ++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/tuskarclient/osc/v2/plan.py b/tuskarclient/osc/v2/plan.py
index 28d0553..c109663 100644
--- a/tuskarclient/osc/v2/plan.py
+++ b/tuskarclient/osc/v2/plan.py
@@ -236,11 +236,31 @@ class RemoveManagementPlanRole(show.ShowOne):
 
     def get_parser(self, prog_name):
         parser = super(RemoveManagementPlanRole, self).get_parser(prog_name)
+
+        parser.add_argument(
+            'plan_uuid',
+            help="The UUID of the plan."
+        )
+
+        parser.add_argument(
+            'role_uuid',
+            help="The UUID of the Role being removed from the Plan."
+        )
+
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug("take_action(%s)" % parsed_args)
 
+        client = self.app.client_manager.management
+
+        plan = client.plans.remove_role(
+            parsed_args.plan_uuid,
+            parsed_args.role_uuid
+        )
+
+        return self.dict2columns(plan.to_dict())
+
 
 class DownloadManagementPlan(command.Command):
     """Download the a Management Plan."""
diff --git a/tuskarclient/tests/osc/v2/test_plans.py b/tuskarclient/tests/osc/v2/test_plans.py
index ec11301..bfd5f06 100644
--- a/tuskarclient/tests/osc/v2/test_plans.py
+++ b/tuskarclient/tests/osc/v2/test_plans.py
@@ -286,12 +286,23 @@ class TestRemoveManagementPlanRole(TestPlans):
         self.cmd = plan.RemoveManagementPlanRole(self.app, None)
 
     def test_remove_plan_role(self):
-        arglist = []
-        verifylist = []
+        arglist = ['UUID1', 'UUID2']
+        verifylist = [
+            ('plan_uuid', 'UUID1'),
+            ('role_uuid', 'UUID2'),
+        ]
+
+        self.management_mock.plans.remove_role.return_value = (
+            fakes.mock_plans[0])
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.cmd.take_action(parsed_args)
+        result = self.cmd.take_action(parsed_args)
+
+        self.assertEqual([
+            ('description', 'name', 'roles', 'uuid'),
+            ('Plan 1', 'Plan 1 Name', fakes.mock_roles, 'UUID1')
+        ], list(result))
 
 
 class TestDownloadManagementPlan(TestPlans):