openstack/heat
Code Issues Proposed changes

heat cli : remove some duplication from parameter formatting

Browse Source 
Cleanup - bin/heat move some duplicated code into a function

Change-Id: Ib74077c557a2b8d7c640ee1686237bb5223b2a85
Signed-off-by: Steven Hardy <shardy@redhat.com>
This commit is contained in:
Steven Hardy 2012-08-14 17:27:16 +01:00
parent c2382317de
commit 619239527f
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bin/heat
View File

@ -49,6 +49,16 @@ from heat.common import exception
from heat import utils
def format_parameters(options):
parameters = {}
if options.parameters:
for count, p in enumerate(options.parameters.split(';'), 1):
(n, v) = p.split('=')
parameters['Parameters.member.%d.ParameterKey' % count] = n
parameters['Parameters.member.%d.ParameterValue' % count] = v
return parameters
@utils.catch_error('validate')
def template_validate(options, arguments):
'''
@ -71,13 +81,7 @@ def template_validate(options, arguments):
logging.error('Please specify a template file or url')
return utils.FAILURE
if options.parameters:
count = 1
for p in options.parameters.split(';'):
(n, v) = p.split('=')
parameters['Parameters.member.%d.ParameterKey' % count] = n
parameters['Parameters.member.%d.ParameterValue' % count] = v
count = count + 1
parameters.update(format_parameters(options))
client = get_client(options)
result = client.validate_template(**parameters)
@ -94,13 +98,7 @@ def estimate_template_cost(options, arguments):
logging.error("as the first argument")
return utils.FAILURE
if options.parameters:
count = 1
for p in options.parameters.split(';'):
(n, v) = p.split('=')
parameters['Parameters.member.%d.ParameterKey' % count] = n
parameters['Parameters.member.%d.ParameterValue' % count] = v
count = count + 1
parameters.update(format_parameters(options))
if options.template_file:
parameters['TemplateBody'] = open(options.template_file).read()
@ -158,13 +156,7 @@ def stack_create(options, arguments):
logging.error("as the first argument")
return utils.FAILURE
if options.parameters:
count = 1
for p in options.parameters.split(';'):
(n, v) = p.split('=')
parameters['Parameters.member.%d.ParameterKey' % count] = n
parameters['Parameters.member.%d.ParameterValue' % count] = v
count = count + 1
parameters.update(format_parameters(options))
parameters['TimeoutInMinutes'] = options.timeout
@ -214,13 +206,7 @@ def stack_update(options, arguments):
elif options.template_url:
parameters['TemplateUrl'] = options.template_url
if options.parameters:
count = 1
for p in options.parameters.split(';'):
(n, v) = p.split('=')
parameters['Parameters.member.%d.ParameterKey' % count] = n
parameters['Parameters.member.%d.ParameterValue' % count] = v
count = count + 1
parameters.update(format_parameters(options))
c = get_client(options)
result = c.update_stack(**parameters)