openstack/python-karborclient
Code Issues Proposed changes

Fix OSC plan show, update, and create formatting

Browse Source 
Change-Id: I0b7377506e38bf31f45e5bb5ad75f423a344af62
This commit is contained in:
Yuval Brik
2017-08-14 11:22:05 +03:00
parent aa5d56495f
commit e774b2178c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
karborclient/osc/v1/plans.py
View File

@@ -12,6 +12,7 @@
"""Data protection V1 plan action implementations"""
import json
from oslo_utils import uuidutils
from osc_lib.command import command
@@ -23,6 +24,14 @@ from karborclient.i18n import _
from karborclient import utils
def format_plan(plan_info):
for key in ('resources', 'parameters'):
if key not in plan_info:
continue
plan_info[key] = json.dumps(plan_info[key], indent=2, sort_keys=True)
plan_info.pop("links", None)
class ListPlans(command.Lister):
_description = _("List plans.")
@@ -118,7 +127,7 @@ class ShowPlan(command.ShowOne):
client = self.app.client_manager.data_protection
plan = osc_utils.find_resource(client.plans, parsed_args.plan)
plan._info.pop("links", None)
format_plan(plan._info)
return zip(*sorted(plan._info.items()))
@@ -182,7 +191,7 @@ class CreatePlan(command.ShowOne):
plan_resources, plan_parameters,
description=parsed_args.description)
plan._info.pop("links", None)
format_plan(plan._info)
return zip(*sorted(plan._info.items()))
@@ -231,7 +240,7 @@ class UpdatePlan(command.ShowOne):
raise exceptions.CommandError(
"Plan %s not found" % parsed_args.plan_id)
else:
plan._info.pop("links", None)
format_plan(plan._info)
return zip(*sorted(plan._info.items()))