openstack/tripleo-common
Code Issues Proposed changes

Merge "Derive params network config stack exists fix"

Browse Source
This commit is contained in:
Jenkins 2017-09-05 11:01:59 +00:00 committed by Gerrit Code Review
commit 0f9fd02e3f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tripleo_common/actions/parameters.py
View File

@ -556,15 +556,18 @@ class GetNetworkConfigAction(templates.ProcessTemplatesAction):
if isinstance(processed_data, actions.Result):
return processed_data
# stacks.preview method raises validation message if stack is
# already deployed. here renaming container to get preview data.
container_temp = self.container + "-TEMP"
fields = {
'template': processed_data['template'],
'files': processed_data['files'],
'environment': processed_data['environment'],
'stack_name': self.container,
'stack_name': container_temp,
}
orc = self.get_orchestration_client(context)
preview_data = orc.stacks.preview(**fields)
result = self.get_network_config(preview_data, self.container,
result = self.get_network_config(preview_data, container_temp,
self.role_name)
return result

8
tripleo_common/tests/actions/test_parameters.py
View File

@ -1052,7 +1052,7 @@ class GetNetworkConfigActionTest(base.TestCase):
mock_heat = mock.MagicMock()
mock_heat.stacks.preview.return_value = mock.Mock(resources=[{
"resource_identity": {"stack_name": "overcloud-Compute-0"},
"resource_identity": {"stack_name": "overcloud-TEMP-Compute-0"},
"resource_name": "OsNetConfigImpl",
"properties": {"config": "echo \'{\"network_config\": {}}\'"}
}])
@ -1070,7 +1070,7 @@ class GetNetworkConfigActionTest(base.TestCase):
environment={},
files={},
template={'heat_template_version': '2016-04-30'},
stack_name='overcloud',
stack_name='overcloud-TEMP',
)
@mock.patch('tripleo_common.actions.base.TripleOAction.'
@ -1113,7 +1113,7 @@ class GetNetworkConfigActionTest(base.TestCase):
mock_heat = mock.MagicMock()
mock_heat.stacks.preview.return_value = mock.Mock(resources=[{
"resource_identity": {"stack_name": "overcloud-Compute-0"},
"resource_identity": {"stack_name": "overcloud-TEMP-Compute-0"},
"resource_name": "OsNetConfigImpl",
"properties": {"config": ""}
}])
@ -1130,5 +1130,5 @@ class GetNetworkConfigActionTest(base.TestCase):
environment={},
files={},
template={'heat_template_version': '2016-04-30'},
stack_name='overcloud',
stack_name='overcloud-TEMP',
)