Code Review
/
parser.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Distinguish the mapping and mapped by name.
[parser.git]
/
tosca2heat
/
tosca-parser
/
toscaparser
/
imports.py
diff --git
a/tosca2heat/tosca-parser/toscaparser/imports.py
b/tosca2heat/tosca-parser/toscaparser/imports.py
index
86c10f0
..
451c952
100644
(file)
--- a/
tosca2heat/tosca-parser/toscaparser/imports.py
+++ b/
tosca2heat/tosca-parser/toscaparser/imports.py
@@
-37,7
+37,7
@@
class ImportsLoader(object):
tpl=None):
self.importslist = importslist
self.custom_defs = {}
tpl=None):
self.importslist = importslist
self.custom_defs = {}
- self.nested_to
po
_tpls = []
+ self.nested_to
sca
_tpls = []
if not path and not tpl:
msg = _('Input tosca template is not provided.')
log.warning(msg)
if not path and not tpl:
msg = _('Input tosca template is not provided.')
log.warning(msg)
@@
-57,8
+57,8
@@
class ImportsLoader(object):
def get_custom_defs(self):
return self.custom_defs
def get_custom_defs(self):
return self.custom_defs
- def get_nested_to
po
_tpls(self):
- return self.nested_to
po
_tpls
+ def get_nested_to
sca
_tpls(self):
+ return self.nested_to
sca
_tpls
def _validate_and_load_imports(self):
imports_names = set()
def _validate_and_load_imports(self):
imports_names = set()
@@
-98,7
+98,7
@@
class ImportsLoader(object):
custom_type, import_def)
self._update_custom_def(custom_type, None)
custom_type, import_def)
self._update_custom_def(custom_type, None)
- self._update_nested_to
po
_tpls(full_file_name, custom_type)
+ self._update_nested_to
sca
_tpls(full_file_name, custom_type)
def _update_custom_def(self, custom_type, namespace_prefix):
outer_custom_types = {}
def _update_custom_def(self, custom_type, namespace_prefix):
outer_custom_types = {}
@@
-119,10
+119,10
@@
class ImportsLoader(object):
else:
self.custom_defs.update(outer_custom_types)
else:
self.custom_defs.update(outer_custom_types)
- def _update_nested_to
po
_tpls(self, full_file_name, custom_tpl):
+ def _update_nested_to
sca
_tpls(self, full_file_name, custom_tpl):
if full_file_name and custom_tpl:
topo_tpl = {full_file_name: custom_tpl}
if full_file_name and custom_tpl:
topo_tpl = {full_file_name: custom_tpl}
- self.nested_to
po
_tpls.append(topo_tpl)
+ self.nested_to
sca
_tpls.append(topo_tpl)
def _validate_import_keys(self, import_name, import_uri_def):
if self.FILE not in import_uri_def.keys():
def _validate_import_keys(self, import_name, import_uri_def):
if self.FILE not in import_uri_def.keys():