From 777a3493a4dc4bfeb854b3b820dc5968124af87e Mon Sep 17 00:00:00 2001 From: talio Date: Sun, 5 Nov 2017 11:34:51 +0200 Subject: duplicate ids throw an exception when a zip with duplicate ids in different files is getting uploaded Issue - Id : SDC-554 Change-Id: I213233d8833b89788f980db859d9597d2c1cb950 Signed-off-by: talio --- .../out/MainServiceTemplate.yaml | 78 +++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index b9c3a5fd45..4c55b814b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -1072,19 +1072,19 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_pcm_port_0 + capability: attachment_pcm_port_00 node: 4p_nested_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pcm_port_1 + capability: attachment_pcm_port_01 node: 4p_nested_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pcm_port_0 + capability: attachment_pcm_port_00 node: 4p_nested_2 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pcm_port_1 + capability: attachment_pcm_port_01 node: 4p_nested_2 relationship: org.openecomp.relationships.AttachesTo - port: @@ -1437,8 +1437,13 @@ topology_template: directives: - substitutable properties: + port_pcm_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false server_group: BE_Affinity_group - port_pcm_port_1_network_role_tag: oam connectivityChk: connectivityTo1C1_T1_02: get_attribute: @@ -1508,30 +1513,24 @@ topology_template: get_attribute: - 1c201_catalog_instance_1C22 - instance_name - port_pcm_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false pcm_image_name: get_input: pcm_image_name - security_group_name: jsa_security_group - port_pcm_port_1_mac_requirements: + port_pcm_port_00_mac_requirements: mac_count_required: is_required: false - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml - port_pcm_port_1_ip_requirements: + security_group_name: jsa_security_group + port_pcm_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: + port_pcm_port_00_network_role_tag: cps + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_01_mac_requirements: mac_count_required: is_required: false pcm_server_name: @@ -1539,8 +1538,9 @@ topology_template: - pcm_server_names - 0 cps_net_name: nested_network + port_pcm_port_01_network_role_tag: oam requirements: - - link_pcm_port_0: + - link_pcm_port_00: capability: tosca.capabilities.network.Linkable node: nested_network relationship: tosca.relationships.network.LinksTo @@ -1570,8 +1570,13 @@ topology_template: directives: - substitutable properties: + port_pcm_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false server_group: BE_Affinity_group - port_pcm_port_1_network_role_tag: oam connectivityChk: connectivityTo4PNested_2: get_attribute: @@ -1641,30 +1646,24 @@ topology_template: get_attribute: - 1c201_catalog_instance_1C22 - instance_name - port_pcm_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false pcm_image_name: get_input: pcm_image_name - security_group_name: jsa_security_group - port_pcm_port_1_mac_requirements: + port_pcm_port_00_mac_requirements: mac_count_required: is_required: false - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml - port_pcm_port_1_ip_requirements: + security_group_name: jsa_security_group + port_pcm_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: + port_pcm_port_00_network_role_tag: cps + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_01_mac_requirements: mac_count_required: is_required: false pcm_server_name: @@ -1672,8 +1671,9 @@ topology_template: - pcm_server_names - 0 cps_net_name: nested_network + port_pcm_port_01_network_role_tag: oam requirements: - - link_pcm_port_0: + - link_pcm_port_00: capability: tosca.capabilities.network.Linkable node: nested_network relationship: tosca.relationships.network.LinksTo @@ -1950,4 +1950,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group \ No newline at end of file -- cgit 1.2.3-korg