From 48dd25f827fc9e1244f578f06a240e31edd47020 Mon Sep 17 00:00:00 2001 From: talio Date: Sun, 5 Nov 2017 09:11:53 +0200 Subject: dynamic ports ignore "depends_on" from / to nested entities, and adding tests Issue - Id : SDC-576 Change-Id: I4788df058ca3b6ea436e54b3a05ceed97135327b Signed-off-by: talio --- .../ConsolidationTypesConnectivity.java | 45 +++++++++------ .../out/MainServiceTemplate.yaml | 67 +--------------------- .../out/MainServiceTemplate.yaml | 27 +-------- .../out/nested2ServiceTemplate.yaml | 26 +-------- .../out/MainServiceTemplate.yaml | 11 +--- .../out/MainServiceTemplate.yaml | 11 +--- .../expectedoutputfiles/MainServiceTemplate.yaml | 10 ---- 7 files changed, 34 insertions(+), 163 deletions(-) diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java index 4e219dae4d..fab9114252 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java @@ -23,34 +23,47 @@ public class ConsolidationTypesConnectivity { .put(ConsolidationEntityType.VOLUME, getIgnoredVolumeRelationships()); entityToEntitiesWithoutRelationship .put(ConsolidationEntityType.VFC_NESTED, getIgnoredVfcNestedRelationships()); + entityToEntitiesWithoutRelationship. + put(ConsolidationEntityType.NESTED, getIgnoredNestedRelationships()); } private static Set getIgnoredComputeRelationships(){ - return Stream.of(ConsolidationEntityType.COMPUTE, - ConsolidationEntityType.VOLUME, - ConsolidationEntityType.PORT, - ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); + return Stream.of(ConsolidationEntityType.COMPUTE, + ConsolidationEntityType.VOLUME, + ConsolidationEntityType.PORT, + ConsolidationEntityType.NESTED, + ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); } private static Set getIgnoredPortRelationships(){ - return Stream.of(ConsolidationEntityType.COMPUTE, - ConsolidationEntityType.VOLUME, - ConsolidationEntityType.PORT, - ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); + return Stream.of(ConsolidationEntityType.COMPUTE, + ConsolidationEntityType.VOLUME, + ConsolidationEntityType.PORT, + ConsolidationEntityType.NESTED, + ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); } private static Set getIgnoredVolumeRelationships(){ - return Stream.of(ConsolidationEntityType.COMPUTE, - ConsolidationEntityType.VOLUME, - ConsolidationEntityType.PORT, - ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); + return Stream.of(ConsolidationEntityType.COMPUTE, + ConsolidationEntityType.VOLUME, + ConsolidationEntityType.PORT, + ConsolidationEntityType.NESTED, + ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); } private static Set getIgnoredVfcNestedRelationships(){ - return Stream.of(ConsolidationEntityType.COMPUTE, - ConsolidationEntityType.VOLUME, - ConsolidationEntityType.PORT, - ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); + return Stream.of(ConsolidationEntityType.COMPUTE, + ConsolidationEntityType.VOLUME, + ConsolidationEntityType.PORT, + ConsolidationEntityType.NESTED, + ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); + } + + private static Set getIgnoredNestedRelationships(){ + return Stream.of(ConsolidationEntityType.COMPUTE, + ConsolidationEntityType.PORT, + ConsolidationEntityType.NESTED, + ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet()); } public static boolean isDependsOnRelationshipValid(ConsolidationEntityType source, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index 376b410539..15a079d930 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -110,10 +110,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: nested_network relationship: tosca.relationships.network.LinksTo - - dependency: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn abstract_b_single_1b: type: org.openecomp.resource.abstract.nodes.b_single_1b directives: @@ -162,10 +158,6 @@ topology_template: - service_template_filter - index_value requirements: - - dependency_b_single_1b: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn - link_b_single_1b_1b_t2_port: capability: tosca.capabilities.network.Linkable node: b_single_1b_network @@ -243,10 +235,6 @@ topology_template: - service_template_filter - index_value requirements: - - dependency_1c1_scalling_instance: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn - link_1c1_scalling_instance_1c1_t1_port: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network @@ -308,10 +296,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: nested_network relationship: tosca.relationships.network.LinksTo - - dependency_server_pcm: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn abstract_1c2_catalog_instance_0: type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance directives: @@ -363,10 +347,6 @@ topology_template: - service_template_filter - index_value requirements: - - dependency_1c2_catalog_instance_1c2_t1_port: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn - link_1c2_catalog_instance_1c2_t2_port: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network @@ -424,10 +404,6 @@ topology_template: - service_template_filter - index_value requirements: - - dependency_1c2_catalog_instance_1c2_t1_port: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn - link_1c2_catalog_instance_1c2_t2_port: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network @@ -441,43 +417,6 @@ topology_template: substitute_service_template: nested-no-novaServiceTemplate.yaml security_group_name: group1 net_name: myNetwork - requirements: - - dependency: - capability: feature_a_single_1a - node: abstract_a_single_1a - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: 4p_nested - relationship: tosca.relationships.DependsOn - - dependency: - capability: feature_b_single_1b_1b_t1_port - node: abstract_b_single_1b - relationship: tosca.relationships.DependsOn - - dependency: - capability: feature_b_single_1b_1b_t1_port - node: abstract_b_single_1b_1 - relationship: tosca.relationships.DependsOn - - dependency: - capability: feature_1c1_scalling_instance - node: abstract_1c1_scalling_instance - relationship: tosca.relationships.DependsOn - - dependency: - capability: feature_1c2_catalog_instance - node: abstract_1c2_catalog_instance_0 - relationship: tosca.relationships.DependsOn - - dependency: - capability: feature_1c2_catalog_instance - node: abstract_1c2_catalog_instance_1 - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: nestedNoNestedSingleComputePattern - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn 1c1_scalling_instance_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -657,10 +596,6 @@ topology_template: - service_template_filter - index_value requirements: - - dependency_a_single_1a: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn - link_a_single_1a_1a_t1_port: capability: tosca.capabilities.network.Linkable node: a_single_1a_network @@ -938,4 +873,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml index db86de004f..ed4dbd6cb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml @@ -180,11 +180,6 @@ topology_template: - SELF - service_template_filter - index_value - requirements: - - dependency_ps_server_main_1b: - capability: tosca.capabilities.Node - node: test_nested_no_compute - relationship: tosca.relationships.DependsOn test_nested1Level_duplicate_same_file: type: org.openecomp.resource.abstract.nodes.heat.nested1 directives: @@ -203,11 +198,6 @@ topology_template: substitute_service_template: nested1-no-computeServiceTemplate.yaml name: get_input: jsa_net_name - requirements: - - dependency: - capability: feature_pd_server_main_1b - node: abstract_pd_server_main_1b_1 - relationship: tosca.relationships.DependsOn abstract_cmaui_1c1_main_1: type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main_1 directives: @@ -254,11 +244,6 @@ topology_template: - SELF - service_template_filter - index_value - requirements: - - dependency_cmaui_1c1_main: - capability: tosca.capabilities.Node - node: test_nested_no_compute - relationship: tosca.relationships.DependsOn test_nested_pattern_4_main_0: type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4 directives: @@ -286,11 +271,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - requirements: - - dependency_server_pd_pattern4: - capability: tosca.capabilities.Node - node: test_nested_no_compute - relationship: tosca.relationships.DependsOn test_nested1Level: type: org.openecomp.resource.abstract.nodes.heat.nested1 directives: @@ -300,11 +280,6 @@ topology_template: substitute_service_template: nested1ServiceTemplate.yaml name: get_input: security_group_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: test_nested_no_compute - relationship: tosca.relationships.DependsOn groups: main_group: type: org.openecomp.groups.heat.HeatStack @@ -319,4 +294,4 @@ topology_template: - test_nested_pattern_4_main_0 - abstract_pd_server_main_1b_1 - abstract_ps_server_main_1b_1 - - abstract_cmaui_1c1_main_1 + - abstract_cmaui_1c1_main_1 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml index 244b6a21cb..935ec13ca3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml @@ -144,11 +144,6 @@ topology_template: - SELF - service_template_filter - index_value - requirements: - - dependency_pd_server_nested2_1b: - capability: tosca.capabilities.Node - node: test_nested3Level - relationship: tosca.relationships.DependsOn test_nested_pattern_4_nested2: type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4 directives: @@ -176,11 +171,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - requirements: - - dependency_server_pd_pattern4: - capability: tosca.capabilities.Node - node: test_resourceGroup - relationship: tosca.relationships.DependsOn test_nested3Level: type: org.openecomp.resource.abstract.nodes.heat.nested3 directives: @@ -190,15 +180,6 @@ topology_template: substitute_service_template: nested3ServiceTemplate.yaml name: get_input: security_group_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: test_nested_pattern_4_nested2 - relationship: tosca.relationships.DependsOn - - dependency: - capability: feature_ps_server_nested2_1b - node: abstract_ps_server_nested2_1b - relationship: tosca.relationships.DependsOn test_nested_pattern_4_same_type_diff_file: type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4_2 directives: @@ -329,11 +310,6 @@ topology_template: - SELF - service_template_filter - index_value - requirements: - - dependency_cmaui_1c1_nested2: - capability: tosca.capabilities.Node - node: test_nested3Level - relationship: tosca.relationships.DependsOn groups: nested2_group: type: org.openecomp.groups.heat.HeatStack @@ -1498,4 +1474,4 @@ topology_template: - dependency dependency_pd_server_pattern4_port_1_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency_pd_server_pattern4_port_1 + - dependency_pd_server_pattern4_port_1 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index 6d51056e60..e9b295a2d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -269,15 +269,6 @@ topology_template: - pattern4_attr_1 service_template_filter: substitute_service_template: nested-no-computeServiceTemplate.yaml - requirements: - - dependency: - capability: tosca.capabilities.Node - node: test_nested_all_patterns - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: test_nested_pattern_4 - relationship: tosca.relationships.DependsOn nested2_pattern_4: type: org.openecomp.resource.abstract.nodes.heat.pd_server directives: @@ -521,4 +512,4 @@ topology_template: value: get_attribute: - abstract_osm_server_1c2_1 - - osm_server_1c2_accessIPv4 + - osm_server_1c2_accessIPv4 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml index 9c3b51c682..1926fafee1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml @@ -72,15 +72,6 @@ topology_template: - pattern4_attr_1 service_template_filter: substitute_service_template: nested-no-computeServiceTemplate.yaml - requirements: - - dependency: - capability: tosca.capabilities.Node - node: test_nested_all_patterns - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: test_nested_pattern_4 - relationship: tosca.relationships.DependsOn test_nested_all_patterns: type: org.openecomp.resource.abstract.nodes.heat.nested1 directives: @@ -107,4 +98,4 @@ topology_template: - dependsOn_network - test_nested_pattern_4 - test_nested_no_compute - - test_nested_all_patterns + - test_nested_all_patterns \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml index 4744837987..d45c614cfc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml @@ -503,11 +503,6 @@ topology_template: - install_config storage_size: 68 group_tag: oam - requirements: - - dependency: - capability: tosca.capabilities.Node - node: NOKIA-LCP-Base - relationship: tosca.relationships.DependsOn IMS_RRG: type: org.openecomp.resource.abstract.nodes.heat.LCP-PairGroup.template directives: @@ -668,11 +663,6 @@ topology_template: get_attribute: - NOKIA-LCP-Base - NetInfoStr - requirements: - - dependency: - capability: tosca.capabilities.Node - node: NOKIA-LCP-Base - relationship: tosca.relationships.DependsOn groups: base_mso_group: type: org.openecomp.groups.heat.HeatStack -- cgit 1.2.3-korg