From eb6354ab6b6e6905e6c002b2399ad4d586c82472 Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Mon, 21 Aug 2017 11:21:37 +0200 Subject: [PATCH] When removing an empty res also remove refs to it in depends_on Change-Id: I4cad4f29d0f9153eb966370089663b419a53dfaf --- translator/hot/translate_node_templates.py | 5 +++++ .../tests/data/hot_output/hot_get_functions_semantic.yaml | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/translator/hot/translate_node_templates.py b/translator/hot/translate_node_templates.py index 78ab1c45..31cfad40 100644 --- a/translator/hot/translate_node_templates.py +++ b/translator/hot/translate_node_templates.py @@ -390,6 +390,11 @@ class TranslateNodeTemplates(object): for resource in to_remove: self.hot_resources.remove(resource) + for resource in self.hot_resources: + for removed_resource in to_remove: + if removed_resource in resource.depends_on: + resource.depends_on.remove(removed_resource) + return self.hot_resources def translate_param_value(self, param_value, resource): diff --git a/translator/tests/data/hot_output/hot_get_functions_semantic.yaml b/translator/tests/data/hot_output/hot_get_functions_semantic.yaml index 318a739b..2538a253 100644 --- a/translator/tests/data/hot_output/hot_get_functions_semantic.yaml +++ b/translator/tests/data/hot_output/hot_get_functions_semantic.yaml @@ -16,8 +16,6 @@ resources: get_resource: myapp_configure_config server: get_resource: server - depends_on: - - mysql_database server: type: OS::Nova::Server properties: