Add input validation in substitution_mapping class

[parser.git] / tosca2heat / tosca-parser / toscaparser / topology_template.py

diff --git a/tosca2heat/tosca-parser/toscaparser/topology_template.py b/tosca2heat/tosca-parser/toscaparser/topology_template.py
index 70bc7d6..fe05979 100644 (file)
--- a/tosca2heat/tosca-parser/toscaparser/topology_template.py
+++ b/tosca2heat/tosca-parser/toscaparser/topology_template.py
@@ -22,7 +22,7 @@ from toscaparser.parameters import Input
 from toscaparser.parameters import Output
 from toscaparser.policy import Policy
 from toscaparser.relationship_template import RelationshipTemplate
-from toscaparser.substitution_mappings import Substitution_mappings
+from toscaparser.substitution_mappings import SubstitutionMappings
 from toscaparser.tpl_relationship_graph import ToscaGraph
 from toscaparser.utils.gettextutils import _
 
@@ -43,9 +43,9 @@ class TopologyTemplate(object):
     '''Load the template data.'''
     def __init__(self, template, custom_defs,
                  rel_types=None, parsed_params=None,
-                 submaped_node_template=None):
+                 sub_mapped_node_template=None):
         self.tpl = template
-        self.submaped_node_template = submaped_node_template
+        self.sub_mapped_node_template = sub_mapped_node_template
         if self.tpl:
             self.custom_defs = custom_defs
             self.rel_types = rel_types
@@ -110,13 +110,13 @@ class TopologyTemplate(object):
 
     def _substitution_mappings(self):
         tpl_substitution_mapping = self._tpl_substitution_mappings()
-        if tpl_substitution_mapping and self.submaped_node_template:
-            return Substitution_mappings(tpl_substitution_mapping,
-                                         self.nodetemplates,
-                                         self.inputs,
-                                         self.outputs,
-                                         self.submaped_node_template,
-                                         self.custom_defs)
+        if tpl_substitution_mapping:
+            return SubstitutionMappings(tpl_substitution_mapping,
+                                        self.nodetemplates,
+                                        self.inputs,
+                                        self.outputs,
+                                        self.sub_mapped_node_template,
+                                        self.custom_defs)
 
     def _policies(self):
         policies = []
@@ -294,7 +294,7 @@ class TopologyTemplate(object):
                 output.attrs[output.VALUE] = func
 
     @classmethod
-    def get_submaped_node_type(cls, topo_tpl):
-        if topo_tpl and isinstance(topo_tpl, dict):
-            submap_tpl = topo_tpl.get(SUBSTITUION_MAPPINGS)
-            return Substitution_mappings.get_node_type(submap_tpl)
+    def get_sub_mapping_node_type(cls, topology_tpl):
+        if topology_tpl and isinstance(topology_tpl, dict):
+            submap_tpl = topology_tpl.get(SUBSTITUION_MAPPINGS)
+            return SubstitutionMappings.get_node_type(submap_tpl)