x
/
python-tuskarclient
Code Issues Proposed changes

Merge "Filter and format parameters for plan role in OSC"

This commit is contained in:
Jenkins 2015-06-16 10:53:41 +00:00 committed by Gerrit Code Review
parent 8a077c6ef9 24087b31c0
commit 6fa19d5d10
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tuskarclient/osc/v2/plan.py
View File

@ -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
from tuskarclient.openstack.common.apiclient import exceptions as exc
@ -234,7 +235,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):
@ -267,7 +268,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):
@ -326,3 +327,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