diff options
Diffstat (limited to 'tosca2heat/heat-translator')
13 files changed, 367 insertions, 421 deletions
diff --git a/tosca2heat/heat-translator/test-requirements.txt b/tosca2heat/heat-translator/test-requirements.txt index 70a261b..17a507c 100644 --- a/tosca2heat/heat-translator/test-requirements.txt +++ b/tosca2heat/heat-translator/test-requirements.txt @@ -4,11 +4,11 @@ hacking<0.11,>=0.10.0 coverage>=3.6 # Apache-2.0 discover # BSD -fixtures>=3.0.0 # Apache-2.0/BSD +fixtures<2.0,>=1.3.1 # Apache-2.0/BSD oslotest>=1.10.0 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD -sphinx!=1.3b1,<1.3,>=1.2.1 # BSD +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT diff --git a/tosca2heat/heat-translator/tox.ini b/tosca2heat/heat-translator/tox.ini index 9ee67a0..be57d3e 100644 --- a/tosca2heat/heat-translator/tox.ini +++ b/tosca2heat/heat-translator/tox.ini @@ -27,11 +27,6 @@ commands = python setup.py build_sphinx [testenv:debug] commands = oslo_debug_helper -t translator/tests {posargs} -[testenv:py27-tosca-parser-master] -commands = - ./run_py27-tosca-parser-master.sh - python setup.py test --slowest --testr-args='{posargs}' - [flake8] # H803 skipped on purpose per list discussion. # E123, E125 skipped as they are invalid PEP-8. diff --git a/tosca2heat/heat-translator/translator/common/utils.py b/tosca2heat/heat-translator/translator/common/utils.py index 8e4b690..459b5ee 100644 --- a/tosca2heat/heat-translator/translator/common/utils.py +++ b/tosca2heat/heat-translator/translator/common/utils.py @@ -18,7 +18,6 @@ import numbers import os import re import requests -import six from six.moves.urllib.parse import urlparse import yaml @@ -263,17 +262,12 @@ class UrlUtils(object): def str_to_num(value): """Convert a string representation of a number into a numeric type.""" - if isinstance(value, numbers.Number) \ - or isinstance(value, six.integer_types) \ - or isinstance(value, float): + if isinstance(value, numbers.Number): return value try: return int(value) except ValueError: - try: - return float(value) - except ValueError: - return None + return float(value) def check_for_env_variables(): diff --git a/tosca2heat/heat-translator/translator/hot/syntax/hot_output.py b/tosca2heat/heat-translator/translator/hot/syntax/hot_output.py index a41208a..ad77fb3 100644 --- a/tosca2heat/heat-translator/translator/hot/syntax/hot_output.py +++ b/tosca2heat/heat-translator/translator/hot/syntax/hot_output.py @@ -21,8 +21,5 @@ class HotOutput(object): self.description = description def get_dict_output(self): - if self.description: - return {self.name: {'value': self.value, - 'description': self.description}} - else: - return {self.name: {'value': self.value}} + return {self.name: {'value': self.value, + 'description': self.description}} diff --git a/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py b/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py index 7b83906..54e0d96 100644 --- a/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py +++ b/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py @@ -103,7 +103,7 @@ class HotResource(object): # scenarios and cannot be fixed or hard coded here operations_deploy_sequence = ['create', 'configure', 'start'] - operations = HotResource.get_all_operations(self.nodetemplate) + operations = HotResource._get_all_operations(self.nodetemplate) # create HotResource for each operation used for deployment: # create, start, configure @@ -140,15 +140,7 @@ class HotResource(object): # hosting_server is None if requirements is None hosting_on_server = (hosting_server.name if hosting_server else None) - base_type = HotResource.get_base_type( - self.nodetemplate.type_definition).type - # handle interfaces directly defined on a compute - if hosting_on_server is None \ - and base_type == 'tosca.nodes.Compute': - hosting_on_server = self.name - - if operation.name == reserve_current and \ - base_type != 'tosca.nodes.Compute': + if operation.name == reserve_current: deploy_resource = self self.name = deploy_name self.type = 'OS::Heat::SoftwareDeployment' @@ -156,7 +148,7 @@ class HotResource(object): 'server': {'get_resource': hosting_on_server}, 'signal_transport': 'HEAT_SIGNAL'} - deploy_lookup[operation] = self + deploy_lookup[operation.name] = self else: sd_config = {'config': {'get_resource': config_name}, 'server': {'get_resource': @@ -168,7 +160,7 @@ class HotResource(object): 'OS::Heat::SoftwareDeployment', sd_config) hot_resources.append(deploy_resource) - deploy_lookup[operation] = deploy_resource + deploy_lookup[operation.name] = deploy_resource lifecycle_inputs = self._get_lifecycle_inputs(operation) if lifecycle_inputs: deploy_resource.properties['input_values'] = \ @@ -178,34 +170,24 @@ class HotResource(object): # in operations_deploy_sequence # TODO(anyone): find some better way to encode this implicit sequence group = {} - op_index_max = -1 for op, hot in deploy_lookup.items(): # position to determine potential preceding nodes - op_index = operations_deploy_sequence.index(op.name) - if op_index > op_index_max: - op_index_max = op_index - for preceding_op_name in \ + op_index = operations_deploy_sequence.index(op) + for preceding_op in \ reversed(operations_deploy_sequence[:op_index]): - preceding_hot = deploy_lookup.get( - operations.get(preceding_op_name)) + preceding_hot = deploy_lookup.get(preceding_op) if preceding_hot: hot.depends_on.append(preceding_hot) hot.depends_on_nodes.append(preceding_hot) group[preceding_hot] = hot break - if op_index_max >= 0: - last_deploy = deploy_lookup.get(operations.get( - operations_deploy_sequence[op_index_max])) - else: - last_deploy = None - # save this dependency chain in the set of HOT resources self.group_dependencies.update(group) for hot in hot_resources: hot.group_dependencies.update(group) - return hot_resources, deploy_lookup, last_deploy + return hot_resources def handle_connectsto(self, tosca_source, tosca_target, hot_source, hot_target, config_location, operation): @@ -353,7 +335,7 @@ class HotResource(object): return tosca_props @staticmethod - def get_all_operations(node): + def _get_all_operations(node): operations = {} for operation in node.interfaces: operations[operation.name] = operation diff --git a/tosca2heat/heat-translator/translator/hot/syntax/hot_template.py b/tosca2heat/heat-translator/translator/hot/syntax/hot_template.py index 0403562..4263c4d 100644 --- a/tosca2heat/heat-translator/translator/hot/syntax/hot_template.py +++ b/tosca2heat/heat-translator/translator/hot/syntax/hot_template.py @@ -77,7 +77,6 @@ class HotTemplate(object): dict_output.update({self.OUTPUTS: all_outputs}) yaml.add_representer(OrderedDict, self.represent_ordereddict) - yaml.add_representer(dict, self.represent_ordereddict) yaml_string = yaml.dump(dict_output, default_flow_style=False) # get rid of the '' from yaml.dump around numbers yaml_string = yaml_string.replace('\'', '') 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 = ''' diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage.py b/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage.py index 924ff9d..d4b2f44 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage.py @@ -67,5 +67,5 @@ class ToscaBlockStorage(HotResource): # attribute for the matching resource. Unless there is additional # runtime support, this should be a one to one mapping. if attribute == 'volume_id': - attr['get_resource'] = self.name + attr['get_resource'] = args[0] return attr diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py b/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py index 2242c2d..71b9822 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py @@ -50,4 +50,4 @@ class ToscaBlockStorageAttachment(HotResource): self.properties.pop('device') def handle_life_cycle(self): - return None, None, None + pass diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py b/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py index 16d0518..8a959d1 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py @@ -84,14 +84,6 @@ class ToscaCompute(HotResource): ('architecture', 'distribution', 'type', 'version') toscatype = 'tosca.nodes.Compute' - ALLOWED_NOVA_SERVER_PROPS = \ - ('admin_pass', 'availability_zone', 'block_device_mapping', - 'block_device_mapping_v2', 'config_drive', 'diskConfig', 'flavor', - 'flavor_update_policy', 'image', 'image_update_policy', 'key_name', - 'metadata', 'name', 'networks', 'personality', 'reservation_id', - 'scheduler_hints', 'security_groups', 'software_config_transport', - 'user_data', 'user_data_format', 'user_data_update_policy') - def __init__(self, nodetemplate): super(ToscaCompute, self).__init__(nodetemplate, type='OS::Nova::Server') @@ -107,8 +99,7 @@ class ToscaCompute(HotResource): self.properties['software_config_transport'] = 'POLL_SERVER_HEAT' tosca_props = self.get_tosca_props() for key, value in tosca_props.items(): - if key in self.ALLOWED_NOVA_SERVER_PROPS: - self.properties[key] = value + self.properties[key] = value # To be reorganized later based on new development in Glance and Graffiti def translate_compute_flavor_and_image(self, @@ -264,7 +255,7 @@ class ToscaCompute(HotResource): images = IMAGES if translator.common.utils.check_for_env_variables(): resp = self._populate_image_dict() - if resp and len(resp.keys()) > 0: + if len(resp.keys()) > 0: images = resp match_all = images.keys() architecture = properties.get(self.ARCHITECTURE) diff --git a/tosca2heat/heat-translator/translator/hot/translate_node_templates.py b/tosca2heat/heat-translator/translator/hot/translate_node_templates.py index 4dd9556..0aefd48 100644 --- a/tosca2heat/heat-translator/translator/hot/translate_node_templates.py +++ b/tosca2heat/heat-translator/translator/hot/translate_node_templates.py @@ -16,8 +16,6 @@ import logging import os import six -from collections import OrderedDict -from toscaparser.functions import Concat from toscaparser.functions import GetAttribute from toscaparser.functions import GetInput from toscaparser.functions import GetProperty @@ -27,7 +25,6 @@ from toscaparser.utils.gettextutils import _ from translator.common.exception import ToscaClassAttributeError from translator.common.exception import ToscaClassImportError from translator.common.exception import ToscaModImportError -from translator.common import utils from translator.conf.config import ConfigProvider as translatorConfig from translator.hot.syntax.hot_resource import HotResource from translator.hot.tosca.tosca_block_storage_attachment import ( @@ -135,8 +132,6 @@ log = logging.getLogger('heat-translator') TOSCA_TO_HOT_TYPE = _generate_type_map() -BASE_TYPES = six.string_types + six.integer_types + (dict, OrderedDict) - class TranslateNodeTemplates(object): '''Translate TOSCA NodeTemplates to Heat Resources.''' @@ -151,9 +146,6 @@ class TranslateNodeTemplates(object): log.debug(_('Mapping between TOSCA nodetemplate and HOT resource.')) self.hot_lookup = {} self.policies = self.tosca.topology_template.policies - # stores the last deploy of generated behavior for a resource - # useful to satisfy underlying dependencies between interfaces - self.last_deploy_map = {} def translate(self): return self._translate_nodetemplates() @@ -231,14 +223,9 @@ class TranslateNodeTemplates(object): # into multiple HOT resources and may change their name lifecycle_resources = [] for resource in self.hot_resources: - expanded_resources, deploy_lookup, last_deploy = resource.\ - handle_life_cycle() - if expanded_resources: - lifecycle_resources += expanded_resources - if deploy_lookup: - self.hot_lookup.update(deploy_lookup) - if last_deploy: - self.last_deploy_map[resource] = last_deploy + expanded = resource.handle_life_cycle() + if expanded: + lifecycle_resources += expanded self.hot_resources += lifecycle_resources # Handle configuration from ConnectsTo relationship in the TOSCA node: @@ -270,9 +257,7 @@ class TranslateNodeTemplates(object): # if the source of dependency is a server and the # relationship type is 'tosca.relationships.HostedOn', # add dependency as properties.server - base_type = HotResource.get_base_type( - node_depend.type_definition) - if base_type.type == 'tosca.nodes.Compute' and \ + if node_depend.type == 'tosca.nodes.Compute' and \ node.related[node_depend].type == \ node.type_definition.HOSTEDON: self.hot_lookup[node].properties['server'] = \ @@ -285,13 +270,6 @@ class TranslateNodeTemplates(object): self.hot_lookup[node].depends_on_nodes.append( self.hot_lookup[node_depend].top_of_chain()) - last_deploy = self.last_deploy_map.get( - self.hot_lookup[node_depend]) - if last_deploy and \ - last_deploy not in self.hot_lookup[node].depends_on: - self.hot_lookup[node].depends_on.append(last_deploy) - self.hot_lookup[node].depends_on_nodes.append(last_deploy) - # handle hosting relationship for resource in self.hot_resources: resource.handle_hosting() @@ -321,202 +299,53 @@ class TranslateNodeTemplates(object): inputs = resource.properties.get('input_values') if inputs: for name, value in six.iteritems(inputs): - inputs[name] = self.translate_param_value(value, resource) - - # remove resources without type defined - # for example a SoftwareComponent without interfaces - # would fall in this case - to_remove = [] - for resource in self.hot_resources: - if resource.type is None: - to_remove.append(resource) - - for resource in to_remove: - self.hot_resources.remove(resource) + inputs[name] = self._translate_input(value, resource) return self.hot_resources - def translate_param_value(self, param_value, resource): - tosca_template = None - if resource: - tosca_template = resource.nodetemplate - + def _translate_input(self, input_value, resource): get_property_args = None - if isinstance(param_value, GetProperty): - get_property_args = param_value.args + if isinstance(input_value, GetProperty): + get_property_args = input_value.args # to remove when the parser is fixed to return GetProperty - elif isinstance(param_value, dict) and 'get_property' in param_value: - get_property_args = param_value['get_property'] + if isinstance(input_value, dict) and 'get_property' in input_value: + get_property_args = input_value['get_property'] if get_property_args is not None: - tosca_target, prop_name, prop_arg = \ - self.decipher_get_operation(get_property_args, - tosca_template) - if tosca_target: - prop_value = tosca_target.get_property_value(prop_name) - if prop_value: - prop_value = self.translate_param_value( - prop_value, resource) - return self._unfold_value(prop_value, prop_arg) - get_attr_args = None - if isinstance(param_value, GetAttribute): - get_attr_args = param_value.result().args - # to remove when the parser is fixed to return GetAttribute - elif isinstance(param_value, dict) and 'get_attribute' in param_value: - get_attr_args = param_value['get_attribute'] - if get_attr_args is not None: + hot_target = self._find_hot_resource_for_tosca( + get_property_args[0], resource) + if hot_target: + props = hot_target.get_tosca_props() + prop_name = get_property_args[1] + if prop_name in props: + return props[prop_name] + elif isinstance(input_value, GetAttribute): # for the attribute # get the proper target type to perform the translation - tosca_target, attr_name, attr_arg = \ - self.decipher_get_operation(get_attr_args, tosca_template) - attr_args = [] - if attr_arg: - attr_args += attr_arg - if tosca_target: - if tosca_target in self.hot_lookup: - attr_value = self.hot_lookup[tosca_target].\ - get_hot_attribute(attr_name, attr_args) - attr_value = self.translate_param_value( - attr_value, resource) - return self._unfold_value(attr_value, attr_arg) - elif isinstance(param_value, dict) and 'get_artifact' in param_value: - get_artifact_args = param_value['get_artifact'] - tosca_target, artifact_name, _ = \ - self.decipher_get_operation(get_artifact_args, - tosca_template) - - if tosca_target: - artifacts = self.get_all_artifacts(tosca_target) - if artifact_name in artifacts: - artifact = artifacts[artifact_name] - if artifact.get('type', None) == 'tosca.artifacts.File': - return {'get_file': artifact.get('file')} - get_input_args = None - if isinstance(param_value, GetInput): - get_input_args = param_value.args - elif isinstance(param_value, dict) and 'get_input' in param_value: - get_input_args = param_value['get_input'] - if get_input_args is not None: - if isinstance(get_input_args, list) \ - and len(get_input_args) == 1: - return {'get_param': self.translate_param_value( - get_input_args[0], resource)} - else: - return {'get_param': self.translate_param_value( - get_input_args, resource)} - elif isinstance(param_value, dict) \ - and 'get_operation_output' in param_value: - res = self._translate_get_operation_output_function( - param_value['get_operation_output'], tosca_template) - if res: - return res - concat_list = None - if isinstance(param_value, Concat): - concat_list = param_value.args - elif isinstance(param_value, dict) and 'concat' in param_value: - concat_list = param_value['concat'] - if concat_list is not None: - res = self._translate_concat_function(concat_list, resource) - if res: - return res - - if isinstance(param_value, list): - translated_list = [] - for elem in param_value: - translated_elem = self.translate_param_value(elem, resource) - if translated_elem: - translated_list.append(translated_elem) - return translated_list - - if isinstance(param_value, BASE_TYPES): - return param_value - - return None - - def _translate_concat_function(self, concat_list, resource): - str_replace_template = '' - str_replace_params = {} - index = 0 - for elem in concat_list: - str_replace_template += '$s' + str(index) - str_replace_params['$s' + str(index)] = \ - self.translate_param_value(elem, resource) - index += 1 - - return {'str_replace': { - 'template': str_replace_template, - 'params': str_replace_params - }} - - def _translate_get_operation_output_function(self, args, tosca_template): - tosca_target = self._find_tosca_node(args[0], - tosca_template) - if tosca_target and len(args) >= 4: - operations = HotResource.get_all_operations(tosca_target) - # ignore Standard interface name, - # it is the only one supported in the translator anyway - op_name = args[2] - output_name = args[3] - if op_name in operations: - operation = operations[op_name] - if operation in self.hot_lookup: - matching_deploy = self.hot_lookup[operation] - matching_config_name = matching_deploy.\ - properties['config']['get_resource'] - matching_config = self.find_hot_resource( - matching_config_name) - if matching_config: - outputs = matching_config.properties.get('outputs') - if outputs is None: - outputs = [] - outputs.append({'name': output_name}) - matching_config.properties['outputs'] = outputs - return {'get_attr': [ - matching_deploy.name, - output_name - ]} - - @staticmethod - def _unfold_value(value, value_arg): - if value_arg is not None: - if isinstance(value, dict): - val = value.get(value_arg) - if val is not None: - return val - - index = utils.str_to_num(value_arg) - if isinstance(value, list) and index is not None: - return value[index] - return value - - def decipher_get_operation(self, args, current_tosca_node): - tosca_target = self._find_tosca_node(args[0], - current_tosca_node) - new_target = None - if tosca_target and len(args) > 2: - cap_or_req_name = args[1] - cap = tosca_target.get_capability(cap_or_req_name) - if cap: - new_target = cap + args = input_value.result().args + hot_target = self._find_hot_resource_for_tosca(args[0], resource) + + return hot_target.get_hot_attribute(args[1], args) + # most of artifacts logic should move to the parser + elif isinstance(input_value, dict) and 'get_artifact' in input_value: + get_artifact_args = input_value['get_artifact'] + + hot_target = self._find_hot_resource_for_tosca( + get_artifact_args[0], resource) + artifacts = TranslateNodeTemplates.get_all_artifacts( + hot_target.nodetemplate) + + if get_artifact_args[1] in artifacts: + artifact = artifacts[get_artifact_args[1]] + if artifact.get('type', None) == 'tosca.artifacts.File': + return {'get_file': artifact.get('file')} + elif isinstance(input_value, GetInput): + if isinstance(input_value.args, list) \ + and len(input_value.args) == 1: + return {'get_param': input_value.args[0]} else: - for req in tosca_target.requirements: - if cap_or_req_name in req: - new_target = self._find_tosca_node( - req[cap_or_req_name]) - cap = new_target.get_capability(cap_or_req_name) - if cap: - new_target = cap - break - - if new_target: - tosca_target = new_target - - prop_name = args[2] - prop_arg = args[3] if len(args) >= 4 else None - else: - prop_name = args[1] - prop_arg = args[2] if len(args) >= 3 else None + return {'get_param': input_value.args} - return tosca_target, prop_name, prop_arg + return input_value @staticmethod def get_all_artifacts(nodetemplate): @@ -591,29 +420,23 @@ class TranslateNodeTemplates(object): if resource.name == name: return resource - def _find_tosca_node(self, tosca_name, current_tosca_template=None): - tosca_node = None - if tosca_name == 'SELF': - tosca_node = current_tosca_template - if tosca_name == 'HOST' and current_tosca_template: - for req in current_tosca_template.requirements: - if 'host' in req: - tosca_node = self._find_tosca_node(req['host']) - - if tosca_node is None: - for node in self.nodetemplates: - if node.name == tosca_name: - tosca_node = node - break - return tosca_node + def _find_tosca_node(self, tosca_name): + for node in self.nodetemplates: + if node.name == tosca_name: + return node def _find_hot_resource_for_tosca(self, tosca_name, current_hot_resource=None): - current_tosca_resource = current_hot_resource.nodetemplate \ - if current_hot_resource else None - tosca_node = self._find_tosca_node(tosca_name, current_tosca_resource) - if tosca_node: - return self.hot_lookup[tosca_node] + if tosca_name == 'SELF': + return current_hot_resource + if tosca_name == 'HOST' and current_hot_resource is not None: + for req in current_hot_resource.nodetemplate.requirements: + if 'host' in req: + return self._find_hot_resource_for_tosca(req['host']) + + for node in self.nodetemplates: + if node.name == tosca_name: + return self.hot_lookup[node] return None diff --git a/tosca2heat/heat-translator/translator/hot/translate_outputs.py b/tosca2heat/heat-translator/translator/hot/translate_outputs.py index 87ec02a..4197cdd 100644 --- a/tosca2heat/heat-translator/translator/hot/translate_outputs.py +++ b/tosca2heat/heat-translator/translator/hot/translate_outputs.py @@ -33,8 +33,16 @@ class TranslateOutputs(object): def _translate_outputs(self): hot_outputs = [] for output in self.outputs: - hot_value = self.nodes.translate_param_value(output.value, None) - if hot_value is not None: - hot_outputs.append(HotOutput(output.name, hot_value, + if output.value.name == 'get_attribute': + get_parameters = output.value.args + hot_target = self.nodes.find_hot_resource(get_parameters[0]) + hot_value = hot_target.get_hot_attribute(get_parameters[1], + get_parameters) + hot_outputs.append(HotOutput(output.name, + hot_value, + output.description)) + else: + hot_outputs.append(HotOutput(output.name, + output.value, output.description)) return hot_outputs diff --git a/tosca2heat/heat-translator/translator/tests/test_tosca_hot_translation.py b/tosca2heat/heat-translator/translator/tests/test_tosca_hot_translation.py index 3e69d7a..bd98904 100644 --- a/tosca2heat/heat-translator/translator/tests/test_tosca_hot_translation.py +++ b/tosca2heat/heat-translator/translator/tests/test_tosca_hot_translation.py @@ -23,48 +23,35 @@ from translator.tests.base import TestCase class ToscaHotTranslationTest(TestCase): - def _test_successful_translation(self, tosca_file, hot_file, params=None): - if not params: - params = {} + def test_hot_translate_single_server(self): + tosca_file = '../tests/data/tosca_single_server.yaml' + hot_file = '../tests/data/hot_output/hot_single_server.yaml' + params = {'cpus': 1} diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, hot_file, params) self.assertEqual({}, diff, '<difference> : ' + json.dumps(diff, indent=4, separators=(', ', ': '))) - def _test_failed_translation(self, tosca_file, hot_file, params, msg, - msg_path, error_raise, error_collect): - if msg_path: - path = os.path.normpath(os.path.join( - os.path.dirname(os.path.realpath(__file__)), tosca_file)) - msg = msg % path - self.assertRaises( - error_raise, - TranslationUtils.compare_tosca_translation_with_hot, - tosca_file, hot_file, params) - ExceptionCollector.assertExceptionMessage(error_collect, msg) - - def test_hot_translate_single_server(self): - tosca_file = '../tests/data/tosca_single_server.yaml' - hot_file = '../tests/data/hot_output/hot_single_server.yaml' - params = {'cpus': 1} - self._test_successful_translation(tosca_file, hot_file, params) - def test_hot_translate_single_server_with_defaults(self): tosca_file = \ '../tests/data/tosca_single_server_with_defaults.yaml' - hot_file_with_input = '../tests/data/hot_output/' \ 'hot_single_server_with_defaults_with_input.yaml' - params1 = {'cpus': '1'} - self._test_successful_translation(tosca_file, hot_file_with_input, - params1) - hot_file_without_input = '../tests/data/hot_output/' \ 'hot_single_server_with_defaults_without_input.yaml' + + params1 = {'cpus': '1'} + diff1 = TranslationUtils.compare_tosca_translation_with_hot( + tosca_file, hot_file_with_input, params1) + self.assertEqual({}, diff1, '<difference> : ' + + json.dumps(diff1, indent=4, separators=(', ', ': '))) + params2 = {} - self._test_successful_translation(tosca_file, hot_file_without_input, - params2) + diff2 = TranslationUtils.compare_tosca_translation_with_hot( + tosca_file, hot_file_without_input, params2) + self.assertEqual({}, diff2, '<difference> : ' + + json.dumps(diff2, indent=4, separators=(', ', ': '))) def test_hot_translate_wordpress_single_instance(self): tosca_file = '../tests/data/tosca_single_instance_wordpress.yaml' @@ -76,17 +63,29 @@ class ToscaHotTranslationTest(TestCase): 'db_root_pwd': 'passw0rd', 'db_port': 3366, 'cpus': 8} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_helloworld(self): tosca_file = '../tests/data/tosca_helloworld.yaml' hot_file = '../tests/data/hot_output/hot_hello_world.yaml' - self._test_successful_translation(tosca_file, hot_file) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + {}) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_host_assignment(self): tosca_file = '../tests/data/test_host_assignment.yaml' hot_file = '../tests/data/hot_output/hot_host_assignment.yaml' - self._test_successful_translation(tosca_file, hot_file) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + {}) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_elk(self): tosca_file = '../tests/data/tosca_elk.yaml' @@ -94,7 +93,11 @@ class ToscaHotTranslationTest(TestCase): params = {'github_url': 'http://github.com/paypal/rest-api-sample-app-nodejs.git', 'my_cpus': 4} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_nodejs_mongodb_two_instances(self): tosca_file = '../tests/data/tosca_nodejs_mongodb_two_instances.yaml' @@ -103,7 +106,11 @@ class ToscaHotTranslationTest(TestCase): params = {'github_url': 'http://github.com/paypal/rest-api-sample-app-nodejs.git', 'my_cpus': 4} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_blockstorage_with_attachment(self): tosca_file = '../tests/data/storage/' \ @@ -114,7 +121,11 @@ class ToscaHotTranslationTest(TestCase): 'storage_location': '/dev/vdc', 'storage_size': '2000 MB', 'storage_snapshot_id': 'ssid'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_blockstorage_with_custom_relationship_type(self): tosca_file = '../tests/data/storage/' \ @@ -125,7 +136,11 @@ class ToscaHotTranslationTest(TestCase): 'storage_location': '/dev/vdc', 'storage_size': '1 GB', 'storage_snapshot_id': 'ssid'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_blockstorage_with_relationship_template(self): tosca_file = '../tests/data/storage/' \ @@ -135,7 +150,11 @@ class ToscaHotTranslationTest(TestCase): params = {'cpus': 1, 'storage_location': '/dev/vdc', 'storage_size': '1 GB'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_blockstorage_with_attachment_notation1(self): tosca_file = '../tests/data/storage/' \ @@ -148,11 +167,19 @@ class ToscaHotTranslationTest(TestCase): 'storage_location': 'some_folder', 'storage_size': '1 GB', 'storage_snapshot_id': 'ssid'} - + diff1 = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file1, + params) try: - self._test_successful_translation(tosca_file, hot_file1, params) + self.assertEqual({}, diff1, '<difference> : ' + + json.dumps(diff1, indent=4, + separators=(', ', ': '))) except Exception: - self._test_successful_translation(tosca_file, hot_file2, params) + diff2 = TranslationUtils.compare_tosca_translation_with_hot( + tosca_file, hot_file2, params) + self.assertEqual({}, diff2, '<difference> : ' + + json.dumps(diff2, indent=4, + separators=(', ', ': '))) def test_hot_translate_blockstorage_with_attachment_notation2(self): tosca_file = '../tests/data/storage/' \ @@ -165,10 +192,19 @@ class ToscaHotTranslationTest(TestCase): 'storage_location': '/dev/vdc', 'storage_size': '1 GB', 'storage_snapshot_id': 'ssid'} + diff1 = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file1, + params) try: - self._test_successful_translation(tosca_file, hot_file1, params) + self.assertEqual({}, diff1, '<difference> : ' + + json.dumps(diff1, indent=4, + separators=(', ', ': '))) except Exception: - self._test_successful_translation(tosca_file, hot_file2, params) + diff2 = TranslationUtils.compare_tosca_translation_with_hot( + tosca_file, hot_file2, params) + self.assertEqual({}, diff2, '<difference> : ' + + json.dumps(diff2, indent=4, + separators=(', ', ': '))) def test_hot_translate_multiple_blockstorage_with_attachment(self): tosca_file = '../tests/data/storage/' \ @@ -181,23 +217,40 @@ class ToscaHotTranslationTest(TestCase): 'storage_location': '/dev/vdc', 'storage_size': '1 GB', 'storage_snapshot_id': 'ssid'} + diff1 = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file1, + params) try: - self._test_successful_translation(tosca_file, hot_file1, params) + self.assertEqual({}, diff1, '<difference> : ' + + json.dumps(diff1, indent=4, + separators=(', ', ': '))) except Exception: - self._test_successful_translation(tosca_file, hot_file2, params) + diff2 = TranslationUtils.compare_tosca_translation_with_hot( + tosca_file, hot_file2, params) + self.assertEqual({}, diff2, '<difference> : ' + + json.dumps(diff2, indent=4, + separators=(', ', ': '))) def test_hot_translate_single_object_store(self): tosca_file = '../tests/data/storage/tosca_single_object_store.yaml' hot_file = '../tests/data/hot_output/hot_single_object_store.yaml' params = {'objectstore_name': 'myobjstore'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_one_server_one_network(self): tosca_file = '../tests/data/network/tosca_one_server_one_network.yaml' hot_file = '../tests/data/hot_output/network/' \ 'hot_one_server_one_network.yaml' params = {'network_name': 'private_net'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_server_on_existing_network(self): tosca_file = '../tests/data/network/' \ @@ -205,7 +258,11 @@ class ToscaHotTranslationTest(TestCase): hot_file = '../tests/data/hot_output/network/' \ 'hot_server_on_existing_network.yaml' params = {'network_name': 'private_net'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_two_servers_one_network(self): tosca_file = '../tests/data/network/tosca_two_servers_one_network.yaml' @@ -215,7 +272,11 @@ class ToscaHotTranslationTest(TestCase): 'network_cidr': '10.0.0.0/24', 'network_start_ip': '10.0.0.100', 'network_end_ip': '10.0.0.150'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_one_server_three_networks(self): tosca_file = '../tests/data/network/' \ @@ -223,20 +284,32 @@ class ToscaHotTranslationTest(TestCase): hot_file = '../tests/data/hot_output/network/' \ 'hot_one_server_three_networks.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_software_component(self): tosca_file = '../tests/data/tosca_software_component.yaml' hot_file = '../tests/data/hot_output/hot_software_component.yaml' params = {'cpus': '1', 'download_url': 'http://www.software.com/download'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_web_application(self): tosca_file = '../tests/data/tosca_web_application.yaml' hot_file = '../tests/data/hot_output/hot_web_application.yaml' params = {'cpus': '2', 'context_root': 'my_web_app'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_template_with_url_import(self): tosca_file = '../tests/data/' \ @@ -249,7 +322,11 @@ class ToscaHotTranslationTest(TestCase): 'db_root_pwd': 'passw0rd', 'db_port': 3366, 'cpus': 8} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_template_by_url_with_local_import(self): tosca_file = 'https://raw.githubusercontent.com/openstack/' \ @@ -263,7 +340,11 @@ class ToscaHotTranslationTest(TestCase): 'db_root_pwd': 'passw0rd', 'db_port': 3366, 'cpus': 8} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_template_by_url_with_local_abspath_import(self): tosca_file = 'https://raw.githubusercontent.com/openstack/' \ @@ -278,15 +359,17 @@ class ToscaHotTranslationTest(TestCase): 'db_root_pwd': 'passw0rd', 'db_port': 3366, 'cpus': 8} + + self.assertRaises( + ValidationError, + TranslationUtils.compare_tosca_translation_with_hot, + tosca_file, hot_file, params) expected_msg = _('Absolute file name "/tmp/wordpress.yaml" cannot be ' 'used in a URL-based input template "https://raw.' 'githubusercontent.com/openstack/heat-translator/' 'master/translator/tests/data/tosca_single_instance_' 'wordpress_with_local_abspath_import.yaml".') - msg_path = False - self._test_failed_translation(tosca_file, hot_file, params, - expected_msg, msg_path, ValidationError, - ImportError) + ExceptionCollector.assertExceptionMessage(ImportError, expected_msg) def test_hot_translate_template_by_url_with_url_import(self): tosca_url = 'https://raw.githubusercontent.com/openstack/' \ @@ -300,12 +383,20 @@ class ToscaHotTranslationTest(TestCase): 'db_root_pwd': 'passw0rd', 'db_port': 3366, 'cpus': 8} - self._test_successful_translation(tosca_url, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_url, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_translate_hello_world_csar(self): tosca_file = '../tests/data/csar_hello_world.zip' hot_file = '../tests/data/hot_output/hot_hello_world.yaml' - self._test_successful_translation(tosca_file, hot_file) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + {}) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_translate_single_instance_wordpress_csar(self): tosca_file = '../tests/data/csar_single_instance_wordpress.zip' @@ -317,7 +408,11 @@ class ToscaHotTranslationTest(TestCase): 'db_root_pwd': 'passw0rd', 'db_port': 3366, 'cpus': 8} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_translate_elk_csar_from_url(self): tosca_file = 'https://github.com/openstack/heat-translator/raw/' \ @@ -326,103 +421,150 @@ class ToscaHotTranslationTest(TestCase): params = {'github_url': 'http://github.com/paypal/rest-api-sample-app-nodejs.git', 'my_cpus': 4} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_translate_csar_not_zip(self): tosca_file = '../tests/data/csar_not_zip.zip' hot_file = '' params = {} - expected_msg = _('"%s" is not a valid zip file.') - msg_path = True - self._test_failed_translation(tosca_file, hot_file, params, - expected_msg, msg_path, ValidationError, - ValidationError) + + self.assertRaises( + ValidationError, + TranslationUtils.compare_tosca_translation_with_hot, + tosca_file, hot_file, params) + path = os.path.normpath(os.path.join( + os.path.dirname(os.path.realpath(__file__)), tosca_file)) + expected_msg = _('"%s" is not a valid zip file.') % path + ExceptionCollector.assertExceptionMessage(ValidationError, + expected_msg) def test_translate_csar_metadata_not_yaml(self): tosca_file = '../tests/data/csar_metadata_not_yaml.zip' hot_file = '' params = {} + + self.assertRaises( + ValidationError, + TranslationUtils.compare_tosca_translation_with_hot, + tosca_file, hot_file, params) + path = os.path.normpath(os.path.join( + os.path.dirname(os.path.realpath(__file__)), tosca_file)) expected_msg = _('The file "TOSCA-Metadata/TOSCA.meta" in the CSAR ' - '"%s" does not contain valid YAML content.') - msg_path = True - self._test_failed_translation(tosca_file, hot_file, params, - expected_msg, msg_path, ValidationError, - ValidationError) + '"%s" does not contain valid YAML content.') % path + ExceptionCollector.assertExceptionMessage(ValidationError, + expected_msg) def test_translate_csar_wrong_metadata_file(self): tosca_file = '../tests/data/csar_wrong_metadata_file.zip' hot_file = '' params = {} + + self.assertRaises( + ValidationError, + TranslationUtils.compare_tosca_translation_with_hot, + tosca_file, hot_file, params) + path = os.path.normpath(os.path.join( + os.path.dirname(os.path.realpath(__file__)), tosca_file)) expected_msg = _('"%s" is not a valid CSAR as it does not contain the ' 'required file "TOSCA.meta" in the folder ' - '"TOSCA-Metadata".') - msg_path = True - self._test_failed_translation(tosca_file, hot_file, params, - expected_msg, msg_path, ValidationError, - ValidationError) + '"TOSCA-Metadata".') % path + ExceptionCollector.assertExceptionMessage(ValidationError, + expected_msg) def test_translate_csar_wordpress_invalid_import_path(self): tosca_file = '../tests/data/csar_wordpress_invalid_import_path.zip' hot_file = '' params = {} + + self.assertRaises( + ValidationError, + TranslationUtils.compare_tosca_translation_with_hot, + tosca_file, hot_file, params) expected_msg = _('Import ' '"Invalid_import_path/wordpress.yaml" is not valid.') - msg_path = False - self._test_failed_translation(tosca_file, hot_file, params, - expected_msg, msg_path, ValidationError, - ImportError) + ExceptionCollector.assertExceptionMessage(ImportError, expected_msg) def test_translate_csar_wordpress_invalid_script_url(self): tosca_file = '../tests/data/csar_wordpress_invalid_script_url.zip' hot_file = '' params = {} + + self.assertRaises( + ValidationError, + TranslationUtils.compare_tosca_translation_with_hot, + tosca_file, hot_file, params) expected_msg = _('The resource at ' '"https://raw.githubusercontent.com/openstack/' 'heat-translator/master/translator/tests/data/' 'custom_types/wordpress1.yaml" cannot be accessed.') - msg_path = False - self._test_failed_translation(tosca_file, hot_file, params, - expected_msg, msg_path, ValidationError, - URLException) + ExceptionCollector.assertExceptionMessage(URLException, expected_msg) def test_hot_translate_flavor_image(self): tosca_file = '../tests/data/test_tosca_flavor_and_image.yaml' hot_file = '../tests/data/hot_output/hot_flavor_and_image.yaml' - self._test_successful_translation(tosca_file, hot_file) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + {}) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_flavor_image_params(self): tosca_file = '../tests/data/test_tosca_flavor_and_image.yaml' hot_file = '../tests/data/hot_output/hot_flavor_and_image_params.yaml' params = {'key_name': 'paramkey'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_custom_type(self): tosca_file = '../tests/data/test_tosca_custom_type.yaml' hot_file = '../tests/data/hot_output/' \ 'hot_custom_type.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_custom_type_with_override(self): tosca_file = '../tests/data/test_tosca_custom_type_with_override.yaml' hot_file = '../tests/data/hot_output/' \ 'hot_custom_type_with_override.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_custom_type_with_param_override(self): tosca_file = '../tests/data/test_tosca_custom_type_with_override.yaml' hot_file = '../tests/data/hot_output/' \ 'hot_custom_type_with_param_override.yaml' params = {'install_path': '/home/custom/from/cli'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_artifact(self): tosca_file = '../tests/data/test_tosca_artifact.yaml' hot_file = '../tests/data/hot_output/' \ 'hot_artifact.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_without_tosca_os_version(self): tosca_file = '../tests/data/' \ @@ -430,13 +572,21 @@ class ToscaHotTranslationTest(TestCase): hot_file = '../tests/data/hot_output/' \ 'hot_single_server_without_tosca_os_version.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_helloworld_with_userkey(self): tosca_file = '../tests/data/tosca_helloworld.yaml' hot_file = '../tests/data/hot_output/hot_hello_world_userkey.yaml' params = {'key_name': 'userkey'} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_custom_networks_nodes_inline(self): tosca_file = '../tests/data/network/' \ @@ -444,7 +594,11 @@ class ToscaHotTranslationTest(TestCase): hot_file = '../tests/data/hot_output/network/' \ 'hot_custom_network_nodes.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_custom_networks_nodes_imports(self): tosca_file = '../tests/data/network/' \ @@ -452,46 +606,38 @@ class ToscaHotTranslationTest(TestCase): hot_file = '../tests/data/hot_output/network/' \ 'hot_custom_network_nodes.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_nfv_sample(self): tosca_file = '../tests/data/test_tosca_nfv_sample.yaml' hot_file = '../tests/data/hot_output/hot_nfv_sample.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) - - def test_hot_translate_nfv_vRNC(self): - tosca_file = "../tests/data/vRNC/Definitions/vRNC.yaml" - hot_file = '../tests/data/hot_output/hot_vRNC.yaml' - params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_translate_policy(self): tosca_file = '../tests/data/tosca_policies.yaml' hot_file = '../tests/data/hot_output/hot_policies.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) def test_hot_script_types(self): tosca_file = '../tests/data/test_tosca_script_types.yaml' hot_file = '../tests/data/hot_output/hot_script_types.yaml' params = {} - self._test_successful_translation(tosca_file, hot_file, params) - - def test_hot_interface_on_compute(self): - tosca_file = '../tests/data/test_tosca_interface_on_compute.yaml' - hot_file = '../tests/data/hot_output/hot_interface_on_compute.yaml' - params = {} - self._test_successful_translation(tosca_file, hot_file, params) - - def test_hot_get_functions_semantic(self): - tosca_file = '../tests/data/test_tosca_get_functions_semantic.yaml' - hot_file = '../tests/data/hot_output/hot_get_functions_semantic.yaml' - params = {} - self._test_successful_translation(tosca_file, hot_file, params) - - def test_hot_exchange_public_ssh_key(self): - tosca_file = '../tests/data/tosca_exchange_public_ssh_key.yaml' - hot_file = '../tests/data/hot_output/hot_exchange_public_ssh_key.yaml' - params = {} - self._test_successful_translation(tosca_file, hot_file, params) + diff = TranslationUtils.compare_tosca_translation_with_hot(tosca_file, + hot_file, + params) + self.assertEqual({}, diff, '<difference> : ' + + json.dumps(diff, indent=4, separators=(', ', ': '))) |