diff options
| author |   julien zhang <zhang.jun3g@zte.com.cn> | 2016-08-19 15:07:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-19 15:07:17 +0000 |
| commit | efd245060936a89f3a56ea98e712c92432680c0f (patch) | |
| tree | 9fe515a7f5722bfea9506ff67a27e6e86790cbef | |
| parent | 4b57a4f7710b4907267e8dfa490a7e50207d4d23 (diff) | |
| parent | 13a0184de4e6c0c8f0935bfbd7627b72f142c6e9 (diff) | |
Merge "Judge volume node is error when translate compute node"
| -rw-r--r-- | tosca2heat/heat-translator/translator/hot/translate_node_templates.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tosca2heat/heat-translator/translator/hot/translate_node_templates.py b/tosca2heat/heat-translator/translator/hot/translate_node_templates.py index d8e7e48..f32d42b 100644 --- a/tosca2heat/heat-translator/translator/hot/translate_node_templates.py +++ b/tosca2heat/heat-translator/translator/hot/translate_node_templates.py @@ -195,12 +195,16 @@ class TranslateNodeTemplates(object): if isinstance(value, dict): for node_name in value.values(): for n in self.nodetemplates: - if n.name == node_name: + if n.name == node_name and \ + n.is_derived_from( + "tosca.nodes.BlockStorage"): volume_name = node_name break else: # unreachable code ! for n in self.nodetemplates: - if n.name == node_name: + if n.name == value and \ + n.is_derived_from( + "tosca.nodes.BlockStorage"): volume_name = node_name break |