openstack
/
heat
Code Issues Proposed changes

Merge "Improve parameters obtaining logic from adopt stack data"

This commit is contained in:
Jenkins 2015-11-13 03:43:53 +00:00 committed by Gerrit Code Review
parent 88da460316 4345fed56b
commit fce736671b
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/service.py
View File

@ -614,8 +614,10 @@ class EngineService(service.Service):
raise exception.NotSupported(feature='Stack Adopt')
# Override the params with values given with -P option
new_params = common_params[rpc_api.PARAM_ADOPT_STACK_DATA][
'environment'][rpc_api.STACK_PARAMETERS].copy()
new_params = {}
if 'environment' in common_params[rpc_api.PARAM_ADOPT_STACK_DATA]:
new_params = common_params[rpc_api.PARAM_ADOPT_STACK_DATA][
'environment'].get(rpc_api.STACK_PARAMETERS, {}).copy()
new_params.update(params.get(rpc_api.STACK_PARAMETERS, {}))
params[rpc_api.STACK_PARAMETERS] = new_params

51
heat/tests/test_engine_service.py
View File

@ -1238,3 +1238,54 @@ class StackServiceTest(common.HeatTestCase):
self.assertEqual('COMPLETE', test_stack.resources.get('r1').status)
self.assertEqual('FAILED', test_stack.resources.get('r2').status)
self.assertEqual('FAILED', test_stack.resources.get('r3').status)
def test_parse_adopt_stack_data_without_parameters(self):
cfg.CONF.set_override('enable_stack_adopt', True)
template = {"heat_template_version": "2015-04-30",
"resources": {
"myres": {
"type": "OS::Cinder::Volume",
"properties": {
"name": "volname",
"size": "1"
}
}
}}
# Assert no KeyError exception raised like before, when trying to
# get parameters from adopt stack data which doesn't have it.
args = {"adopt_stack_data": '''{}'''}
self.eng._parse_template_and_validate_stack(
self.ctx, 'stack_name', template, {}, {}, args)
args = {"adopt_stack_data": '''{
"environment": {}
}'''}
self.eng._parse_template_and_validate_stack(
self.ctx, 'stack_name', template, {}, {}, args)
def test_parse_adopt_stack_data_with_parameters(self):
cfg.CONF.set_override('enable_stack_adopt', True)
template = {"heat_template_version": "2015-04-30",
"parameters": {
"volsize": {"type": "number"}
},
"resources": {
"myres": {
"type": "OS::Cinder::Volume",
"properties": {
"name": "volname",
"size": {"get_param": "volsize"}
}
}
}}
args = {"adopt_stack_data": '''{
"environment": {
"parameters": {
"volsize": 1
}
}}'''}
stack = self.eng._parse_template_and_validate_stack(
self.ctx, 'stack_name', template, {}, {}, args)
self.assertEqual(1, stack.parameters['volsize'])