diff options
author | shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-19 14:23:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-19 14:23:44 +0000 |
commit | be620c74d492cb2e4b9ad3055832e36849a3ac6b (patch) | |
tree | 5d919e23cf404d4aa8d999dd7dfc6f7b30d2d48e /tosca2heat/heat-translator/translator/hot/tosca/tests | |
parent | 86b894e80fcb29f0354109730ee37bff20b1a89b (diff) | |
parent | f977b94e012828cd2a905b9b841aff33c4b732f8 (diff) |
Merge "Update the upstream of tosco-parser and heat-translator to stable release 0.6/0.5"
Diffstat (limited to 'tosca2heat/heat-translator/translator/hot/tosca/tests')
-rw-r--r-- | tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py b/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py index 743074b..408ee8b 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py @@ -16,6 +16,7 @@ from mock import patch from toscaparser.nodetemplate import NodeTemplate from toscaparser.tests.base import TestCase +from toscaparser.utils.gettextutils import _ import toscaparser.utils.yamlparser from translator.hot.tosca.tosca_compute import ToscaCompute @@ -26,12 +27,22 @@ class ToscaComputeTest(TestCase): nodetemplates = (toscaparser.utils.yamlparser. simple_parse(tpl_snippet)['node_templates']) name = list(nodetemplates.keys())[0] - nodetemplate = NodeTemplate(name, nodetemplates) - nodetemplate.validate() - toscacompute = ToscaCompute(nodetemplate) - toscacompute.handle_properties() + try: + nodetemplate = NodeTemplate(name, nodetemplates) + nodetemplate.validate() + toscacompute = ToscaCompute(nodetemplate) + toscacompute.handle_properties() + if not self._compare_properties(toscacompute.properties, + expectedprops): + raise Exception(_("Hot Properties are not" + " same as expected properties")) + except Exception: + # for time being rethrowing. Will be handled future based + # on new development in Glance and Graffiti + raise - self.assertDictEqual(expectedprops, toscacompute.properties) + def _compare_properties(self, hotprops, expectedprops): + return all(item in hotprops.items() for item in expectedprops.items()) def test_node_compute_with_host_and_os_capabilities(self): tpl_snippet = ''' |