From 24087b31c0f9564641730b7c7c1fdbc090330497 Mon Sep 17 00:00:00 2001 From: Marek Aufart Date: Fri, 29 May 2015 13:58:06 +0200 Subject: [PATCH] Filter and format parameters for plan role in OSC Output of commands for add/remove role to plan inside OpenStack client was too long. Filter and formatter for parameters and roles added. Change-Id: I1831aab96dad00f605feb6340e43ca5437fe0c04 --- tuskarclient/osc/v2/plan.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tuskarclient/osc/v2/plan.py b/tuskarclient/osc/v2/plan.py index 4325992..8b12eff 100644 --- a/tuskarclient/osc/v2/plan.py +++ b/tuskarclient/osc/v2/plan.py @@ -21,6 +21,7 @@ from cliff import command from cliff import lister from cliff import show +from tuskarclient.common import formatting from tuskarclient.common import utils @@ -228,7 +229,7 @@ class AddManagementPlanRole(show.ShowOne): parsed_args.role_uuid ) - return self.dict2columns(plan.to_dict()) + return self.dict2columns(filtered_plan_dict(plan.to_dict())) class RemoveManagementPlanRole(show.ShowOne): @@ -261,7 +262,7 @@ class RemoveManagementPlanRole(show.ShowOne): parsed_args.role_uuid ) - return self.dict2columns(plan.to_dict()) + return self.dict2columns(filtered_plan_dict(plan.to_dict())) class DownloadManagementPlan(command.Command): @@ -320,3 +321,18 @@ class DownloadManagementPlan(command.Command): with open(filename, 'w+') as template_file: template_file.write(template_content) print(filename) + + +def filtered_plan_dict(plan_dict): + if 'parameters' in plan_dict and 'roles' in plan_dict: + plan_dict['parameters'] = [param for param in + plan_dict['parameters'] + if param['name'].endswith('::count')] + + plan_dict['parameters'] = formatting.parameters_v2_formatter( + plan_dict['parameters']) + + plan_dict['roles'] = formatting.parameters_v2_formatter( + plan_dict['roles']) + + return plan_dict \ No newline at end of file