diff options
| author |   Pavel Aharoni <pa0916@att.com> | 2017-04-03 10:06:16 +0300 |
|---|---|---|
| committer | Pavel Aharoni <pa0916@att.com> | 2017-04-03 10:06:32 +0300 |
| commit | 1df0b72a316dcc7f913061706db165d78d2c3a03 (patch) | |
| tree | ba549dc1e15b963ee39cc55d577317c08367e53e /jython-tosca-parser/src/main/resources | |
| parent | b51f888ee16f8bf92c7d9a0331eaa05e3bb938d2 (diff) | |
[SDC-8] trying to merge changes of tests and csars
Change-Id: Iac4d5bd1ea312b76cba52a172d5ac80757173409
Signed-off-by: Pavel Aharoni <pa0916@att.com>
Diffstat (limited to 'jython-tosca-parser/src/main/resources')
2 files changed, 8 insertions, 2 deletions
diff --git a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/parameters.py b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/parameters.py index 7a4acd9..1bb58be 100644 --- a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/parameters.py +++ b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/parameters.py @@ -50,7 +50,10 @@ class Input(JyInput): return self.required def getJyDescription(self): - return self.description + return self.description + + def getJyDefault(self): + return self.default @property def type(self): diff --git a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tosca_template.py b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tosca_template.py index 55485f0..6b3ea87 100644 --- a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tosca_template.py +++ b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tosca_template.py @@ -119,8 +119,11 @@ class ToscaTemplate(JyToscaTemplate): return self.description def getJyTopologyTemplate(self): - return self.topology_template + return self.topology_template + def getJyNestedTopologyTemplates(self): + return self.nested_tosca_templates_with_topology + def _topology_template(self): return TopologyTemplate(self._tpl_topology_template(), self._get_all_custom_defs(), |