aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsiddharth0905 <siddharth.singh4@amdocs.com>2018-04-12 19:29:57 +0530
committerOren Kleks <orenkle@amdocs.com>2018-04-12 14:51:57 +0000
commitd60b2a40c15c5952f8a31e2d2aa4be2cf4837fc8 (patch)
treed17143ff8d9708103d98b487700efa1bc356f850
parent8da1beb7fb630954a0c7adfc7ae6fbb175877b49 (diff)
Subinterface_indicator property issue
It should only be present under port implementation Change-Id: I8b52905c5e5c888cf384bebf1d23168c7906b004 Issue-ID: SDC-1183 Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java21
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml54
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml44
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml84
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml28
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml182
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml52
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml96
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml182
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml52
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml96
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml126
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml46
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml54
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml7
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml48
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml48
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml48
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml13
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml13
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml13
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml13
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml494
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml202
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml50
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml50
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml156
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml192
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml36
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml28
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml28
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml28
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml84
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml82
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml78
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml86
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml22
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml88
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml80
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml66
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml172
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml86
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml166
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml7
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml134
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml70
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml128
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml164
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml156
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml80
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml74
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml9
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml9
496 files changed, 2747 insertions, 7735 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
index e8a4656adf..c4aea2b6a4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
@@ -605,6 +605,9 @@ public class UnifiedCompositionService {
handleNodeTypeProperties(nestedServiceTemplate,
portEntityConsolidationDataList, portNodeTemplate, UnifiedCompositionEntity.PORT,
null, context);
+ //Add subinterface_indicator property to PORT
+ addPortSubInterfaceIndicatorProperty(portNodeTemplate.getProperties(),
+ filePortConsolidationData.getPortTemplateConsolidationData(portNodeTemplateId));
}
}
}
@@ -1866,6 +1869,10 @@ public class UnifiedCompositionService {
portTemplateConsolidationDataList, computeTemplateConsolidationData,
unifiedCompositionDataList, context);
+ //Add subinterface_indicator property to PORT
+ portTemplateConsolidationDataList.forEach(entity ->
+ addPortSubInterfaceIndicatorProperty(newPortNodeTemplate.getProperties(), entity));
+
String newPortNodeTemplateId =
getNewPortNodeTemplateId(portTemplateConsolidationData
.getNodeTemplateId(), connectedComputeNodeType,
@@ -2141,7 +2148,14 @@ public class UnifiedCompositionService {
handleNodeTypeProperties(substitutionServiceTemplate,
entityConsolidationDataList, nodeTemplate, unifiedCompositionEntity,
computeTemplateConsolidationData, context);
+ }
+ private void addPortSubInterfaceIndicatorProperty(Map<String, Object> properties,
+ EntityConsolidationData entityConsolidationData) {
+ if (ToggleableFeature.VLAN_TAGGING.isActive()) {
+ properties.put(SUB_INTERFACE_INDICATOR_PROPERTY,
+ ((PortTemplateConsolidationData) entityConsolidationData).isPortBoundToSubInterface());
+ }
}
private void handleNodeTemplateProperties(UnifiedCompositionTo unifiedCompositionTo,
@@ -2166,13 +2180,6 @@ public class UnifiedCompositionService {
continue;
}
- if (unifiedCompositionEntity == UnifiedCompositionEntity.PORT
- && entityConsolidationData instanceof PortTemplateConsolidationData
- && ToggleableFeature.VLAN_TAGGING.isActive()) {
- properties.put(SUB_INTERFACE_INDICATOR_PROPERTY,
- ((PortTemplateConsolidationData) entityConsolidationData).isPortBoundToSubInterface());
- }
-
for (Map.Entry<String, Object> propertyEntry : properties.entrySet()) {
NodeType nodeTypeWithFlatHierarchy =
HeatToToscaUtil.getNodeTypeWithFlatHierarchy(unifiedCompositionTo.getNodeTemplate().getType(),
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bf2b9ada70..1a003c8e28 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -54,12 +54,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_plt_oam_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -102,12 +96,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.network.AddressPair
- port_plt_internal_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_plt_internal_0_port_subnetpoolid:
type: string
required: true
@@ -254,12 +242,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_plt_data_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_plt_oam_0_port_replacement_policy:
type: list
required: true
@@ -805,12 +787,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_app_internal_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_app_scheduler_hints:
type: list
required: true
@@ -827,12 +803,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_app_data_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_app_oam_0_port_replacement_policy:
type: list
required: true
@@ -881,12 +851,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_app_oam_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_app_data_0_port_network:
type: list
required: true
@@ -1588,12 +1552,6 @@ node_types:
org.openecomp.resource.abstract.nodes.iox:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_iox_oam_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_iox_data_0_port_ip_requirements:
type: list
required: true
@@ -1616,12 +1574,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_iox_internal_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
@@ -1630,12 +1582,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_iox_data_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_iox_data_0_port_allowed_address_pairs:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
index 795db3308a..1d355386cf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
@@ -903,8 +903,6 @@ topology_template:
directives:
- substitutable
properties:
- port_iox_oam_0_port_subinterface_indicator:
- - false
port_iox_data_0_port_ip_requirements:
- ip_version: 6
ip_count_required:
@@ -919,12 +917,8 @@ topology_template:
params:
$vnf_name:
get_input: vnf_name
- port_iox_internal_0_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: iox_flavor_name
- port_iox_data_0_port_subinterface_indicator:
- - false
port_iox_data_0_port_allowed_address_pairs:
- ip_address:
get_attribute:
@@ -1048,8 +1042,6 @@ topology_template:
port_app_data_0_port_mac_requirements:
mac_count_required:
is_required: false
- port_app_internal_0_port_subinterface_indicator:
- - false
compute_app_scheduler_hints:
- group: app_server_group_group
port_app_internal_0_port_ip_requirements:
@@ -1058,8 +1050,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_app_data_0_port_subinterface_indicator:
- - false
port_app_oam_0_port_replacement_policy:
- AUTO
port_app_oam_0_port_network:
@@ -1081,8 +1071,6 @@ topology_template:
port_app_oam_0_port_mac_requirements:
mac_count_required:
is_required: false
- port_app_oam_0_port_subinterface_indicator:
- - false
port_app_data_0_port_network:
- get_input: data_net_id
port_app_data_0_port_network_role_tag: data
@@ -1200,8 +1188,6 @@ topology_template:
directives:
- substitutable
properties:
- port_iox_oam_0_port_subinterface_indicator:
- - false
port_iox_data_0_port_ip_requirements:
- ip_version: 6
ip_count_required:
@@ -1216,12 +1202,8 @@ topology_template:
params:
$vnf_name:
get_input: vnf_name
- port_iox_internal_0_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: iox_flavor_name
- port_iox_data_0_port_subinterface_indicator:
- - false
port_iox_data_0_port_allowed_address_pairs:
- ip_address:
get_attribute:
@@ -1340,8 +1322,6 @@ topology_template:
port_app_data_0_port_mac_requirements:
mac_count_required:
is_required: false
- port_app_internal_0_port_subinterface_indicator:
- - false
compute_app_scheduler_hints:
- group: app_server_group_group
port_app_internal_0_port_ip_requirements:
@@ -1350,8 +1330,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_app_data_0_port_subinterface_indicator:
- - false
port_app_oam_0_port_replacement_policy:
- AUTO
port_app_oam_0_port_network:
@@ -1378,8 +1356,6 @@ topology_template:
port_app_oam_0_port_mac_requirements:
mac_count_required:
is_required: false
- port_app_oam_0_port_subinterface_indicator:
- - false
port_app_data_0_port_network:
- get_input: data_net_id
port_app_data_0_port_network_role_tag: data
@@ -1470,8 +1446,6 @@ topology_template:
port_app_data_0_port_mac_requirements:
mac_count_required:
is_required: false
- port_app_internal_0_port_subinterface_indicator:
- - false
compute_app_scheduler_hints:
- group: app_server_group_group
port_app_internal_0_port_ip_requirements:
@@ -1480,8 +1454,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_app_data_0_port_subinterface_indicator:
- - false
port_app_oam_0_port_replacement_policy:
- AUTO
port_app_oam_0_port_network:
@@ -1508,8 +1480,6 @@ topology_template:
port_app_oam_0_port_mac_requirements:
mac_count_required:
is_required: false
- port_app_oam_0_port_subinterface_indicator:
- - false
port_app_data_0_port_network:
- get_input: data_net_id
port_app_data_0_port_network_role_tag: data
@@ -1628,8 +1598,6 @@ topology_template:
get_input:
- plt_data_v6_ips
- 1
- port_plt_oam_0_port_subinterface_indicator:
- - false
vm_image_name:
get_input: plt_image_name
compute_plt_availability_zone:
@@ -1658,8 +1626,6 @@ topology_template:
- fixed_ips
- 0
- ip_address
- port_plt_internal_0_port_subinterface_indicator:
- - false
port_plt_data_0_port_ip_requirements:
- ip_version: 6
ip_count_required:
@@ -1720,8 +1686,6 @@ topology_template:
- get_input: data_net_id
port_plt_oam_0_port_network:
- get_input: oam_net_id
- port_plt_data_0_port_subinterface_indicator:
- - false
port_plt_oam_0_port_replacement_policy:
- AUTO
port_plt_data_0_port_replacement_policy:
@@ -1765,8 +1729,6 @@ topology_template:
get_input:
- plt_data_v6_ips
- 0
- port_plt_oam_0_port_subinterface_indicator:
- - false
vm_image_name:
get_input: plt_image_name
compute_plt_availability_zone:
@@ -1795,8 +1757,6 @@ topology_template:
- fixed_ips
- 0
- ip_address
- port_plt_internal_0_port_subinterface_indicator:
- - false
port_plt_data_0_port_ip_requirements:
- ip_version: 6
ip_count_required:
@@ -1862,8 +1822,6 @@ topology_template:
- get_input: data_net_id
port_plt_oam_0_port_network:
- get_input: oam_net_id
- port_plt_data_0_port_subinterface_indicator:
- - false
port_plt_oam_0_port_replacement_policy:
- AUTO
port_plt_data_0_port_replacement_policy:
@@ -1986,4 +1944,4 @@ topology_template:
get_input: vnf_name
container_type: host
targets:
- - app_server_group_group \ No newline at end of file
+ - app_server_group_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
index 3723fc133f..9f19dcc0ac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
port_app_data_0_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_app_internal_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_app_scheduler_hints:
type: list
required: true
@@ -32,11 +27,6 @@ topology_template:
port_app_data_0_port_network_role:
type: string
required: true
- port_app_data_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_app_oam_0_port_replacement_policy:
type: list
required: true
@@ -76,11 +66,6 @@ topology_template:
port_app_oam_0_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_app_oam_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_app_data_0_port_network:
type: list
required: true
@@ -290,10 +275,7 @@ topology_template:
get_input: port_app_internal_0_port_exCP_naming
vlan_requirements:
get_input: port_app_internal_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_app_internal_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_app_internal_0_port_ip_requirements
network_role_tag:
@@ -334,10 +316,7 @@ topology_template:
get_input: port_app_oam_0_port_exCP_naming
vlan_requirements:
get_input: port_app_oam_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_app_oam_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_app_oam_0_port_ip_requirements
network_role_tag:
@@ -382,10 +361,7 @@ topology_template:
get_input: port_app_data_0_port_exCP_naming
vlan_requirements:
get_input: port_app_data_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_app_data_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_app_data_0_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
index bdd2d98bfc..5776405b4f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_iox_oam_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_iox_data_0_port_ip_requirements:
type: list
required: true
@@ -34,22 +29,12 @@ topology_template:
required: true
entry_schema:
type: string
- port_iox_internal_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
port_iox_data_0_port_subnetpoolid:
type: string
required: true
- port_iox_data_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_iox_data_0_port_allowed_address_pairs:
type: list
required: true
@@ -260,10 +245,7 @@ topology_template:
get_input: port_iox_data_0_port_exCP_naming
vlan_requirements:
get_input: port_iox_data_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_iox_data_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_iox_data_0_port_ip_requirements
network_role_tag:
@@ -341,10 +323,7 @@ topology_template:
get_input: port_iox_oam_0_port_exCP_naming
vlan_requirements:
get_input: port_iox_oam_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_iox_oam_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_iox_oam_0_port_ip_requirements
network_role_tag:
@@ -391,10 +370,7 @@ topology_template:
get_input: port_iox_internal_0_port_exCP_naming
vlan_requirements:
get_input: port_iox_internal_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_iox_internal_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_iox_internal_0_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
index bb4b53504b..43be472875 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
@@ -48,11 +48,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_plt_oam_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -87,11 +82,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.network.AddressPair
- port_plt_internal_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_plt_internal_0_port_subnetpoolid:
type: string
required: true
@@ -210,11 +200,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_plt_data_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_plt_oam_0_port_replacement_policy:
type: list
required: true
@@ -260,10 +245,7 @@ topology_template:
get_input: port_plt_internal_0_port_exCP_naming
vlan_requirements:
get_input: port_plt_internal_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_plt_internal_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_plt_internal_0_port_ip_requirements
network_role_tag:
@@ -306,10 +288,7 @@ topology_template:
get_input: port_plt_data_0_port_exCP_naming
vlan_requirements:
get_input: port_plt_data_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_plt_data_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_plt_data_0_port_ip_requirements
network_role_tag:
@@ -387,10 +366,7 @@ topology_template:
get_input: port_plt_oam_0_port_exCP_naming
vlan_requirements:
get_input: port_plt_oam_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_plt_oam_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_plt_oam_0_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 906aa4cb1d..cde571c443 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
index 938b9ecd6d..616ac37069 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
@@ -162,8 +162,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- packet_internal_network
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -205,8 +203,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- packet_internal_network
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -248,8 +244,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- packet_internal_network
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 906aa4cb1d..cde571c443 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
index 6e9b546d6d..28836651f6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -348,8 +348,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -394,8 +392,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -435,8 +431,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 906aa4cb1d..cde571c443 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
index 484bf539d1..3ae6fa0b26 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
@@ -153,8 +153,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- packet_external_network
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -201,8 +199,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- packet_internal_network
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -244,8 +240,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- packet_internal_network
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d3b8ed789c..d155532795 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -74,12 +74,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml
index 064f1e510a..172582fd24 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml
@@ -184,8 +184,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- packet_internal_network
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -231,8 +229,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- packet_internal_network
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
index 3a4992f5c2..ea4971ffb5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
@@ -65,11 +65,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -131,10 +126,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml
index 61c371c1b1..97fcee7365 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml
@@ -614,8 +614,6 @@ topology_template:
- get_input: availability_zone_0
compute_sbg_sc_user_data_format:
- RAW
- port_sbg_sc_internal_0_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_sbg_scServiceTemplate.yaml
count: 1
@@ -634,4 +632,4 @@ topology_template:
members:
- sbg_pl_trunk_subport_avpn_group_1
- sbg_pl_trunk_subport_avpn_group_0
- - abstract_sbg_sc \ No newline at end of file
+ - abstract_sbg_sc
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml
index 51e081f84f..0741732d8b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml
@@ -351,8 +351,6 @@ topology_template:
- get_input: availability_zone_0
compute_sbg_sc_user_data_format:
- RAW
- port_sbg_sc_internal_0_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_sbg_scServiceTemplate.yaml
count: 1
@@ -370,4 +368,4 @@ topology_template:
SC1, SC2, PL3 and PL4. This is the main template, to be used to create an initial stack, with 1 mated pair
members:
- sbg_pl_trunk_subport_avpn_group_0
- - abstract_sbg_sc \ No newline at end of file
+ - abstract_sbg_sc
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml
index 5e89dcaab5..82cb2a4fa6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml
@@ -613,12 +613,8 @@ topology_template:
get_input:
- sbg_internal_mac_addresses
- 0
- port_sbg_sc_management_1_port_subinterface_indicator:
- - false
compute_sbg_sc_availability_zone:
- get_input: availability_zone_0
- port_sbg_sc_internal_0_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_sbg_scServiceTemplate.yaml
count: 1
@@ -636,4 +632,4 @@ topology_template:
SC1, SC2, PL3 and PL4. This is the main template, to be used to create an initial stack, with 1 mated pair
members:
- sbg_pl_trunk_subport_avpn_group_0
- - abstract_sbg_sc \ No newline at end of file
+ - abstract_sbg_sc
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml
index 4fa2189c11..d070beaf9e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml
@@ -613,12 +613,8 @@ topology_template:
get_input:
- sbg_internal_mac_addresses
- 0
- port_sbg_sc_management_1_port_subinterface_indicator:
- - false
compute_sbg_sc_availability_zone:
- get_input: availability_zone_0
- port_sbg_sc_internal_0_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_sbg_scServiceTemplate.yaml
count: 1
@@ -675,4 +671,4 @@ topology_template:
members:
- sbg_pl_trunk_subport_avpn_group_0
- nested_sbg
- - abstract_sbg_sc \ No newline at end of file
+ - abstract_sbg_sc
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml
index 2864d9ea6c..1802188f23 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml
@@ -1023,12 +1023,8 @@ topology_template:
get_input:
- sbg_internal_mac_addresses
- 0
- port_sbg_sc_management_1_port_subinterface_indicator:
- - false
compute_sbg_sc_availability_zone:
- get_input: availability_zone_0
- port_sbg_sc_internal_0_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_sbg_scServiceTemplate.yaml
count: 1
@@ -1091,4 +1087,4 @@ topology_template:
- sbg_pl_trunk_subport_avpn_group_0
- sbg_pl_trunk_1_port_0
- sbg_pl_internal_0_port_0
- - abstract_sbg_sc \ No newline at end of file
+ - abstract_sbg_sc
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f315b706ff..93674458d4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -964,12 +964,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_pcm_port_2_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_3_network_role:
type: string
required: true
@@ -1068,12 +1062,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pcm_port_3_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_2_order:
type: integer
required: true
@@ -2138,12 +2126,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_1c2_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c2_t2_port_network_role:
type: string
required: true
@@ -2184,12 +2166,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c2_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c2_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -2706,12 +2682,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pcm_port_0_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_1_network_role_tag:
type: string
required: true
@@ -2776,12 +2746,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pcm_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_1_network:
type: list
required: true
@@ -3325,12 +3289,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -3385,12 +3343,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t1_port_network_role_tag:
type: string
required: true
@@ -3879,12 +3831,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_1c1_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c1_t2_port_network_role_tag:
type: string
required: true
@@ -4019,12 +3965,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c1_t1_port_order:
type: integer
required: true
@@ -4564,22 +4504,10 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1a_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t2_port_vlan_requirements:
type: list
required: true
@@ -5080,12 +5008,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -5140,12 +5062,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t1_port_value_specs:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
index add19141b8..7fe4cc4503 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
@@ -226,8 +226,6 @@ topology_template:
is_required: false
vm_image_name:
get_input: pd_image_name
- port_1b_t2_port_subinterface_indicator:
- - false
compute_b_single_1b_user_data_format:
- RAW
port_1b_t2_port_mac_requirements:
@@ -243,8 +241,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_subinterface_indicator:
- - false
compute_b_single_1b_metadata:
- connectivityTo4PNested:
get_attribute:
@@ -300,9 +296,6 @@ topology_template:
compute_1c1_scalling_instance_user_data_format:
- RAW2
- RAW1
- port_1c1_t2_port_subinterface_indicator:
- - false
- - false
port_1c1_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
@@ -409,9 +402,6 @@ topology_template:
get_attribute:
- abstract_b_single_1b
- b_single_1b_instance_name
- port_1c1_t1_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
count: 2
@@ -512,8 +502,6 @@ topology_template:
properties:
compute_1c2_catalog_instance_availability_zone:
- get_input: availabilityzone_name
- port_1c2_t1_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
vm_image_name:
@@ -524,8 +512,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c2_t2_port_subinterface_indicator:
- - false
port_1c2_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -600,8 +586,6 @@ topology_template:
properties:
compute_1c2_catalog_instance_availability_zone:
- get_input: availabilityzone_name
- port_1c2_t1_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
vm_image_name:
@@ -612,8 +596,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c2_t2_port_subinterface_indicator:
- - false
port_1c2_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -847,10 +829,6 @@ topology_template:
- get_input: availabilityzone_name
compute_a_single_1a_scheduler_hints:
- group: BE_Affinity_group
- port_1a_t2_port_subinterface_indicator:
- - false
- port_1a_t1_port_subinterface_indicator:
- - false
compute_a_single_1a_user_data_format:
- RAW
compute_a_single_1a_name:
@@ -1048,8 +1026,6 @@ topology_template:
is_required: false
vm_image_name:
get_input: pd_image_name
- port_1b_t2_port_subinterface_indicator:
- - false
compute_b_single_1b_user_data_format:
- RAW
port_1b_t2_port_mac_requirements:
@@ -1065,8 +1041,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_subinterface_indicator:
- - false
port_1b_t1_port_value_specs:
- get_attribute:
- abstract_a_single_1a
@@ -1206,4 +1180,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 2149ee469a..d83e7cc273 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_1c1_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c1_t2_port_network_role_tag:
type: string
required: true
@@ -137,11 +132,6 @@ topology_template:
port_1c1_t1_port_network_role:
type: string
required: true
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c1_t1_port_order:
type: integer
required: true
@@ -157,10 +147,7 @@ topology_template:
get_input: port_1c1_t1_port_exCP_naming
vlan_requirements:
get_input: port_1c1_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c1_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c1_t1_port_ip_requirements
network_role_tag:
@@ -224,10 +211,7 @@ topology_template:
get_input: port_1c1_t2_port_exCP_naming
vlan_requirements:
get_input: port_1c1_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c1_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c1_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index c47e4d5767..9178a58df9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
port_1c2_t2_port_subnetpoolid:
type: string
required: true
- port_1c2_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c2_t2_port_network_role:
type: string
required: true
@@ -58,11 +53,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c2_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c2_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -160,10 +150,7 @@ topology_template:
get_input: port_1c2_t2_port_exCP_naming
vlan_requirements:
get_input: port_1c2_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c2_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c2_t2_port_ip_requirements
network_role_tag:
@@ -192,10 +179,7 @@ topology_template:
get_input: port_1c2_t1_port_exCP_naming
vlan_requirements:
get_input: port_1c2_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c2_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c2_t1_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
index 42c86b84bc..3a130a9584 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
@@ -88,19 +88,9 @@ topology_template:
port_1a_t1_port_order:
type: integer
required: true
- port_1a_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t2_port_vlan_requirements:
type: list
required: true
@@ -133,10 +123,7 @@ topology_template:
get_input: port_1a_t1_port_exCP_naming
vlan_requirements:
get_input: port_1a_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t1_port_ip_requirements
network_role_tag:
@@ -192,10 +179,7 @@ topology_template:
get_input: port_1a_t2_port_exCP_naming
vlan_requirements:
get_input: port_1a_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml
index 85437cb4cd..35a7e0973a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
port_1b_t2_port_order:
type: integer
required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -86,11 +81,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t1_port_network_role_tag:
type: string
required: true
@@ -155,10 +145,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -187,10 +174,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
index d41833ab63..1473c76637 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
port_1b_t2_port_order:
type: integer
required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -86,11 +81,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t1_port_value_specs:
type: list
required: true
@@ -160,10 +150,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -192,10 +179,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml
index 45191338e8..42c8b54010 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_pcm_port_2_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_3_network_role:
type: string
required: true
@@ -106,11 +101,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pcm_port_3_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_2_order:
type: integer
required: true
@@ -188,10 +178,7 @@ topology_template:
get_input: port_pcm_port_3_exCP_naming
vlan_requirements:
get_input: port_pcm_port_3_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_3_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_3_ip_requirements
network_role_tag:
@@ -228,10 +215,7 @@ topology_template:
get_input: port_pcm_port_2_exCP_naming
vlan_requirements:
get_input: port_pcm_port_2_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_2_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_2_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml
index 7a3ec20712..d42796a554 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
port_pcm_port_0_network_role:
type: string
required: true
- port_pcm_port_0_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_1_network_role_tag:
type: string
required: true
@@ -69,11 +64,6 @@ topology_template:
port_pcm_port_1_network_role:
type: string
required: true
- port_pcm_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_1_network:
type: list
required: true
@@ -179,10 +169,7 @@ topology_template:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
get_input: port_pcm_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_0_ip_requirements
network_role_tag:
@@ -219,10 +206,7 @@ topology_template:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
get_input: port_pcm_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_1_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 2a7c9e98a5..394046886b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -112,8 +112,6 @@ topology_template:
directives:
- substitutable
properties:
- port_pcm_port_0_subinterface_indicator:
- - false
port_pcm_port_1_network_role_tag: oam
port_pcm_port_0_fixed_ips:
- ip_address:
@@ -127,8 +125,6 @@ topology_template:
vm_image_name:
get_input: pcma_image_name
port_pcm_port_0_network_role_tag: cps
- port_pcm_port_1_subinterface_indicator:
- - false
port_pcm_port_1_network:
- get_input: oam_net_name
port_pcm_port_0_ip_requirements:
@@ -181,8 +177,6 @@ topology_template:
port_pcm_port_2_fixed_ips:
- ip_address:
get_input: cps_net_ip
- port_pcm_port_2_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pcma_flavor_name
port_pcm_port_3_security_groups:
@@ -210,8 +204,6 @@ topology_template:
get_input: oam_net_ip
compute_pcma_server_user_data_format:
- RAW
- port_pcm_port_3_subinterface_indicator:
- - false
port_pcm_port_2_network:
- get_input: cps_net_name
port_pcm_port_2_ip_requirements:
@@ -677,4 +669,4 @@ topology_template:
- dependency_pcma_server_pcm_port_1
dependency_pcm_port_2:
- abstract_pcma_server
- - dependency_pcma_server_pcm_port_2 \ No newline at end of file
+ - dependency_pcma_server_pcm_port_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
index 04e97ca016..5dc6de3055 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -170,6 +170,7 @@ topology_template:
get_input: port_pcm_port_00_subnetpoolid
mac_requirements:
get_input: port_pcm_port_00_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_00_exCP_naming
vlan_requirements:
@@ -217,6 +218,7 @@ topology_template:
get_input: port_pcm_port_01_subnetpoolid
mac_requirements:
get_input: port_pcm_port_01_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_01_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0708c661c5..20f2eca975 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -960,12 +960,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_pcm_port_2_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_3_network_role:
type: string
required: true
@@ -1064,12 +1058,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pcm_port_3_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_2_order:
type: integer
required: true
@@ -2130,12 +2118,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_1c2_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c2_t2_port_network_role:
type: string
required: true
@@ -2176,12 +2158,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c2_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c2_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -2692,12 +2668,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pcm_port_0_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_1_network_role_tag:
type: string
required: true
@@ -2762,12 +2732,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pcm_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_1_network:
type: list
required: true
@@ -3277,64 +3241,6 @@ node_types:
org.openecomp.resource.abstract.nodes.b_single_1b:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_1b_t1_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_1b_t1_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- vm_flavor_name:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t1_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- vm_image_name:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t2_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t2_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
- compute_b_single_1b_user_data_format:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_1b_t2_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_1b_t2_port_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t2_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -3359,6 +3265,10 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
+ port_1b_t1_port_order:
+ type: integer
+ required: true
+ status: SUPPORTED
port_1b_t2_port_vlan_requirements:
type: list
required: true
@@ -3371,13 +3281,29 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
+ port_1b_t1_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t1_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
+ vm_flavor_name:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t1_port_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t1_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_1b_t1_port_network_role_tag:
+ type: org.openecomp.datatypes.network.IpRequirements
+ vm_image_name:
type: string
required: true
status: SUPPORTED
@@ -3395,18 +3321,44 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ port_1b_t2_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t2_port_order:
+ type: integer
+ required: true
+ status: SUPPORTED
port_1b_t1_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ compute_b_single_1b_user_data_format:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ port_1b_t2_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
compute_b_single_1b_name:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_1b_t2_port_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t2_port_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
attributes:
b_single_1b_instance_name:
type: string
@@ -3859,12 +3811,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_1c1_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c1_t2_port_network_role_tag:
type: string
required: true
@@ -3993,12 +3939,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c1_t1_port_order:
type: integer
required: true
@@ -4529,22 +4469,10 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1a_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t2_port_vlan_requirements:
type: list
required: true
@@ -5045,12 +4973,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -5105,12 +5027,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t1_port_network_role_tag:
type: string
required: true
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 b9c9ae7630..7c8d560c1e 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
@@ -243,20 +243,6 @@ topology_template:
directives:
- substitutable
properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1b_t2_port_subinterface_indicator:
- - false
- compute_b_single_1b_user_data_format:
- - RAW
port_1b_t2_port_mac_requirements:
mac_count_required:
is_required: false
@@ -270,13 +256,23 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_subinterface_indicator:
- - false
+ vm_flavor_name:
+ get_input: pd_flavor_name
+ port_1b_t1_port_ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ vm_image_name:
+ get_input: pd_image_name
port_1b_t1_port_mac_requirements:
mac_count_required:
is_required: false
port_1b_t2_port_network:
- b_single_1b_network
+ compute_b_single_1b_user_data_format:
+ - RAW
compute_b_single_1b_name:
- get_input:
- b_single_1b_names
@@ -302,9 +298,6 @@ topology_template:
compute_1c1_scalling_instance_user_data_format:
- RAW2
- RAW1
- port_1c1_t2_port_subinterface_indicator:
- - false
- - false
port_1c1_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
@@ -381,9 +374,6 @@ topology_template:
compute_1c1_scalling_instance_scheduler_hints:
- group: BE_Affinity_group
- group: BE_Affinity_group
- port_1c1_t1_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
count: 2
@@ -461,8 +451,6 @@ topology_template:
properties:
compute_1c2_catalog_instance_availability_zone:
- get_input: availabilityzone_name
- port_1c2_t1_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
vm_image_name:
@@ -473,8 +461,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c2_t2_port_subinterface_indicator:
- - false
port_1c2_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -520,8 +506,6 @@ topology_template:
properties:
compute_1c2_catalog_instance_availability_zone:
- get_input: availabilityzone_name
- port_1c2_t1_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
vm_image_name:
@@ -532,8 +516,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c2_t2_port_subinterface_indicator:
- - false
port_1c2_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -744,10 +726,6 @@ topology_template:
- get_input: availabilityzone_name
compute_a_single_1a_scheduler_hints:
- group: BE_Affinity_group
- port_1a_t2_port_subinterface_indicator:
- - false
- port_1a_t1_port_subinterface_indicator:
- - false
compute_a_single_1a_user_data_format:
- RAW
compute_a_single_1a_name:
@@ -886,8 +864,6 @@ topology_template:
is_required: false
vm_image_name:
get_input: pd_image_name
- port_1b_t2_port_subinterface_indicator:
- - false
compute_b_single_1b_user_data_format:
- RAW
port_1b_t2_port_mac_requirements:
@@ -903,8 +879,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_subinterface_indicator:
- - false
port_1b_t1_port_network_role_tag: oam
port_1b_t1_port_mac_requirements:
mac_count_required:
@@ -1047,4 +1021,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index f52324068f..268118dc64 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_1c1_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c1_t2_port_network_role_tag:
type: string
required: true
@@ -132,11 +127,6 @@ topology_template:
port_1c1_t1_port_network_role:
type: string
required: true
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c1_t1_port_order:
type: integer
required: true
@@ -152,10 +142,7 @@ topology_template:
get_input: port_1c1_t1_port_exCP_naming
vlan_requirements:
get_input: port_1c1_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c1_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c1_t1_port_ip_requirements
network_role_tag:
@@ -215,10 +202,7 @@ topology_template:
get_input: port_1c1_t2_port_exCP_naming
vlan_requirements:
get_input: port_1c1_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c1_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c1_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 30ca14f281..2c11c084ec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
port_1c2_t2_port_subnetpoolid:
type: string
required: true
- port_1c2_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c2_t2_port_network_role:
type: string
required: true
@@ -58,11 +53,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c2_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c2_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -151,10 +141,7 @@ topology_template:
get_input: port_1c2_t2_port_exCP_naming
vlan_requirements:
get_input: port_1c2_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c2_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c2_t2_port_ip_requirements
network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
get_input: port_1c2_t1_port_exCP_naming
vlan_requirements:
get_input: port_1c2_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c2_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c2_t1_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
index c72b1eb54c..5169d022a8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
@@ -83,19 +83,9 @@ topology_template:
port_1a_t1_port_order:
type: integer
required: true
- port_1a_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t2_port_vlan_requirements:
type: list
required: true
@@ -128,10 +118,7 @@ topology_template:
get_input: port_1a_t1_port_exCP_naming
vlan_requirements:
get_input: port_1a_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t1_port_ip_requirements
network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
get_input: port_1a_t2_port_exCP_naming
vlan_requirements:
get_input: port_1a_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
index 3ba6c8079f..391eba68f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
@@ -11,51 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_1b_t1_port_order:
- type: integer
- required: true
- port_1b_t1_port_network_role:
- type: string
- required: true
- port_1b_t1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- vm_flavor_name:
- type: string
- required: true
- port_1b_t1_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- vm_image_name:
- type: string
- required: true
- port_1b_t2_port_network_role:
- type: string
- required: true
- port_1b_t2_port_order:
- type: integer
- required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- compute_b_single_1b_user_data_format:
- type: list
- required: true
- entry_schema:
- type: string
- port_1b_t2_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_1b_t2_port_network_role_tag:
- type: string
- required: true
- port_1b_t2_port_subnetpoolid:
- type: string
- required: true
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -76,6 +31,9 @@ topology_template:
required: true
entry_schema:
type: json
+ port_1b_t1_port_order:
+ type: integer
+ required: true
port_1b_t2_port_vlan_requirements:
type: list
required: true
@@ -86,12 +44,24 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
+ port_1b_t1_port_network_role:
+ type: string
+ required: true
+ port_1b_t1_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ vm_flavor_name:
+ type: string
+ required: true
+ port_1b_t1_port_network_role_tag:
+ type: string
+ required: true
+ port_1b_t1_port_ip_requirements:
type: list
required: true
entry_schema:
- type: boolean
- port_1b_t1_port_network_role_tag:
+ type: org.openecomp.datatypes.network.IpRequirements
+ vm_image_name:
type: string
required: true
port_1b_t1_port_subnetpoolid:
@@ -105,16 +75,36 @@ topology_template:
required: true
entry_schema:
type: string
+ port_1b_t2_port_network_role:
+ type: string
+ required: true
+ port_1b_t2_port_order:
+ type: integer
+ required: true
port_1b_t1_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ compute_b_single_1b_user_data_format:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ port_1b_t2_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
compute_b_single_1b_name:
type: list
required: true
entry_schema:
type: string
+ port_1b_t2_port_network_role_tag:
+ type: string
+ required: true
+ port_1b_t2_port_subnetpoolid:
+ type: string
+ required: true
node_templates:
b_single_1b:
type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b
@@ -146,10 +136,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -178,10 +165,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 06e90acd93..ed3dde70f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
port_1b_t2_port_order:
type: integer
required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -86,11 +81,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t1_port_network_role_tag:
type: string
required: true
@@ -151,10 +141,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
index 45191338e8..42c8b54010 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_pcm_port_2_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_3_network_role:
type: string
required: true
@@ -106,11 +101,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pcm_port_3_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_2_order:
type: integer
required: true
@@ -188,10 +178,7 @@ topology_template:
get_input: port_pcm_port_3_exCP_naming
vlan_requirements:
get_input: port_pcm_port_3_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_3_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_3_ip_requirements
network_role_tag:
@@ -228,10 +215,7 @@ topology_template:
get_input: port_pcm_port_2_exCP_naming
vlan_requirements:
get_input: port_pcm_port_2_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_2_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_2_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
index 9dd220a0a1..502244f096 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
port_pcm_port_0_network_role:
type: string
required: true
- port_pcm_port_0_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_1_network_role_tag:
type: string
required: true
@@ -69,11 +64,6 @@ topology_template:
port_pcm_port_1_network_role:
type: string
required: true
- port_pcm_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_1_network:
type: list
required: true
@@ -179,10 +169,7 @@ topology_template:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
get_input: port_pcm_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_0_ip_requirements
network_role_tag:
@@ -219,10 +206,7 @@ topology_template:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
get_input: port_pcm_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_1_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 21335a5297..96bccb85ef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -108,8 +108,6 @@ topology_template:
directives:
- substitutable
properties:
- port_pcm_port_0_subinterface_indicator:
- - false
port_pcm_port_1_network_role_tag: oam
port_pcm_port_0_fixed_ips:
- ip_address:
@@ -123,8 +121,6 @@ topology_template:
vm_image_name:
get_input: pcma_image_name
port_pcm_port_0_network_role_tag: cps
- port_pcm_port_1_subinterface_indicator:
- - false
port_pcm_port_1_network:
- get_input: oam_net_name
port_pcm_port_1_security_groups:
@@ -177,8 +173,6 @@ topology_template:
port_pcm_port_2_fixed_ips:
- ip_address:
get_input: cps_net_ip
- port_pcm_port_2_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pcma_flavor_name
port_pcm_port_3_security_groups:
@@ -206,8 +200,6 @@ topology_template:
get_input: oam_net_ip
compute_pcma_server_user_data_format:
- RAW
- port_pcm_port_3_subinterface_indicator:
- - false
port_pcm_port_2_network:
- get_input: cps_net_name
port_pcm_port_2_ip_requirements:
@@ -673,4 +665,4 @@ topology_template:
- link_pcma_server_pcm_port_0
link_pcm_port_3_0:
- abstract_pcma_server
- - link_pcma_server_pcm_port_3 \ No newline at end of file
+ - link_pcma_server_pcm_port_3
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
index d881e9e06f..d8b22559e8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -166,6 +166,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -213,6 +214,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 565834cea3..7a1ce8554b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -960,12 +960,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_pcm_port_2_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_3_network_role:
type: string
required: true
@@ -1064,12 +1058,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pcm_port_3_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_2_order:
type: integer
required: true
@@ -2130,12 +2118,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_1c2_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c2_t2_port_network_role:
type: string
required: true
@@ -2176,12 +2158,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c2_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c2_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -2692,12 +2668,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pcm_port_0_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_1_network_role_tag:
type: string
required: true
@@ -2762,12 +2732,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pcm_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_1_network:
type: list
required: true
@@ -3277,64 +3241,6 @@ node_types:
org.openecomp.resource.abstract.nodes.b_single_1b:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_1b_t1_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_1b_t1_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- vm_flavor_name:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t1_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- vm_image_name:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t2_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t2_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
- compute_b_single_1b_user_data_format:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_1b_t2_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_1b_t2_port_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
- port_1b_t2_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -3359,6 +3265,10 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
+ port_1b_t1_port_order:
+ type: integer
+ required: true
+ status: SUPPORTED
port_1b_t2_port_vlan_requirements:
type: list
required: true
@@ -3371,13 +3281,29 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
+ port_1b_t1_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t1_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
+ vm_flavor_name:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t1_port_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t1_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_1b_t1_port_network_role_tag:
+ type: org.openecomp.datatypes.network.IpRequirements
+ vm_image_name:
type: string
required: true
status: SUPPORTED
@@ -3395,18 +3321,44 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ port_1b_t2_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t2_port_order:
+ type: integer
+ required: true
+ status: SUPPORTED
port_1b_t1_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ compute_b_single_1b_user_data_format:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ port_1b_t2_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
compute_b_single_1b_name:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_1b_t2_port_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_1b_t2_port_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
attributes:
b_single_1b_instance_name:
type: string
@@ -3859,12 +3811,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_1c1_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c1_t2_port_network_role_tag:
type: string
required: true
@@ -3993,12 +3939,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c1_t1_port_order:
type: integer
required: true
@@ -4529,22 +4469,10 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1a_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t2_port_vlan_requirements:
type: list
required: true
@@ -5045,12 +4973,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -5105,12 +5027,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t1_port_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index d920487490..166119ea31 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -216,20 +216,6 @@ topology_template:
directives:
- substitutable
properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1b_t2_port_subinterface_indicator:
- - false
- compute_b_single_1b_user_data_format:
- - RAW
port_1b_t2_port_mac_requirements:
mac_count_required:
is_required: false
@@ -243,13 +229,23 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_subinterface_indicator:
- - false
+ vm_flavor_name:
+ get_input: pd_flavor_name
+ port_1b_t1_port_ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ vm_image_name:
+ get_input: pd_image_name
port_1b_t1_port_mac_requirements:
mac_count_required:
is_required: false
port_1b_t2_port_network:
- b_single_1b_network
+ compute_b_single_1b_user_data_format:
+ - RAW
compute_b_single_1b_name:
- get_input:
- b_single_1b_names
@@ -275,9 +271,6 @@ topology_template:
compute_1c1_scalling_instance_user_data_format:
- RAW2
- RAW1
- port_1c1_t2_port_subinterface_indicator:
- - false
- - false
port_1c1_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
@@ -354,9 +347,6 @@ topology_template:
compute_1c1_scalling_instance_scheduler_hints:
- group: BE_Affinity_group
- group: BE_Affinity_group
- port_1c1_t1_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
count: 2
@@ -425,8 +415,6 @@ topology_template:
properties:
compute_1c2_catalog_instance_availability_zone:
- get_input: availabilityzone_name
- port_1c2_t1_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
vm_image_name:
@@ -437,8 +425,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c2_t2_port_subinterface_indicator:
- - false
port_1c2_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -484,8 +470,6 @@ topology_template:
properties:
compute_1c2_catalog_instance_availability_zone:
- get_input: availabilityzone_name
- port_1c2_t1_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
vm_image_name:
@@ -496,8 +480,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c2_t2_port_subinterface_indicator:
- - false
port_1c2_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -695,10 +677,6 @@ topology_template:
- get_input: availabilityzone_name
compute_a_single_1a_scheduler_hints:
- group: BE_Affinity_group
- port_1a_t2_port_subinterface_indicator:
- - false
- port_1a_t1_port_subinterface_indicator:
- - false
compute_a_single_1a_user_data_format:
- RAW
compute_a_single_1a_name:
@@ -864,8 +842,6 @@ topology_template:
is_required: false
vm_image_name:
get_input: pd_image_name
- port_1b_t2_port_subinterface_indicator:
- - false
compute_b_single_1b_user_data_format:
- RAW
port_1b_t2_port_mac_requirements:
@@ -881,8 +857,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_subinterface_indicator:
- - false
port_1b_t1_port_network_role_tag: oam
port_1b_t1_port_mac_requirements:
mac_count_required:
@@ -1018,4 +992,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index f52324068f..268118dc64 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_1c1_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c1_t2_port_network_role_tag:
type: string
required: true
@@ -132,11 +127,6 @@ topology_template:
port_1c1_t1_port_network_role:
type: string
required: true
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c1_t1_port_order:
type: integer
required: true
@@ -152,10 +142,7 @@ topology_template:
get_input: port_1c1_t1_port_exCP_naming
vlan_requirements:
get_input: port_1c1_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c1_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c1_t1_port_ip_requirements
network_role_tag:
@@ -215,10 +202,7 @@ topology_template:
get_input: port_1c1_t2_port_exCP_naming
vlan_requirements:
get_input: port_1c1_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c1_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c1_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 30ca14f281..2c11c084ec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
port_1c2_t2_port_subnetpoolid:
type: string
required: true
- port_1c2_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c2_t2_port_network_role:
type: string
required: true
@@ -58,11 +53,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c2_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c2_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -151,10 +141,7 @@ topology_template:
get_input: port_1c2_t2_port_exCP_naming
vlan_requirements:
get_input: port_1c2_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c2_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c2_t2_port_ip_requirements
network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
get_input: port_1c2_t1_port_exCP_naming
vlan_requirements:
get_input: port_1c2_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c2_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c2_t1_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
index c72b1eb54c..5169d022a8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
@@ -83,19 +83,9 @@ topology_template:
port_1a_t1_port_order:
type: integer
required: true
- port_1a_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t2_port_vlan_requirements:
type: list
required: true
@@ -128,10 +118,7 @@ topology_template:
get_input: port_1a_t1_port_exCP_naming
vlan_requirements:
get_input: port_1a_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t1_port_ip_requirements
network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
get_input: port_1a_t2_port_exCP_naming
vlan_requirements:
get_input: port_1a_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
index 3ba6c8079f..391eba68f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
@@ -11,51 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_1b_t1_port_order:
- type: integer
- required: true
- port_1b_t1_port_network_role:
- type: string
- required: true
- port_1b_t1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- vm_flavor_name:
- type: string
- required: true
- port_1b_t1_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- vm_image_name:
- type: string
- required: true
- port_1b_t2_port_network_role:
- type: string
- required: true
- port_1b_t2_port_order:
- type: integer
- required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- compute_b_single_1b_user_data_format:
- type: list
- required: true
- entry_schema:
- type: string
- port_1b_t2_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_1b_t2_port_network_role_tag:
- type: string
- required: true
- port_1b_t2_port_subnetpoolid:
- type: string
- required: true
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -76,6 +31,9 @@ topology_template:
required: true
entry_schema:
type: json
+ port_1b_t1_port_order:
+ type: integer
+ required: true
port_1b_t2_port_vlan_requirements:
type: list
required: true
@@ -86,12 +44,24 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
+ port_1b_t1_port_network_role:
+ type: string
+ required: true
+ port_1b_t1_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ vm_flavor_name:
+ type: string
+ required: true
+ port_1b_t1_port_network_role_tag:
+ type: string
+ required: true
+ port_1b_t1_port_ip_requirements:
type: list
required: true
entry_schema:
- type: boolean
- port_1b_t1_port_network_role_tag:
+ type: org.openecomp.datatypes.network.IpRequirements
+ vm_image_name:
type: string
required: true
port_1b_t1_port_subnetpoolid:
@@ -105,16 +75,36 @@ topology_template:
required: true
entry_schema:
type: string
+ port_1b_t2_port_network_role:
+ type: string
+ required: true
+ port_1b_t2_port_order:
+ type: integer
+ required: true
port_1b_t1_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ compute_b_single_1b_user_data_format:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ port_1b_t2_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
compute_b_single_1b_name:
type: list
required: true
entry_schema:
type: string
+ port_1b_t2_port_network_role_tag:
+ type: string
+ required: true
+ port_1b_t2_port_subnetpoolid:
+ type: string
+ required: true
node_templates:
b_single_1b:
type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b
@@ -146,10 +136,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -178,10 +165,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 06e90acd93..ed3dde70f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
port_1b_t2_port_order:
type: integer
required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -86,11 +81,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t1_port_network_role_tag:
type: string
required: true
@@ -151,10 +141,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
index 45191338e8..42c8b54010 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_pcm_port_2_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_3_network_role:
type: string
required: true
@@ -106,11 +101,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pcm_port_3_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_2_order:
type: integer
required: true
@@ -188,10 +178,7 @@ topology_template:
get_input: port_pcm_port_3_exCP_naming
vlan_requirements:
get_input: port_pcm_port_3_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_3_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_3_ip_requirements
network_role_tag:
@@ -228,10 +215,7 @@ topology_template:
get_input: port_pcm_port_2_exCP_naming
vlan_requirements:
get_input: port_pcm_port_2_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_2_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_2_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
index 7a3ec20712..d42796a554 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
port_pcm_port_0_network_role:
type: string
required: true
- port_pcm_port_0_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_1_network_role_tag:
type: string
required: true
@@ -69,11 +64,6 @@ topology_template:
port_pcm_port_1_network_role:
type: string
required: true
- port_pcm_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_1_network:
type: list
required: true
@@ -179,10 +169,7 @@ topology_template:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
get_input: port_pcm_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_0_ip_requirements
network_role_tag:
@@ -219,10 +206,7 @@ topology_template:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
get_input: port_pcm_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_1_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 564dc8e9f8..3398598b22 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -108,8 +108,6 @@ topology_template:
directives:
- substitutable
properties:
- port_pcm_port_0_subinterface_indicator:
- - false
port_pcm_port_1_network_role_tag: oam
port_pcm_port_0_fixed_ips:
- ip_address:
@@ -123,8 +121,6 @@ topology_template:
vm_image_name:
get_input: pcma_image_name
port_pcm_port_0_network_role_tag: cps
- port_pcm_port_1_subinterface_indicator:
- - false
port_pcm_port_1_network:
- get_input: oam_net_name
port_pcm_port_0_ip_requirements:
@@ -177,8 +173,6 @@ topology_template:
port_pcm_port_2_fixed_ips:
- ip_address:
get_input: cps_net_ip
- port_pcm_port_2_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pcma_flavor_name
port_pcm_port_3_security_groups:
@@ -206,8 +200,6 @@ topology_template:
get_input: oam_net_ip
compute_pcma_server_user_data_format:
- RAW
- port_pcm_port_3_subinterface_indicator:
- - false
port_pcm_port_2_network:
- get_input: cps_net_name
port_pcm_port_2_ip_requirements:
@@ -673,4 +665,4 @@ topology_template:
- dependency_pcma_server_pcm_port_1
dependency_pcm_port_2:
- abstract_pcma_server
- - dependency_pcma_server_pcm_port_2 \ No newline at end of file
+ - dependency_pcma_server_pcm_port_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index a99b0d53d2..7b34372e08 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -166,6 +166,7 @@ topology_template:
get_input: port_pcm_port_00_subnetpoolid
mac_requirements:
get_input: port_pcm_port_00_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_00_exCP_naming
vlan_requirements:
@@ -213,6 +214,7 @@ topology_template:
get_input: port_pcm_port_01_subnetpoolid
mac_requirements:
get_input: port_pcm_port_01_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_01_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 646e484720..278deb808f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1034,12 +1034,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c1_t1_port_network:
type: list
required: true
@@ -2065,12 +2059,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c1_t1_port_network:
type: list
required: true
@@ -2447,12 +2435,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_pcm_port_2_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_3_network_role:
type: string
required: true
@@ -2551,12 +2533,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pcm_port_3_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_2_order:
type: integer
required: true
@@ -3613,12 +3589,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_2c202_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c201_port_vlan_requirements:
type: list
required: true
@@ -3715,12 +3685,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c201_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c201_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -4176,12 +4140,6 @@ node_types:
org.openecomp.resource.abstract.nodes.1c2_catalog_instance:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_2c202_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -4278,12 +4236,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c201_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1c201_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -4830,12 +4782,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t1_port_vlan_requirements:
type: list
required: true
@@ -5201,12 +5147,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pcm_port_0_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_1_network_role_tag:
type: string
required: true
@@ -5271,12 +5211,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pcm_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pcm_port_1_network:
type: list
required: true
@@ -5820,12 +5754,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -5880,12 +5808,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t1_port_value_specs:
type: list
required: true
@@ -6460,22 +6382,10 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1a_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1a_t2_port_vlan_requirements:
type: list
required: true
@@ -6976,12 +6886,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -7036,12 +6940,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t1_port_network_role_tag:
type: string
required: true
@@ -7554,12 +7452,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -7608,12 +7500,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t1_port_value_specs:
type: list
required: true
@@ -8135,12 +8021,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_1b_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -8189,12 +8069,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_b_single_2b_user_data_format:
type: list
required: true
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 e478518c3b..db28dc19e1 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
@@ -274,8 +274,6 @@ topology_template:
is_required: false
vm_image_name:
get_input: pd_image_name
- port_1b_t2_port_subinterface_indicator:
- - false
compute_b_single_1b_user_data_format:
- RAW
port_1b_t2_port_mac_requirements:
@@ -291,8 +289,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_subinterface_indicator:
- - false
port_1b_t1_port_value_specs:
- get_attribute:
- abstract_a_single_1a
@@ -331,8 +327,6 @@ topology_template:
- get_attribute:
- abstract_1c2_catalog_instance_1
- 1c2_catalog_instance_instance_name
- port_2c202_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
port_2c202_port_ip_requirements:
@@ -363,8 +357,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c201_port_subinterface_indicator:
- - false
port_1c201_port_mac_requirements:
mac_count_required:
is_required: false
@@ -390,8 +382,6 @@ topology_template:
properties:
compute_2c2_catalog_instance_user_data_format:
- RAW1
- port_2c202_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
port_2c202_port_ip_requirements:
@@ -422,8 +412,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c201_port_subinterface_indicator:
- - false
port_1c201_port_mac_requirements:
mac_count_required:
is_required: false
@@ -447,8 +435,6 @@ topology_template:
directives:
- substitutable
properties:
- port_2c202_port_subinterface_indicator:
- - false
compute_1c2_catalog_instance_availability_zone:
- get_input: availabilityzone_name
vm_flavor_name:
@@ -479,8 +465,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c201_port_subinterface_indicator:
- - false
port_1c201_port_mac_requirements:
mac_count_required:
is_required: false
@@ -508,8 +492,6 @@ topology_template:
directives:
- substitutable
properties:
- port_2c202_port_subinterface_indicator:
- - false
compute_1c2_catalog_instance_availability_zone:
- get_input: availabilityzone_name
vm_flavor_name:
@@ -538,8 +520,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1c201_port_subinterface_indicator:
- - false
port_1c201_port_mac_requirements:
mac_count_required:
is_required: false
@@ -724,10 +704,6 @@ topology_template:
- get_input: availabilityzone_name
compute_a_single_1a_scheduler_hints:
- group: BE_Affinity_group
- port_1a_t2_port_subinterface_indicator:
- - false
- port_1a_t1_port_subinterface_indicator:
- - false
compute_a_single_1a_user_data_format:
- RAW
compute_a_single_1a_name:
@@ -993,9 +969,6 @@ topology_template:
compute_1c11_scalling_instance_scheduler_hints:
- group: BE_Affinity_group
- group: BE_Affinity_group
- port_1c1_t1_port_subinterface_indicator:
- - false
- - false
port_1c1_t1_port_network:
- 1c1_scalling_instance_network
- 1c1_scalling_instance_network
@@ -1094,8 +1067,6 @@ topology_template:
get_input: pd_image_name
compute_b_single_2b_scheduler_hints:
- group: BE_Affinity_group
- port_1b_t2_port_subinterface_indicator:
- - false
compute_b_single_2b_availability_zone:
- get_input: availabilityzone_name
port_1b_t2_port_mac_requirements:
@@ -1111,8 +1082,6 @@ topology_template:
- get_input:
- b_single_2b_names
- 0
- port_1b_t1_port_subinterface_indicator:
- - false
compute_b_single_2b_user_data_format:
- RAW
port_1b_t1_port_mac_requirements:
@@ -1194,9 +1163,6 @@ topology_template:
compute_1c12_scalling_instance_availability_zone:
- get_input: availabilityzone_name
- get_input: availabilityzone_name
- port_1c1_t1_port_subinterface_indicator:
- - false
- - false
port_1c1_t1_port_network:
- 1c1_scalling_instance_network
- 1c1_scalling_instance_network
@@ -1373,8 +1339,6 @@ topology_template:
- 0
vm_image_name:
get_input: pd_image_name
- port_1a_t1_port_subinterface_indicator:
- - false
compute_a_single_2a_metadata:
- connectivityTo4PNested_2:
get_attribute:
@@ -1516,8 +1480,6 @@ topology_template:
get_input: pd_image_name
compute_b_single_2b_scheduler_hints:
- group: BE_Affinity_group
- port_1b_t2_port_subinterface_indicator:
- - false
compute_b_single_2b_availability_zone:
- get_input: availabilityzone_name
port_1b_t2_port_mac_requirements:
@@ -1533,8 +1495,6 @@ topology_template:
- get_input:
- b_single_2b_names
- 1
- port_1b_t1_port_subinterface_indicator:
- - false
port_1b_t1_port_value_specs:
- get_attribute:
- abstract_a_single_1a
@@ -1938,8 +1898,6 @@ topology_template:
is_required: false
vm_image_name:
get_input: pd_image_name
- port_1b_t2_port_subinterface_indicator:
- - false
compute_b_single_1b_user_data_format:
- RAW
port_1b_t2_port_mac_requirements:
@@ -1955,8 +1913,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_subinterface_indicator:
- - false
compute_b_single_1b_metadata:
- connectivityTo4PNested_2:
get_attribute:
@@ -2174,4 +2130,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
index 59f38d2842..a2e1f59327 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
@@ -79,11 +79,6 @@ topology_template:
port_1c1_t1_port_network_role:
type: string
required: true
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c1_t1_port_network:
type: list
required: true
@@ -127,10 +122,7 @@ topology_template:
get_input: port_1c1_t1_port_exCP_naming
vlan_requirements:
get_input: port_1c1_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c1_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c1_t1_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
index bec0f575e2..2a4e09b067 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
@@ -79,11 +79,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_1c1_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c1_t1_port_network:
type: list
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_1c1_t1_port_exCP_naming
vlan_requirements:
get_input: port_1c1_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c1_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c1_t1_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 88d3420e9c..2d3c227a20 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_2c202_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -93,11 +88,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c201_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c201_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -164,10 +154,7 @@ topology_template:
get_input: port_1c201_port_exCP_naming
vlan_requirements:
get_input: port_1c201_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c201_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c201_port_ip_requirements
network_role_tag:
@@ -196,10 +183,7 @@ topology_template:
get_input: port_2c202_port_exCP_naming
vlan_requirements:
get_input: port_2c202_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_2c202_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_2c202_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml
index 78ef186ce1..eb8dd3909c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml
@@ -16,11 +16,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_2c202_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c201_port_vlan_requirements:
type: list
required: true
@@ -98,11 +93,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1c201_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1c201_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -151,10 +141,7 @@ topology_template:
get_input: port_2c202_port_exCP_naming
vlan_requirements:
get_input: port_2c202_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_2c202_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_2c202_port_ip_requirements
network_role_tag:
@@ -183,10 +170,7 @@ topology_template:
get_input: port_1c201_port_exCP_naming
vlan_requirements:
get_input: port_1c201_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1c201_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1c201_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
index 42c86b84bc..3a130a9584 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
@@ -88,19 +88,9 @@ topology_template:
port_1a_t1_port_order:
type: integer
required: true
- port_1a_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t2_port_vlan_requirements:
type: list
required: true
@@ -133,10 +123,7 @@ topology_template:
get_input: port_1a_t1_port_exCP_naming
vlan_requirements:
get_input: port_1a_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t1_port_ip_requirements
network_role_tag:
@@ -192,10 +179,7 @@ topology_template:
get_input: port_1a_t2_port_exCP_naming
vlan_requirements:
get_input: port_1a_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
index c099fc8050..456e82876b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
@@ -72,11 +72,6 @@ topology_template:
vm_image_name:
type: string
required: true
- port_1a_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1a_t1_port_vlan_requirements:
type: list
required: true
@@ -122,10 +117,7 @@ topology_template:
get_input: port_1a_t1_port_exCP_naming
vlan_requirements:
get_input: port_1a_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1a_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1a_t1_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml
index 7c950fb3b4..0074e70291 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
port_1b_t2_port_order:
type: integer
required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -86,11 +81,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t1_port_value_specs:
type: list
required: true
@@ -160,10 +150,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -192,10 +179,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 80e69025cd..00901d49d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
port_1b_t2_port_order:
type: integer
required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -86,11 +81,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t1_port_network_role_tag:
type: string
required: true
@@ -155,10 +145,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -187,10 +174,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml
index 3bdd28fc08..49065169de 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml
@@ -42,11 +42,6 @@ topology_template:
port_1b_t2_port_order:
type: integer
required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -86,11 +81,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t1_port_value_specs:
type: list
required: true
@@ -160,10 +150,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -192,10 +179,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
index 4b997a780a..a7f96eb52f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
@@ -47,11 +47,6 @@ topology_template:
port_1b_t2_port_order:
type: integer
required: true
- port_1b_t2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_1b_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -91,11 +86,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_1b_t1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_b_single_2b_user_data_format:
type: list
required: true
@@ -155,10 +145,7 @@ topology_template:
get_input: port_1b_t1_port_exCP_naming
vlan_requirements:
get_input: port_1b_t1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t1_port_ip_requirements
network_role_tag:
@@ -187,10 +174,7 @@ topology_template:
get_input: port_1b_t2_port_exCP_naming
vlan_requirements:
get_input: port_1b_t2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_1b_t2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_1b_t2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml
index 45191338e8..42c8b54010 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_pcm_port_2_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_3_network_role:
type: string
required: true
@@ -106,11 +101,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pcm_port_3_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_2_order:
type: integer
required: true
@@ -188,10 +178,7 @@ topology_template:
get_input: port_pcm_port_3_exCP_naming
vlan_requirements:
get_input: port_pcm_port_3_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_3_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_3_ip_requirements
network_role_tag:
@@ -228,10 +215,7 @@ topology_template:
get_input: port_pcm_port_2_exCP_naming
vlan_requirements:
get_input: port_pcm_port_2_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_2_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_2_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml
index 7a3ec20712..d42796a554 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
port_pcm_port_0_network_role:
type: string
required: true
- port_pcm_port_0_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_1_network_role_tag:
type: string
required: true
@@ -69,11 +64,6 @@ topology_template:
port_pcm_port_1_network_role:
type: string
required: true
- port_pcm_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pcm_port_1_network:
type: list
required: true
@@ -179,10 +169,7 @@ topology_template:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
get_input: port_pcm_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_0_ip_requirements
network_role_tag:
@@ -219,10 +206,7 @@ topology_template:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
get_input: port_pcm_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_1_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 2a7c9e98a5..394046886b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -112,8 +112,6 @@ topology_template:
directives:
- substitutable
properties:
- port_pcm_port_0_subinterface_indicator:
- - false
port_pcm_port_1_network_role_tag: oam
port_pcm_port_0_fixed_ips:
- ip_address:
@@ -127,8 +125,6 @@ topology_template:
vm_image_name:
get_input: pcma_image_name
port_pcm_port_0_network_role_tag: cps
- port_pcm_port_1_subinterface_indicator:
- - false
port_pcm_port_1_network:
- get_input: oam_net_name
port_pcm_port_0_ip_requirements:
@@ -181,8 +177,6 @@ topology_template:
port_pcm_port_2_fixed_ips:
- ip_address:
get_input: cps_net_ip
- port_pcm_port_2_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pcma_flavor_name
port_pcm_port_3_security_groups:
@@ -210,8 +204,6 @@ topology_template:
get_input: oam_net_ip
compute_pcma_server_user_data_format:
- RAW
- port_pcm_port_3_subinterface_indicator:
- - false
port_pcm_port_2_network:
- get_input: cps_net_name
port_pcm_port_2_ip_requirements:
@@ -677,4 +669,4 @@ topology_template:
- dependency_pcma_server_pcm_port_1
dependency_pcm_port_2:
- abstract_pcma_server
- - dependency_pcma_server_pcm_port_2 \ No newline at end of file
+ - dependency_pcma_server_pcm_port_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
index 04e97ca016..5dc6de3055 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -170,6 +170,7 @@ topology_template:
get_input: port_pcm_port_00_subnetpoolid
mac_requirements:
get_input: port_pcm_port_00_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_00_exCP_naming
vlan_requirements:
@@ -217,6 +218,7 @@ topology_template:
get_input: port_pcm_port_01_subnetpoolid
mac_requirements:
get_input: port_pcm_port_01_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_01_exCP_naming
vlan_requirements:
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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 484bf5e953..037768dd4f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -90,12 +90,6 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_pd_server_nested2_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
requirements:
- dependency_pd_server_nested2_1b:
capability: tosca.capabilities.Node
@@ -2387,12 +2381,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_cmaui_1c1_main_name:
type: list
required: true
@@ -7028,12 +7016,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_ps_server_main_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_main_1b_port_order:
type: integer
required: true
@@ -9849,12 +9831,6 @@ node_types:
org.openecomp.resource.abstract.nodes.pd_server_main_1b:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_pd_server_main_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -10282,12 +10258,6 @@ node_types:
org.openecomp.resource.abstract.nodes.pd_server_main_1b_1:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_pd_server_main_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -10820,12 +10790,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_ps_server_main_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_main_1b_port_order:
type: integer
required: true
@@ -11283,12 +11247,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
@@ -11648,12 +11606,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_ps_server_nested2_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_nested2_1b_port_ip_requirements:
type: list
required: true
@@ -12149,12 +12101,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_cmaui_1c1_main_name:
type: list
required: true
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 6f042e795b..e958a9199c 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
@@ -239,8 +239,6 @@ topology_template:
directives:
- substitutable
properties:
- port_pd_server_main_1b_port_subinterface_indicator:
- - false
compute_pd_server_main_1b_availability_zone:
- get_input: availability_zone_0
port_pd_server_main_1b_port_replacement_policy:
@@ -297,8 +295,6 @@ topology_template:
- get_input: availability_zone_0
vm_flavor_name:
get_input: ps_server_main_1b_flavor
- port_ps_server_main_1b_port_subinterface_indicator:
- - false
vm_image_name:
get_input: ps_server_main_1b_image
compute_ps_server_main_1b_name:
@@ -380,9 +376,6 @@ topology_template:
compute_cmaui_1c1_main_availability_zone:
- get_input: availability_zone_0
- get_input: availability_zone_0
- port_cmaui_port_subinterface_indicator:
- - false
- - false
compute_cmaui_1c1_main_name:
- get_input:
- cmaui_1c1_main_names
@@ -448,4 +441,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 \ No newline at end of file
+ - abstract_cmaui_1c1_main_1
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/Nested_cmaui_1c1_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/Nested_cmaui_1c1_mainServiceTemplate.yaml
index f3120be438..ebe44ed6db 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_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/Nested_cmaui_1c1_mainServiceTemplate.yaml
@@ -69,11 +69,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_cmaui_1c1_main_name:
type: list
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_cmaui_port_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_ip_requirements
network_role_tag:
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/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml
index fecb92251b..627a385a37 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml
@@ -69,11 +69,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_cmaui_1c1_main_name:
type: list
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_cmaui_port_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_ip_requirements
network_role_tag:
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/Nested_cmaui_1c1_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/Nested_cmaui_1c1_nested2ServiceTemplate.yaml
index d3b2646004..028c8b3716 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_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/Nested_cmaui_1c1_nested2ServiceTemplate.yaml
@@ -69,11 +69,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_cmaui_port_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_ip_requirements
network_role_tag:
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/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
index dd00330a2b..6124951e17 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_pd_server_main_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_main_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_main_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_main_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_main_1b_port_ip_requirements
network_role_tag:
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/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml
index e80ff4a301..c572dc5e47 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_pd_server_main_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_main_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_main_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_main_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_main_1b_port_ip_requirements
network_role_tag:
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/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml
index b742da4d91..6619eb85b6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml
@@ -77,11 +77,6 @@ topology_template:
port_pd_server_nested2_1b_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_pd_server_nested2_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
node_templates:
pd_server_nested2_1b:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_nested2_1b
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_nested2_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_nested2_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_nested2_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_nested2_1b_port_ip_requirements
network_role_tag:
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/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
index 389638daf1..698772dd9c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
@@ -45,11 +45,6 @@ topology_template:
port_ps_server_main_1b_port_network_role:
type: string
required: true
- port_ps_server_main_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_main_1b_port_order:
type: integer
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_ps_server_main_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_main_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_main_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_main_1b_port_ip_requirements
network_role_tag:
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/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml
index 6b46235339..106f1659ae 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml
@@ -45,11 +45,6 @@ topology_template:
port_ps_server_main_1b_port_network_role:
type: string
required: true
- port_ps_server_main_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_main_1b_port_order:
type: integer
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_ps_server_main_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_main_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_main_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_main_1b_port_ip_requirements
network_role_tag:
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/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml
index 9e09392294..41a8b66e77 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
port_ps_server_nested2_1b_port_network_role_tag:
type: string
required: true
- port_ps_server_nested2_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_nested2_1b_port_ip_requirements:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_ps_server_nested2_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_nested2_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_nested2_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_nested2_1b_port_ip_requirements
network_role_tag:
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/nested-pattern-4-same-typeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
index 55df63acbc..3a9ca34c65 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
@@ -138,6 +138,7 @@ topology_template:
get_input: port_pd_server_pattern4_port_1_subnetpoolid
mac_requirements:
get_input: port_pd_server_pattern4_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pd_server_pattern4_port_1_exCP_naming
vlan_requirements:
@@ -183,6 +184,7 @@ topology_template:
get_input: port_pd_server_pattern4_port_2_subnetpoolid
mac_requirements:
get_input: port_pd_server_pattern4_port_2_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pd_server_pattern4_port_2_exCP_naming
vlan_requirements:
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/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
index 101ef1e4b4..695ecf07cc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
@@ -138,6 +138,7 @@ topology_template:
get_input: port_pd_server_pattern4_port_01_subnetpoolid
mac_requirements:
get_input: port_pd_server_pattern4_port_01_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pd_server_pattern4_port_01_exCP_naming
vlan_requirements:
@@ -183,6 +184,7 @@ topology_template:
get_input: port_pd_server_pattern4_port_02_subnetpoolid
mac_requirements:
get_input: port_pd_server_pattern4_port_02_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pd_server_pattern4_port_02_exCP_naming
vlan_requirements:
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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
index 1d2ef5e409..11949e3798 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
@@ -150,8 +150,6 @@ topology_template:
- get_input: availability_zone_0
vm_flavor_name:
get_input: ps_server_main_1b_flavor
- port_ps_server_main_1b_port_subinterface_indicator:
- - false
vm_image_name:
get_input: ps_server_main_1b_image
compute_ps_server_main_1b_name:
@@ -215,9 +213,6 @@ topology_template:
compute_cmaui_1c1_main_availability_zone:
- get_input: availability_zone_0
- get_input: availability_zone_0
- port_cmaui_port_subinterface_indicator:
- - false
- - false
compute_cmaui_1c1_main_name:
- get_input:
- cmaui_1c1_main_names
@@ -238,8 +233,6 @@ topology_template:
directives:
- substitutable
properties:
- port_pd_server_main_1b_port_subinterface_indicator:
- - false
compute_pd_server_main_1b_availability_zone:
- get_input: availability_zone_0
port_pd_server_main_1b_port_replacement_policy:
@@ -2380,4 +2373,4 @@ topology_template:
- dependency_test_nested_pattern_4_nested2
dependency_test_nested3Level_test_nested2Level:
- test_nested2Level
- - dependency_test_nested3Level \ No newline at end of file
+ - dependency_test_nested3Level
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 8fc7a37dd9..d6aadd1e4b 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
@@ -136,8 +136,6 @@ topology_template:
is_required: false
port_pd_server_nested2_1b_port_network:
- get_input: jsa_name
- port_pd_server_nested2_1b_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_pd_server_nested2_1bServiceTemplate.yaml
count: 1
@@ -214,8 +212,6 @@ topology_template:
directives:
- substitutable
properties:
- port_ps_server_nested2_1b_port_subinterface_indicator:
- - false
port_ps_server_nested2_1b_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -314,9 +310,6 @@ topology_template:
- get_input:
- cmaui_1c1_nested2_names
- 0
- port_cmaui_port_subinterface_indicator:
- - false
- - false
compute_cmaui_1c1_nested2_availability_zone:
- get_input: availability_zone_0
- get_input: availability_zone_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 680d88be08..06e161e034 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -54,12 +54,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_port_network_role_tag:
type: string
required: true
@@ -1032,12 +1026,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_oam_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_server_port_replacement_policy:
type: list
required: true
@@ -4581,12 +4569,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_sm_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_sm_server_name:
type: list
required: true
@@ -5040,12 +5022,6 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_ps_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
index 334615f25f..b47f6e936e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
required: true
entry_schema:
type: json
- port_oam_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_server_port_replacement_policy:
type: list
required: true
@@ -122,22 +117,19 @@ topology_template:
get_input: port_oam_server_port_exCP_naming
vlan_requirements:
get_input: port_oam_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_server_port_ip_requirements
network_role_tag:
get_input: port_oam_server_port_network_role_tag
network_role:
get_input: port_oam_server_port_network_role
- subnetpoolid:
- get_input: port_oam_server_port_subnetpoolid
fixed_ips:
get_input:
- port_oam_server_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_oam_server_port_subnetpoolid
network:
get_input:
- port_oam_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml
index 51b0e191db..3130f3cf53 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -49,11 +49,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_port_network_role_tag:
type: string
required: true
@@ -122,22 +117,19 @@ topology_template:
get_input: port_pd_server_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_port_ip_requirements
network_role_tag:
get_input: port_pd_server_port_network_role_tag
network_role:
get_input: port_pd_server_port_network_role
- subnetpoolid:
- get_input: port_pd_server_port_subnetpoolid
fixed_ips:
get_input:
- port_pd_server_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_pd_server_port_subnetpoolid
network:
get_input:
- port_pd_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
index 31dc6da30a..a8789f3705 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
@@ -63,11 +63,6 @@ topology_template:
port_ps_server_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_ps_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_port_ip_requirements:
type: list
required: true
@@ -107,22 +102,19 @@ topology_template:
get_input: port_ps_server_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_port_ip_requirements
network_role_tag:
get_input: port_ps_server_port_network_role_tag
network_role:
get_input: port_ps_server_port_network_role
- subnetpoolid:
- get_input: port_ps_server_port_subnetpoolid
fixed_ips:
get_input:
- port_ps_server_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_ps_server_port_subnetpoolid
network:
get_input:
- port_ps_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
index e486f79a06..22ec89c3c2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
@@ -46,11 +46,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_sm_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_sm_server_name:
type: list
required: true
@@ -122,22 +117,19 @@ topology_template:
get_input: port_sm_server_port_exCP_naming
vlan_requirements:
get_input: port_sm_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_sm_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_sm_server_port_ip_requirements
network_role_tag:
get_input: port_sm_server_port_network_role_tag
network_role:
get_input: port_sm_server_port_network_role
- subnetpoolid:
- get_input: port_sm_server_port_subnetpoolid
fixed_ips:
get_input:
- port_sm_server_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_sm_server_port_subnetpoolid
network:
get_input:
- port_sm_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml
index 2eb111855b..824b645089 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml
@@ -112,8 +112,6 @@ topology_template:
- get_input: net1
vm_flavor_name:
get_input: pd_server_flavor
- port_pd_server_port_subinterface_indicator:
- - false
port_pd_server_port_fixed_ips:
- ip_address:
get_input:
@@ -156,8 +154,6 @@ topology_template:
- 0
vm_flavor_name:
get_input: ps_server_flavor
- port_ps_server_port_subinterface_indicator:
- - false
port_ps_server_port_ip_requirements:
- ip_version: 4
ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
index 5ad68ddf2e..c8e50a5f3d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml
@@ -131,8 +131,6 @@ topology_template:
get_input: sm_server_flavor
port_sm_server_port_network:
- get_input: net1
- port_sm_server_port_subinterface_indicator:
- - false
compute_sm_server_name:
- get_input:
- sm_server_names
@@ -177,8 +175,6 @@ topology_template:
- get_input: net2
port_oam_server_port_security_groups:
- - get_input: p1
- port_oam_server_port_subinterface_indicator:
- - false
port_oam_server_port_replacement_policy:
- AUTO
vm_flavor_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
index 25d58dc6b9..5eccdf3d2d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
@@ -132,6 +132,10 @@ topology_template:
cmaui_port_7:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_cmaui_port_7_subnetpoolid
+ network:
+ get_input: net1
replacement_policy: AUTO
ip_requirements:
get_input: port_cmaui_port_7_ip_requirements
@@ -144,18 +148,15 @@ topology_template:
get_input:
- cmaui_oam_ips
- 0
- subnetpoolid:
- get_input: port_cmaui_port_7_subnetpoolid
mac_requirements:
get_input: port_cmaui_port_7_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_cmaui_port_7_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_7_vlan_requirements
network_role_tag:
get_input: port_cmaui_port_7_network_role_tag
- network:
- get_input: net1
order:
get_input: port_cmaui_port_7_order
requirements:
@@ -166,6 +167,10 @@ topology_template:
cmaui_port_8:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_cmaui_port_8_subnetpoolid
+ network:
+ get_input: net2
replacement_policy: AUTO
ip_requirements:
get_input: port_cmaui_port_8_ip_requirements
@@ -179,18 +184,15 @@ topology_template:
get_input:
- cmaui_oam_ips
- 0
- subnetpoolid:
- get_input: port_cmaui_port_8_subnetpoolid
mac_requirements:
get_input: port_cmaui_port_8_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_cmaui_port_8_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_8_vlan_requirements
network_role_tag:
get_input: port_cmaui_port_8_network_role_tag
- network:
- get_input: net2
order:
get_input: port_cmaui_port_8_order
requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0697992c11..a4c69ca7ea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -48,12 +48,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -501,12 +495,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -922,12 +910,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -1389,12 +1371,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_oam02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
requirements:
- dependency_oam_oam02_port:
capability: tosca.capabilities.Node
@@ -1788,12 +1764,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_oam01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -2267,12 +2237,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_cmaui02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
requirements:
- dependency_cmaui_cmaui02_port:
capability: tosca.capabilities.Node
@@ -2656,12 +2620,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui01_port_vlan_requirements:
type: list
required: true
@@ -6631,12 +6589,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml
index 63c91e5ebe..8fdf0c1e04 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml
@@ -145,8 +145,6 @@ topology_template:
vm_flavor_name:
get_input: pd_flavor_name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_image_name
port_pd02_port_ip_requirements:
@@ -193,8 +191,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml
index 6d81c28d86..c42e264b2b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml
@@ -82,11 +82,6 @@ topology_template:
port_cmaui02_port_network_role_tag:
type: string
required: true
- port_cmaui02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
node_templates:
cmaui_cmaui02_port:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -107,22 +102,19 @@ topology_template:
get_input: port_cmaui02_port_exCP_naming
vlan_requirements:
get_input: port_cmaui02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui02_port_ip_requirements
network_role_tag:
get_input: port_cmaui02_port_network_role_tag
network_role:
get_input: port_cmaui02_port_network_role
- subnetpoolid:
- get_input: port_cmaui02_port_subnetpoolid
fixed_ips:
get_input:
- port_cmaui02_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_cmaui02_port_subnetpoolid
network:
get_input:
- port_cmaui02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml
index 7ea3d38bc9..95de8756cc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml
@@ -42,11 +42,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui01_port_vlan_requirements:
type: list
required: true
@@ -107,22 +102,19 @@ topology_template:
get_input: port_cmaui01_port_exCP_naming
vlan_requirements:
get_input: port_cmaui01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui01_port_ip_requirements
network_role_tag:
get_input: port_cmaui01_port_network_role_tag
network_role:
get_input: port_cmaui01_port_network_role
- subnetpoolid:
- get_input: port_cmaui01_port_subnetpoolid
fixed_ips:
get_input:
- port_cmaui01_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_cmaui01_port_subnetpoolid
network:
get_input:
- port_cmaui01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml
index c5aee48015..285d94a86a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml
@@ -82,11 +82,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_oam02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
node_templates:
oam_oam02_port:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -107,22 +102,19 @@ topology_template:
get_input: port_oam02_port_exCP_naming
vlan_requirements:
get_input: port_oam02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam02_port_ip_requirements
network_role_tag:
get_input: port_oam02_port_network_role_tag
network_role:
get_input: port_oam02_port_network_role
- subnetpoolid:
- get_input: port_oam02_port_subnetpoolid
fixed_ips:
get_input:
- port_oam02_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_oam02_port_subnetpoolid
network:
get_input:
- port_oam02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml
index 7089c10490..a68212a407 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_oam01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -107,22 +102,19 @@ topology_template:
get_input: port_oam01_port_exCP_naming
vlan_requirements:
get_input: port_oam01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam01_port_ip_requirements
network_role_tag:
get_input: port_oam01_port_network_role_tag
network_role:
get_input: port_oam01_port_network_role
- subnetpoolid:
- get_input: port_oam01_port_subnetpoolid
fixed_ips:
get_input:
- port_oam01_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_oam01_port_subnetpoolid
network:
get_input:
- port_oam01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
index 0858b9dd3e..0102fb5009 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -43,11 +43,6 @@ topology_template:
port_pd02_port_network_role_tag:
type: string
required: true
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
index c5324d5469..f875aad129 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml
index 5e20bc5571..f55c8f7c6c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml
@@ -38,11 +38,6 @@ topology_template:
port_pd02_port_network_role_tag:
type: string
required: true
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -122,22 +117,19 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
get_input: port_pd02_port_network_role_tag
network_role:
get_input: port_pd02_port_network_role
- subnetpoolid:
- get_input: port_pd02_port_subnetpoolid
fixed_ips:
get_input:
- port_pd02_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_pd02_port_subnetpoolid
network:
get_input:
- port_pd02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml
index 4a195fb22d..937a2b3864 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml
@@ -65,11 +65,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -122,22 +117,19 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
get_input: port_pd01_port_network_role_tag
network_role:
get_input: port_pd01_port_network_role
- subnetpoolid:
- get_input: port_pd01_port_subnetpoolid
fixed_ips:
get_input:
- port_pd01_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_pd01_port_subnetpoolid
network:
get_input:
- port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml
index d5464d4bac..aa2ed981f2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml
@@ -92,8 +92,6 @@ topology_template:
- - get_input: p2
port_cmaui02_port_network:
- get_input: net
- port_cmaui02_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_cmauiServiceTemplate.yaml
count: 1
@@ -118,8 +116,6 @@ topology_template:
- get_input:
- cmaui_names
- 0
- port_cmaui01_port_subinterface_indicator:
- - false
compute_cmaui_availability_zone:
- get_input: availability_zone_0
vm_image_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml
index 834883b90e..07c709079f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml
@@ -80,8 +80,6 @@ topology_template:
- AUTO
vm_flavor_name:
get_input: cmaui_flavor
- port_oam01_port_subinterface_indicator:
- - false
vm_image_name:
get_input: cmaui_image
port_oam01_port_fixed_ips:
@@ -138,8 +136,6 @@ topology_template:
- get_input:
- oam_names
- 0
- port_oam02_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_oamServiceTemplate.yaml
count: 1
@@ -860,4 +856,4 @@ topology_template:
- local_storage_server_ps_1
dependency_server_ps_2_test_nested3Level:
- test_nested3Level
- - dependency_server_ps_2 \ No newline at end of file
+ - dependency_server_ps_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml
index 7d403c437a..1a19d76b8c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml
@@ -72,8 +72,6 @@ topology_template:
is_required: false
vm_flavor_name:
get_input: cmaui_flavor
- port_pd02_port_subinterface_indicator:
- - false
vm_image_name:
get_input: cmaui_image
port_pd02_port_security_groups:
@@ -138,8 +136,6 @@ topology_template:
- get_input:
- ps_names
- 0
- port_pd01_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_ps_1ServiceTemplate.yaml
count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 89b4e9e2c7..c50219dfd3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -499,12 +493,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_ps02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_pd_server_user_data_format:
type: list
required: true
@@ -902,12 +890,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -1337,12 +1319,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -1764,12 +1740,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -2183,12 +2153,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -2610,12 +2574,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -3045,12 +3003,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml
index 506d98ef4a..9914f9b938 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml
@@ -145,8 +145,6 @@ topology_template:
vm_flavor_name:
get_input: pd_flavor_name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_image_name
port_pd02_port_ip_requirements:
@@ -193,8 +191,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
index 62d5fee5a6..cc309161c1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -43,11 +43,6 @@ topology_template:
port_pd02_port_network_role_tag:
type: string
required: true
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml
index 445bcc54d7..a3c329478a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -43,11 +43,6 @@ topology_template:
port_pd02_port_network_role_tag:
type: string
required: true
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml
index 1fdc6999a6..f450366600 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
index 7dd0802b4a..62ab62f014 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
index 252a651fa2..0ef4cda950 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
@@ -62,11 +62,6 @@ topology_template:
port_ps02_port_order:
type: integer
required: true
- port_ps02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_pd_server_user_data_format:
type: list
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_ps02_port_exCP_naming
vlan_requirements:
get_input: port_ps02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml
index bbc69567f3..61f33e6f81 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml
@@ -43,11 +43,6 @@ topology_template:
port_pd02_port_network_role_tag:
type: string
required: true
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml
index a5c0eb8564..5423f41fe5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml
index c31426f68d..c51dcc3d09 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml
@@ -83,8 +83,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -121,8 +119,6 @@ topology_template:
port_ps02_port_network_role_tag: oam
vm_image_name:
get_input: pd_image_name
- port_ps02_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
port_ps02_port_network:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml
index 7d4f1fe449..64678af2fe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml
@@ -83,8 +83,6 @@ topology_template:
vm_flavor_name:
get_input: pd_flavor_name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_image_name
port_pd02_port_ip_requirements:
@@ -131,8 +129,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml
index ed8c2c8b46..6a84a53e6e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml
@@ -83,8 +83,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -113,8 +111,6 @@ topology_template:
vm_flavor_name:
get_input: pd_flavor_name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_image_name
port_pd02_port_ip_requirements:
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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2edec5c600..beb3e3d011 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -26,12 +26,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -459,12 +453,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_osm_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -950,12 +938,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_oam_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_port_vlan_requirements:
type: list
required: true
@@ -1905,12 +1887,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -2404,12 +2380,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_BE_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
attributes:
BE_1c1_accessIPv4:
type: string
@@ -5399,12 +5369,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -5846,12 +5810,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_rd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
@@ -7736,12 +7694,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
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 de19b19b41..3599ca2da1 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
@@ -321,8 +321,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
mac_count_required:
is_required: false
- port_ps_server_1b_port_subinterface_indicator:
- - false
port_ps_server_1b_port_fixed_ips:
- ip_address:
get_input:
@@ -383,8 +381,6 @@ topology_template:
- get_input: net
compute_rd_server_1b_availability_zone:
- get_input: availability_zone_0
- port_rd_server_1b_port_subinterface_indicator:
- - false
vm_flavor_name:
get_input: rd_server_1b_flavor
port_rd_server_1b_port_ip_requirements:
@@ -491,8 +487,6 @@ topology_template:
properties:
port_osm_port_replacement_policy:
- AUTO
- port_osm_port_subinterface_indicator:
- - false
port_osm_port_network:
- packet_internal_network_2
compute_osm_server_1c2_name:
@@ -539,8 +533,6 @@ topology_template:
properties:
port_osm_port_replacement_policy:
- AUTO
- port_osm_port_subinterface_indicator:
- - false
port_osm_port_network:
- packet_external_network_2
compute_osm_server_1c2_name:
@@ -655,9 +647,6 @@ topology_template:
port_BE_port_replacement_policy:
- AUTO
- AUTO
- port_BE_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_BE_1c1ServiceTemplate.yaml
count: 2
@@ -718,4 +707,4 @@ topology_template:
value:
get_attribute:
- abstract_osm_server_1c2_1
- - osm_server_1c2_accessIPv4 \ No newline at end of file
+ - osm_server_1c2_accessIPv4
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/Nested_BE_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml
index b5533b8d3b..f96e8a62d2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml
@@ -77,11 +77,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_BE_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
node_templates:
BE_1c1_BE_port:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -98,10 +93,7 @@ topology_template:
get_input: port_BE_port_exCP_naming
vlan_requirements:
get_input: port_BE_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_BE_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_BE_port_ip_requirements
network_role_tag:
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/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml
index 2b317c5b0f..4f667386c6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml
@@ -74,11 +74,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_cmaui_port_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_ip_requirements
network_role_tag:
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/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml
index dfc91c7f43..6dbb4c2895 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml
@@ -61,11 +61,6 @@ topology_template:
required: true
entry_schema:
type: json
- port_oam_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_port_vlan_requirements:
type: list
required: true
@@ -122,10 +117,7 @@ topology_template:
get_input: port_oam_port_exCP_naming
vlan_requirements:
get_input: port_oam_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_port_ip_requirements
network_role_tag:
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/Nested_osm_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml
index f77c265371..e7e5928189 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
port_osm_port_subnetpoolid:
type: string
required: true
- port_osm_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -103,10 +98,7 @@ topology_template:
get_input: port_osm_port_exCP_naming
vlan_requirements:
get_input: port_osm_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_osm_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_osm_port_ip_requirements
network_role_tag:
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/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
index 0d0073bd0c..3e54bf3448 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
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/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
index 35a5263155..f371e78e35 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
@@ -26,11 +26,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
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/Nested_rd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml
index 33fc9dafc2..2e1aaa5537 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_rd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_rd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_rd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_rd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_rd_server_1b_port_ip_requirements
network_role_tag:
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/Nested_rd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml
index 286bbfa5df..38f55fa865 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml
@@ -19,11 +19,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
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/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml
index ec4283632d..71db42ec92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml
@@ -138,6 +138,7 @@ topology_template:
get_input: port_pd_server_port_1_subnetpoolid
mac_requirements:
get_input: port_pd_server_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pd_server_port_1_exCP_naming
vlan_requirements:
@@ -170,6 +171,7 @@ topology_template:
get_input: port_pd_server_port_2_subnetpoolid
mac_requirements:
get_input: port_pd_server_port_2_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pd_server_port_2_exCP_naming
vlan_requirements:
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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
index 2b9babc590..c53a03545d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
@@ -135,8 +135,6 @@ topology_template:
- 0
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_server_1b_image
port_pd_server_1b_port_replacement_policy:
@@ -215,9 +213,6 @@ topology_template:
- get_input:
- cmaui_1c1_names
- 0
- port_cmaui_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml
count: 2
@@ -270,8 +265,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
mac_count_required:
is_required: false
- port_ps_server_1b_port_subinterface_indicator:
- - false
port_ps_server_1b_port_fixed_ips:
- ip_address:
get_input:
@@ -348,8 +341,6 @@ topology_template:
get_attribute:
- abstract_cmaui_1c1
- cmaui_1c1_accessIPv4
- port_oam_port_subinterface_indicator:
- - false
port_oam_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -396,8 +387,6 @@ topology_template:
- 1
vm_image_name:
get_input: oam_server_1c2_image
- port_oam_port_subinterface_indicator:
- - false
port_oam_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -1712,4 +1701,4 @@ topology_template:
- dependency
dependency_server_1b_pd_2:
- abstract_pd_server_1b
- - dependency_pd_server_1b \ No newline at end of file
+ - dependency_pd_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 65368cfc2b..f2f4d3479c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -64,12 +64,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_oam_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_port_vlan_requirements:
type: list
required: true
@@ -459,12 +453,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -3073,12 +3061,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -3574,12 +3556,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
index c79149bea1..61df375cae 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
@@ -74,11 +74,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_cmaui_port_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
index 674a9d6a5b..f7dc996de0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
@@ -56,11 +56,6 @@ topology_template:
vm_image_name:
type: string
required: true
- port_oam_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_port_vlan_requirements:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_oam_port_exCP_naming
vlan_requirements:
get_input: port_oam_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml
index 71c4d654a2..c3bad7cb18 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -26,11 +26,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml
index 633d5d087b..2ee92d2b40 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -19,11 +19,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml
index 5f9c660752..9c22e8f15d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml
@@ -172,9 +172,6 @@ topology_template:
- get_input:
- cmaui_1c1_names
- 0
- port_cmaui_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml
count: 2
@@ -199,8 +196,6 @@ topology_template:
- 0
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_server_1b_image
port_pd_server_1b_port_replacement_policy:
@@ -239,8 +234,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
mac_count_required:
is_required: false
- port_ps_server_1b_port_subinterface_indicator:
- - false
port_ps_server_1b_port_fixed_ips:
- ip_address:
get_input:
@@ -309,8 +302,6 @@ topology_template:
- 1
vm_image_name:
get_input: oam_server_1c2_image
- port_oam_port_subinterface_indicator:
- - false
port_oam_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -357,8 +348,6 @@ topology_template:
- 1
vm_image_name:
get_input: oam_server_1c2_image
- port_oam_port_subinterface_indicator:
- - false
port_oam_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -1441,4 +1430,4 @@ topology_template:
- dependency_cmaui_1c1_cmaui_port
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 80f9877600..26be6a1655 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -64,12 +64,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_oam_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_port_vlan_requirements:
type: list
required: true
@@ -1021,12 +1015,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -3927,12 +3915,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -4428,12 +4410,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
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/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml
index c79149bea1..61df375cae 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml
@@ -74,11 +74,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_cmaui_port_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_ip_requirements
network_role_tag:
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/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml
index 3b43af97f6..f2c93a18cf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml
@@ -56,11 +56,6 @@ topology_template:
vm_image_name:
type: string
required: true
- port_oam_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_port_vlan_requirements:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_oam_port_exCP_naming
vlan_requirements:
get_input: port_oam_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_port_ip_requirements
network_role_tag:
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/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
index 71c4d654a2..c3bad7cb18 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -26,11 +26,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
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/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
index 633d5d087b..2ee92d2b40 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -19,11 +19,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
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/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml
index ec4283632d..71db42ec92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml
@@ -138,6 +138,7 @@ topology_template:
get_input: port_pd_server_port_1_subnetpoolid
mac_requirements:
get_input: port_pd_server_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pd_server_port_1_exCP_naming
vlan_requirements:
@@ -170,6 +171,7 @@ topology_template:
get_input: port_pd_server_port_2_subnetpoolid
mac_requirements:
get_input: port_pd_server_port_2_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pd_server_port_2_exCP_naming
vlan_requirements:
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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml
index fae66e3338..bb2dbe5815 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml
@@ -172,9 +172,6 @@ topology_template:
- get_input:
- cmaui_1c1_names
- 0
- port_cmaui_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml
count: 2
@@ -199,8 +196,6 @@ topology_template:
- 0
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_server_1b_image
port_pd_server_1b_port_replacement_policy:
@@ -239,8 +234,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
mac_count_required:
is_required: false
- port_ps_server_1b_port_subinterface_indicator:
- - false
port_ps_server_1b_port_fixed_ips:
- ip_address:
get_input:
@@ -309,8 +302,6 @@ topology_template:
- 1
vm_image_name:
get_input: oam_server_1c2_image
- port_oam_port_subinterface_indicator:
- - false
port_oam_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -357,8 +348,6 @@ topology_template:
- 1
vm_image_name:
get_input: oam_server_1c2_image
- port_oam_port_subinterface_indicator:
- - false
port_oam_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -1448,4 +1437,4 @@ topology_template:
- dependency_cmaui_1c1_cmaui_port
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0d08845ac3..411b35e31a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -86,12 +86,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml
index 9786d07c75..9825e925d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml
@@ -74,11 +74,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_cmaui_port_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml
index 9ee6ff47d9..7e77e65af5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml
@@ -103,8 +103,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_cmaui_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_cmauiServiceTemplate.yaml
count: 1
@@ -151,8 +149,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_cmaui_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_cmauiServiceTemplate.yaml
count: 1
@@ -546,4 +542,4 @@ topology_template:
- local_storage_cmaui
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8d6eae184e..0a4871769b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -86,12 +86,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml
index 9786d07c75..9825e925d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml
@@ -74,11 +74,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_cmaui_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_subnetpoolid:
type: string
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_cmaui_port_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml
index b2b6690966..61b74e8f11 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml
@@ -105,9 +105,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_cmaui_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_cmauiServiceTemplate.yaml
count: 2
@@ -469,4 +466,4 @@ topology_template:
- dependency_cmaui_cmaui_port
local_storage_server_cmaui_1:
- abstract_cmaui
- - local_storage_cmaui \ No newline at end of file
+ - local_storage_cmaui
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d480eddc00..5448c1ed56 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -48,12 +48,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_port_network_role_tag:
type: string
required: true
@@ -1252,12 +1246,6 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_ps_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml
index 54906d7701..831d03d388 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -44,11 +44,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_port_network_role_tag:
type: string
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
index de0ad423a0..86d5f4532a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
@@ -58,11 +58,6 @@ topology_template:
port_ps_server_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_ps_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_port_ip_requirements:
type: list
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_ps_server_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml
index 4cd0ea0ac4..83240c60ca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml
@@ -99,8 +99,6 @@ topology_template:
- get_input: net
vm_flavor_name:
get_input: pd_server_flavor
- port_pd_server_port_subinterface_indicator:
- - false
port_pd_server_port_fixed_ips:
- ip_address:
get_input:
@@ -141,8 +139,6 @@ topology_template:
- 0
vm_flavor_name:
get_input: ps_server_flavor
- port_ps_server_port_subinterface_indicator:
- - false
port_ps_server_port_ip_requirements:
- ip_version: 4
ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1849248662..49d43a3cfc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -48,12 +48,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_port_network_role_tag:
type: string
required: true
@@ -1975,12 +1969,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_oam_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_server_port_replacement_policy:
type: list
required: true
@@ -2434,12 +2422,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_sm_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_sm_server_name:
type: list
required: true
@@ -2881,12 +2863,6 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_ps_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
index 3a5ee71b1a..9287c9a685 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
@@ -26,11 +26,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_oam_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_server_port_replacement_policy:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_oam_server_port_exCP_naming
vlan_requirements:
get_input: port_oam_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_server_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
index 54906d7701..831d03d388 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
@@ -44,11 +44,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_port_network_role_tag:
type: string
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
index de0ad423a0..86d5f4532a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
@@ -58,11 +58,6 @@ topology_template:
port_ps_server_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_ps_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_port_ip_requirements:
type: list
required: true
@@ -98,10 +93,7 @@ topology_template:
get_input: port_ps_server_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
index bb990b977e..502ee9b957 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
@@ -46,11 +46,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_sm_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_sm_server_name:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_sm_server_port_exCP_naming
vlan_requirements:
get_input: port_sm_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_sm_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_sm_server_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
index 083ffb8cc4..3044ae9f59 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml
@@ -99,8 +99,6 @@ topology_template:
- get_input: net
vm_flavor_name:
get_input: pd_server_flavor
- port_pd_server_port_subinterface_indicator:
- - false
port_pd_server_port_fixed_ips:
- ip_address:
get_input:
@@ -141,8 +139,6 @@ topology_template:
- 0
vm_flavor_name:
get_input: ps_server_flavor
- port_ps_server_port_subinterface_indicator:
- - false
port_ps_server_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -522,4 +518,4 @@ topology_template:
- link_ps_server_ps_server_port
local_storage_server_ps:
- abstract_ps_server
- - local_storage_ps_server \ No newline at end of file
+ - local_storage_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
index dba728c8d9..0429c660e7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml
@@ -87,8 +87,6 @@ topology_template:
get_input: sm_server_flavor
port_sm_server_port_network:
- get_input: net
- port_sm_server_port_subinterface_indicator:
- - false
compute_sm_server_name:
- get_input:
- sm_server_names
@@ -128,8 +126,6 @@ topology_template:
properties:
port_oam_server_port_network:
- get_input: net
- port_oam_server_port_subinterface_indicator:
- - false
port_oam_server_port_replacement_policy:
- AUTO
vm_flavor_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8c643c711c..0d456cdb90 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -54,12 +54,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_port_network_role_tag:
type: string
required: true
@@ -1987,12 +1981,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_oam_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_server_port_replacement_policy:
type: list
required: true
@@ -2446,12 +2434,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_sm_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_sm_server_name:
type: list
required: true
@@ -2905,12 +2887,6 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_ps_server_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
index 334615f25f..b47f6e936e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
required: true
entry_schema:
type: json
- port_oam_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_server_port_replacement_policy:
type: list
required: true
@@ -122,22 +117,19 @@ topology_template:
get_input: port_oam_server_port_exCP_naming
vlan_requirements:
get_input: port_oam_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_server_port_ip_requirements
network_role_tag:
get_input: port_oam_server_port_network_role_tag
network_role:
get_input: port_oam_server_port_network_role
- subnetpoolid:
- get_input: port_oam_server_port_subnetpoolid
fixed_ips:
get_input:
- port_oam_server_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_oam_server_port_subnetpoolid
network:
get_input:
- port_oam_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
index 51b0e191db..3130f3cf53 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
@@ -49,11 +49,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_port_network_role_tag:
type: string
required: true
@@ -122,22 +117,19 @@ topology_template:
get_input: port_pd_server_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_port_ip_requirements
network_role_tag:
get_input: port_pd_server_port_network_role_tag
network_role:
get_input: port_pd_server_port_network_role
- subnetpoolid:
- get_input: port_pd_server_port_subnetpoolid
fixed_ips:
get_input:
- port_pd_server_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_pd_server_port_subnetpoolid
network:
get_input:
- port_pd_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
index 31dc6da30a..a8789f3705 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
@@ -63,11 +63,6 @@ topology_template:
port_ps_server_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_ps_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_port_ip_requirements:
type: list
required: true
@@ -107,22 +102,19 @@ topology_template:
get_input: port_ps_server_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_port_ip_requirements
network_role_tag:
get_input: port_ps_server_port_network_role_tag
network_role:
get_input: port_ps_server_port_network_role
- subnetpoolid:
- get_input: port_ps_server_port_subnetpoolid
fixed_ips:
get_input:
- port_ps_server_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_ps_server_port_subnetpoolid
network:
get_input:
- port_ps_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
index e486f79a06..22ec89c3c2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
@@ -46,11 +46,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_sm_server_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_sm_server_name:
type: list
required: true
@@ -122,22 +117,19 @@ topology_template:
get_input: port_sm_server_port_exCP_naming
vlan_requirements:
get_input: port_sm_server_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_sm_server_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_sm_server_port_ip_requirements
network_role_tag:
get_input: port_sm_server_port_network_role_tag
network_role:
get_input: port_sm_server_port_network_role
- subnetpoolid:
- get_input: port_sm_server_port_subnetpoolid
fixed_ips:
get_input:
- port_sm_server_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_sm_server_port_subnetpoolid
network:
get_input:
- port_sm_server_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml
index 4b1f8a2f8c..f730407335 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml
@@ -102,8 +102,6 @@ topology_template:
- get_input: net
vm_flavor_name:
get_input: pd_server_flavor
- port_pd_server_port_subinterface_indicator:
- - false
port_pd_server_port_fixed_ips:
- ip_address:
get_input:
@@ -146,8 +144,6 @@ topology_template:
- 0
vm_flavor_name:
get_input: ps_server_flavor
- port_ps_server_port_subinterface_indicator:
- - false
port_ps_server_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -527,4 +523,4 @@ topology_template:
- link_ps_server_ps_server_port
local_storage_server_ps:
- abstract_ps_server
- - local_storage_ps_server \ No newline at end of file
+ - local_storage_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml
index 475bebc7d1..574225ef0a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml
@@ -87,8 +87,6 @@ topology_template:
get_input: sm_server_flavor
port_sm_server_port_network:
- get_input: net
- port_sm_server_port_subinterface_indicator:
- - false
compute_sm_server_name:
- get_input:
- sm_server_names
@@ -133,8 +131,6 @@ topology_template:
- get_input: net
port_oam_server_port_security_groups:
- - get_input: p1
- port_oam_server_port_subinterface_indicator:
- - false
port_oam_server_port_replacement_policy:
- AUTO
vm_flavor_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 284d7d06f1..1fb93b4f2e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -162,6 +162,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -206,6 +207,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index c1975a9d23..2055eaa7b0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -175,6 +175,7 @@ topology_template:
get_input: port_pcm_port_12_subnetpoolid
mac_requirements:
get_input: port_pcm_port_12_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_12_exCP_naming
vlan_requirements:
@@ -206,6 +207,7 @@ topology_template:
get_input: port_pcm_port_02_subnetpoolid
mac_requirements:
get_input: port_pcm_port_02_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_02_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3735042d2d..258642ea2d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -128,24 +128,12 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_cdi_ims_core_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_cdi_config_drive:
type: list
required: true
status: SUPPORTED
entry_schema:
type: boolean
- port_cdi_internal_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -633,6 +621,12 @@ node_types:
org.openecomp.resource.abstract.nodes.lbd:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
+ port_lbd_internal_1_port_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_lbd_ims_core_1_port_allowed_address_pairs:
type: list
required: true
@@ -645,6 +639,12 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ compute_lbd_config_drive:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: boolean
port_lbd_internal_1_port_name:
type: list
required: true
@@ -657,6 +657,22 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.network.AddressPair
+ port_lbd_ims_core_1_port_ip_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_lbd_ims_core_1_port_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_lbd_dpdk_1_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
port_lbd_dpdk_1_port_subnetpoolid:
type: string
required: true
@@ -687,16 +703,26 @@ node_types:
type: integer
required: true
status: SUPPORTED
- vm_image_name:
- type: string
+ port_lbd_internal_1_port_ip_requirements:
+ type: list
required: true
status: SUPPORTED
- port_lbd_dpdk_1_port_subinterface_indicator:
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_lbd_internal_1_port_security_groups:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
+ type: json
+ port_lbd_ims_core_1_port_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
+ vm_image_name:
+ type: string
+ required: true
+ status: SUPPORTED
port_lbd_dpdk_1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -725,92 +751,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- compute_lbd_scheduler_hints:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- port_lbd_dpdk_1_port_name:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_lbd_ims_core_1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_lbd_internal_1_port_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_lbd_internal_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- compute_lbd_name:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_lbd_ims_core_1_port_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
- port_lbd_internal_1_port_vlan_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- compute_lbd_config_drive:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
- port_lbd_ims_core_1_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_lbd_ims_core_1_port_vlan_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_lbd_dpdk_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_lbd_ims_core_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
- port_lbd_internal_1_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_lbd_internal_1_port_security_groups:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- port_lbd_ims_core_1_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
port_lbd_internal_1_port_subnetpoolid:
type: string
required: true
@@ -851,6 +791,18 @@ node_types:
type: string
required: true
status: SUPPORTED
+ compute_lbd_scheduler_hints:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: json
+ port_lbd_dpdk_1_port_name:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
port_lbd_dpdk_1_port_security_groups:
type: list
required: true
@@ -863,6 +815,16 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+ port_lbd_ims_core_1_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
+ port_lbd_internal_1_port_network:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
port_lbd_internal_1_port_network_role:
type: string
required: true
@@ -879,18 +841,26 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
+ port_lbd_internal_1_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
port_lbd_dpdk_1_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- port_lbd_internal_1_port_subinterface_indicator:
+ compute_lbd_name:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
+ type: string
+ port_lbd_ims_core_1_port_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
port_lbd_dpdk_1_port_network_role:
type: string
required: true
@@ -1442,12 +1412,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_oam_oam_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_oam_1_port_network_role_tag:
type: string
required: true
@@ -1568,12 +1532,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_oam_internal_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_oam_availability_zone:
type: list
required: true
@@ -2037,12 +1995,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_oam_oam_2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_oam_2_port_security_groups:
type: list
required: true
@@ -2141,12 +2093,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_oam_internal_2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -3344,12 +3290,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_cdi_ims_core_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -3484,12 +3424,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_cdi_internal_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_cdi_metadata:
type: list
required: true
@@ -3947,6 +3881,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ compute_lbd_config_drive:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: boolean
+ port_lbd_dpdk_0_port_fixed_ips:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.neutron.port.FixedIps
port_lbd_internal_0_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -3959,10 +3905,22 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_lbd_internal_0_port_security_groups:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: json
vm_flavor_name:
type: string
required: true
status: SUPPORTED
+ port_lbd_dpdk_0_port_security_groups:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: json
compute_lbd_availability_zone:
type: list
required: true
@@ -3979,226 +3937,184 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_lbd_dpdk_0_port_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
vm_image_name:
type: string
required: true
status: SUPPORTED
- port_lbd_dpdk_0_port_ip_requirements:
+ port_lbd_dpdk_0_port_name:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_lbd_ims_core_0_port_order:
- type: integer
+ type: string
+ port_lbd_internal_0_port_subnetpoolid:
+ type: string
required: true
status: SUPPORTED
- port_lbd_ims_core_0_port_network:
+ port_lbd_dpdk_0_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- port_lbd_ims_core_0_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_lbd_ims_core_0_port_order:
+ type: integer
required: true
status: SUPPORTED
- port_lbd_ims_core_0_port_allowed_address_pairs:
- type: list
+ port_lbd_ims_core_0_port_network_role:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.heat.network.AddressPair
- port_lbd_internal_0_port_name:
+ port_lbd_ims_core_0_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_lbd_internal_0_port_subinterface_indicator:
+ port_lbd_dpdk_0_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_lbd_ims_core_0_port_network_role_tag:
+ type: string
+ port_lbd_dpdk_0_port_network_role_tag:
type: string
required: true
status: SUPPORTED
- compute_lbd_scheduler_hints:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- port_lbd_internal_0_port_mac_requirements:
+ port_lbd_ims_core_0_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_lbd_dpdk_0_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_lbd_ims_core_0_port_ip_requirements:
+ port_lbd_ims_core_0_port_allowed_address_pairs:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_lbd_ims_core_0_port_subinterface_indicator:
+ type: org.openecomp.datatypes.heat.network.AddressPair
+ port_lbd_internal_0_port_name:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_lbd_internal_0_port_network:
- type: list
+ type: string
+ port_lbd_internal_0_port_order:
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_lbd_dpdk_0_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_lbd_dpdk_0_port_network_role:
+ type: string
required: true
status: SUPPORTED
- compute_lbd_name:
+ port_lbd_ims_core_0_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- port_lbd_ims_core_0_port_security_groups:
- type: list
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_lbd_ims_core_0_port_subnetpoolid:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: json
- port_lbd_ims_core_0_port_name:
- type: list
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
+ port_lbd_ims_core_0_port_network_role_tag:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_lbd_internal_0_port_vlan_requirements:
+ compute_lbd_scheduler_hints:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- compute_lbd_config_drive:
- type: list
+ type: json
+ port_lbd_internal_0_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_lbd_dpdk_0_port_fixed_ips:
+ port_lbd_ims_core_0_port_fixed_ips:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_lbd_internal_0_port_security_groups:
- type: list
+ port_lbd_dpdk_0_port_order:
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: json
- port_lbd_dpdk_0_port_security_groups:
+ port_lbd_ims_core_0_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: json
- port_lbd_dpdk_0_port_vlan_requirements:
- type: list
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_lbd_ims_core_0_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_lbd_dpdk_0_port_name:
+ port_lbd_internal_0_port_fixed_ips:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- port_lbd_internal_0_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- port_lbd_ims_core_0_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_lbd_dpdk_0_port_network:
+ type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+ port_lbd_internal_0_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_lbd_dpdk_0_port_network_role_tag:
- type: string
+ port_lbd_dpdk_0_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_lbd_dpdk_0_port_subinterface_indicator:
+ compute_lbd_metadata:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_lbd_internal_0_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_lbd_dpdk_0_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_lbd_ims_core_0_port_vlan_requirements:
+ type: json
+ compute_lbd_name:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_lbd_ims_core_0_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_lbd_ims_core_0_port_fixed_ips:
+ type: string
+ port_lbd_internal_0_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_lbd_ims_core_0_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_lbd_internal_0_port_fixed_ips:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_lbd_ims_core_0_port_security_groups:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- compute_lbd_metadata:
+ type: json
+ port_lbd_ims_core_0_port_name:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: json
- port_lbd_internal_0_port_ip_requirements:
+ type: string
+ port_lbd_internal_0_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
+ type: org.openecomp.datatypes.network.VlanRequirements
requirements:
- dependency_lbd_lbd_ims_core_0_port:
capability: tosca.capabilities.Node
@@ -4748,22 +4664,10 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_cif_internal_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cif_oam_1_port_3_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_cif_ims_core_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -4774,12 +4678,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cif_ims_li_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cif_oam_1_port_3_allowed_address_pairs:
type: list
required: true
@@ -4864,12 +4762,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_cif_oam_1_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cif_ims_core_1_port_order:
type: integer
required: true
@@ -5084,12 +4976,6 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_cif_oam_1_port_3_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cif_oam_1_port_3_name:
type: list
required: true
@@ -6343,12 +6229,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_oam_internal_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_oam_0_port_fixed_ips:
type: list
required: true
@@ -6427,12 +6307,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_oam_oam_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_oam_oam_0_port_network_role_tag:
type: string
required: true
@@ -7631,12 +7505,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cif_oam_0_port_3_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cif_oam_0_port_1_order:
type: integer
required: true
@@ -7791,18 +7659,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_cif_ims_core_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
- port_cif_ims_li_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cif_oam_0_port_3_security_groups:
type: list
required: true
@@ -7819,12 +7675,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_cif_oam_0_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cif_oam_0_port_1_network:
type: list
required: true
@@ -7901,12 +7751,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_cif_internal_0_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cif_internal_0_port_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
index 6c1b8e5c95..c3d07be8f3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
@@ -2084,8 +2084,6 @@ topology_template:
port_cdi_ims_core_1_port_mac_requirements:
mac_count_required:
is_required: false
- port_cdi_ims_core_1_port_subinterface_indicator:
- - false
vm_image_name:
get_input: cdi_image_name
compute_cdi_scheduler_hints:
@@ -2155,8 +2153,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_cdi_internal_1_port_subinterface_indicator:
- - false
compute_cdi_metadata:
- vf_module_id:
get_input: vf_module_id
@@ -2508,6 +2504,8 @@ topology_template:
get_input: lbd_ims_core_v6_vip_0
compute_lbd_user_data_format:
- RAW
+ compute_lbd_config_drive:
+ - true
port_lbd_internal_1_port_name:
- str_replace:
template: $PREFIX$DELeth0
@@ -2521,6 +2519,15 @@ topology_template:
- ip_address: 128.0.0.0/1
- ip_address: ::/1
- ip_address: 8000::/1
+ port_lbd_ims_core_1_port_ip_requirements:
+ - ip_version: 6
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
+ port_lbd_dpdk_1_port_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_flavor_name:
get_input: lbd_flavor_name
port_lbd_ims_core_1_port_mac_requirements:
@@ -2528,10 +2535,16 @@ topology_template:
is_required: false
compute_lbd_availability_zone:
- get_input: availability_zone_1
+ port_lbd_internal_1_port_ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
+ port_lbd_internal_1_port_security_groups:
+ - - cscf_RSG
vm_image_name:
get_input: lbd_image_name
- port_lbd_dpdk_1_port_subinterface_indicator:
- - false
port_lbd_dpdk_1_port_network:
- cscf_internal_dpdk_network_0
port_lbd_ims_core_1_port_name:
@@ -2542,45 +2555,6 @@ topology_template:
get_input: lbd_name_1
$DEL:
get_input: vcscf_name_delimeter
- compute_lbd_scheduler_hints:
- - group: lbd_server_group_group
- port_lbd_dpdk_1_port_name:
- - str_replace:
- template: $PREFIX$DELeth1
- params:
- $PREFIX:
- get_input: lbd_name_1
- $DEL:
- get_input: vcscf_name_delimeter
- port_lbd_internal_1_port_network:
- - cscf_internal_network_0
- port_lbd_internal_1_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_lbd_name:
- - get_input: lbd_name_1
- port_lbd_ims_core_1_port_network_role_tag: ims_core
- compute_lbd_config_drive:
- - true
- port_lbd_ims_core_1_port_ip_requirements:
- - ip_version: 6
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- port_lbd_dpdk_1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_lbd_ims_core_1_port_subinterface_indicator:
- - false
- port_lbd_internal_1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- port_lbd_internal_1_port_security_groups:
- - - cscf_RSG
port_lbd_ims_core_1_port_security_groups:
- - cscf_RSG
port_lbd_ims_core_1_port_fixed_ips:
@@ -2591,11 +2565,23 @@ topology_template:
get_input: lbd_internal_ip_1
port_lbd_ims_core_1_port_network:
- get_input: ims_core_net_id
+ compute_lbd_scheduler_hints:
+ - group: lbd_server_group_group
+ port_lbd_dpdk_1_port_name:
+ - str_replace:
+ template: $PREFIX$DELeth1
+ params:
+ $PREFIX:
+ get_input: lbd_name_1
+ $DEL:
+ get_input: vcscf_name_delimeter
port_lbd_dpdk_1_port_security_groups:
- - cscf_RSG
port_lbd_dpdk_1_port_fixed_ips:
- ip_address:
get_input: lbd_internal_dpdk_ip_1
+ port_lbd_internal_1_port_network:
+ - cscf_internal_network_0
port_lbd_dpdk_1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -2612,8 +2598,12 @@ topology_template:
get_input: vnf_name
vf_module_name:
get_input: vf_module_name
- port_lbd_internal_1_port_subinterface_indicator:
- - false
+ port_lbd_internal_1_port_mac_requirements:
+ mac_count_required:
+ is_required: false
+ compute_lbd_name:
+ - get_input: lbd_name_1
+ port_lbd_ims_core_1_port_network_role_tag: ims_core
service_template_filter:
substitute_service_template: Nested_lbdServiceTemplate.yaml
count: 1
@@ -2851,12 +2841,8 @@ topology_template:
get_input: cdi_internal_ip_0
- ip_address:
get_input: cdi_internal_v6_ip_0
- port_cdi_ims_core_0_port_subinterface_indicator:
- - false
compute_cdi_config_drive:
- true
- port_cdi_internal_0_port_subinterface_indicator:
- - false
port_cdi_internal_0_port_security_groups:
- - cscf_RSG
port_cdi_ims_core_0_port_security_groups:
@@ -2946,8 +2932,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_oam_oam_1_port_subinterface_indicator:
- - false
port_oam_oam_1_port_network_role_tag: oam
port_oam_oam_1_port_security_groups:
- - cscf_RSG
@@ -2996,8 +2980,6 @@ topology_template:
get_input: vcscf_name_delimeter
compute_oam_scheduler_hints:
- group: oam_server_group_group
- port_oam_internal_1_port_subinterface_indicator:
- - false
compute_oam_availability_zone:
- get_input: availability_zone_1
compute_oam_metadata:
@@ -3041,8 +3023,6 @@ topology_template:
- substitutable
properties:
port_oam_oam_2_port_network_role_tag: oam
- port_oam_oam_2_port_subinterface_indicator:
- - false
port_oam_oam_2_port_security_groups:
- - cscf_RSG
port_oam_oam_2_port_name:
@@ -3086,8 +3066,6 @@ topology_template:
port_oam_oam_2_port_mac_requirements:
mac_count_required:
is_required: false
- port_oam_internal_2_port_subinterface_indicator:
- - false
port_oam_oam_2_port_network:
- get_input: oam_net_id
compute_oam_user_data_format:
@@ -3225,8 +3203,6 @@ topology_template:
get_input: oam_name_0
$DEL:
get_input: vcscf_name_delimeter
- port_oam_internal_0_port_subinterface_indicator:
- - false
port_oam_oam_0_port_fixed_ips:
- ip_address:
get_input: oam_oam_ip_0
@@ -3263,8 +3239,6 @@ topology_template:
port_oam_internal_0_port_fixed_ips:
- ip_address:
get_input: oam_internal_ip_0
- port_oam_oam_0_port_subinterface_indicator:
- - false
port_oam_oam_0_port_network_role_tag: oam
compute_oam_user_data_format:
- RAW
@@ -3326,8 +3300,17 @@ topology_template:
properties:
compute_lbd_user_data_format:
- RAW
+ compute_lbd_config_drive:
+ - true
+ port_lbd_dpdk_0_port_fixed_ips:
+ - ip_address:
+ get_input: lbd_internal_dpdk_ip_0
+ port_lbd_internal_0_port_security_groups:
+ - - cscf_RSG
vm_flavor_name:
get_input: lbd_flavor_name
+ port_lbd_dpdk_0_port_security_groups:
+ - - cscf_RSG
compute_lbd_availability_zone:
- get_input: availability_zone_0
port_lbd_dpdk_0_port_allowed_address_pairs:
@@ -3337,6 +3320,14 @@ topology_template:
- ip_address: 8000::/1
vm_image_name:
get_input: lbd_image_name
+ port_lbd_dpdk_0_port_name:
+ - str_replace:
+ template: $PREFIX$DELeth1
+ params:
+ $PREFIX:
+ get_input: lbd_name_0
+ $DEL:
+ get_input: vcscf_name_delimeter
port_lbd_dpdk_0_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -3345,6 +3336,8 @@ topology_template:
is_required: false
port_lbd_ims_core_0_port_network:
- get_input: ims_core_net_id
+ port_lbd_dpdk_0_port_network:
+ - cscf_internal_dpdk_network_0
port_lbd_ims_core_0_port_mac_requirements:
mac_count_required:
is_required: false
@@ -3359,66 +3352,29 @@ topology_template:
get_input: lbd_name_0
$DEL:
get_input: vcscf_name_delimeter
- port_lbd_internal_0_port_subinterface_indicator:
- - false
port_lbd_ims_core_0_port_network_role_tag: ims_core
compute_lbd_scheduler_hints:
- group: lbd_server_group_group
port_lbd_internal_0_port_mac_requirements:
mac_count_required:
is_required: false
+ port_lbd_ims_core_0_port_fixed_ips:
+ - ip_address:
+ get_input: lbd_ims_core_v6_ip_0
port_lbd_ims_core_0_port_ip_requirements:
- ip_version: 6
ip_count_required:
is_required: true
floating_ip_count_required:
is_required: false
- port_lbd_ims_core_0_port_subinterface_indicator:
- - false
+ port_lbd_internal_0_port_fixed_ips:
+ - ip_address:
+ get_input: lbd_internal_ip_0
port_lbd_internal_0_port_network:
- cscf_internal_network_0
port_lbd_dpdk_0_port_mac_requirements:
mac_count_required:
is_required: false
- compute_lbd_name:
- - get_input: lbd_name_0
- port_lbd_ims_core_0_port_security_groups:
- - - cscf_RSG
- port_lbd_ims_core_0_port_name:
- - str_replace:
- template: $PREFIX$DELeth2
- params:
- $PREFIX:
- get_input: lbd_name_0
- $DEL:
- get_input: vcscf_name_delimeter
- compute_lbd_config_drive:
- - true
- port_lbd_dpdk_0_port_fixed_ips:
- - ip_address:
- get_input: lbd_internal_dpdk_ip_0
- port_lbd_internal_0_port_security_groups:
- - - cscf_RSG
- port_lbd_dpdk_0_port_security_groups:
- - - cscf_RSG
- port_lbd_dpdk_0_port_name:
- - str_replace:
- template: $PREFIX$DELeth1
- params:
- $PREFIX:
- get_input: lbd_name_0
- $DEL:
- get_input: vcscf_name_delimeter
- port_lbd_dpdk_0_port_network:
- - cscf_internal_dpdk_network_0
- port_lbd_dpdk_0_port_subinterface_indicator:
- - false
- port_lbd_ims_core_0_port_fixed_ips:
- - ip_address:
- get_input: lbd_ims_core_v6_ip_0
- port_lbd_internal_0_port_fixed_ips:
- - ip_address:
- get_input: lbd_internal_ip_0
compute_lbd_metadata:
- vf_module_id:
get_input: vf_module_id
@@ -3429,12 +3385,24 @@ topology_template:
get_input: vnf_name
vf_module_name:
get_input: vf_module_name
+ compute_lbd_name:
+ - get_input: lbd_name_0
port_lbd_internal_0_port_ip_requirements:
- ip_version: 4
ip_count_required:
is_required: true
floating_ip_count_required:
is_required: false
+ port_lbd_ims_core_0_port_security_groups:
+ - - cscf_RSG
+ port_lbd_ims_core_0_port_name:
+ - str_replace:
+ template: $PREFIX$DELeth2
+ params:
+ $PREFIX:
+ get_input: lbd_name_0
+ $DEL:
+ get_input: vcscf_name_delimeter
service_template_filter:
substitute_service_template: Nested_lbd_1ServiceTemplate.yaml
count: 1
@@ -3665,8 +3633,6 @@ topology_template:
get_input: cif_name_0
$DEL:
get_input: vcscf_name_delimeter
- port_cif_oam_0_port_3_subinterface_indicator:
- - false
vm_image_name:
get_input: cif_image_name
compute_cif_user_data_format:
@@ -3724,10 +3690,6 @@ topology_template:
get_input: vcscf_name_delimeter
port_cif_internal_0_port_network:
- cscf_internal_network_0
- port_cif_ims_core_0_port_subinterface_indicator:
- - false
- port_cif_ims_li_0_port_subinterface_indicator:
- - false
port_cif_oam_0_port_3_security_groups:
- - cscf_RSG
port_cif_ims_core_0_port_ip_requirements:
@@ -3739,8 +3701,6 @@ topology_template:
port_cif_ims_li_0_port_mac_requirements:
mac_count_required:
is_required: false
- port_cif_oam_0_port_1_subinterface_indicator:
- - false
port_cif_oam_0_port_1_network:
- get_input: oam_net_id
port_cif_ims_li_0_port_security_groups:
@@ -3763,8 +3723,6 @@ topology_template:
port_cif_ims_li_0_port_allowed_address_pairs:
- ip_address:
get_input: cif_ims_li_v6_vip_0
- port_cif_internal_0_port_subinterface_indicator:
- - false
port_cif_internal_0_port_mac_requirements:
mac_count_required:
is_required: false
@@ -3858,16 +3816,10 @@ topology_template:
- get_input: oam_net_id
vm_flavor_name:
get_input: cif_flavor_name
- port_cif_internal_1_port_subinterface_indicator:
- - false
- port_cif_ims_core_1_port_subinterface_indicator:
- - false
vm_image_name:
get_input: cif_image_name
compute_cif_user_data_format:
- RAW
- port_cif_ims_li_1_port_subinterface_indicator:
- - false
port_cif_oam_1_port_3_allowed_address_pairs:
- ip_address:
get_input: cif_oam_vip_1
@@ -3904,8 +3856,6 @@ topology_template:
get_input: vnf_name
vf_module_name:
get_input: vf_module_name
- port_cif_oam_1_port_1_subinterface_indicator:
- - false
port_cif_oam_1_port_1_fixed_ips:
- ip_address:
get_input: cif_oam_ip_1
@@ -4004,8 +3954,6 @@ topology_template:
get_input: vcscf_name_delimeter
compute_cif_config_drive:
- true
- port_cif_oam_1_port_3_subinterface_indicator:
- - false
port_cif_oam_1_port_3_name:
- str_replace:
template: $PREFIX$DELeth3
@@ -4209,4 +4157,4 @@ topology_template:
get_input: vnf_name
container_type: host
targets:
- - tdcore_zone_1_server_group_group \ No newline at end of file
+ - tdcore_zone_1_server_group_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
index ab4499b8d9..37354cf0a8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
@@ -108,21 +108,11 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_cdi_ims_core_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_cdi_config_drive:
type: list
required: true
entry_schema:
type: boolean
- port_cdi_internal_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -188,10 +178,7 @@ topology_template:
get_input: port_cdi_ims_core_0_port_exCP_naming
vlan_requirements:
get_input: port_cdi_ims_core_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cdi_ims_core_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cdi_ims_core_0_port_ip_requirements
network_role_tag:
@@ -265,10 +252,7 @@ topology_template:
get_input: port_cdi_internal_0_port_exCP_naming
vlan_requirements:
get_input: port_cdi_internal_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cdi_internal_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cdi_internal_0_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
index 462ce4b069..1e5366896c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
@@ -36,11 +36,6 @@ topology_template:
port_cdi_ims_core_1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_cdi_ims_core_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -151,11 +146,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_cdi_internal_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_cdi_metadata:
type: list
required: true
@@ -188,10 +178,7 @@ topology_template:
get_input: port_cdi_internal_1_port_exCP_naming
vlan_requirements:
get_input: port_cdi_internal_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cdi_internal_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cdi_internal_1_port_ip_requirements
network_role_tag:
@@ -265,10 +252,7 @@ topology_template:
get_input: port_cdi_ims_core_1_port_exCP_naming
vlan_requirements:
get_input: port_cdi_ims_core_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cdi_ims_core_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cdi_ims_core_1_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
index 275a1ecb4d..4f95a1d7c5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
@@ -42,11 +42,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cif_oam_0_port_3_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cif_oam_0_port_1_order:
type: integer
required: true
@@ -170,16 +165,6 @@ topology_template:
port_cif_ims_core_0_port_order:
type: integer
required: true
- port_cif_ims_core_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_cif_ims_li_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cif_oam_0_port_3_security_groups:
type: list
required: true
@@ -193,11 +178,6 @@ topology_template:
port_cif_ims_li_0_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_cif_oam_0_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cif_oam_0_port_1_network:
type: list
required: true
@@ -259,11 +239,6 @@ topology_template:
port_cif_ims_core_0_port_subnetpoolid:
type: string
required: true
- port_cif_internal_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cif_internal_0_port_network_role_tag:
type: string
required: true
@@ -393,10 +368,7 @@ topology_template:
get_input: port_cif_internal_0_port_exCP_naming
vlan_requirements:
get_input: port_cif_internal_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_internal_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_internal_0_port_ip_requirements
network_role_tag:
@@ -439,10 +411,7 @@ topology_template:
get_input: port_cif_ims_li_0_port_exCP_naming
vlan_requirements:
get_input: port_cif_ims_li_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_ims_li_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_ims_li_0_port_ip_requirements
network_role_tag:
@@ -485,10 +454,7 @@ topology_template:
get_input: port_cif_ims_core_0_port_exCP_naming
vlan_requirements:
get_input: port_cif_ims_core_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_ims_core_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_ims_core_0_port_ip_requirements
network_role_tag:
@@ -531,10 +497,7 @@ topology_template:
get_input: port_cif_oam_0_port_1_exCP_naming
vlan_requirements:
get_input: port_cif_oam_0_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_oam_0_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_oam_0_port_1_ip_requirements
network_role_tag:
@@ -577,10 +540,7 @@ topology_template:
get_input: port_cif_oam_0_port_3_exCP_naming
vlan_requirements:
get_input: port_cif_oam_0_port_3_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_oam_0_port_3_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_oam_0_port_3_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
index a2d95fddbc..0e02d6611d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
@@ -40,19 +40,9 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_cif_internal_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cif_oam_1_port_3_subnetpoolid:
type: string
required: true
- port_cif_ims_core_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -61,11 +51,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cif_ims_li_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cif_oam_1_port_3_allowed_address_pairs:
type: list
required: true
@@ -134,11 +119,6 @@ topology_template:
port_cif_ims_li_1_port_network_role:
type: string
required: true
- port_cif_oam_1_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cif_ims_core_1_port_order:
type: integer
required: true
@@ -312,11 +292,6 @@ topology_template:
port_cif_oam_1_port_3_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_cif_oam_1_port_3_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cif_oam_1_port_3_name:
type: list
required: true
@@ -393,10 +368,7 @@ topology_template:
get_input: port_cif_ims_li_1_port_exCP_naming
vlan_requirements:
get_input: port_cif_ims_li_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_ims_li_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_ims_li_1_port_ip_requirements
network_role_tag:
@@ -439,10 +411,7 @@ topology_template:
get_input: port_cif_internal_1_port_exCP_naming
vlan_requirements:
get_input: port_cif_internal_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_internal_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_internal_1_port_ip_requirements
network_role_tag:
@@ -485,10 +454,7 @@ topology_template:
get_input: port_cif_oam_1_port_1_exCP_naming
vlan_requirements:
get_input: port_cif_oam_1_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_oam_1_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_oam_1_port_1_ip_requirements
network_role_tag:
@@ -531,10 +497,7 @@ topology_template:
get_input: port_cif_ims_core_1_port_exCP_naming
vlan_requirements:
get_input: port_cif_ims_core_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_ims_core_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_ims_core_1_port_ip_requirements
network_role_tag:
@@ -577,10 +540,7 @@ topology_template:
get_input: port_cif_oam_1_port_3_exCP_naming
vlan_requirements:
get_input: port_cif_oam_1_port_3_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cif_oam_1_port_3_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cif_oam_1_port_3_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
index 34628a22a5..40d031a7ef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
+ port_lbd_internal_1_port_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_lbd_ims_core_1_port_allowed_address_pairs:
type: list
required: true
@@ -21,6 +26,11 @@ topology_template:
required: true
entry_schema:
type: string
+ compute_lbd_config_drive:
+ type: list
+ required: true
+ entry_schema:
+ type: boolean
port_lbd_internal_1_port_name:
type: list
required: true
@@ -31,6 +41,19 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.network.AddressPair
+ port_lbd_ims_core_1_port_ip_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_lbd_ims_core_1_port_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_lbd_dpdk_1_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_lbd_dpdk_1_port_subnetpoolid:
type: string
required: true
@@ -54,14 +77,22 @@ topology_template:
port_lbd_internal_1_port_order:
type: integer
required: true
- vm_image_name:
- type: string
+ port_lbd_internal_1_port_ip_requirements:
+ type: list
required: true
- port_lbd_dpdk_1_port_subinterface_indicator:
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_lbd_internal_1_port_security_groups:
type: list
required: true
entry_schema:
- type: boolean
+ type: json
+ port_lbd_ims_core_1_port_subnetpoolid:
+ type: string
+ required: true
+ vm_image_name:
+ type: string
+ required: true
port_lbd_dpdk_1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -84,76 +115,6 @@ topology_template:
port_lbd_ims_core_1_port_network_role:
type: string
required: true
- compute_lbd_scheduler_hints:
- type: list
- required: true
- entry_schema:
- type: json
- port_lbd_dpdk_1_port_name:
- type: list
- required: true
- entry_schema:
- type: string
- port_lbd_ims_core_1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_lbd_internal_1_port_network:
- type: list
- required: true
- entry_schema:
- type: string
- port_lbd_internal_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- compute_lbd_name:
- type: list
- required: true
- entry_schema:
- type: string
- port_lbd_ims_core_1_port_network_role_tag:
- type: string
- required: true
- port_lbd_internal_1_port_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- compute_lbd_config_drive:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_lbd_ims_core_1_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_lbd_ims_core_1_port_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_lbd_dpdk_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_lbd_ims_core_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_lbd_internal_1_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_lbd_internal_1_port_security_groups:
- type: list
- required: true
- entry_schema:
- type: json
- port_lbd_ims_core_1_port_subnetpoolid:
- type: string
- required: true
port_lbd_internal_1_port_subnetpoolid:
type: string
required: true
@@ -187,6 +148,16 @@ topology_template:
port_lbd_dpdk_1_port_network_role_tag:
type: string
required: true
+ compute_lbd_scheduler_hints:
+ type: list
+ required: true
+ entry_schema:
+ type: json
+ port_lbd_dpdk_1_port_name:
+ type: list
+ required: true
+ entry_schema:
+ type: string
port_lbd_dpdk_1_port_security_groups:
type: list
required: true
@@ -197,6 +168,14 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+ port_lbd_ims_core_1_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ port_lbd_internal_1_port_network:
+ type: list
+ required: true
+ entry_schema:
+ type: string
port_lbd_internal_1_port_network_role:
type: string
required: true
@@ -210,16 +189,22 @@ topology_template:
required: true
entry_schema:
type: json
+ port_lbd_internal_1_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_lbd_dpdk_1_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- port_lbd_internal_1_port_subinterface_indicator:
+ compute_lbd_name:
type: list
required: true
entry_schema:
- type: boolean
+ type: string
+ port_lbd_ims_core_1_port_network_role_tag:
+ type: string
+ required: true
port_lbd_dpdk_1_port_network_role:
type: string
required: true
@@ -241,10 +226,7 @@ topology_template:
get_input: port_lbd_ims_core_1_port_exCP_naming
vlan_requirements:
get_input: port_lbd_ims_core_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_lbd_ims_core_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_lbd_ims_core_1_port_ip_requirements
network_role_tag:
@@ -287,10 +269,7 @@ topology_template:
get_input: port_lbd_dpdk_1_port_exCP_naming
vlan_requirements:
get_input: port_lbd_dpdk_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_lbd_dpdk_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_lbd_dpdk_1_port_ip_requirements
network_role_tag:
@@ -331,22 +310,19 @@ topology_template:
get_input: port_lbd_internal_1_port_exCP_naming
vlan_requirements:
get_input: port_lbd_internal_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_lbd_internal_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_lbd_internal_1_port_ip_requirements
network_role_tag:
get_input: port_lbd_internal_1_port_network_role_tag
network_role:
get_input: port_lbd_internal_1_port_network_role
- subnetpoolid:
- get_input: port_lbd_internal_1_port_subnetpoolid
fixed_ips:
get_input:
- port_lbd_internal_1_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_lbd_internal_1_port_subnetpoolid
name:
get_input:
- port_lbd_internal_1_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
index 15b0d89cd5..6cf9d097ad 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
@@ -19,6 +19,16 @@ topology_template:
required: true
entry_schema:
type: string
+ compute_lbd_config_drive:
+ type: list
+ required: true
+ entry_schema:
+ type: boolean
+ port_lbd_dpdk_0_port_fixed_ips:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.heat.neutron.port.FixedIps
port_lbd_internal_0_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -28,9 +38,19 @@ topology_template:
port_lbd_internal_0_port_network_role:
type: string
required: true
+ port_lbd_internal_0_port_security_groups:
+ type: list
+ required: true
+ entry_schema:
+ type: json
vm_flavor_name:
type: string
required: true
+ port_lbd_dpdk_0_port_security_groups:
+ type: list
+ required: true
+ entry_schema:
+ type: json
compute_lbd_availability_zone:
type: list
required: true
@@ -44,9 +64,22 @@ topology_template:
port_lbd_dpdk_0_port_subnetpoolid:
type: string
required: true
+ port_lbd_dpdk_0_port_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
vm_image_name:
type: string
required: true
+ port_lbd_dpdk_0_port_name:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ port_lbd_internal_0_port_subnetpoolid:
+ type: string
+ required: true
port_lbd_dpdk_0_port_ip_requirements:
type: list
required: true
@@ -55,11 +88,22 @@ topology_template:
port_lbd_ims_core_0_port_order:
type: integer
required: true
+ port_lbd_ims_core_0_port_network_role:
+ type: string
+ required: true
port_lbd_ims_core_0_port_network:
type: list
required: true
entry_schema:
type: string
+ port_lbd_dpdk_0_port_network:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ port_lbd_dpdk_0_port_network_role_tag:
+ type: string
+ required: true
port_lbd_ims_core_0_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -73,11 +117,27 @@ topology_template:
required: true
entry_schema:
type: string
- port_lbd_internal_0_port_subinterface_indicator:
+ port_lbd_internal_0_port_order:
+ type: integer
+ required: true
+ port_lbd_dpdk_0_port_network_role:
+ type: string
+ required: true
+ port_lbd_ims_core_0_port_vlan_requirements:
type: list
required: true
entry_schema:
- type: boolean
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_lbd_ims_core_0_port_subnetpoolid:
+ type: string
+ required: true
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
port_lbd_ims_core_0_port_network_role_tag:
type: string
required: true
@@ -89,6 +149,11 @@ topology_template:
port_lbd_internal_0_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
+ port_lbd_ims_core_0_port_fixed_ips:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.heat.neutron.port.FixedIps
port_lbd_dpdk_0_port_order:
type: integer
required: true
@@ -97,11 +162,14 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_lbd_ims_core_0_port_subinterface_indicator:
+ port_lbd_ims_core_0_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ port_lbd_internal_0_port_fixed_ips:
type: list
required: true
entry_schema:
- type: boolean
+ type: org.openecomp.datatypes.heat.neutron.port.FixedIps
port_lbd_internal_0_port_network:
type: list
required: true
@@ -110,119 +178,36 @@ topology_template:
port_lbd_dpdk_0_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- compute_lbd_name:
- type: list
- required: true
- entry_schema:
- type: string
- port_lbd_ims_core_0_port_security_groups:
+ compute_lbd_metadata:
type: list
required: true
entry_schema:
type: json
- port_lbd_ims_core_0_port_name:
+ compute_lbd_name:
type: list
required: true
entry_schema:
type: string
- port_lbd_internal_0_port_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- compute_lbd_config_drive:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_lbd_dpdk_0_port_fixed_ips:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_lbd_internal_0_port_security_groups:
+ port_lbd_internal_0_port_ip_requirements:
type: list
required: true
entry_schema:
- type: json
- port_lbd_dpdk_0_port_security_groups:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_lbd_ims_core_0_port_security_groups:
type: list
required: true
entry_schema:
type: json
- port_lbd_dpdk_0_port_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_lbd_dpdk_0_port_name:
- type: list
- required: true
- entry_schema:
- type: string
- port_lbd_internal_0_port_subnetpoolid:
- type: string
- required: true
- port_lbd_ims_core_0_port_network_role:
- type: string
- required: true
- port_lbd_dpdk_0_port_network:
+ port_lbd_ims_core_0_port_name:
type: list
required: true
entry_schema:
type: string
- port_lbd_dpdk_0_port_network_role_tag:
- type: string
- required: true
- port_lbd_dpdk_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_lbd_internal_0_port_order:
- type: integer
- required: true
- port_lbd_dpdk_0_port_network_role:
- type: string
- required: true
- port_lbd_ims_core_0_port_vlan_requirements:
+ port_lbd_internal_0_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- port_lbd_ims_core_0_port_subnetpoolid:
- type: string
- required: true
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_lbd_ims_core_0_port_fixed_ips:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_lbd_ims_core_0_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_lbd_internal_0_port_fixed_ips:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- compute_lbd_metadata:
- type: list
- required: true
- entry_schema:
- type: json
- port_lbd_internal_0_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
node_templates:
lbd_lbd_ims_core_0_port:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -241,10 +226,7 @@ topology_template:
get_input: port_lbd_ims_core_0_port_exCP_naming
vlan_requirements:
get_input: port_lbd_ims_core_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_lbd_ims_core_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_lbd_ims_core_0_port_ip_requirements
network_role_tag:
@@ -287,10 +269,7 @@ topology_template:
get_input: port_lbd_dpdk_0_port_exCP_naming
vlan_requirements:
get_input: port_lbd_dpdk_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_lbd_dpdk_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_lbd_dpdk_0_port_ip_requirements
network_role_tag:
@@ -331,22 +310,19 @@ topology_template:
get_input: port_lbd_internal_0_port_exCP_naming
vlan_requirements:
get_input: port_lbd_internal_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_lbd_internal_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_lbd_internal_0_port_ip_requirements
network_role_tag:
get_input: port_lbd_internal_0_port_network_role_tag
network_role:
get_input: port_lbd_internal_0_port_network_role
- subnetpoolid:
- get_input: port_lbd_internal_0_port_subnetpoolid
fixed_ips:
get_input:
- port_lbd_internal_0_port_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_lbd_internal_0_port_subnetpoolid
name:
get_input:
- port_lbd_internal_0_port_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
index 1448429d91..342b6795fc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
@@ -22,11 +22,6 @@ topology_template:
port_oam_internal_0_port_subnetpoolid:
type: string
required: true
- port_oam_internal_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_oam_0_port_fixed_ips:
type: list
required: true
@@ -90,11 +85,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_oam_oam_0_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_oam_0_port_network_role_tag:
type: string
required: true
@@ -188,10 +178,7 @@ topology_template:
get_input: port_oam_oam_0_port_exCP_naming
vlan_requirements:
get_input: port_oam_oam_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_oam_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_oam_0_port_ip_requirements
network_role_tag:
@@ -234,10 +221,7 @@ topology_template:
get_input: port_oam_internal_0_port_exCP_naming
vlan_requirements:
get_input: port_oam_internal_0_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_internal_0_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_internal_0_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
index 08a7d58f36..1c727e5b8f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
@@ -38,11 +38,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_oam_oam_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_oam_1_port_network_role_tag:
type: string
required: true
@@ -141,11 +136,6 @@ topology_template:
required: true
entry_schema:
type: json
- port_oam_internal_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_oam_availability_zone:
type: list
required: true
@@ -188,10 +178,7 @@ topology_template:
get_input: port_oam_internal_1_port_exCP_naming
vlan_requirements:
get_input: port_oam_internal_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_internal_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_internal_1_port_ip_requirements
network_role_tag:
@@ -234,10 +221,7 @@ topology_template:
get_input: port_oam_oam_1_port_exCP_naming
vlan_requirements:
get_input: port_oam_oam_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_oam_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_oam_1_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
index 2b4a83915e..6d835ea8fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
port_oam_oam_2_port_network_role_tag:
type: string
required: true
- port_oam_oam_2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_oam_oam_2_port_security_groups:
type: list
required: true
@@ -97,11 +92,6 @@ topology_template:
port_oam_oam_2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_oam_internal_2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -188,10 +178,7 @@ topology_template:
get_input: port_oam_internal_2_port_exCP_naming
vlan_requirements:
get_input: port_oam_internal_2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_internal_2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_internal_2_port_ip_requirements
network_role_tag:
@@ -234,10 +221,7 @@ topology_template:
get_input: port_oam_oam_2_port_exCP_naming
vlan_requirements:
get_input: port_oam_oam_2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_oam_oam_2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_oam_oam_2_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml
index 658b0d62a4..73d44bd634 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml
@@ -211,6 +211,10 @@ topology_template:
cscf_internal_0_port_0:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_cscf_internal_0_port_0_subnetpoolid
+ network:
+ get_input: internal_net_id
ip_requirements:
get_input: port_cscf_internal_0_port_0_ip_requirements
security_groups:
@@ -226,10 +230,9 @@ topology_template:
get_input:
- cscf_internal_v6_ips
- get_input: index
- subnetpoolid:
- get_input: port_cscf_internal_0_port_0_subnetpoolid
mac_requirements:
get_input: port_cscf_internal_0_port_0_mac_requirements
+ subinterface_indicator: false
name:
str_replace:
template: $PREFIX$DELeth0
@@ -246,8 +249,6 @@ topology_template:
get_input: port_cscf_internal_0_port_0_vlan_requirements
network_role_tag:
get_input: port_cscf_internal_0_port_0_network_role_tag
- network:
- get_input: internal_net_id
order:
get_input: port_cscf_internal_0_port_0_order
requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml
index 65e2fb86e9..e13629478c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml
@@ -224,6 +224,10 @@ topology_template:
tdcore_internal_0_port_0:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_tdcore_internal_0_port_0_subnetpoolid
+ network:
+ get_input: internal_net_id
ip_requirements:
get_input: port_tdcore_internal_0_port_0_ip_requirements
security_groups:
@@ -235,10 +239,9 @@ topology_template:
get_input:
- tdcore_internal_ips
- get_input: index
- subnetpoolid:
- get_input: port_tdcore_internal_0_port_0_subnetpoolid
mac_requirements:
get_input: port_tdcore_internal_0_port_0_mac_requirements
+ subinterface_indicator: false
name:
str_replace:
template: $PREFIX$DELeth0
@@ -255,8 +258,6 @@ topology_template:
get_input: port_tdcore_internal_0_port_0_vlan_requirements
network_role_tag:
get_input: port_tdcore_internal_0_port_0_network_role_tag
- network:
- get_input: internal_net_id
order:
get_input: port_tdcore_internal_0_port_0_order
requirements:
@@ -289,6 +290,7 @@ topology_template:
- get_input: index
mac_requirements:
get_input: port_tdcore_dpdk_0_port_1_mac_requirements
+ subinterface_indicator: false
name:
str_replace:
template: $PREFIX$DELeth1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index a689fa4403..7c80b6149d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -3458,4 +3458,4 @@ topology_template:
value: vson_dbs_volume_1
vson_mon_server_group_id:
description: ID of the Server Group intended for vSON MON instances.
- value: UNSUPPORTED_RESOURCE_vson_mon_server_group \ No newline at end of file
+ value: UNSUPPORTED_RESOURCE_vson_mon_server_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
index 0286b378ce..8e29ff83a5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
@@ -226,6 +226,10 @@ topology_template:
vson_server_oam_net_port_20:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_vson_server_oam_net_port_20_subnetpoolid
+ network:
+ get_input: oam_net_id
ip_requirements:
get_input: port_vson_server_oam_net_port_20_ip_requirements
security_groups:
@@ -237,10 +241,9 @@ topology_template:
get_input:
- oam_net_ips
- get_input: instance_index
- subnetpoolid:
- get_input: port_vson_server_oam_net_port_20_subnetpoolid
mac_requirements:
get_input: port_vson_server_oam_net_port_20_mac_requirements
+ subinterface_indicator: false
name:
str_replace:
template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -259,8 +262,6 @@ topology_template:
get_input: port_vson_server_oam_net_port_20_vlan_requirements
network_role_tag:
get_input: port_vson_server_oam_net_port_20_network_role_tag
- network:
- get_input: oam_net_id
order:
get_input: port_vson_server_oam_net_port_20_order
requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
index b53841145b..2814364cfb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
@@ -213,6 +213,10 @@ topology_template:
vson_server_oam_net_port_10:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_vson_server_oam_net_port_10_subnetpoolid
+ network:
+ get_input: oam_net_id
ip_requirements:
get_input: port_vson_server_oam_net_port_10_ip_requirements
security_groups:
@@ -224,10 +228,9 @@ topology_template:
get_input:
- oam_net_ips
- get_input: instance_index
- subnetpoolid:
- get_input: port_vson_server_oam_net_port_10_subnetpoolid
mac_requirements:
get_input: port_vson_server_oam_net_port_10_mac_requirements
+ subinterface_indicator: false
name:
str_replace:
template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -246,8 +249,6 @@ topology_template:
get_input: port_vson_server_oam_net_port_10_vlan_requirements
network_role_tag:
get_input: port_vson_server_oam_net_port_10_network_role_tag
- network:
- get_input: oam_net_id
order:
get_input: port_vson_server_oam_net_port_10_order
requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
index 5f7bbc52f4..0ab6d2e292 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
@@ -228,6 +228,10 @@ topology_template:
vson_server_oam_net_port_00:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_vson_server_oam_net_port_00_subnetpoolid
+ network:
+ get_input: oam_net_id
ip_requirements:
get_input: port_vson_server_oam_net_port_00_ip_requirements
security_groups:
@@ -239,10 +243,9 @@ topology_template:
get_input:
- oam_net_ips
- get_input: instance_index
- subnetpoolid:
- get_input: port_vson_server_oam_net_port_00_subnetpoolid
mac_requirements:
get_input: port_vson_server_oam_net_port_00_mac_requirements
+ subinterface_indicator: false
name:
str_replace:
template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -261,8 +264,6 @@ topology_template:
get_input: port_vson_server_oam_net_port_00_vlan_requirements
network_role_tag:
get_input: port_vson_server_oam_net_port_00_network_role_tag
- network:
- get_input: oam_net_id
order:
get_input: port_vson_server_oam_net_port_00_order
requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
index cffb1be0a7..4f102dd2d7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
@@ -248,6 +248,10 @@ topology_template:
vson_server_oam_net_port_0:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_vson_server_oam_net_port_0_subnetpoolid
+ network:
+ get_input: oam_net_id
ip_requirements:
get_input: port_vson_server_oam_net_port_0_ip_requirements
security_groups:
@@ -263,10 +267,9 @@ topology_template:
get_input:
- oam_net_v6_ips
- get_input: instance_index
- subnetpoolid:
- get_input: port_vson_server_oam_net_port_0_subnetpoolid
mac_requirements:
get_input: port_vson_server_oam_net_port_0_mac_requirements
+ subinterface_indicator: false
name:
str_replace:
template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -285,8 +288,6 @@ topology_template:
get_input: port_vson_server_oam_net_port_0_vlan_requirements
network_role_tag:
get_input: port_vson_server_oam_net_port_0_network_role_tag
- network:
- get_input: oam_net_id
order:
get_input: port_vson_server_oam_net_port_0_order
requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ac8621e29b..94ebe4da6c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -866,12 +866,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui_port_5_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_cmaui_availability_zone:
type: list
required: true
@@ -960,12 +954,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_cmaui_port_6_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_5_vlan_requirements:
type: list
required: true
@@ -1445,12 +1433,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_cmaui_port_4_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_4_fixed_ips:
type: list
required: true
@@ -1531,12 +1513,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_cmaui_port_3_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_4_network_role_tag:
type: string
required: true
@@ -3808,12 +3784,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_cmaui_port_2_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_1_security_groups:
type: list
required: true
@@ -3902,12 +3872,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- port_cmaui_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_cmaui_port_1_replacement_policy:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
index 1fc1065837..8f42b61c6a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
@@ -36,11 +36,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui_port_5_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_cmaui_availability_zone:
type: list
required: true
@@ -113,11 +108,6 @@ topology_template:
port_cmaui_port_5_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_cmaui_port_6_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_5_vlan_requirements:
type: list
required: true
@@ -160,22 +150,19 @@ topology_template:
get_input: port_cmaui_port_5_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_5_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_5_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_5_ip_requirements
network_role_tag:
get_input: port_cmaui_port_5_network_role_tag
network_role:
get_input: port_cmaui_port_5_network_role
- subnetpoolid:
- get_input: port_cmaui_port_5_subnetpoolid
fixed_ips:
get_input:
- port_cmaui_port_5_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_cmaui_port_5_subnetpoolid
network:
get_input:
- port_cmaui_port_5_network
@@ -204,22 +191,19 @@ topology_template:
get_input: port_cmaui_port_6_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_6_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_6_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_6_ip_requirements
network_role_tag:
get_input: port_cmaui_port_6_network_role_tag
network_role:
get_input: port_cmaui_port_6_network_role
- subnetpoolid:
- get_input: port_cmaui_port_6_subnetpoolid
fixed_ips:
get_input:
- port_cmaui_port_6_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_cmaui_port_6_subnetpoolid
network:
get_input:
- port_cmaui_port_6_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
index 178821d0f9..3407e72dc8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
@@ -28,11 +28,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_cmaui_port_4_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_4_fixed_ips:
type: list
required: true
@@ -98,11 +93,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_cmaui_port_3_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_4_network_role_tag:
type: string
required: true
@@ -160,22 +150,19 @@ topology_template:
get_input: port_cmaui_port_4_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_4_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_4_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_4_ip_requirements
network_role_tag:
get_input: port_cmaui_port_4_network_role_tag
network_role:
get_input: port_cmaui_port_4_network_role
- subnetpoolid:
- get_input: port_cmaui_port_4_subnetpoolid
fixed_ips:
get_input:
- port_cmaui_port_4_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_cmaui_port_4_subnetpoolid
network:
get_input:
- port_cmaui_port_4_network
@@ -204,22 +191,19 @@ topology_template:
get_input: port_cmaui_port_3_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_3_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_3_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_3_ip_requirements
network_role_tag:
get_input: port_cmaui_port_3_network_role_tag
network_role:
get_input: port_cmaui_port_3_network_role
- subnetpoolid:
- get_input: port_cmaui_port_3_subnetpoolid
fixed_ips:
get_input:
- port_cmaui_port_3_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_cmaui_port_3_subnetpoolid
network:
get_input:
- port_cmaui_port_3_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
index 934995a586..08dd30adc1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
@@ -20,11 +20,6 @@ topology_template:
port_cmaui_port_1_subnetpoolid:
type: string
required: true
- port_cmaui_port_2_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_1_security_groups:
type: list
required: true
@@ -96,11 +91,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- port_cmaui_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_cmaui_port_1_replacement_policy:
type: list
required: true
@@ -160,22 +150,19 @@ topology_template:
get_input: port_cmaui_port_1_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_1_ip_requirements
network_role_tag:
get_input: port_cmaui_port_1_network_role_tag
network_role:
get_input: port_cmaui_port_1_network_role
- subnetpoolid:
- get_input: port_cmaui_port_1_subnetpoolid
fixed_ips:
get_input:
- port_cmaui_port_1_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_cmaui_port_1_subnetpoolid
network:
get_input:
- port_cmaui_port_1_network
@@ -204,22 +191,19 @@ topology_template:
get_input: port_cmaui_port_2_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_2_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_cmaui_port_2_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_cmaui_port_2_ip_requirements
network_role_tag:
get_input: port_cmaui_port_2_network_role_tag
network_role:
get_input: port_cmaui_port_2_network_role
- subnetpoolid:
- get_input: port_cmaui_port_2_subnetpoolid
fixed_ips:
get_input:
- port_cmaui_port_2_fixed_ips
- index_value
+ subnetpoolid:
+ get_input: port_cmaui_port_2_subnetpoolid
network:
get_input:
- port_cmaui_port_2_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
index 9c4ebd296a..e543c21f8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
@@ -62,8 +62,6 @@ topology_template:
directives:
- substitutable
properties:
- port_cmaui_port_2_subinterface_indicator:
- - false
port_cmaui_port_1_security_groups:
- - get_input: p1
- get_input: p2
@@ -96,8 +94,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_cmaui_port_1_subinterface_indicator:
- - false
port_cmaui_port_1_replacement_policy:
- AUTO
port_cmaui_port_2_replacement_policy:
@@ -1018,4 +1014,4 @@ topology_template:
- dependency_cmaui
dependency_cmaui_port_4_test_nested2Level:
- test_nested2Level
- - dependency_cmaui_port_4 \ No newline at end of file
+ - dependency_cmaui_port_4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
index d607379ed9..67af3b2fa7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
@@ -89,8 +89,6 @@ topology_template:
- get_input:
- cmaui_names
- 0
- port_cmaui_port_4_subinterface_indicator:
- - false
port_cmaui_port_4_fixed_ips:
- ip_address:
get_input:
@@ -118,8 +116,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_cmaui_port_3_subinterface_indicator:
- - false
port_cmaui_port_4_replacement_policy:
- AUTO
port_cmaui_port_3_replacement_policy:
@@ -806,4 +802,4 @@ topology_template:
- dependency_cmaui_cmaui_port_3
dependency_cmaui_port_5_test_nested3Level:
- test_nested3Level
- - dependency_cmaui_port_5 \ No newline at end of file
+ - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
index 8d6cae825d..a68045fcea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
@@ -105,8 +105,6 @@ topology_template:
- get_input:
- cmaui_names
- 0
- port_cmaui_port_5_subinterface_indicator:
- - false
compute_cmaui_availability_zone:
- get_input: availability_zone_0
vm_image_name:
@@ -141,8 +139,6 @@ topology_template:
port_cmaui_port_5_mac_requirements:
mac_count_required:
is_required: false
- port_cmaui_port_6_subinterface_indicator:
- - false
port_cmaui_port_6_mac_requirements:
mac_count_required:
is_required: false
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
index 257d8c7722..17205b3a8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
@@ -118,6 +118,10 @@ topology_template:
cmaui_port_7:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_cmaui_port_7_subnetpoolid
+ network:
+ get_input: net
replacement_policy: AUTO
ip_requirements:
get_input: port_cmaui_port_7_ip_requirements
@@ -130,18 +134,15 @@ topology_template:
get_input:
- cmaui_oam_ips
- 0
- subnetpoolid:
- get_input: port_cmaui_port_7_subnetpoolid
mac_requirements:
get_input: port_cmaui_port_7_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_cmaui_port_7_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_7_vlan_requirements
network_role_tag:
get_input: port_cmaui_port_7_network_role_tag
- network:
- get_input: net
order:
get_input: port_cmaui_port_7_order
requirements:
@@ -165,6 +166,10 @@ topology_template:
cmaui_port_8:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
+ subnetpoolid:
+ get_input: port_cmaui_port_8_subnetpoolid
+ network:
+ get_input: net
replacement_policy: AUTO
ip_requirements:
get_input: port_cmaui_port_8_ip_requirements
@@ -178,18 +183,15 @@ topology_template:
get_input:
- cmaui_oam_ips
- 0
- subnetpoolid:
- get_input: port_cmaui_port_8_subnetpoolid
mac_requirements:
get_input: port_cmaui_port_8_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_cmaui_port_8_exCP_naming
vlan_requirements:
get_input: port_cmaui_port_8_vlan_requirements
network_role_tag:
get_input: port_cmaui_port_8_network_role_tag
- network:
- get_input: net
order:
get_input: port_cmaui_port_8_order
requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 37a35b6a53..794802978f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -172,6 +172,7 @@ topology_template:
get_input: port_oam_port_0_subnetpoolid
mac_requirements:
get_input: port_oam_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_oam_port_0_exCP_naming
vlan_requirements:
@@ -216,6 +217,7 @@ topology_template:
get_input: port_oam_port_1_subnetpoolid
mac_requirements:
get_input: port_oam_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_oam_port_1_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index ed7bb6c11e..205114d690 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -172,6 +172,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -217,6 +218,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
index cbd3ded507..dfd135166c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
@@ -539,4 +539,4 @@ topology_template:
- server_pcm_001
- packet_mirror_network
- compute_port_0
- - abstract_compute \ No newline at end of file
+ - abstract_compute
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index bb22e48d0a..9affd9d74a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -174,6 +174,7 @@ topology_template:
get_input: port_pcm_port_00_subnetpoolid
mac_requirements:
get_input: port_pcm_port_00_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_00_exCP_naming
vlan_requirements:
@@ -205,6 +206,7 @@ topology_template:
get_input: port_pcm_port_01_subnetpoolid
mac_requirements:
get_input: port_pcm_port_01_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_01_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 4ae500bb53..d716bdc7a4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -180,6 +180,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -224,6 +225,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index c906988f38..0525feb0aa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -552,4 +552,4 @@ topology_template:
value:
get_attribute:
- server_pcm_002
- - server_pcm_id \ No newline at end of file
+ - server_pcm_id
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index bb22e48d0a..9affd9d74a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -174,6 +174,7 @@ topology_template:
get_input: port_pcm_port_00_subnetpoolid
mac_requirements:
get_input: port_pcm_port_00_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_00_exCP_naming
vlan_requirements:
@@ -205,6 +206,7 @@ topology_template:
get_input: port_pcm_port_01_subnetpoolid
mac_requirements:
get_input: port_pcm_port_01_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_01_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 00424ac7af..8272ab5967 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -174,6 +174,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -218,6 +219,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 41c0fbbe84..b583725281 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -589,12 +589,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_compute_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
index 1016524a14..f26ec33021 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
@@ -320,8 +320,6 @@ topology_template:
- get_attribute:
- server_pcm_001
- oam_net_gw
- port_compute_port_subinterface_indicator:
- - false
compute_compute_name:
- compute_name: null
vm_flavor_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
index b2dbb10079..0f397b9fe7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
@@ -19,11 +19,6 @@ topology_template:
port_compute_port_subnetpoolid:
type: string
required: true
- port_compute_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -122,10 +117,7 @@ topology_template:
get_input: port_compute_port_exCP_naming
vlan_requirements:
get_input: port_compute_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_compute_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_compute_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
index f9522f3c5c..1e7caa5fd8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -162,6 +162,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -206,6 +207,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 866ceacfb4..6e4407c1de 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -175,6 +175,7 @@ topology_template:
get_input: port_pcm_1port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_1port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_1port_0_exCP_naming
vlan_requirements:
@@ -206,6 +207,7 @@ topology_template:
get_input: port_pcm_2port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_2port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_2port_1_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 56124f643d..d9bdb0048d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pcm_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_pcm_server_user_data_format:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
index 47887b4f3c..692fdc2d96 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pcm_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_pcm_server_user_data_format:
type: list
required: true
@@ -131,10 +126,7 @@ topology_template:
get_input: port_pcm_port_exCP_naming
vlan_requirements:
get_input: port_pcm_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 9701cf6226..bb6490a5ef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -113,8 +113,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_pcm_port_subinterface_indicator:
- - false
compute_pcm_server_user_data_format:
- RAW
vm_image_name:
@@ -157,8 +155,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_pcm_port_subinterface_indicator:
- - false
compute_pcm_server_user_data_format:
- RAW
vm_image_name:
@@ -536,4 +532,4 @@ topology_template:
- local_storage_pcm_server
local_storage_server_pcm_1:
- abstract_pcm_server_1
- - local_storage_pcm_server \ No newline at end of file
+ - local_storage_pcm_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 72a100052d..30b8f79f0c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pcm_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -513,12 +507,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pcm_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_pcm_server_user_data_format:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
index 47887b4f3c..692fdc2d96 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pcm_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_pcm_server_user_data_format:
type: list
required: true
@@ -131,10 +126,7 @@ topology_template:
get_input: port_pcm_port_exCP_naming
vlan_requirements:
get_input: port_pcm_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
index ccee6999af..6b122e7e5e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pcm_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -131,10 +126,7 @@ topology_template:
get_input: port_pcm_port_exCP_naming
vlan_requirements:
get_input: port_pcm_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pcm_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pcm_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
index 4c55b1118b..8e26dac997 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -131,8 +131,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_pcm_port_subinterface_indicator:
- - false
compute_pcm_server_user_data_format:
- RAW
vm_image_name:
@@ -175,8 +173,6 @@ topology_template:
is_required: true
floating_ip_count_required:
is_required: false
- port_pcm_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_image_name
compute_pd_server_config_drive:
@@ -554,4 +550,4 @@ topology_template:
- dependency_pd_server
dependency_pcm_port_1:
- abstract_pd_server
- - dependency_pd_server_pcm_port \ No newline at end of file
+ - dependency_pd_server_pcm_port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
index d81c6a7b2f..a42d0d5975 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
@@ -245,4 +245,4 @@ topology_template:
- server_pcm_002
- server_pcm_001
- server_pcm_003
- - compute_port_0 \ No newline at end of file
+ - compute_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 38642e8085..0a53c42257 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -162,6 +162,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -206,6 +207,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index cb42268375..c76abdd78d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -162,6 +162,7 @@ topology_template:
get_input: port_pcm_port_11_subnetpoolid
mac_requirements:
get_input: port_pcm_port_11_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_11_exCP_naming
vlan_requirements:
@@ -193,6 +194,7 @@ topology_template:
get_input: port_pcm_port_01_subnetpoolid
mac_requirements:
get_input: port_pcm_port_01_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_01_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
index e4e97f1d85..1026374596 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
@@ -162,6 +162,7 @@ topology_template:
get_input: port_pcm_port_12_subnetpoolid
mac_requirements:
get_input: port_pcm_port_12_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_12_exCP_naming
vlan_requirements:
@@ -193,6 +194,7 @@ topology_template:
get_input: port_pcm_port_02_subnetpoolid
mac_requirements:
get_input: port_pcm_port_02_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_02_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
index 518c22b40f..007c922276 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
@@ -245,4 +245,4 @@ topology_template:
- server_pcm_002
- server_pcm_001
- server_pcm_003
- - compute_port_0 \ No newline at end of file
+ - compute_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
index 31241fa35d..bdeda3459d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -162,6 +162,7 @@ topology_template:
get_input: port_pcm_port_11_subnetpoolid
mac_requirements:
get_input: port_pcm_port_11_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_11_exCP_naming
vlan_requirements:
@@ -193,6 +194,7 @@ topology_template:
get_input: port_pcm_port_01_subnetpoolid
mac_requirements:
get_input: port_pcm_port_01_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_01_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
index 7e16cca168..efe9830fe7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -162,6 +162,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -206,6 +207,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index f9522f3c5c..1e7caa5fd8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -162,6 +162,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -206,6 +207,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c618732ca8..9d3d07a943 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,12 +62,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
index 5a44e0173d..917fb38587 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
@@ -112,9 +112,6 @@ topology_template:
port_pd01_port_network:
- Network-1
- Network-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- RAW_SERVER_PD_2
- RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 2e8cac336a..9399f0b603 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,11 +55,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -113,10 +108,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9add418772..5e0a3d7d8f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,12 +62,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
index 6cc6dadd75..2e7a929f6e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
@@ -126,9 +126,6 @@ topology_template:
port_pd01_port_network:
- Network-1
- Network-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- RAW_SERVER_PD_2
- RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 516a938e81..2976d039a0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,11 +55,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -113,10 +108,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4f4dc39cdb..b970514a2d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,12 +62,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
index f427a9b00c..b54e72b70b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
@@ -129,9 +129,6 @@ topology_template:
port_pd01_port_network:
- Network-1
- Network-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- RAW_SERVER_PD_2
- get_attribute:
@@ -163,4 +160,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- network_policy_server
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
index 8e79cec55a..c4c49ef39d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,11 +55,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -122,10 +117,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f6309b4565..2e88f7541a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
index 822bb3b5a8..fc2a7312b9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
@@ -109,9 +109,6 @@ topology_template:
port_pd01_port_network:
- Network-1
- Network-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
index 4f3939bd00..4157d5835c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -103,10 +98,7 @@ topology_template:
- accessIPv4
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a397543a9e..494f1fc3bb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
index 2030e8f6a1..726f16c1a9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -144,9 +144,6 @@ topology_template:
port_pd01_port_network:
- Network-1
- Network-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- RAW_SERVER_PD_2
- RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index b1ffb37314..e9a77948df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -126,10 +121,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c618732ca8..9d3d07a943 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,12 +62,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
index c32d886ed3..a350c15168 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -165,9 +165,6 @@ topology_template:
port_pd01_port_network:
- packet_mirror_network
- packet_mirror_network
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- RAW_SERVER_PD_2
- RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 2e8cac336a..9399f0b603 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,11 +55,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -113,10 +108,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a601dbb5e4..b6d4b3f5a3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
index 5ae24552fb..9f518755b5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
@@ -115,9 +115,6 @@ topology_template:
port_pd01_port_network:
- Network-1
- Network-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- RAW_SERVER_PD_2
- RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
index a14f0c9043..27c5771381 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -122,10 +117,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a82d2208e4..cebc59cdc2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,12 +62,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index 203c665e33..32f8f48d22 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -112,9 +112,6 @@ topology_template:
port_pd01_port_network:
- Network-1
- Network-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- RAW_SERVER_PD_2
- RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 562554f743..54eff7e37f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,11 +55,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -113,10 +108,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 102326a14f..53263864fd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,12 +62,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -481,12 +475,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
index d8a342d626..29712de461 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
@@ -163,9 +163,6 @@ topology_template:
port_pd01_port_network:
- Network-PD-1
- Network-PD-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- null
- RAW
@@ -197,9 +194,6 @@ topology_template:
- RAW
vm_flavor_name:
get_input: ps_flavor_name
- port_ps01_port_subinterface_indicator:
- - false
- - false
vm_image_name:
get_input: ps_image_name
port_ps01_port_replacement_policy:
@@ -238,4 +232,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_ps_server \ No newline at end of file
+ - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 2e8cac336a..9399f0b603 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,11 +55,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -113,10 +108,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
index 5636f4b752..c64c7f13d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,11 +44,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
@@ -113,10 +108,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_ps01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3b488ab0e8..b8bd4c0c96 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -62,12 +62,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -485,12 +479,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
index 7db883c8af..f69da5ba75 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
@@ -163,9 +163,6 @@ topology_template:
port_pd01_port_network:
- Network-PD-1
- Network-PD-0
- port_pd01_port_subinterface_indicator:
- - false
- - false
compute_pd_server_user_data_format:
- null
- get_attribute:
@@ -201,9 +198,6 @@ topology_template:
- null
vm_flavor_name:
get_input: ps_flavor_name
- port_ps01_port_subinterface_indicator:
- - false
- - false
vm_image_name:
get_input: ps_image_name
port_ps01_port_replacement_policy:
@@ -242,4 +236,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_ps_server \ No newline at end of file
+ - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
index 51bcd3b538..6929803dc1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
@@ -55,11 +55,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -113,10 +108,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
index edf777c2a6..2fbc68e862 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,11 +44,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
@@ -113,10 +108,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_ps01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps01_port_ip_requirements
network_role_tag:
@@ -319,4 +311,4 @@ topology_template:
- dependency
local_storage_ps_server:
- ps_server
- - local_storage \ No newline at end of file
+ - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5df6256ee1..615de8dc2e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,14 @@ node_types:
org.openecomp.resource.abstract.nodes.pd_server:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -20,92 +28,60 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
status: SUPPORTED
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd02_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_order:
type: integer
required: true
@@ -132,12 +108,24 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
requirements:
- dependency_pd_server:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
index bc0b6e2f3d..a6d5ed65ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
@@ -838,11 +838,12 @@ topology_template:
- get_input:
- pd_server_names
- 0
+ port_pd02_port_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_flavor_name:
get_input: pd_flavor_name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -854,13 +855,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
- compute_pd_server_user_data_format:
- - RAW
- port_pd02_port_mac_requirements:
- mac_count_required:
- is_required: false
port_pd01_port_network:
- get_input: oam_net_name
port_pd02_port_ip_requirements:
@@ -872,6 +866,8 @@ topology_template:
port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
+ compute_pd_server_user_data_format:
+ - RAW
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -887,4 +883,4 @@ topology_template:
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
index f84903c708..3c0aeaee28 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,13 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -21,75 +28,48 @@ topology_template:
required: true
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
- port_pd01_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd02_port_order:
- type: integer
- required: true
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
port_pd01_port_order:
type: integer
required: true
@@ -110,11 +90,21 @@ topology_template:
port_pd01_port_network_role_tag:
type: string
required: true
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ entry_schema:
+ type: string
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f185be579f..43c0f0badf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -72,12 +72,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_port1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_port1_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
index 4096acade3..b6df4b4bc3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
@@ -125,8 +125,6 @@ topology_template:
- RAW
vm_image_name:
get_input: image_smp_name
- port_port1_subinterface_indicator:
- - false
port_port1_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -187,4 +185,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
index 00a60624cd..2aa43774c9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
@@ -63,11 +63,6 @@ topology_template:
vm_image_name:
type: string
required: true
- port_port1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_port1_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -104,10 +99,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_port1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_port1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_port1_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f3f62dafc0..c4d4e6bc15 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -40,12 +40,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -70,12 +64,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
index deee13fe85..424fcd66ab 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -165,8 +165,6 @@ topology_template:
port_pd01_port_security_groups:
- - jsa_security_group
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -180,8 +178,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
port_pd02_port_mac_requirements:
@@ -217,4 +213,4 @@ topology_template:
members:
- resources_with_dependOn
- jsa_security_group
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index e604ae2ae5..14e970880c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
port_pd02_port_network_role_tag:
type: string
required: true
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -61,11 +56,6 @@ topology_template:
port_pd02_port_network_role:
type: string
required: true
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -174,10 +164,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
@@ -214,10 +201,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ad1fe5af08..7c030269e5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -34,12 +34,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -64,12 +58,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 875168c704..0ad20baa65 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -174,8 +174,6 @@ topology_template:
- AUTO
vm_flavor_name:
get_input: pd_flavor_name
- port_pd02_port_subinterface_indicator:
- - false
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -189,8 +187,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
port_pd02_port_mac_requirements:
@@ -246,4 +242,4 @@ topology_template:
members:
- packet_mirror_network
- pd01_volume
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 5cf54bac84..e5183bdf1c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -32,11 +32,6 @@ topology_template:
port_pd02_port_network_role_tag:
type: string
required: true
- port_pd02_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -56,11 +51,6 @@ topology_template:
port_pd02_port_network_role:
type: string
required: true
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -156,10 +146,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
@@ -192,10 +179,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e31c7e32bc..7ff82db5b6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -46,12 +46,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_0_replacement_policy:
type: list
required: true
@@ -116,12 +110,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_1_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
index 64c5fd5936..3529fedc3a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -171,8 +171,6 @@ topology_template:
- get_input:
- pd_server_names
- 0
- port_pd01_port_0_subinterface_indicator:
- - false
port_pd01_port_0_replacement_policy:
- AUTO
vm_flavor_name:
@@ -191,8 +189,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_1_subinterface_indicator:
- - false
port_pd01_port_1_mac_requirements:
mac_count_required:
is_required: false
@@ -217,4 +213,4 @@ topology_template:
members:
- resources_with_dependOn
- jsa_security_group
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index b949593d7d..8460f43650 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -42,11 +42,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_0_replacement_policy:
type: list
required: true
@@ -98,11 +93,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_1_order:
type: integer
required: true
@@ -174,10 +164,7 @@ topology_template:
get_input: port_pd01_port_1_exCP_naming
vlan_requirements:
get_input: port_pd01_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_1_ip_requirements
network_role_tag:
@@ -214,10 +201,7 @@ topology_template:
get_input: port_pd01_port_0_exCP_naming
vlan_requirements:
get_input: port_pd01_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_0_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 55cbc86f16..4af5b2df1f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -40,12 +40,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_0_replacement_policy:
type: list
required: true
@@ -110,12 +104,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_1_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 420e802a28..3f3e490da9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -200,8 +200,6 @@ topology_template:
- get_input:
- pd_server_names
- 0
- port_pd01_port_0_subinterface_indicator:
- - false
port_pd01_port_0_replacement_policy:
- AUTO
vm_flavor_name:
@@ -218,8 +216,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_1_subinterface_indicator:
- - false
port_pd01_port_1_mac_requirements:
mac_count_required:
is_required: false
@@ -266,4 +262,4 @@ topology_template:
- packet_mirror_network
- pd01_volume
- packet_internal_network
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index a45b794a03..f8630d572f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -37,11 +37,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_0_replacement_policy:
type: list
required: true
@@ -93,11 +88,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_1_order:
type: integer
required: true
@@ -156,10 +146,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_1_ip_requirements
network_role_tag:
@@ -192,10 +179,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_pd01_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_0_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 76ab87a8b8..d4f3cb8ffb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,14 @@ node_types:
org.openecomp.resource.abstract.nodes.pd_server:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -20,92 +28,60 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
status: SUPPORTED
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd02_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_order:
type: integer
required: true
@@ -132,12 +108,24 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
requirements:
- dependency_pd_server:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
index c2477214e5..e7fa960d3b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
@@ -869,11 +869,12 @@ topology_template:
- get_input:
- pd_server_names
- 0
+ port_pd02_port_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_flavor_name:
get_input: pd_flavor_name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -885,13 +886,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
- compute_pd_server_user_data_format:
- - RAW
- port_pd02_port_mac_requirements:
- mac_count_required:
- is_required: false
port_pd01_port_network:
- get_input: oam_net_name
port_pd02_port_ip_requirements:
@@ -903,6 +897,8 @@ topology_template:
port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
+ compute_pd_server_user_data_format:
+ - RAW
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -919,4 +915,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- server_pcm_003
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
index f84903c708..3c0aeaee28 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,13 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -21,75 +28,48 @@ topology_template:
required: true
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
- port_pd01_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd02_port_order:
- type: integer
- required: true
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
port_pd01_port_order:
type: integer
required: true
@@ -110,11 +90,21 @@ topology_template:
port_pd01_port_network_role_tag:
type: string
required: true
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ entry_schema:
+ type: string
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
index b31492fa74..02aa261eac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -174,6 +174,7 @@ topology_template:
get_input: port_pcm_port_1_subnetpoolid
mac_requirements:
get_input: port_pcm_port_1_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_1_exCP_naming
vlan_requirements:
@@ -218,6 +219,7 @@ topology_template:
get_input: port_pcm_port_0_subnetpoolid
mac_requirements:
get_input: port_pcm_port_0_mac_requirements
+ subinterface_indicator: false
exCP_naming:
get_input: port_pcm_port_0_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ace7b0798e..3a97da1e81 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,10 +24,28 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_0_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_0_network_role:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_1_ip_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -40,16 +58,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
+ port_pd01_port_1_order:
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
port_pd01_port_1_network_role:
type: string
required: true
@@ -58,86 +78,54 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_pd01_port_1_subnetpoolid:
- type: string
+ port_pd01_port_1_vlan_requirements:
+ type: list
required: true
status: SUPPORTED
- vm_image_name:
- type: string
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd01_port_1_network_role_tag:
+ port_pd01_port_1_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_0_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd01_port_1_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- compute_pd_server_user_data_format:
- type: list
+ port_pd01_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_pd01_port_0_network_role_tag:
+ port_pd01_port_1_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_1_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
+ port_pd01_port_0_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_pd01_port_1_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd01_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_0_subnetpoolid:
+ type: string
required: true
status: SUPPORTED
- port_pd01_port_1_vlan_requirements:
+ port_pd01_port_1_network:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd01_port_0_vlan_requirements:
+ type: string
+ compute_pd_server_user_data_format:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: string
requirements:
- dependency_pd_server:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
index aec25e442c..cdc3fd47ee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
@@ -843,16 +843,24 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
+ port_pd01_port_0_network_role_tag: oam
+ port_pd01_port_1_ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
compute_pd_server_availability_zone:
- get_input: availabilityzone_name
compute_pd_server_name:
- get_input:
- pd_server_names
- 0
- port_pd01_port_0_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
+ port_pd01_port_1_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
port_pd01_port_1_network_role_tag: oam
@@ -860,18 +868,6 @@ topology_template:
- get_input: oam_net_name
compute_pd_server_user_data_format:
- RAW
- port_pd01_port_0_network_role_tag: oam
- port_pd01_port_1_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_1_subinterface_indicator:
- - false
- port_pd01_port_1_mac_requirements:
- mac_count_required:
- is_required: false
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -887,4 +883,4 @@ topology_template:
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
index 818ba138cb..0dd90f3eea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,9 +24,24 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_0_network_role_tag:
+ type: string
+ required: true
port_pd01_port_0_network_role:
type: string
required: true
+ port_pd01_port_1_ip_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -37,29 +52,46 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
+ port_pd01_port_1_order:
+ type: integer
required: true
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
+ port_pd01_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd01_port_1_network_role:
type: string
required: true
port_pd01_port_0_order:
type: integer
required: true
+ port_pd01_port_1_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_pd01_port_1_subnetpoolid:
type: string
required: true
vm_image_name:
type: string
required: true
+ port_pd01_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd01_port_1_network_role_tag:
type: string
required: true
+ port_pd01_port_0_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
type: string
required: true
@@ -73,48 +105,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_network_role_tag:
- type: string
- required: true
- port_pd01_port_1_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_pd01_port_1_order:
- type: integer
- required: true
- port_pd01_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_1_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_0_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_1_exCP_naming
vlan_requirements:
get_input: port_pd01_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_1_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd01_port_0_exCP_naming
vlan_requirements:
get_input: port_pd01_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_0_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f95dac28ed..d689fd88ea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -14,30 +14,42 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd_2_port_1_vlan_requirements:
+ port_pd_1_port_0_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_availability_zone:
+ port_pd_1_port_0_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
+ port_pd_2_port_1_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- compute_pd_server_name:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ compute_pd_server_availability_zone:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_pd_2_port_1_subinterface_indicator:
+ compute_pd_server_name:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
+ type: string
port_pd_2_port_1_network:
type: list
required: true
@@ -48,6 +60,10 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_pd_2_port_1_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
vm_flavor_name:
type: string
required: true
@@ -56,12 +72,10 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_pd_1_port_0_subinterface_indicator:
- type: list
+ port_pd_2_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -74,12 +88,28 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
+ port_pd_1_port_0_order:
+ type: integer
+ required: true
+ status: SUPPORTED
+ port_pd_1_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
port_pd_1_port_0_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd_1_port_0_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_pd_2_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
port_pd_2_port_1_ip_requirements:
type: list
required: true
@@ -96,48 +126,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd_1_port_0_vlan_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd_1_port_0_network_role:
- type: string
- required: true
- status: SUPPORTED
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd_2_port_1_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- port_pd_2_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd_1_port_0_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd_1_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd_1_port_0_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
- port_pd_2_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
requirements:
- dependency_pd_server:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml
index 8fde33fb03..81e6cac6ff 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml
@@ -840,14 +840,10 @@ topology_template:
- get_input:
- pd_server_names
- 0
- port_pd_2_port_1_subinterface_indicator:
- - false
port_pd_2_port_1_network:
- get_input: oam_net_name
vm_flavor_name:
get_input: pd_flavor_name
- port_pd_1_port_0_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_image_name
port_pd_1_port_0_mac_requirements:
@@ -859,6 +855,10 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
+ port_pd_1_port_0_network_role_tag: oam
+ port_pd_2_port_1_mac_requirements:
+ mac_count_required:
+ is_required: false
port_pd_2_port_1_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -868,10 +868,6 @@ topology_template:
port_pd_2_port_1_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
- port_pd_1_port_0_network_role_tag: oam
- port_pd_2_port_1_mac_requirements:
- mac_count_required:
- is_required: false
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -887,4 +883,4 @@ topology_template:
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml
index 6e005d07a3..58da3124e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml
@@ -16,6 +16,21 @@ topology_template:
required: true
entry_schema:
type: string
+ port_pd_1_port_0_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd_1_port_0_network_role:
+ type: string
+ required: true
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
port_pd_2_port_1_vlan_requirements:
type: list
required: true
@@ -31,11 +46,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd_2_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_2_port_1_network:
type: list
required: true
@@ -44,17 +54,18 @@ topology_template:
port_pd_2_port_1_network_role:
type: string
required: true
+ port_pd_2_port_1_subnetpoolid:
+ type: string
+ required: true
vm_flavor_name:
type: string
required: true
port_pd_2_port_1_order:
type: integer
required: true
- port_pd_1_port_0_subinterface_indicator:
- type: list
+ port_pd_2_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -64,11 +75,23 @@ topology_template:
port_pd_1_port_0_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
+ port_pd_1_port_0_order:
+ type: integer
+ required: true
+ port_pd_1_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd_1_port_0_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd_1_port_0_network_role_tag:
+ type: string
+ required: true
+ port_pd_2_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_pd_2_port_1_ip_requirements:
type: list
required: true
@@ -82,39 +105,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd_1_port_0_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd_1_port_0_network_role:
- type: string
- required: true
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd_2_port_1_subnetpoolid:
- type: string
- required: true
- port_pd_2_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd_1_port_0_order:
- type: integer
- required: true
- port_pd_1_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd_1_port_0_network_role_tag:
- type: string
- required: true
- port_pd_2_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd_2_port_1_exCP_naming
vlan_requirements:
get_input: port_pd_2_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_2_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_2_port_1_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd_1_port_0_exCP_naming
vlan_requirements:
get_input: port_pd_1_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_1_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_1_port_0_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d5acb4ca67..2c72b0aa07 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -22,6 +22,20 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
+ port_pd_oam1_port_0_ip_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
compute_pd_server_availability_zone:
type: list
required: true
@@ -42,48 +56,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_pd_oam1_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd_oam1_port_1_network_role:
- type: string
- required: true
- status: SUPPORTED
- vm_image_name:
- type: string
- required: true
- status: SUPPORTED
- port_pd_oam1_port_1_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd_oam1_port_1_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
- compute_pd_server_user_data_format:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd_oam1_port_0_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
port_pd_oam1_port_0_vlan_requirements:
type: list
required: true
@@ -96,16 +68,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd_oam1_port_1_subnetpoolid:
+ port_pd_oam1_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
+ port_pd_oam1_port_1_network_role:
type: string
required: true
status: SUPPORTED
- port_pd_oam1_port_0_subinterface_indicator:
- type: list
+ port_pd_oam1_port_1_subnetpoolid:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_oam1_port_0_order:
type: integer
required: true
@@ -120,6 +94,10 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ vm_image_name:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd_oam1_port_0_subnetpoolid:
type: string
required: true
@@ -128,6 +106,10 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
+ port_pd_oam1_port_1_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd_oam1_port_1_vlan_requirements:
type: list
required: true
@@ -138,6 +120,12 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
requirements:
- dependency_pd_server:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
index 33bdfa22df..4f4840d9ba 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
@@ -839,6 +839,12 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
+ port_pd_oam1_port_0_ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
compute_pd_server_availability_zone:
- get_input: availabilityzone_name
compute_pd_server_name:
@@ -847,31 +853,21 @@ topology_template:
- 0
vm_flavor_name:
get_input: pd_flavor_name
+ port_pd_oam1_port_1_network:
+ - get_input: oam_net_name
port_pd_oam1_port_1_mac_requirements:
mac_count_required:
is_required: false
+ port_pd_oam1_port_0_network:
+ - get_input: oam_net_name
vm_image_name:
get_input: pd_image_name
- port_pd_oam1_port_1_subinterface_indicator:
- - false
port_pd_oam1_port_1_network_role_tag: oam
- compute_pd_server_user_data_format:
- - RAW
- port_pd_oam1_port_0_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_oam1_port_1_network:
- - get_input: oam_net_name
- port_pd_oam1_port_0_subinterface_indicator:
- - false
- port_pd_oam1_port_0_network:
- - get_input: oam_net_name
port_pd_oam1_port_0_mac_requirements:
mac_count_required:
is_required: false
+ compute_pd_server_user_data_format:
+ - RAW
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -887,4 +883,4 @@ topology_template:
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
index ccd2d95f87..fdcc754cb8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
@@ -22,6 +22,18 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
+ port_pd_oam1_port_0_ip_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
compute_pd_server_availability_zone:
type: list
required: true
@@ -38,40 +50,6 @@ topology_template:
port_pd_oam1_port_1_order:
type: integer
required: true
- port_pd_oam1_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd_oam1_port_1_network_role:
- type: string
- required: true
- vm_image_name:
- type: string
- required: true
- port_pd_oam1_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_pd_oam1_port_1_network_role_tag:
- type: string
- required: true
- compute_pd_server_user_data_format:
- type: list
- required: true
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd_oam1_port_0_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
port_pd_oam1_port_0_vlan_requirements:
type: list
required: true
@@ -82,14 +60,15 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd_oam1_port_1_subnetpoolid:
+ port_pd_oam1_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ port_pd_oam1_port_1_network_role:
type: string
required: true
- port_pd_oam1_port_0_subinterface_indicator:
- type: list
+ port_pd_oam1_port_1_subnetpoolid:
+ type: string
required: true
- entry_schema:
- type: boolean
port_pd_oam1_port_0_order:
type: integer
required: true
@@ -101,12 +80,18 @@ topology_template:
required: true
entry_schema:
type: string
+ vm_image_name:
+ type: string
+ required: true
port_pd_oam1_port_0_subnetpoolid:
type: string
required: true
port_pd_oam1_port_0_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
+ port_pd_oam1_port_1_network_role_tag:
+ type: string
+ required: true
port_pd_oam1_port_1_vlan_requirements:
type: list
required: true
@@ -115,6 +100,11 @@ topology_template:
port_pd_oam1_port_0_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ entry_schema:
+ type: string
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd_oam1_port_1_exCP_naming
vlan_requirements:
get_input: port_pd_oam1_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_oam1_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_oam1_port_1_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd_oam1_port_0_exCP_naming
vlan_requirements:
get_input: port_pd_oam1_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_oam1_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_oam1_port_0_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7624e45914..8f9cd39986 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -28,12 +28,24 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ port_pd01_port1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
port_pd01_port2_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -46,98 +58,74 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- vm_flavor_name:
+ port_pd01_port1_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port2_network_role_tag:
+ port_pd01_port2_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port1_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd01_port2_order:
- type: integer
+ port_pd01_port2_network_role:
+ type: string
required: true
status: SUPPORTED
- vm_image_name:
+ vm_flavor_name:
type: string
required: true
status: SUPPORTED
- port_pd01_port2_subinterface_indicator:
+ port_pd01_port1_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_pd01_port2_vlan_requirements:
- type: list
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port2_network_role_tag:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port2_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ port_pd01_port1_order:
+ type: integer
required: true
status: SUPPORTED
- compute_pd_server_user_data_format:
- type: list
+ port_pd01_port1_network_role:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_pd01_port1_mac_requirements:
+ port_pd01_port2_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- index_value:
+ port_pd01_port2_order:
type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd01_port1_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- port_pd01_port2_subnetpoolid:
- type: string
required: true
status: SUPPORTED
- port_pd01_port2_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_pd01_port1_ip_requirements:
+ port_pd01_port1_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port1_network_role:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd01_port2_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port1_vlan_requirements:
+ port_pd01_port2_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port1_subinterface_indicator:
+ port_pd01_port2_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
+ compute_pd_server_user_data_format:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
+ type: string
requirements:
- dependency_pd_server_pd01_port1:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
index 14be3f3ae6..1b6083282c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
@@ -837,6 +837,9 @@ topology_template:
port_pd01_port1_network_role_tag: oam
port_pd01_port2_network:
- get_input: oam_net_name
+ port_pd01_port1_mac_requirements:
+ mac_count_required:
+ is_required: false
port_pd01_port2_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -851,27 +854,20 @@ topology_template:
- 0
vm_flavor_name:
get_input: pd_flavor_name
- port_pd01_port2_network_role_tag: oam
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port2_subinterface_indicator:
- - false
- compute_pd_server_user_data_format:
- - RAW
- port_pd01_port1_mac_requirements:
- mac_count_required:
- is_required: false
port_pd01_port1_ip_requirements:
- ip_version: 4
ip_count_required:
is_required: false
floating_ip_count_required:
is_required: false
+ port_pd01_port2_network_role_tag: oam
port_pd01_port2_mac_requirements:
mac_count_required:
is_required: false
- port_pd01_port1_subinterface_indicator:
- - false
+ vm_image_name:
+ get_input: pd_image_name
+ compute_pd_server_user_data_format:
+ - RAW
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -887,4 +883,4 @@ topology_template:
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
index 1293f8f76d..906ea1896b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
@@ -27,11 +27,21 @@ topology_template:
required: true
entry_schema:
type: string
+ port_pd01_port1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_pd01_port2_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -42,79 +52,59 @@ topology_template:
required: true
entry_schema:
type: string
- vm_flavor_name:
+ port_pd01_port1_subnetpoolid:
type: string
required: true
- port_pd01_port2_network_role_tag:
+ port_pd01_port2_subnetpoolid:
type: string
required: true
- port_pd01_port1_order:
- type: integer
- required: true
- port_pd01_port2_order:
- type: integer
+ port_pd01_port2_network_role:
+ type: string
required: true
- vm_image_name:
+ vm_flavor_name:
type: string
required: true
- port_pd01_port2_subinterface_indicator:
+ port_pd01_port1_ip_requirements:
type: list
required: true
entry_schema:
- type: boolean
- port_pd01_port2_vlan_requirements:
- type: list
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port2_network_role_tag:
+ type: string
required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port2_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ port_pd01_port1_order:
+ type: integer
required: true
- compute_pd_server_user_data_format:
- type: list
+ port_pd01_port1_network_role:
+ type: string
required: true
- entry_schema:
- type: string
- port_pd01_port1_mac_requirements:
+ port_pd01_port2_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- index_value:
+ port_pd01_port2_order:
type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd01_port1_subnetpoolid:
- type: string
- required: true
- port_pd01_port2_subnetpoolid:
- type: string
required: true
- port_pd01_port2_network_role:
- type: string
- required: true
- port_pd01_port1_ip_requirements:
+ port_pd01_port1_vlan_requirements:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port1_network_role:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ vm_image_name:
type: string
required: true
- port_pd01_port2_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port1_vlan_requirements:
+ port_pd01_port2_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port1_subinterface_indicator:
+ port_pd01_port2_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ compute_pd_server_user_data_format:
type: list
required: true
entry_schema:
- type: boolean
+ type: string
node_templates:
pd_server_pd01_port1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -123,10 +113,7 @@ topology_template:
get_input: port_pd01_port1_exCP_naming
vlan_requirements:
get_input: port_pd01_port1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port1_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd01_port2_exCP_naming
vlan_requirements:
get_input: port_pd01_port2_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port2_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port2_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 63428c4dff..d652fffcb5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,14 @@ node_types:
org.openecomp.resource.abstract.nodes.pd_server:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -20,92 +28,60 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
status: SUPPORTED
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd02_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_order:
type: integer
required: true
@@ -132,12 +108,24 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
attributes:
pd_server_accessIPv4:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
index f437be45a1..4054d32d29 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -838,11 +838,12 @@ topology_template:
- get_input:
- pd_server_names
- 0
+ port_pd02_port_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_flavor_name:
get_input: pd_flavor_name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -854,13 +855,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
- compute_pd_server_user_data_format:
- - RAW
- port_pd02_port_mac_requirements:
- mac_count_required:
- is_required: false
port_pd01_port_network:
- get_input: oam_net_name
port_pd02_port_ip_requirements:
@@ -872,6 +866,8 @@ topology_template:
port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
+ compute_pd_server_user_data_format:
+ - RAW
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -906,4 +902,4 @@ topology_template:
value:
get_attribute:
- abstract_pd_server
- - pd_server_accessIPv4 \ No newline at end of file
+ - pd_server_accessIPv4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index ff9ab1fa47..33183aebc4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,13 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -21,75 +28,48 @@ topology_template:
required: true
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
- port_pd01_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd02_port_order:
- type: integer
- required: true
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
port_pd01_port_order:
type: integer
required: true
@@ -110,11 +90,21 @@ topology_template:
port_pd01_port_network_role_tag:
type: string
required: true
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ entry_schema:
+ type: string
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3053ba7550..cf4a0e04ec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -50,12 +50,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_template_VMInt_OAM_lb_virtual_machine_interface_properties:
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
required: true
@@ -266,12 +260,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_template_VMInt_OAM_lb_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_template_VMInt_OAM_lb_name:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
index c12219adc0..4712348457 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml
@@ -424,8 +424,6 @@ topology_template:
is_required: true
vm_image_name:
get_input: pd_image_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_device_id:
- PORT_PD_DEVICE_ID
port_pd01_port_admin_state_up:
@@ -491,8 +489,6 @@ topology_template:
- fq_name
port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses:
- - get_input: mac_address
- port_template_VMInt_OAM_lb_subinterface_indicator:
- - false
port_template_VMInt_OAM_lb_name:
- template_VMInt_OAM_lb_NAME
port_pd01_port_port_security_enabled:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml
index 1536b33544..e676206762 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml
@@ -45,11 +45,6 @@ topology_template:
vm_image_name:
type: string
required: true
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_template_VMInt_OAM_lb_virtual_machine_interface_properties:
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
required: true
@@ -222,11 +217,6 @@ topology_template:
required: true
entry_schema:
type: json
- port_template_VMInt_OAM_lb_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_template_VMInt_OAM_lb_name:
type: list
required: true
@@ -369,10 +359,7 @@ topology_template:
get_input:
- port_template_VMInt_OAM_lb_virtual_machine_interface_properties
- index_value
- subinterface_indicator:
- get_input:
- - port_template_VMInt_OAM_lb_subinterface_indicator
- - index_value
+ subinterface_indicator: false
security_group_refs:
get_input:
- port_template_VMInt_OAM_lb_security_group_refs
@@ -441,10 +428,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
qos_policy:
get_input:
- port_pd01_port_qos_policy
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 98ef12fa28..0b464f4f24 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,14 @@ node_types:
org.openecomp.resource.abstract.nodes.pd_server:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -20,92 +28,60 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
status: SUPPORTED
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd02_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_order:
type: integer
required: true
@@ -132,12 +108,24 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
attributes:
pd_server_accessIPv4:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
index e91c7baf2f..e9d7a14899 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
@@ -838,11 +838,12 @@ topology_template:
- get_input:
- pd_server_names
- 0
+ port_pd02_port_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_flavor_name:
get_input: pd_flavor_name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -854,13 +855,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
- compute_pd_server_user_data_format:
- - RAW
- port_pd02_port_mac_requirements:
- mac_count_required:
- is_required: false
port_pd01_port_network:
- get_input: oam_net_name
port_pd02_port_ip_requirements:
@@ -872,6 +866,8 @@ topology_template:
port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
+ compute_pd_server_user_data_format:
+ - RAW
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -903,4 +899,4 @@ topology_template:
members:
- network_policy_port
- network_policy_server
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
index acec850677..796f721384 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,13 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -21,75 +28,48 @@ topology_template:
required: true
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
- port_pd01_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd02_port_order:
- type: integer
- required: true
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
port_pd01_port_order:
type: integer
required: true
@@ -110,11 +90,21 @@ topology_template:
port_pd01_port_network_role_tag:
type: string
required: true
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ entry_schema:
+ type: string
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5df6256ee1..615de8dc2e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,14 @@ node_types:
org.openecomp.resource.abstract.nodes.pd_server:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -20,92 +28,60 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
status: SUPPORTED
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd02_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_order:
type: integer
required: true
@@ -132,12 +108,24 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
requirements:
- dependency_pd_server:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
index ab8accff76..0feb8ef859 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
@@ -838,13 +838,14 @@ topology_template:
- get_input:
- pd_server_names
- 0
+ port_pd02_port_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_flavor_name:
get_attribute:
- network_policy_server
- name
port_pd02_port_network_role_tag: oam
- port_pd02_port_subinterface_indicator:
- - false
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -856,13 +857,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
- compute_pd_server_user_data_format:
- - RAW
- port_pd02_port_mac_requirements:
- mac_count_required:
- is_required: false
port_pd01_port_network:
- get_attribute:
- network_policy_server
@@ -875,6 +869,8 @@ topology_template:
is_required: false
port_pd02_port_network:
- get_input: oam_net_name
+ compute_pd_server_user_data_format:
+ - RAW
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -896,4 +892,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- network_policy_server
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index f84903c708..3c0aeaee28 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,13 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -21,75 +28,48 @@ topology_template:
required: true
entry_schema:
type: string
- vm_flavor_name:
- type: string
+ port_pd02_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_pd02_port_network_role_tag:
- type: string
+ port_pd01_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
- port_pd02_port_subinterface_indicator:
- type: list
+ vm_flavor_name:
+ type: string
required: true
- entry_schema:
- type: boolean
- port_pd01_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd02_port_order:
+ type: integer
required: true
- vm_image_name:
+ port_pd02_port_subnetpoolid:
type: string
required: true
- port_pd01_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd02_port_network_role:
+ port_pd02_port_network_role_tag:
type: string
required: true
- port_pd01_port_subinterface_indicator:
- type: list
+ port_pd01_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- entry_schema:
- type: boolean
- port_pd01_port_vlan_requirements:
+ port_pd02_port_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- compute_pd_server_user_data_format:
- type: list
- required: true
- entry_schema:
- type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd02_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd02_port_order:
- type: integer
- required: true
- port_pd02_port_subnetpoolid:
+ vm_image_name:
type: string
required: true
- port_pd02_port_vlan_requirements:
+ port_pd01_port_ip_requirements:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network:
type: list
required: true
entry_schema:
type: string
+ port_pd02_port_network_role:
+ type: string
+ required: true
port_pd01_port_order:
type: integer
required: true
@@ -110,11 +90,21 @@ topology_template:
port_pd01_port_network_role_tag:
type: string
required: true
+ port_pd01_port_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd02_port_network:
type: list
required: true
entry_schema:
type: string
+ compute_pd_server_user_data_format:
+ type: list
+ required: true
+ entry_schema:
+ type: string
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd02_port_exCP_naming
vlan_requirements:
get_input: port_pd02_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd02_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd02_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ace7b0798e..3a97da1e81 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,10 +24,28 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_0_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_0_network_role:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_1_ip_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -40,16 +58,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
+ port_pd01_port_1_order:
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
port_pd01_port_1_network_role:
type: string
required: true
@@ -58,86 +78,54 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_pd01_port_1_subnetpoolid:
- type: string
+ port_pd01_port_1_vlan_requirements:
+ type: list
required: true
status: SUPPORTED
- vm_image_name:
- type: string
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd01_port_1_network_role_tag:
+ port_pd01_port_1_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_0_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd01_port_1_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- compute_pd_server_user_data_format:
- type: list
+ port_pd01_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_pd01_port_0_network_role_tag:
+ port_pd01_port_1_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_1_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
+ port_pd01_port_0_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_pd01_port_1_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd01_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_0_subnetpoolid:
+ type: string
required: true
status: SUPPORTED
- port_pd01_port_1_vlan_requirements:
+ port_pd01_port_1_network:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd01_port_0_vlan_requirements:
+ type: string
+ compute_pd_server_user_data_format:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: string
requirements:
- dependency_pd_server:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
index 7239791942..dd26c73c26 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
@@ -106,18 +106,25 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
+ port_pd01_port_1_ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
compute_pd_server_availability_zone:
- get_input: availabilityzone_name
compute_pd_server_name:
- get_input:
- pd_server_names
- 0
- port_pd01_port_0_subinterface_indicator:
- - false
vm_flavor_name:
get_attribute:
- network_policy_server
- name
+ port_pd01_port_1_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
port_pd01_port_1_network_role_tag: oam
@@ -125,17 +132,6 @@ topology_template:
- get_input: oam_net_name
compute_pd_server_user_data_format:
- RAW
- port_pd01_port_1_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_1_subinterface_indicator:
- - false
- port_pd01_port_1_mac_requirements:
- mac_count_required:
- is_required: false
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -157,4 +153,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- network_policy_server
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index 818ba138cb..0dd90f3eea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,9 +24,24 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_0_network_role_tag:
+ type: string
+ required: true
port_pd01_port_0_network_role:
type: string
required: true
+ port_pd01_port_1_ip_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -37,29 +52,46 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
+ port_pd01_port_1_order:
+ type: integer
required: true
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
+ port_pd01_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd01_port_1_network_role:
type: string
required: true
port_pd01_port_0_order:
type: integer
required: true
+ port_pd01_port_1_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_pd01_port_1_subnetpoolid:
type: string
required: true
vm_image_name:
type: string
required: true
+ port_pd01_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd01_port_1_network_role_tag:
type: string
required: true
+ port_pd01_port_0_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
type: string
required: true
@@ -73,48 +105,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_network_role_tag:
- type: string
- required: true
- port_pd01_port_1_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_pd01_port_1_order:
- type: integer
- required: true
- port_pd01_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_1_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_0_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_1_exCP_naming
vlan_requirements:
get_input: port_pd01_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_1_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd01_port_0_exCP_naming
vlan_requirements:
get_input: port_pd01_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_0_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ffd4d72a14..530e44c0bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,10 +24,28 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_0_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_0_network_role:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_1_ip_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -40,16 +58,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
+ port_pd01_port_1_order:
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
port_pd01_port_1_network_role:
type: string
required: true
@@ -58,86 +78,54 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_pd01_port_1_subnetpoolid:
- type: string
+ port_pd01_port_1_vlan_requirements:
+ type: list
required: true
status: SUPPORTED
- vm_image_name:
- type: string
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd01_port_1_network_role_tag:
+ port_pd01_port_1_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_0_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd01_port_1_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- compute_pd_server_user_data_format:
- type: list
+ port_pd01_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_pd01_port_0_network_role_tag:
+ port_pd01_port_1_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_1_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
+ port_pd01_port_0_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_pd01_port_1_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd01_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_0_subnetpoolid:
+ type: string
required: true
status: SUPPORTED
- port_pd01_port_1_vlan_requirements:
+ port_pd01_port_1_network:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd01_port_0_vlan_requirements:
+ type: string
+ compute_pd_server_user_data_format:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: string
attributes:
pd_server_accessIPv4:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
index f1f724ca42..41f9b91758 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
@@ -843,16 +843,24 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
+ port_pd01_port_0_network_role_tag: oam
+ port_pd01_port_1_ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
compute_pd_server_availability_zone:
- get_input: availabilityzone_name
compute_pd_server_name:
- get_input:
- pd_server_names
- 0
- port_pd01_port_0_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
+ port_pd01_port_1_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
port_pd01_port_1_network_role_tag: oam
@@ -860,18 +868,6 @@ topology_template:
- get_input: oam_net_name
compute_pd_server_user_data_format:
- RAW
- port_pd01_port_0_network_role_tag: oam
- port_pd01_port_1_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_1_subinterface_indicator:
- - false
- port_pd01_port_1_mac_requirements:
- mac_count_required:
- is_required: false
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -911,4 +907,4 @@ topology_template:
- network_policy_port0
- network_policy_server
- network_policy_port1
- - abstract_pd_server \ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 64e8423103..997d59b094 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,9 +24,24 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_0_network_role_tag:
+ type: string
+ required: true
port_pd01_port_0_network_role:
type: string
required: true
+ port_pd01_port_1_ip_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -37,29 +52,46 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
+ port_pd01_port_1_order:
+ type: integer
required: true
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
+ port_pd01_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd01_port_1_network_role:
type: string
required: true
port_pd01_port_0_order:
type: integer
required: true
+ port_pd01_port_1_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_pd01_port_1_subnetpoolid:
type: string
required: true
vm_image_name:
type: string
required: true
+ port_pd01_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd01_port_1_network_role_tag:
type: string
required: true
+ port_pd01_port_0_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
type: string
required: true
@@ -73,48 +105,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_network_role_tag:
- type: string
- required: true
- port_pd01_port_1_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_pd01_port_1_order:
- type: integer
- required: true
- port_pd01_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_1_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_0_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_1_exCP_naming
vlan_requirements:
get_input: port_pd01_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_1_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd01_port_0_exCP_naming
vlan_requirements:
get_input: port_pd01_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_0_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6d9b66fe62..32a7c0254d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,10 +24,28 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_0_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
port_pd01_port_0_network_role:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_1_ip_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -40,16 +58,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
+ port_pd01_port_1_order:
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
port_pd01_port_1_network_role:
type: string
required: true
@@ -58,86 +78,54 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_pd01_port_1_subnetpoolid:
- type: string
+ port_pd01_port_1_vlan_requirements:
+ type: list
required: true
status: SUPPORTED
- vm_image_name:
- type: string
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd01_port_1_network_role_tag:
+ port_pd01_port_1_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_pd01_port_0_subnetpoolid:
+ vm_image_name:
type: string
required: true
status: SUPPORTED
- port_pd01_port_1_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- compute_pd_server_user_data_format:
- type: list
+ port_pd01_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_pd01_port_0_network_role_tag:
+ port_pd01_port_1_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_pd01_port_1_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
+ port_pd01_port_0_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_pd01_port_1_order:
- type: integer
- required: true
- status: SUPPORTED
- port_pd01_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_0_subnetpoolid:
+ type: string
required: true
status: SUPPORTED
- port_pd01_port_1_vlan_requirements:
+ port_pd01_port_1_network:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_pd01_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd01_port_0_vlan_requirements:
+ type: string
+ compute_pd_server_user_data_format:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
+ type: string
attributes:
pd_server_pd01_port_0_device_id:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
index fed463ac76..d35d65a2d4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -843,16 +843,24 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
+ port_pd01_port_0_network_role_tag: oam
+ port_pd01_port_1_ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
compute_pd_server_availability_zone:
- get_input: availabilityzone_name
compute_pd_server_name:
- get_input:
- pd_server_names
- 0
- port_pd01_port_0_subinterface_indicator:
- - false
vm_flavor_name:
get_input: pd_flavor_name
+ port_pd01_port_1_mac_requirements:
+ mac_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
port_pd01_port_1_network_role_tag: oam
@@ -860,18 +868,6 @@ topology_template:
- get_input: oam_net_name
compute_pd_server_user_data_format:
- RAW
- port_pd01_port_0_network_role_tag: oam
- port_pd01_port_1_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_1_subinterface_indicator:
- - false
- port_pd01_port_1_mac_requirements:
- mac_count_required:
- is_required: false
service_template_filter:
substitute_service_template: Nested_pd_serverServiceTemplate.yaml
count: 1
@@ -906,4 +902,4 @@ topology_template:
value:
get_attribute:
- abstract_pd_server
- - pd_server_accessIPv4 \ No newline at end of file
+ - pd_server_accessIPv4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index f934f60a74..7f9ab67ca5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,9 +24,24 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_0_network_role_tag:
+ type: string
+ required: true
port_pd01_port_0_network_role:
type: string
required: true
+ port_pd01_port_1_ip_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
compute_pd_server_availability_zone:
type: list
required: true
@@ -37,29 +52,46 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_subinterface_indicator:
- type: list
+ port_pd01_port_1_order:
+ type: integer
required: true
- entry_schema:
- type: boolean
vm_flavor_name:
type: string
required: true
+ port_pd01_port_0_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd01_port_1_network_role:
type: string
required: true
port_pd01_port_0_order:
type: integer
required: true
+ port_pd01_port_1_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_pd01_port_1_subnetpoolid:
type: string
required: true
vm_image_name:
type: string
required: true
+ port_pd01_port_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
port_pd01_port_1_network_role_tag:
type: string
required: true
+ port_pd01_port_0_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
type: string
required: true
@@ -73,48 +105,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_0_network_role_tag:
- type: string
- required: true
- port_pd01_port_1_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd01_port_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_pd01_port_1_order:
- type: integer
- required: true
- port_pd01_port_0_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_1_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_0_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
node_templates:
pd_server:
type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_1_exCP_naming
vlan_requirements:
get_input: port_pd01_port_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_1_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd01_port_0_exCP_naming
vlan_requirements:
get_input: port_pd01_port_0_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_0_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_0_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1eadc23a94..2b4345e681 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -502,12 +496,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -963,12 +951,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
index db4109d81a..8002f73309 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
@@ -413,8 +413,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -467,8 +465,6 @@ topology_template:
- get_attribute:
- network_policy_server
- name
- port_pd01_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_ps_serverServiceTemplate.yaml
count: 1
@@ -508,8 +504,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
compute_oam_server_user_data_format:
- RAW
compute_oam_server_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
index ab73989d32..da16719710 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -99,10 +94,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
index cb03463f31..c5ea7736e5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -122,10 +117,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
index 554ecbf1d6..e634dcdf84 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
@@ -65,11 +65,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -99,10 +94,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7216b0c255..6f6eb39722 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -477,12 +471,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -916,12 +904,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
index aa673f97b7..0bb61d1682 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
@@ -350,8 +350,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -395,8 +393,6 @@ topology_template:
- get_attribute:
- network_policy_server
- name
- port_pd01_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_ps_serverServiceTemplate.yaml
count: 1
@@ -429,8 +425,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
compute_oam_server_user_data_format:
- RAW
compute_oam_server_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
index 38592a2bf8..bae9f9e1b5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
@@ -45,11 +45,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -85,10 +80,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
index cf6052bf9f..4012ad45ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
@@ -55,11 +55,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -85,10 +80,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 41c744d8b4..abab5c3f7f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -50,12 +50,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -471,12 +465,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -898,12 +886,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
index 502f8fa595..7863e55a5b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
@@ -361,8 +361,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -399,8 +397,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -441,8 +437,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -464,4 +458,4 @@ topology_template:
- network_policy_server
- abstract_pd_server
- abstract_pd_server_1
- - abstract_pd_server_2 \ No newline at end of file
+ - abstract_pd_server_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml
index e360446048..9a5769b7cc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml
@@ -45,11 +45,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -99,10 +94,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
index 474984e929..61ca45bec6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -45,11 +45,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -99,10 +94,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
index e133a985b5..8c0ba00c86 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0f03728659..dd92ac4351 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -483,12 +477,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -870,6 +858,18 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_pd01_port_3_order:
+ type: integer
+ required: true
+ status: SUPPORTED
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
port_pd01_port_2_vlan_requirements:
type: list
required: true
@@ -902,6 +902,10 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_3_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
port_pd01_port_3_network:
type: list
required: true
@@ -924,70 +928,42 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd01_port_2_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_2_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_2_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- compute_pd_server_user_data_format:
+ port_pd01_port_3_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- port_pd01_port_2_ip_requirements:
- type: list
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_pd01_port_2_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port_3_order:
- type: integer
+ port_pd01_port_2_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_pd01_port_3_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_pd01_port_3_network_role_tag:
+ type: string
required: true
status: SUPPORTED
- port_pd01_port_3_subinterface_indicator:
+ compute_pd_server_user_data_format:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_pd01_port_3_vlan_requirements:
+ type: string
+ port_pd01_port_2_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_2_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_pd01_port_3_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
+ type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_3_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
index 79f14b2199..344d34ea74 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
@@ -350,8 +350,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -385,17 +383,19 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
+ port_pd01_port_3_mac_requirements:
+ mac_count_required:
+ is_required: false
port_pd01_port_3_network:
- get_input: oam_net_name
vm_image_name:
get_input: pd_image_name
- port_pd01_port_2_subinterface_indicator:
- - false
port_pd01_port_2_network:
- get_input: oam_net_name
port_pd01_port_2_mac_requirements:
mac_count_required:
is_required: false
+ port_pd01_port_3_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
port_pd01_port_2_ip_requirements:
@@ -404,12 +404,6 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_3_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd01_port_3_subinterface_indicator:
- - false
- port_pd01_port_3_network_role_tag: oam
service_template_filter:
substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml
count: 1
@@ -453,8 +447,6 @@ topology_template:
- get_attribute:
- network_policy_server
- name
- port_pd01_port_subinterface_indicator:
- - false
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -475,4 +467,4 @@ topology_template:
- network_policy_server
- abstract_pd_server
- abstract_pd_server_1
- - abstract_pd_server_2 \ No newline at end of file
+ - abstract_pd_server_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
index c5324d5469..f875aad129 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
index 84b2aec4a7..2ab72c8a16 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -17,6 +17,16 @@ topology_template:
port_pd01_port_3_network_role:
type: string
required: true
+ port_pd01_port_3_order:
+ type: integer
+ required: true
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
port_pd01_port_2_vlan_requirements:
type: list
required: true
@@ -43,6 +53,9 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_pd01_port_3_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_pd01_port_3_network:
type: list
required: true
@@ -60,19 +73,25 @@ topology_template:
port_pd01_port_3_subnetpoolid:
type: string
required: true
- port_pd01_port_2_subinterface_indicator:
+ port_pd01_port_2_network:
type: list
required: true
entry_schema:
- type: boolean
- port_pd01_port_2_network:
+ type: string
+ port_pd01_port_3_vlan_requirements:
type: list
required: true
entry_schema:
- type: string
+ type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_2_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
+ port_pd01_port_2_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ port_pd01_port_3_network_role_tag:
+ type: string
+ required: true
compute_pd_server_user_data_format:
type: list
required: true
@@ -83,35 +102,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port_3_order:
- type: integer
- required: true
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- port_pd01_port_3_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_pd01_port_3_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_pd01_port_3_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_pd01_port_2_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_pd01_port_3_network_role_tag:
- type: string
- required: true
port_pd01_port_3_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -142,10 +132,7 @@ topology_template:
get_input: port_pd01_port_2_exCP_naming
vlan_requirements:
get_input: port_pd01_port_2_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_2_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_2_ip_requirements
network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
get_input: port_pd01_port_3_exCP_naming
vlan_requirements:
get_input: port_pd01_port_3_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_3_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_3_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8cef821fd7..575f1f3d1e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -479,12 +473,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
index c59fb848b5..4d445e467c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -706,8 +706,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -734,8 +732,6 @@ topology_template:
- RAW
vm_flavor_name:
get_input: pd_flavor_name
- port_ps01_port_subinterface_indicator:
- - false
vm_image_name:
get_attribute:
- abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
index ff163d0573..633da82add 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
index 2109090026..0e6bc63fdb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,11 +44,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_ps01_port_exCP_naming
vlan_requirements:
get_input: port_ps01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 603bceea9a..e2792b59fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -475,12 +469,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
index a349637b7a..3fe02b86e4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
@@ -704,8 +704,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -732,8 +730,6 @@ topology_template:
- RAW
vm_flavor_name:
get_input: pd_flavor_name
- port_ps01_port_subinterface_indicator:
- - false
vm_image_name:
get_input: pd_image_name
port_ps01_port_mac_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
index 5a5d97e43f..86a0b0dbba 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,11 +44,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_ps01_port_exCP_naming
vlan_requirements:
get_input: port_ps01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c30564adad..5424d55986 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -34,12 +34,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_vdbe_untr_vmi_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_vdbe_availability_zone:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml
index 447f628beb..46d5688f80 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml
@@ -401,8 +401,6 @@ topology_template:
- get_input: aap_address_mode
subinterface_nested_vlan_tag_list:
- get_input: untrusted_vlan_tags
- port_vdbe_untr_vmi_subinterface_indicator:
- - true
compute_vdbe_availability_zone:
- get_input: availability_zone_1
subinterface_nested_service_template_filter_count:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
index 024ca9a725..da427334a7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
@@ -32,11 +32,6 @@ topology_template:
required: true
entry_schema:
type: json
- port_vdbe_untr_vmi_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_vdbe_availability_zone:
type: list
required: true
@@ -205,10 +200,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_vmi_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_vmi_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_vmi_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2b6e88dd48..d6eb7f3ee5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -52,12 +52,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: float
- port_vdbe_untr_2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_vlan2_aap_untrusted_v6_ip_prefix:
type: list
required: true
@@ -196,12 +190,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_vlan1_ip_v6_address:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
index 6608ddb811..7d79d2ac08 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
@@ -485,8 +485,6 @@ topology_template:
get_input: vdbe_flavor_name
subinterface_vlan1_counter:
- get_input: counter
- port_vdbe_untr_2_port_subinterface_indicator:
- - true
subinterface_vlan2_aap_untrusted_v6_ip_prefix:
- get_input: vdbe_aap_untrusted_v6_ip_prefix
vm_image_name:
@@ -522,8 +520,6 @@ topology_template:
- get_input: vdbe_name_1
subinterface_vlan2_aap_untrusted_ip_prefix:
- get_input: vdbe_aap_untrusted_ip_prefix
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_vlan1_ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
subinterface_vlan2_vmac_address:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
index 4ef1ae6e3d..eb07f32348 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
@@ -47,11 +47,6 @@ topology_template:
required: true
entry_schema:
type: float
- port_vdbe_untr_2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_vlan2_aap_untrusted_v6_ip_prefix:
type: list
required: true
@@ -164,11 +159,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_vlan1_ip_v6_address:
type: list
required: true
@@ -346,10 +336,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_2_port_virtual_network_refs
@@ -552,10 +539,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 28d80b519e..7287a3e5cf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -156,12 +156,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_vlan1_ip_v6_address:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml
index 3ecb94b2fe..4b01d53b86 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml
@@ -455,8 +455,6 @@ topology_template:
- get_input: vdbe_name_1
subinterface_vlan2_aap_untrusted_ip_prefix:
- get_input: vdbe_aap_untrusted_ip_prefix
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_vlan1_ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
subinterface_vlan2_vmac_address:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml
index 3babb153db..32b9a11a22 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml
@@ -132,11 +132,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_vlan1_ip_v6_address:
type: list
required: true
@@ -376,10 +371,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bd94f25284..c7b8cd4d42 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -186,12 +186,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml
index 0516898e7e..0be42078f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml
@@ -471,8 +471,6 @@ topology_template:
- get_input: vdbe_aap_sec_untrusted_ip_prefix_len
subinterface_vdbe_untr_1_subports_vlan_tag_list:
- get_input: untrusted_vlan_tags
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
- get_input: vdbe_aap_untrusted_ip_prefix
subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml
index 721af0f45b..6cff6fed0d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml
@@ -157,11 +157,6 @@ topology_template:
required: true
entry_schema:
type: json
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
type: list
required: true
@@ -372,10 +367,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9b8810f3f3..fc61996a8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,6 @@ node_types:
org.openecomp.resource.abstract.nodes.vdbe:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_vdbe_untr_1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml
index 4d550ba930..bc23a31f92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml
@@ -488,8 +488,6 @@ topology_template:
directives:
- substitutable
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- - false
compute_vdbe_availability_zone:
- get_input: availability_zone_1
vm_flavor_name:
@@ -541,4 +539,4 @@ topology_template:
- suport_missing_vlan_tag_property
- control_int_net
- subport_get_param_parent
- - abstract_vdbe \ No newline at end of file
+ - abstract_vdbe
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml
index aca6038cfe..32820f315d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_vdbe_untr_1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -125,10 +120,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9bf67731bd..c9fd22347a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,6 @@ node_types:
org.openecomp.resource.abstract.nodes.vdbe:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml
index 7eb63dbfcc..ad4d4b176b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml
@@ -395,8 +395,6 @@ topology_template:
directives:
- substitutable
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_nested_parent_interface:
- vdbe_untr_1_port
subinterface_nested_aap_address_mode:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
index 41bb064ee0..41df8dbf83 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
@@ -290,10 +285,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ecc78109cd..a97e1c5616 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,6 @@ node_types:
org.openecomp.resource.abstract.nodes.vdbe:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml
index 5ffc4e1449..761705a73a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml
@@ -471,8 +471,6 @@ topology_template:
directives:
- substitutable
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_nested_parent_interface:
- vdbe_untr_1_port
subinterface_nested_aap_address_mode:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml
index 70e19420b3..f6a589c740 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
@@ -286,10 +281,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 30a4aec6a2..ba1e016f54 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,6 @@ node_types:
org.openecomp.resource.abstract.nodes.vdbe:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml
index 3232218d9e..eba062fc34 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml
@@ -473,8 +473,6 @@ topology_template:
directives:
- substitutable
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_nested_parent_interface:
- vdbe_untr_1_port
subinterface_nested_aap_address_mode:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml
index ae5bb90ea4..b99beeba54 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
@@ -291,10 +286,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0f685b46e7..ed56e9450a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,6 @@ node_types:
org.openecomp.resource.abstract.nodes.vdbe:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml
index 199571e7df..d972079e92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml
@@ -395,8 +395,6 @@ topology_template:
directives:
- substitutable
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_nested_parent_interface:
- vdbe_untr_1_port
subinterface_nested_aap_address_mode:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml
index 5edce41701..ff4be3b1c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
@@ -287,10 +282,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e8ac4eac41..38dc006923 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -122,12 +122,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_vdbe_untr_port_name:
type: list
required: true
@@ -689,12 +683,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_vdbe_untr_port_subnetpoolid:
type: string
required: true
@@ -1096,4 +1084,4 @@ node_types:
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- - UNBOUNDED \ No newline at end of file
+ - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml
index 9e46cf6bf1..66cbff9d89 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml
@@ -417,8 +417,6 @@ topology_template:
port_vdbe_untr_port_mac_requirements:
mac_count_required:
is_required: false
- port_vdbe_untr_port_subinterface_indicator:
- - false
compute_vdbe_availability_zone:
- get_input: availability_zone_1
port_vdbe_untr_port_name:
@@ -505,8 +503,6 @@ topology_template:
port_vdbe_untr_port_mac_requirements:
mac_count_required:
is_required: false
- port_vdbe_untr_port_subinterface_indicator:
- - true
port_vdbe_untr_port_name:
- str_replace:
template: VM_NAMEDBE001p1n004
@@ -562,4 +558,4 @@ topology_template:
get_input: untr_vfc_instance_group_function
subinterface_role: untr
members:
- - abstract_vdbe \ No newline at end of file
+ - abstract_vdbe
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml
index c74aa04dcd..044f967842 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml
@@ -104,11 +104,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_vdbe_untr_port_name:
type: list
required: true
@@ -266,10 +261,7 @@ topology_template:
get_input: port_vdbe_untr_port_exCP_naming
vlan_requirements:
get_input: port_vdbe_untr_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_vdbe_untr_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml
index 82071e382b..fb2c45beed 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_vdbe_untr_port_subnetpoolid:
type: string
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_vdbe_untr_port_exCP_naming
vlan_requirements:
get_input: port_vdbe_untr_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_vdbe_untr_port_ip_requirements
network_role_tag:
@@ -303,4 +295,4 @@ topology_template:
- local_storage
dependency_vdbe:
- vdbe
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 95f99fc457..b481f2805a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -610,12 +604,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml
index e2df01a92d..ca498b2bff 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml
@@ -733,8 +733,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net1
port_pd01_port_network_role_tag: oam
@@ -772,8 +770,6 @@ topology_template:
get_input: pd_flavor_name
subinterface_nested_p1:
- ps01_port_0
- port_ps01_port_subinterface_indicator:
- - true
vm_image_name:
get_input: pd_image_name
port_ps01_port_mac_requirements:
@@ -813,4 +809,4 @@ topology_template:
- test_net2
- test_net1
- abstract_pd_server
- - abstract_ps_server \ No newline at end of file
+ - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index ae47cfa092..968bf65bcf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -144,10 +139,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
index cbe6b147ec..bbe685969c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
@@ -54,11 +54,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
@@ -144,10 +139,7 @@ topology_template:
get_input: port_ps01_port_exCP_naming
vlan_requirements:
get_input: port_ps01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_ps01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d6fa3c4559..9fb2e4e107 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -495,12 +489,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml
index 1b2e4c6775..e873e659f2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml
@@ -729,8 +729,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -772,8 +770,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net1
port_pd01_port_network_role_tag: oam
@@ -802,4 +798,4 @@ topology_template:
- test_net2
- test_net1
- abstract_pd_server
- - abstract_pd_server_1 \ No newline at end of file
+ - abstract_pd_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
index 0ca34a79a5..5cedff2bb9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -144,10 +139,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 95f99fc457..b481f2805a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -610,12 +604,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml
index efa499bdd7..22aa789154 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml
@@ -731,8 +731,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net1
port_pd01_port_network_role_tag: oam
@@ -768,8 +766,6 @@ topology_template:
get_input: pd_flavor_name
subinterface_nested_p1:
- ps01_port_0
- port_ps01_port_subinterface_indicator:
- - true
vm_image_name:
get_input: pd_image_name
port_ps01_port_mac_requirements:
@@ -809,4 +805,4 @@ topology_template:
- test_net2
- test_net1
- abstract_pd_server
- - abstract_ps_server \ No newline at end of file
+ - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index 8a4a553505..9bf8dac214 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -143,10 +138,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
index dd03ca0248..63bea4a70f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
@@ -54,11 +54,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
@@ -143,10 +138,7 @@ topology_template:
get_input: port_ps01_port_exCP_naming
vlan_requirements:
get_input: port_ps01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_ps01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index eb19ee1ea8..06c4052f8f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -54,12 +54,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
@@ -543,12 +537,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml
index 29b1cd7c9f..b902522d1c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml
@@ -720,8 +720,6 @@ topology_template:
get_input: pd_flavor_name
subinterface_nested_p1:
- ps01_port_0
- port_ps01_port_subinterface_indicator:
- - true
vm_image_name:
get_input: pd_image_name
port_ps01_port_mac_requirements:
@@ -783,8 +781,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net1
port_pd01_port_network_role_tag: oam
@@ -813,4 +809,4 @@ topology_template:
- test_net2
- test_net1
- abstract_pd_server
- - abstract_pd_server_1 \ No newline at end of file
+ - abstract_pd_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index 66c054bc84..b18f7613c0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -49,11 +49,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_ps01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps01_port_order:
type: integer
required: true
@@ -125,10 +120,7 @@ topology_template:
get_input: port_ps01_port_exCP_naming
vlan_requirements:
get_input: port_ps01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_ps01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
index 0ca34a79a5..5cedff2bb9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -144,10 +139,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d6fa3c4559..9fb2e4e107 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -56,12 +56,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -495,12 +489,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml
index 1b2e4c6775..e873e659f2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml
@@ -729,8 +729,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - false
port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
@@ -772,8 +770,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net1
port_pd01_port_network_role_tag: oam
@@ -802,4 +798,4 @@ topology_template:
- test_net2
- test_net1
- abstract_pd_server
- - abstract_pd_server_1 \ No newline at end of file
+ - abstract_pd_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
index 54070a9852..9ce1d48341 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
@@ -50,11 +50,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -104,10 +99,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
index 0ca34a79a5..5cedff2bb9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -144,10 +139,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4840c96647..fb7153670f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -14,6 +14,12 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ subinterface_vlan1_ip_v6_address:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
subinterface_vlan1_aap_sec_untrusted_ip_prefix:
type: list
required: true
@@ -26,6 +32,12 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ subinterface_vlan1_aap_untrusted_ip_prefix:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
type: list
required: true
@@ -40,22 +52,38 @@ node_types:
type: string
required: true
status: SUPPORTED
+ port_vdbe_untr_2_port_virtual_network_refs:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: json
subinterface_vlan1_counter:
type: list
required: true
status: SUPPORTED
entry_schema:
type: float
- port_vdbe_untr_2_port_subinterface_indicator:
+ subinterface_vlan1_subinterfaces_name_prefix:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
+ type: string
vm_image_name:
type: string
required: true
status: SUPPORTED
+ port_vdbe_untr_1_port_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_vdbe_untr_2_port_name:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
port_vdbe_untr_2_port_network_role:
type: string
required: true
@@ -72,6 +100,12 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ port_vdbe_untr_1_port_virtual_network_refs:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: json
port_vdbe_untr_1_port_ip_requirements:
type: list
required: true
@@ -88,176 +122,130 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_vdbe_untr_2_port_ip_requirements:
+ subinterface_vlan1_vn_network_list:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_vdbe_untr_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_order:
- type: integer
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_subnetpoolid:
+ type: string
+ port_vdbe_untr_2_port_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_vdbe_untr_2_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
- type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- required: true
- status: SUPPORTED
- subinterface_vlan1_mac_address:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- subinterface_vlan1_aap_untrusted_ip_prefix_len:
- type: list
+ port_vdbe_untr_2_port_order:
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: string
- subinterface_vlan1_ip_address:
+ subinterface_vlan1_service_template_filter_count:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- compute_vdbe_name:
+ type: float
+ port_vdbe_untr_2_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- port_vdbe_untr_1_port_network_role_tag:
- type: string
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_vdbe_untr_1_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
+ port_vdbe_untr_1_port_order:
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- subinterface_vlan1_ip_v6_address:
+ subinterface_vlan1_parent_interface:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vlan1_aap_untrusted_ip_prefix:
+ subinterface_vlan1_aap_address_mode:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_2_port_virtual_network_refs:
- type: list
- required: true
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
status: SUPPORTED
- entry_schema:
- type: json
- subinterface_vlan1_subinterfaces_name_prefix:
- type: list
+ constraints:
+ - greater_or_equal: 0
+ port_vdbe_untr_1_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_vdbe_untr_1_port_network_role:
+ port_vdbe_untr_1_port_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_vdbe_untr_2_port_name:
+ subinterface_vlan1_optional_property_1:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_1_port_virtual_network_refs:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- subinterface_vlan1_vn_network_list:
+ port_vdbe_untr_1_port_name:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_2_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_2_port_order:
- type: integer
+ port_vdbe_untr_2_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- subinterface_vlan1_service_template_filter_count:
+ subinterface_vlan1_optional_property_2:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: float
- subinterface_vlan1_parent_interface:
- type: list
+ type: string
+ port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
required: true
status: SUPPORTED
- entry_schema:
- type: string
- subinterface_vlan1_aap_address_mode:
+ subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- port_vdbe_untr_1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- subinterface_vlan1_optional_property_1:
+ subinterface_vlan1_mac_address:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_1_port_name:
+ subinterface_vlan1_aap_untrusted_ip_prefix_len:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vlan1_optional_property_2:
+ subinterface_vlan1_ip_address:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
+ port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+ required: true
+ status: SUPPORTED
+ compute_vdbe_name:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
- type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+ port_vdbe_untr_1_port_network_role_tag:
+ type: string
required: true
status: SUPPORTED
port_vdbe_untr_1_port_vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
index f556f19079..1cbb297669 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
@@ -476,65 +476,29 @@ topology_template:
subinterface_vlan1_aap_untrusted_v6_ip_prefix:
- get_input: vdbe_aap_untrusted_v6_ip_prefix
- get_input: vdbe_aap_untrusted_v6_ip_prefix
+ subinterface_vlan1_ip_v6_address:
+ - get_input: vdbe_untrusted_v6_ip_1
+ - get_input: vdbe_untrusted_v6_ip_1
subinterface_vlan1_aap_sec_untrusted_ip_prefix:
- get_input: vdbe_aap_sec_untrusted_ip_prefix
- get_input: vdbe_aap_sec_untrusted_ip_prefix
compute_vdbe_availability_zone:
- get_input: availability_zone_1
- get_input: availability_zone_1
+ subinterface_vlan1_aap_untrusted_ip_prefix:
+ - get_input: vdbe_aap_untrusted_ip_prefix
+ - get_input: vdbe_aap_untrusted_ip_prefix
port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
- - get_input: vdbe_hw_untr_mac_1
- - get_input: vdbe_hw_untr_mac_1
vm_flavor_name:
get_input: vdbe_flavor_name
- subinterface_vlan1_counter:
- - get_input: counter
- - get_input: counter
- port_vdbe_untr_2_port_subinterface_indicator:
- - false
- - false
- vm_image_name:
- get_input: vdbe_image_name
- compute_vdbe_metadata:
- - vf_module_id:
- get_input: vf_module_id
- vnf_id:
- get_input: vnf_id
- vnf_name:
- get_input: vnf_name
- - vf_module_id:
- get_input: vf_module_id
- vnf_id:
- get_input: vnf_id
- vnf_name:
- get_input: vnf_name
- subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- subinterface_vlan1_mac_address:
- - get_input: vdbe_hw_untr_mac_1
- - get_input: vdbe_hw_untr_mac_1
- subinterface_vlan1_aap_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- subinterface_vlan1_ip_address:
- - get_input: vdbe_untrusted_ip_1
- - get_input: vdbe_untrusted_ip_1
- compute_vdbe_name:
- - get_input: vdbe_name_1
- - get_input: vdbe_name_1
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
- - true
- subinterface_vlan1_ip_v6_address:
- - get_input: vdbe_untrusted_v6_ip_1
- - get_input: vdbe_untrusted_v6_ip_1
- subinterface_vlan1_aap_untrusted_ip_prefix:
- - get_input: vdbe_aap_untrusted_ip_prefix
- - get_input: vdbe_aap_untrusted_ip_prefix
port_vdbe_untr_2_port_virtual_network_refs:
- - fabric_int_net
- - fabric_int_net
+ subinterface_vlan1_counter:
+ - get_input: counter
+ - get_input: counter
subinterface_vlan1_subinterfaces_name_prefix:
- str_replace:
template: VM_NAMEDBE001p1n004
@@ -550,9 +514,27 @@ topology_template:
get_input: vdbe_device_name
VM_NAME:
get_input: vdbe_name_1
+ vm_image_name:
+ get_input: vdbe_image_name
port_vdbe_untr_2_port_name:
- Port_2
- Port_4
+ compute_vdbe_metadata:
+ - vf_module_id:
+ get_input: vf_module_id
+ vnf_id:
+ get_input: vnf_id
+ vnf_name:
+ get_input: vnf_name
+ - vf_module_id:
+ get_input: vf_module_id
+ vnf_id:
+ get_input: vnf_id
+ vnf_name:
+ get_input: vnf_name
+ subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+ - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+ - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
port_vdbe_untr_1_port_virtual_network_refs:
- - control_int_net
- - control_int_net
@@ -592,6 +574,18 @@ topology_template:
subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
- get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- get_input: vdbe_aap_sec_untrusted_ip_prefix_len
+ subinterface_vlan1_mac_address:
+ - get_input: vdbe_hw_untr_mac_1
+ - get_input: vdbe_hw_untr_mac_1
+ subinterface_vlan1_aap_untrusted_ip_prefix_len:
+ - get_input: vdbe_aap_untrusted_ip_prefix_len
+ - get_input: vdbe_aap_untrusted_ip_prefix_len
+ subinterface_vlan1_ip_address:
+ - get_input: vdbe_untrusted_ip_1
+ - get_input: vdbe_untrusted_ip_1
+ compute_vdbe_name:
+ - get_input: vdbe_name_1
+ - get_input: vdbe_name_1
port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- - get_input: vdbe_hw_untr_mac_1
- - get_input: vdbe_hw_untr_mac_1
@@ -640,4 +634,4 @@ topology_template:
value:
get_attribute:
- abstract_vdbe
- - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode \ No newline at end of file
+ - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
index eb21b34ada..13006c7a6e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
@@ -16,147 +16,94 @@ topology_template:
required: true
entry_schema:
type: string
- subinterface_vlan1_aap_sec_untrusted_ip_prefix:
+ subinterface_vlan1_ip_v6_address:
type: list
required: true
entry_schema:
type: string
- compute_vdbe_availability_zone:
+ subinterface_vlan1_aap_sec_untrusted_ip_prefix:
type: list
required: true
entry_schema:
type: string
- port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
+ compute_vdbe_availability_zone:
type: list
required: true
entry_schema:
- type: json
- port_vdbe_untr_2_port_network_role_tag:
- type: string
- required: true
- vm_flavor_name:
- type: string
- required: true
- subinterface_vlan1_counter:
+ type: string
+ subinterface_vlan1_aap_untrusted_ip_prefix:
type: list
required: true
entry_schema:
- type: float
- port_vdbe_untr_2_port_subinterface_indicator:
+ type: string
+ port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
type: list
required: true
entry_schema:
- type: boolean
- vm_image_name:
+ type: json
+ port_vdbe_untr_2_port_network_role_tag:
type: string
required: true
- port_vdbe_untr_2_port_network_role:
+ vm_flavor_name:
type: string
required: true
- compute_vdbe_metadata:
+ port_vdbe_untr_2_port_virtual_network_refs:
type: list
required: true
entry_schema:
type: json
- subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
- type: list
- required: true
- entry_schema:
- type: string
- port_vdbe_untr_1_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_vdbe_untr_2_port_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_vdbe_untr_2_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_vdbe_untr_2_port_ip_requirements:
+ subinterface_vlan1_counter:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_vdbe_untr_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_vdbe_untr_1_port_order:
- type: integer
- required: true
- port_vdbe_untr_1_port_subnetpoolid:
- type: string
- required: true
- port_vdbe_untr_2_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
- type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- required: true
- subinterface_vlan1_mac_address:
+ type: float
+ subinterface_vlan1_subinterfaces_name_prefix:
type: list
required: true
entry_schema:
type: string
- subinterface_vlan1_aap_untrusted_ip_prefix_len:
- type: list
+ vm_image_name:
+ type: string
required: true
- entry_schema:
- type: string
- subinterface_vlan1_ip_address:
- type: list
+ port_vdbe_untr_1_port_network_role:
+ type: string
required: true
- entry_schema:
- type: string
- compute_vdbe_name:
+ port_vdbe_untr_2_port_name:
type: list
required: true
entry_schema:
type: string
- port_vdbe_untr_1_port_network_role_tag:
+ port_vdbe_untr_2_port_network_role:
type: string
required: true
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- subinterface_vlan1_ip_v6_address:
+ compute_vdbe_metadata:
type: list
required: true
entry_schema:
- type: string
- subinterface_vlan1_aap_untrusted_ip_prefix:
+ type: json
+ subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
type: list
required: true
entry_schema:
type: string
- port_vdbe_untr_2_port_virtual_network_refs:
+ port_vdbe_untr_1_port_virtual_network_refs:
type: list
required: true
entry_schema:
type: json
- subinterface_vlan1_subinterfaces_name_prefix:
+ port_vdbe_untr_1_port_ip_requirements:
type: list
required: true
entry_schema:
- type: string
- port_vdbe_untr_1_port_network_role:
- type: string
- required: true
- port_vdbe_untr_2_port_name:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_vdbe_untr_2_port_vlan_requirements:
type: list
required: true
entry_schema:
- type: string
- port_vdbe_untr_1_port_virtual_network_refs:
- type: list
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_vdbe_untr_2_port_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
- entry_schema:
- type: json
subinterface_vlan1_vn_network_list:
type: list
required: true
@@ -173,6 +120,17 @@ topology_template:
required: true
entry_schema:
type: float
+ port_vdbe_untr_2_port_ip_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_vdbe_untr_1_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ port_vdbe_untr_1_port_order:
+ type: integer
+ required: true
subinterface_vlan1_parent_interface:
type: list
required: true
@@ -193,6 +151,9 @@ topology_template:
port_vdbe_untr_1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
+ port_vdbe_untr_1_port_subnetpoolid:
+ type: string
+ required: true
subinterface_vlan1_optional_property_1:
type: list
required: true
@@ -203,19 +164,48 @@ topology_template:
required: true
entry_schema:
type: string
+ port_vdbe_untr_2_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
subinterface_vlan1_optional_property_2:
type: list
required: true
entry_schema:
type: string
+ port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+ required: true
subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
type: list
required: true
entry_schema:
type: string
+ subinterface_vlan1_mac_address:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ subinterface_vlan1_aap_untrusted_ip_prefix_len:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ subinterface_vlan1_ip_address:
+ type: list
+ required: true
+ entry_schema:
+ type: string
port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
required: true
+ compute_vdbe_name:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ port_vdbe_untr_1_port_network_role_tag:
+ type: string
+ required: true
port_vdbe_untr_1_port_vlan_requirements:
type: list
required: true
@@ -266,10 +256,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
virtual_network_refs:
get_input:
- port_vdbe_untr_2_port_virtual_network_refs
@@ -399,10 +386,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a2a3bc67dd..33bfc083ae 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -210,12 +210,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_vmi_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_vlan1_aap_untrusted_ip_prefix:
type: list
required: true
@@ -336,12 +330,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_oam_vmi_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_vdbe_untr_vmi_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
index 1e7c8c88c7..226d35e920 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml
@@ -581,9 +581,6 @@ topology_template:
subinterface_vlan2_vmac_address:
- get_input: vdbe_untrusted_vmac_address
- get_input: vdbe_untrusted_vmac_address
- port_vdbe_untr_vmi_subinterface_indicator:
- - true
- - true
subinterface_vlan1_aap_untrusted_ip_prefix:
- get_input: vdbe_aap_untrusted_ip_prefix
- get_input: vdbe_aap_untrusted_ip_prefix
@@ -653,9 +650,6 @@ topology_template:
subinterface_vlan2_aap_untrusted_v6_ip_prefix_len:
- get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- port_vdbe_oam_vmi_subinterface_indicator:
- - true
- - true
subinterface_vlan2_service_template_filter_count:
- 5
- 5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
index 2bb75a89ee..02a12c7f60 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
@@ -176,11 +176,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_vdbe_untr_vmi_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_vlan1_aap_untrusted_ip_prefix:
type: list
required: true
@@ -280,11 +275,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_vdbe_oam_vmi_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_vdbe_untr_vmi_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -427,10 +417,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_vmi_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_vmi_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_vmi_virtual_network_refs
@@ -471,10 +458,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_oam_vmi_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_oam_vmi_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_oam_vmi_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bebd463f09..996cafa0a5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -138,12 +138,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_nested_vmac_address:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml
index 1d4530863a..dda3d09c8d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml
@@ -545,9 +545,6 @@ topology_template:
subinterface_nested_ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
- get_input: vdbe_untrusted_v6_ip_1
- port_vdbe_untr_port_subinterface_indicator:
- - true
- - true
subinterface_nested_vmac_address:
- get_input: vdbe_untrusted_vmac_address
- get_input: vdbe_untrusted_vmac_address
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml
index 2f44c0c8a8..589a6620e5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml
@@ -117,11 +117,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_nested_vmac_address:
type: list
required: true
@@ -210,10 +205,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 36046c5423..f81ad1f7ef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -52,12 +52,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: float
- port_vdbe_untr_2_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -148,12 +142,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_vlan1_ip_v6_address:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml
index e48bb116b8..d7306a1a23 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml
@@ -488,9 +488,6 @@ topology_template:
subinterface_vlan1_counter:
- get_input: counter
- get_input: counter
- port_vdbe_untr_2_port_subinterface_indicator:
- - false
- - false
vm_image_name:
get_input: vdbe_image_name
compute_vdbe_metadata:
@@ -521,9 +518,6 @@ topology_template:
compute_vdbe_name:
- get_input: vdbe_name_1
- get_input: vdbe_name_1
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
- - true
subinterface_vlan1_ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
- get_input: vdbe_untrusted_v6_ip_1
@@ -623,4 +617,4 @@ topology_template:
members:
- fabric_int_net
- control_int_net
- - abstract_vdbe \ No newline at end of file
+ - abstract_vdbe
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
index e2bf61738b..b8e1dc1ac8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
@@ -47,11 +47,6 @@ topology_template:
required: true
entry_schema:
type: float
- port_vdbe_untr_2_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
vm_image_name:
type: string
required: true
@@ -124,11 +119,6 @@ topology_template:
port_vdbe_untr_1_port_network_role_tag:
type: string
required: true
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_vlan1_ip_v6_address:
type: list
required: true
@@ -271,10 +261,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_2_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_2_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
virtual_network_refs:
get_input:
- port_vdbe_untr_2_port_virtual_network_refs
@@ -404,10 +391,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 25b57c6b4e..042ae7193a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -138,12 +138,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_nested_vmac_address:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml
index bb61d9e082..60c5fb643a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml
@@ -542,9 +542,6 @@ topology_template:
subinterface_nested_ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
- get_input: vdbe_untrusted_v6_ip_1
- port_vdbe_untr_port_subinterface_indicator:
- - true
- - true
subinterface_nested_vmac_address:
- get_input: vdbe_untrusted_vmac_address
- get_input: vdbe_untrusted_vmac_address
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
index aa3c3edb2c..db916c651e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
@@ -117,11 +117,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_nested_vmac_address:
type: list
required: true
@@ -220,10 +215,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b0e8e5605b..feff997eb2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml
index 8ab31b787c..cd1888879e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml
@@ -733,8 +733,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net2
port_pd01_port_network_role_tag: oam
@@ -783,8 +781,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net1
port_pd01_port_network_role_tag: oam
@@ -813,4 +809,4 @@ topology_template:
- test_net2
- test_net1
- abstract_pd_server_0
- - abstract_pd_server_1 \ No newline at end of file
+ - abstract_pd_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml
index 25932a5bf6..e33f3ba91f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -144,10 +139,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b0e8e5605b..feff997eb2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,12 +68,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml
index 3506c1184b..b2cc3927cb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml
@@ -733,8 +733,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net1
port_pd01_port_network_role_tag: oam
@@ -783,8 +781,6 @@ topology_template:
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_subinterface_indicator:
- - true
subinterface_nested_net1:
- test_net1
port_pd01_port_network_role_tag: oam
@@ -817,4 +813,4 @@ topology_template:
- test_net2
- test_net1
- abstract_pd_server_0
- - abstract_pd_server_1 \ No newline at end of file
+ - abstract_pd_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 25932a5bf6..e33f3ba91f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -60,11 +60,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_pd01_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd01_port_order:
type: integer
required: true
@@ -144,10 +139,7 @@ topology_template:
get_input: port_pd01_port_exCP_naming
vlan_requirements:
get_input: port_pd01_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd01_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd01_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9bf67731bd..c9fd22347a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,6 @@ node_types:
org.openecomp.resource.abstract.nodes.vdbe:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml
index e13c18f644..8a3bf941d1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml
@@ -399,8 +399,6 @@ topology_template:
directives:
- substitutable
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_nested_parent_interface:
- vdbe_untr_1_port_1
subinterface_nested_aap_address_mode:
@@ -498,8 +496,6 @@ topology_template:
directives:
- substitutable
properties:
- port_vdbe_untr_1_port_subinterface_indicator:
- - true
subinterface_nested_parent_interface:
- vdbe_untr_1_port_2
subinterface_nested_aap_address_mode:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml
index bd02fe09f5..c3b0f08c96 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_vdbe_untr_1_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_nested_parent_interface:
type: list
required: true
@@ -291,10 +286,7 @@ topology_template:
- index_value
vlan_requirements:
get_input: port_vdbe_untr_1_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_1_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
virtual_network_refs:
get_input:
- port_vdbe_untr_1_port_virtual_network_refs
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml
index 33f746f7f8..010d46bbc5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml
@@ -214,14 +214,15 @@ topology_template:
vdbe_untr_1_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_1_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_1_port_ip_requirements
network_role:
get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_1_port_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml
index 7b355eacb2..bd7ee9a331 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml
@@ -332,14 +332,15 @@ topology_template:
vdbe_untr_1_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_1_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_1_port_ip_requirements
network_role:
get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_1_port_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
@@ -464,14 +465,15 @@ topology_template:
vdbe_untr_2_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_2_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_2_port_ip_requirements
network_role:
get_input: port_vdbe_untr_2_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_2_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_2_port_mac_requirements
+ subinterface_indicator: true
name: Port_2
exCP_naming:
get_input: port_vdbe_untr_2_port_exCP_naming
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml
index 72af3e6093..196ba3ea5e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml
@@ -270,14 +270,15 @@ topology_template:
vdbe_untr_1_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_1_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_1_port_ip_requirements
network_role:
get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_1_port_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml
index 7bda071fa2..933474cc28 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml
@@ -270,14 +270,15 @@ topology_template:
vdbe_untr_1_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_1_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_1_port_ip_requirements
network_role:
get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_1_port_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml
index d3bf9d737e..7ca9a56a96 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml
@@ -214,14 +214,15 @@ topology_template:
vdbe_untr_1_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_1_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_1_port_ip_requirements
network_role:
get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_1_port_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml
index 0f42e66438..f41111de75 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml
@@ -250,14 +250,15 @@ topology_template:
vdbe_untr_1_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_1_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_1_port_ip_requirements
network_role:
get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_1_port_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
index d92dab440e..d307f6eb2a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
@@ -252,14 +252,15 @@ topology_template:
vdbe_untr_1_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_1_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_1_port_ip_requirements
network_role:
get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_1_port_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
index 66689e8228..bde17d080e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
@@ -214,14 +214,15 @@ topology_template:
vdbe_untr_1_port:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_untr_1_port_subnetpoolid
ip_requirements:
get_input: port_vdbe_untr_1_port_ip_requirements
network_role:
get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
mac_requirements:
get_input: port_vdbe_untr_1_port_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 11ab827c9b..62768365f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1113,12 +1113,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -1139,12 +1133,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_pd_server_2b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_2b_port_network_role:
type: string
required: true
@@ -1680,12 +1668,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_ps_server_2b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_2b_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -1712,12 +1694,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 21bc68dae8..1904d92b73 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -94,11 +94,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -115,11 +110,6 @@ topology_template:
port_pd_server_1b_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_pd_server_2b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_2b_port_network_role:
type: string
required: true
@@ -161,10 +151,7 @@ topology_template:
get_input: port_pd_server_2b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_2b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_2b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_2b_port_ip_requirements
network_role_tag:
@@ -241,10 +228,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index 1ed349aea4..0d17953bf2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -46,11 +46,6 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
- port_ps_server_2b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_2b_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -72,11 +67,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -161,10 +151,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
@@ -201,10 +188,7 @@ topology_template:
get_input: port_ps_server_2b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_2b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_2b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_2b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
index aafd2aad7d..17d059e72f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -152,15 +152,11 @@ topology_template:
is_required: false
subinterface_nested_vlan_service_template_filter_count:
- 9
- port_pd_server_1b_port_subinterface_indicator:
- - true
port_pd_server_1b_port_replacement_policy:
- AUTO
port_pd_server_1b_port_mac_requirements:
mac_count_required:
is_required: false
- port_pd_server_2b_port_subinterface_indicator:
- - false
port_pd_server_1b_port_network:
- packet_internal_network
port_pd_server_2b_port_replacement_policy:
@@ -212,8 +208,6 @@ topology_template:
get_input:
- ps_server_2b_ips
- 0
- port_ps_server_2b_port_subinterface_indicator:
- - false
compute_ps_server_1b_availability_zone:
- get_input: availability_zone_0
compute_ps_server_1b_name:
@@ -223,8 +217,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
mac_count_required:
is_required: false
- port_ps_server_1b_port_subinterface_indicator:
- - false
port_ps_server_1b_port_network:
- packet_internal_network
port_ps_server_1b_port_ip_requirements:
@@ -726,4 +718,4 @@ topology_template:
- link_pd_server_1b_pd_server_2b_port
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5833433c36..a80a91c227 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -930,12 +930,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
index ffbd33cba3..033465e290 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -106,8 +106,6 @@ topology_template:
- 9
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - true
subinterface_nested_vlan_net1:
- packet_external_network
vm_image_name:
@@ -591,4 +589,4 @@ topology_template:
- dependency
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 85b75c7544..0f2212017f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -148,6 +148,7 @@ topology_template:
get_input: port_ps_server_1b_port_1_subnetpoolid
mac_requirements:
get_input: port_ps_server_1b_port_1_mac_requirements
+ subinterface_indicator: true
exCP_naming:
get_input: port_ps_server_1b_port_1_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d7ea458bf6..19ea2cdaec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1288,12 +1288,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -2593,12 +2587,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: float
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index f518d262b3..b7e7e4a0df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
required: true
entry_schema:
type: float
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
index cb769d3137..bbc680fb1c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -97,8 +97,6 @@ topology_template:
- 9
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - true
subinterface_nested_vlan_net1:
- packet_external_network
vm_image_name:
@@ -762,4 +760,4 @@ topology_template:
- dependency
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 78d812d65f..cf76c3e13c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -88,9 +88,6 @@ topology_template:
subinterface_nested_vlan_service_template_filter_count:
- 9
- 9
- port_ps_server_1b_port_subinterface_indicator:
- - true
- - true
port_ps_server_1b_port_fixed_ips:
- - ip_address:
get_input:
@@ -557,4 +554,4 @@ topology_template:
- dependency_ps_server_1b
dependency_server_1b_ps_2:
- abstract_ps_server_1b
- - dependency_ps_server_1b \ No newline at end of file
+ - dependency_ps_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0f730fd451..d7df807be0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -861,12 +861,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
index cca8d74d41..fc9893df82 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -115,8 +115,6 @@ topology_template:
- 9
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - true
subinterface_nested_vlan_net1:
- get_input: sub_inf_net
vm_image_name:
@@ -541,4 +539,4 @@ topology_template:
- dependency
local_storage_server_1b_pd_1_test_nested_level2:
- test_nested_level2
- - local_storage_server_1b_pd_1 \ No newline at end of file
+ - local_storage_server_1b_pd_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 019e6cf76e..e415457bec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -147,6 +147,7 @@ topology_template:
get_input: port_pd_server_1b_port_1_subnetpoolid
mac_requirements:
get_input: port_pd_server_1b_port_1_mac_requirements
+ subinterface_indicator: true
exCP_naming:
get_input: port_pd_server_1b_port_1_exCP_naming
vlan_requirements:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f671973941..e4265b87a2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,12 +32,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -2028,12 +2022,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -2459,12 +2447,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: float
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
index 7c56f7b75a..c76ef1bf49 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
@@ -139,11 +139,6 @@ topology_template:
- 9
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - true
- - true
- - true
- - true
subinterface_nested_vlan_net1:
- packet_externalmain_network
- packet_externalmain_network
@@ -257,4 +252,4 @@ topology_template:
- packet_internalmain_network
- test_nested_level1
- packet_externalmain_network
- - abstract_pd_server_1b_1 \ No newline at end of file
+ - abstract_pd_server_1b_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 71c4d654a2..c3bad7cb18 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -26,11 +26,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
index f3ebc433f9..eba7e8bdb0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index f518d262b3..b7e7e4a0df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
required: true
entry_schema:
type: float
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
index 35cb12a9d1..b706d0cfb8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -102,9 +102,6 @@ topology_template:
- 0
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - false
- - false
vm_image_name:
get_input: pd_server_1b_image
port_pd_server_1b_port_replacement_policy:
@@ -173,9 +170,6 @@ topology_template:
subinterface_nested_vlan_service_template_filter_count:
- 9
- 9
- port_ps_server_1b_port_subinterface_indicator:
- - true
- - true
port_ps_server_1b_port_fixed_ips:
- - ip_address:
get_input:
@@ -979,4 +973,4 @@ topology_template:
- dependency_pd_server_1b
dependency_server_1b_pd_3:
- abstract_pd_server_1b
- - dependency_pd_server_1b \ No newline at end of file
+ - dependency_pd_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 974e584ce7..12b12abf68 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -891,12 +891,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
index 6bb9df2728..a9ce4973af 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -121,9 +121,6 @@ topology_template:
- 9
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - true
- - true
subinterface_nested_vlan_net1:
- packet_external_network
- packet_external_network
@@ -584,4 +581,4 @@ topology_template:
- dependency_pd_server_1b_pd_server_1b_port
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1387e5c045..594f24d7bb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1264,12 +1264,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -2539,12 +2533,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -2978,12 +2966,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: float
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index e37886cc8b..40cf56b99a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index f518d262b3..b7e7e4a0df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
required: true
entry_schema:
type: float
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
index fa14eab377..27604b5ede 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
@@ -19,11 +19,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -113,10 +108,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
index 2db4e0145a..5b9bd4c74d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -97,8 +97,6 @@ topology_template:
- 9
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - true
subinterface_nested_vlan_net1:
- packet_external_network
vm_image_name:
@@ -750,4 +748,4 @@ topology_template:
- dependency
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index c732306c51..5aa4c84390 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -85,8 +85,6 @@ topology_template:
port_ps_server_1b_port_mac_requirements:
mac_count_required:
is_required: false
- port_ps_server_1b_port_subinterface_indicator:
- - false
port_ps_server_1b_port_fixed_ips:
- ip_address:
get_input:
@@ -135,8 +133,6 @@ topology_template:
is_required: false
subinterface_nested_vlan_service_template_filter_count:
- 9
- port_ps_server_1b_port_subinterface_indicator:
- - true
port_ps_server_1b_port_fixed_ips:
- ip_address:
get_input:
@@ -575,4 +571,4 @@ topology_template:
- dependency_ps_server_1b
dependency_server_1b_ps_2:
- abstract_ps_server_1b_1
- - dependency_ps_server_1b \ No newline at end of file
+ - dependency_ps_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1e5a598b9e..fcb2bb1802 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1288,12 +1288,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -2593,12 +2587,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: float
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index a429c0a6ea..aecb447d5c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,11 +31,6 @@ topology_template:
vm_flavor_name:
type: string
required: true
- port_pd_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_pd_server_1b_port_vlan_requirements:
type: list
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_pd_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_pd_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_pd_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_pd_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index bda2ced2cf..aa2205acd3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -24,11 +24,6 @@ topology_template:
required: true
entry_schema:
type: float
- port_ps_server_1b_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_ps_server_1b_port_network_role_tag:
type: string
required: true
@@ -153,10 +148,7 @@ topology_template:
get_input: port_ps_server_1b_port_exCP_naming
vlan_requirements:
get_input: port_ps_server_1b_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_ps_server_1b_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_ps_server_1b_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
index 2cd856b0bf..3993f75f99 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -103,8 +103,6 @@ topology_template:
- 9
vm_flavor_name:
get_input: pd_server_1b_flavor
- port_pd_server_1b_port_subinterface_indicator:
- - true
subinterface_nested_vlan_net1:
- packet_external_network
vm_image_name:
@@ -779,4 +777,4 @@ topology_template:
- dependency
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 088577523f..2bba8fd0f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -83,8 +83,6 @@ topology_template:
is_required: false
subinterface_nested_vlan_service_template_filter_count:
- 9
- port_ps_server_1b_port_subinterface_indicator:
- - true
port_ps_server_1b_port_fixed_ips:
- ip_address:
get_input:
@@ -151,8 +149,6 @@ topology_template:
is_required: false
subinterface_nested_vlan_service_template_filter_count:
- 19
- port_ps_server_1b_port_subinterface_indicator:
- - true
port_ps_server_1b_port_fixed_ips:
- ip_address:
get_input:
@@ -615,4 +611,4 @@ topology_template:
- dependency_ps_server_1b
dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1:
- test_resourceGroup_1
- - dependency_template_subint_Vlan_vmi_1 \ No newline at end of file
+ - dependency_template_subint_Vlan_vmi_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bd4018ecbe..65df4491d8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,6 +18,22 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ port_vdbe_untr_port_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
type: list
required: true
@@ -62,6 +78,12 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ subinterface_vdbe_untr_1_subports_ip_v6_address:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
type: list
required: true
@@ -112,182 +134,154 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_vdbe_untr_port_subinterface_indicator:
- type: list
+ port_vdbe_untr_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- entry_schema:
- type: boolean
- subinterface_vdbe_untr_1_subports_vn_network_list:
- type: list
- required: true
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
status: SUPPORTED
- entry_schema:
- type: string
- port_vdbe_untr_port_name:
+ constraints:
+ - greater_or_equal: 0
+ subinterface_vdbe_untr_1_subports_parent_interface:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- subinterface_vdbe_untr_2_subports_vn_network_list:
+ subinterface_vdbe_untr_2_subports_service_template_filter_count:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
+ type: float
+ subinterface_vdbe_untr_1_subports_service_template_filter_count:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- subinterface_vdbe_untr_2_subports_ip_v6_address:
+ type: float
+ subinterface_vdbe_untr_1_subports_vn_network_list:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_mac_address:
+ port_vdbe_untr_port_name:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
+ port_vdbe_untr_port_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- compute_vdbe_name:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ subinterface_vdbe_untr_2_subports_ip_address:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
- type: list
+ port_vdbe_untr_port_network_role:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
- subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
+ subinterface_vdbe_untr_1_subports_vmac_address:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- subinterface_vdbe_untr_1_subports_vlan_tag_list:
+ subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: json
- subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
+ type: string
+ subinterface_vdbe_untr_2_subports_vn_network_list:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
+ subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- subinterface_vdbe_untr_1_subports_ip_v6_address:
+ subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_vdbe_untr_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- subinterface_vdbe_untr_1_subports_parent_interface:
+ subinterface_vdbe_untr_2_subports_ip_v6_address:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_service_template_filter_count:
+ subinterface_vdbe_untr_2_subports_mac_address:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: float
- subinterface_vdbe_untr_1_subports_service_template_filter_count:
+ type: string
+ subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: float
- port_vdbe_untr_port_vlan_requirements:
+ type: string
+ subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- subinterface_vdbe_untr_2_subports_ip_address:
+ type: string
+ subinterface_vdbe_untr_2_subports_parent_interface:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_1_subports_vmac_address:
+ compute_vdbe_name:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
+ subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
+ subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
+ port_vdbe_untr_port_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- subinterface_vdbe_untr_2_subports_parent_interface:
+ type: org.openecomp.datatypes.network.IpRequirements
+ subinterface_vdbe_untr_1_subports_vlan_tag_list:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
+ type: json
requirements:
- dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml
index b24c4a27d3..9f6943864b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml
@@ -416,6 +416,10 @@ topology_template:
properties:
subinterface_vdbe_untr_1_subports_ip_address:
- get_input: vdbe_untrusted_ip_1
+ subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
+ - get_input: vdbe_aap_untrusted_ip_prefix
+ subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
+ - get_input: vdbe_aap_untrusted_ip_prefix
subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
- get_input: vdbe_aap_sec_untrusted_ip_prefix
subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix:
@@ -430,6 +434,8 @@ topology_template:
- get_input: vdbe_aap_untrusted_ip_prefix_len
subinterface_vdbe_untr_1_subports_mac_address:
- get_input: vdbe_hw_untr_mac_1
+ subinterface_vdbe_untr_1_subports_ip_v6_address:
+ - get_input: vdbe_untrusted_v6_ip_1
subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
- str_replace:
template: VM_NAMEDBE001p1n004
@@ -457,8 +463,15 @@ topology_template:
- get_input: aap_address_mode
subinterface_vdbe_untr_2_subports_vlan_tag_list:
- get_input: untrusted_vlan_tags
- port_vdbe_untr_port_subinterface_indicator:
- - true
+ port_vdbe_untr_port_mac_requirements:
+ mac_count_required:
+ is_required: false
+ subinterface_vdbe_untr_1_subports_parent_interface:
+ - vdbe_1_untr_port_1
+ subinterface_vdbe_untr_2_subports_service_template_filter_count:
+ - 5
+ subinterface_vdbe_untr_1_subports_service_template_filter_count:
+ - get_input: untrusted_num_vn
subinterface_vdbe_untr_1_subports_vn_network_list:
- get_input: untrusted_vn_networks
port_vdbe_untr_port_name:
@@ -469,16 +482,34 @@ topology_template:
get_input: vdbe_device_name
VM_NAME:
get_input: vdbe_name_1
+ subinterface_vdbe_untr_2_subports_ip_address:
+ - get_input: vdbe_untrusted_ip_1
+ subinterface_vdbe_untr_1_subports_vmac_address:
+ - get_input: vdbe_untrusted_vmac_address
+ subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
+ - str_replace:
+ template: VM_NAMEDBE001p1n004
+ params:
+ DBE:
+ get_input: vdbe_device_name
+ VM_NAME:
+ get_input: vdbe_name_1
subinterface_vdbe_untr_2_subports_vn_network_list:
- get_input: untrusted_vn_networks
subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
- get_input: vdbe_aap_untrusted_v6_ip_prefix
+ subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
+ - get_input: vdbe_aap_sec_untrusted_ip_prefix
subinterface_vdbe_untr_2_subports_ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
subinterface_vdbe_untr_2_subports_mac_address:
- get_input: vdbe_hw_untr_mac_1
subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
- get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+ subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
+ - get_input: vdbe_aap_untrusted_ip_prefix_len
+ subinterface_vdbe_untr_2_subports_parent_interface:
+ - vdbe_1_untr_port_1
compute_vdbe_name:
- get_input: vdbe_name_1
subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
@@ -493,39 +524,6 @@ topology_template:
is_required: false
subinterface_vdbe_untr_1_subports_vlan_tag_list:
- get_input: untrusted_vlan_tags
- subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
- - get_input: vdbe_aap_untrusted_ip_prefix
- subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
- - get_input: vdbe_aap_untrusted_ip_prefix
- subinterface_vdbe_untr_1_subports_ip_v6_address:
- - get_input: vdbe_untrusted_v6_ip_1
- port_vdbe_untr_port_mac_requirements:
- mac_count_required:
- is_required: false
- subinterface_vdbe_untr_1_subports_parent_interface:
- - vdbe_1_untr_port_1
- subinterface_vdbe_untr_2_subports_service_template_filter_count:
- - 5
- subinterface_vdbe_untr_1_subports_service_template_filter_count:
- - get_input: untrusted_num_vn
- subinterface_vdbe_untr_2_subports_ip_address:
- - get_input: vdbe_untrusted_ip_1
- subinterface_vdbe_untr_1_subports_vmac_address:
- - get_input: vdbe_untrusted_vmac_address
- subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix
- subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- subinterface_vdbe_untr_2_subports_parent_interface:
- - vdbe_1_untr_port_1
service_template_filter:
substitute_service_template: Nested_vdbeServiceTemplate.yaml
count: 1
@@ -554,4 +552,4 @@ topology_template:
get_input: untr_vfc_instance_group_function
subinterface_role: untr
members:
- - abstract_vdbe \ No newline at end of file
+ - abstract_vdbe
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml
index 8ca8da6bcd..9886c59afb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml
@@ -19,6 +19,19 @@ topology_template:
required: true
entry_schema:
type: string
+ subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ port_vdbe_untr_port_subnetpoolid:
+ type: string
+ required: true
subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
type: list
required: true
@@ -55,6 +68,11 @@ topology_template:
required: true
entry_schema:
type: string
+ subinterface_vdbe_untr_1_subports_ip_v6_address:
+ type: list
+ required: true
+ entry_schema:
+ type: string
subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
type: list
required: true
@@ -96,152 +114,129 @@ topology_template:
required: true
entry_schema:
type: json
- port_vdbe_untr_port_subinterface_indicator:
- type: list
+ port_vdbe_untr_port_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- entry_schema:
- type: boolean
- subinterface_vdbe_untr_1_subports_vn_network_list:
+ index_value:
+ type: integer
+ description: Index value of this substitution service template runtime instance
+ required: false
+ default: 0
+ constraints:
+ - greater_or_equal: 0
+ subinterface_vdbe_untr_1_subports_parent_interface:
type: list
required: true
entry_schema:
type: string
- port_vdbe_untr_port_name:
+ subinterface_vdbe_untr_2_subports_service_template_filter_count:
type: list
required: true
entry_schema:
- type: string
- port_vdbe_untr_port_network_role:
- type: string
- required: true
- subinterface_vdbe_untr_2_subports_vn_network_list:
+ type: float
+ subinterface_vdbe_untr_1_subports_service_template_filter_count:
type: list
required: true
entry_schema:
- type: string
- subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
+ type: float
+ subinterface_vdbe_untr_1_subports_vn_network_list:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_ip_v6_address:
+ port_vdbe_untr_port_name:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_mac_address:
+ port_vdbe_untr_port_vlan_requirements:
type: list
required: true
entry_schema:
- type: string
- subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ subinterface_vdbe_untr_2_subports_ip_address:
type: list
required: true
entry_schema:
type: string
- compute_vdbe_name:
- type: list
+ port_vdbe_untr_port_network_role:
+ type: string
required: true
- entry_schema:
- type: string
- subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
+ subinterface_vdbe_untr_1_subports_vmac_address:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
+ subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
type: list
required: true
entry_schema:
type: string
- port_vdbe_untr_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- subinterface_vdbe_untr_1_subports_vlan_tag_list:
- type: list
- required: true
- entry_schema:
- type: json
- subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
+ subinterface_vdbe_untr_2_subports_vn_network_list:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
+ subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
type: list
required: true
entry_schema:
type: string
- port_vdbe_untr_port_subnetpoolid:
- type: string
- required: true
- subinterface_vdbe_untr_1_subports_ip_v6_address:
+ subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
type: list
required: true
entry_schema:
type: string
- port_vdbe_untr_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- subinterface_vdbe_untr_1_subports_parent_interface:
+ subinterface_vdbe_untr_2_subports_ip_v6_address:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_service_template_filter_count:
+ subinterface_vdbe_untr_2_subports_mac_address:
type: list
required: true
entry_schema:
- type: float
- subinterface_vdbe_untr_1_subports_service_template_filter_count:
+ type: string
+ subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
type: list
required: true
entry_schema:
- type: float
- port_vdbe_untr_port_vlan_requirements:
+ type: string
+ subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- subinterface_vdbe_untr_2_subports_ip_address:
+ type: string
+ subinterface_vdbe_untr_2_subports_parent_interface:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_1_subports_vmac_address:
+ compute_vdbe_name:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
+ subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
+ subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
type: list
required: true
entry_schema:
type: string
- subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
+ port_vdbe_untr_port_ip_requirements:
type: list
required: true
entry_schema:
- type: string
- subinterface_vdbe_untr_2_subports_parent_interface:
+ type: org.openecomp.datatypes.network.IpRequirements
+ subinterface_vdbe_untr_1_subports_vlan_tag_list:
type: list
required: true
entry_schema:
- type: string
+ type: json
node_templates:
vdbe_vdbe_untr_port_vdbe_untr_1_subports:
type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
@@ -432,10 +427,7 @@ topology_template:
get_input: port_vdbe_untr_port_exCP_naming
vlan_requirements:
get_input: port_vdbe_untr_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_vdbe_untr_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7294ba02a2..96d91bc3ff 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -128,12 +128,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
subinterface_nested_vmac_address:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
index 031731079b..5dac40ecee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
@@ -445,8 +445,6 @@ topology_template:
port_vdbe_untr_port_mac_requirements:
mac_count_required:
is_required: false
- port_vdbe_untr_port_subinterface_indicator:
- - true
subinterface_nested_vmac_address:
- get_input: vdbe_untrusted_vmac_address
subinterface_nested_vn_network_list:
@@ -544,8 +542,6 @@ topology_template:
port_vdbe_untr_port_mac_requirements:
mac_count_required:
is_required: false
- port_vdbe_untr_port_subinterface_indicator:
- - true
subinterface_nested_vmac_address:
- get_input: vdbe_untrusted_vmac_address
subinterface_nested_vn_network_list:
@@ -608,4 +604,4 @@ topology_template:
subinterface_role: untr
members:
- abstract_vdbe_0
- - abstract_vdbe_1 \ No newline at end of file
+ - abstract_vdbe_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
index 71097c0ac2..64948006ea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
@@ -109,11 +109,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
subinterface_nested_vmac_address:
type: list
required: true
@@ -189,10 +184,7 @@ topology_template:
get_input: port_vdbe_untr_port_exCP_naming
vlan_requirements:
get_input: port_vdbe_untr_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_vdbe_untr_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
index 19a79dc96d..17a2d85109 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
@@ -196,14 +196,15 @@ topology_template:
vdbe_0_untr_vmi_1:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
+ subnetpoolid:
+ get_input: port_vdbe_0_untr_vmi_1_subnetpoolid
ip_requirements:
get_input: port_vdbe_0_untr_vmi_1_ip_requirements
network_role:
get_input: port_vdbe_0_untr_vmi_1_network_role
- subnetpoolid:
- get_input: port_vdbe_0_untr_vmi_1_subnetpoolid
mac_requirements:
get_input: port_vdbe_0_untr_vmi_1_mac_requirements
+ subinterface_indicator: true
name:
str_replace:
template: VM_NAMEDBE001p1n004
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 134a235a05..7bf576a9c5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -234,12 +234,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_vdbe_untr_port_name:
type: list
required: true
@@ -881,12 +875,6 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_vdbe_untr_port_name:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
index 9b2302bf01..e71657f3c9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml
@@ -458,8 +458,6 @@ topology_template:
is_required: false
subinterface_nested2_ip_address:
- get_input: vdbe_untrusted_ip_1
- port_vdbe_untr_port_subinterface_indicator:
- - true
port_vdbe_untr_port_name:
- str_replace:
template: VM_NAMEDBE001p1n004
@@ -551,8 +549,6 @@ topology_template:
port_vdbe_untr_port_mac_requirements:
mac_count_required:
is_required: false
- port_vdbe_untr_port_subinterface_indicator:
- - true
port_vdbe_untr_port_name:
- str_replace:
template: VM_NAMEDBE001p1n004
@@ -619,4 +615,4 @@ topology_template:
get_input: oam_vfc_instance_group_function
subinterface_role: oam
members:
- - abstract_vdbe_1 \ No newline at end of file
+ - abstract_vdbe_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
index c74aa04dcd..044f967842 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
@@ -104,11 +104,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_vdbe_untr_port_name:
type: list
required: true
@@ -266,10 +261,7 @@ topology_template:
get_input: port_vdbe_untr_port_exCP_naming
vlan_requirements:
get_input: port_vdbe_untr_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_vdbe_untr_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml
index d75abde655..4ab26dde29 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml
@@ -89,11 +89,6 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_vdbe_untr_port_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_vdbe_untr_port_name:
type: list
required: true
@@ -270,10 +265,7 @@ topology_template:
get_input: port_vdbe_untr_port_exCP_naming
vlan_requirements:
get_input: port_vdbe_untr_port_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_vdbe_untr_port_subinterface_indicator
- - index_value
+ subinterface_indicator: true
ip_requirements:
get_input: port_vdbe_untr_port_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7087e7d068..114521fe48 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,12 +8,20 @@ node_types:
org.openecomp.resource.abstract.nodes.FSB1:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
+ port_FSB1_Internal_mac_address:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB1_Internal_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_FSB2_Internal_2_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
port_FSB1_Internal_subnetpoolid:
type: string
required: true
@@ -22,142 +30,74 @@ node_types:
type: string
required: true
status: SUPPORTED
- compute_FSB1_metadata:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- port_FSB1_OAM_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
- port_FSB2_Internal_2_order:
- type: integer
- required: true
- status: SUPPORTED
- vm_flavor_name:
+ port_FSB1_OAM_subnetpoolid:
type: string
required: true
status: SUPPORTED
- port_FSB1_OAM_vlan_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB1_Internal_vlan_requirements:
+ compute_FSB1_metadata:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB1_Internal_network:
- type: list
+ type: json
+ port_FSB2_Internal_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_FSB2_Internal_1_order:
- type: integer
+ port_FSB1_OAM_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_FSB2_Internal_2_ip_requirements:
+ port_FSB1_OAM_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_FSB1_OAM_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_FSB2_Internal_1_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_FSB2_Internal_2_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_FSB1_OAM_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_FSB2_Internal_1_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_FSB2_Internal_2_network_role_tag:
- type: string
+ port_FSB2_Internal_2_order:
+ type: integer
required: true
status: SUPPORTED
- port_FSB2_Internal_1_subnetpoolid:
+ port_FSB2_Internal_1_mac_address:
type: string
required: true
status: SUPPORTED
- port_FSB1_Internal_mac_address:
+ vm_flavor_name:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal_2_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_FSB1_OAM_subnetpoolid:
+ port_FSB2_Internal_2_mac_address:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal_1_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_FSB2_Internal_1_subinterface_indicator:
+ port_FSB2_Internal_1_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- port_FSB1_OAM_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_FSB1_OAM_ip_requirements:
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_FSB2_Internal_2_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_FSB2_Internal_1_mac_address:
- type: string
- required: true
- status: SUPPORTED
- port_FSB2_Internal_2_mac_address:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_FSB1_Internal_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal_1_ip_requirements:
+ port_FSB1_OAM_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_FSB2_Internal_2_vlan_requirements:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_FSB1_Internal_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB1_Internal_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -174,13 +114,13 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_FSB1_Internal_subinterface_indicator:
+ compute_FSB1_availability_zone:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
- compute_FSB1_availability_zone:
+ type: string
+ port_FSB1_Internal_network:
type: list
required: true
status: SUPPORTED
@@ -194,12 +134,16 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_FSB2_Internal_2_subinterface_indicator:
+ port_FSB2_Internal_1_order:
+ type: integer
+ required: true
+ status: SUPPORTED
+ port_FSB2_Internal_2_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
+ type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_OAM_order:
type: integer
required: true
@@ -210,12 +154,28 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ port_FSB1_OAM_network:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ port_FSB2_Internal_1_network:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
port_FSB2_Internal_2_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_FSB2_Internal_2_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB2_Internal_1_network_role_tag:
type: string
required: true
@@ -224,6 +184,14 @@ node_types:
type: integer
required: true
status: SUPPORTED
+ port_FSB1_OAM_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_FSB2_Internal_1_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB1_OAM_network_role_tag:
type: string
required: true
@@ -244,10 +212,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+ port_FSB2_Internal_2_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB2_Internal_2_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
+ port_FSB2_Internal_1_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
requirements:
- dependency_FSB1_FSB1_Internal:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
index 29f618cc5b..eb0ec3020f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
@@ -11,98 +11,34 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
+ port_FSB1_Internal_mac_address:
+ type: string
+ required: true
port_FSB1_Internal_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_FSB2_Internal_2_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_FSB1_Internal_subnetpoolid:
type: string
required: true
port_FSB2_Internal_2_subnetpoolid:
type: string
required: true
- compute_FSB1_metadata:
- type: list
- required: true
- entry_schema:
- type: json
- port_FSB1_OAM_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
- port_FSB2_Internal_2_order:
- type: integer
- required: true
- vm_flavor_name:
+ port_FSB1_OAM_subnetpoolid:
type: string
required: true
- port_FSB1_OAM_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB1_Internal_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB1_Internal_network:
- type: list
- required: true
- entry_schema:
- type: string
- port_FSB2_Internal_1_order:
- type: integer
- required: true
- port_FSB2_Internal_2_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_FSB1_OAM_network:
- type: list
- required: true
- entry_schema:
- type: string
- port_FSB2_Internal_1_network:
+ compute_FSB1_metadata:
type: list
required: true
entry_schema:
- type: string
- port_FSB2_Internal_2_network_role:
- type: string
- required: true
- port_FSB1_OAM_network_role:
- type: string
- required: true
- port_FSB2_Internal_1_network_role:
- type: string
- required: true
- port_FSB2_Internal_2_network_role_tag:
- type: string
- required: true
- port_FSB2_Internal_1_subnetpoolid:
- type: string
- required: true
- port_FSB1_Internal_mac_address:
- type: string
- required: true
- port_FSB2_Internal_2_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_FSB1_OAM_subnetpoolid:
- type: string
- required: true
+ type: json
port_FSB2_Internal_1_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_FSB2_Internal_1_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_OAM_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -111,9 +47,15 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_FSB2_Internal_2_order:
+ type: integer
+ required: true
port_FSB2_Internal_1_mac_address:
type: string
required: true
+ vm_flavor_name:
+ type: string
+ required: true
port_FSB2_Internal_2_mac_address:
type: string
required: true
@@ -130,6 +72,16 @@ topology_template:
port_FSB1_Internal_network_role_tag:
type: string
required: true
+ port_FSB1_OAM_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_FSB1_Internal_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -142,12 +94,12 @@ topology_template:
port_FSB1_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_FSB1_Internal_subinterface_indicator:
+ compute_FSB1_availability_zone:
type: list
required: true
entry_schema:
- type: boolean
- compute_FSB1_availability_zone:
+ type: string
+ port_FSB1_Internal_network:
type: list
required: true
entry_schema:
@@ -159,11 +111,14 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_FSB2_Internal_2_subinterface_indicator:
+ port_FSB2_Internal_1_order:
+ type: integer
+ required: true
+ port_FSB2_Internal_2_ip_requirements:
type: list
required: true
entry_schema:
- type: boolean
+ type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_OAM_order:
type: integer
required: true
@@ -172,17 +127,36 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ port_FSB1_OAM_network:
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ port_FSB2_Internal_1_network:
+ type: list
+ required: true
+ entry_schema:
+ type: string
port_FSB2_Internal_2_network:
type: list
required: true
entry_schema:
type: string
+ port_FSB2_Internal_2_network_role:
+ type: string
+ required: true
port_FSB2_Internal_1_network_role_tag:
type: string
required: true
port_FSB1_Internal_order:
type: integer
required: true
+ port_FSB1_OAM_network_role:
+ type: string
+ required: true
+ port_FSB2_Internal_1_network_role:
+ type: string
+ required: true
port_FSB1_OAM_network_role_tag:
type: string
required: true
@@ -199,9 +173,15 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+ port_FSB2_Internal_2_network_role_tag:
+ type: string
+ required: true
port_FSB2_Internal_2_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
+ port_FSB2_Internal_1_subnetpoolid:
+ type: string
+ required: true
node_templates:
FSB1_FSB1_Internal:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -210,10 +190,7 @@ topology_template:
get_input: port_FSB1_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB1_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_Internal_ip_requirements
network_role_tag:
@@ -244,10 +221,7 @@ topology_template:
get_input: port_FSB2_Internal_1_exCP_naming
vlan_requirements:
get_input: port_FSB2_Internal_1_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB2_Internal_1_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB2_Internal_1_ip_requirements
network_role_tag:
@@ -278,10 +252,7 @@ topology_template:
get_input: port_FSB2_Internal_2_exCP_naming
vlan_requirements:
get_input: port_FSB2_Internal_2_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB2_Internal_2_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB2_Internal_2_ip_requirements
network_role_tag:
@@ -312,10 +283,7 @@ topology_template:
get_input: port_FSB1_OAM_exCP_naming
vlan_requirements:
get_input: port_FSB1_OAM_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_OAM_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_OAM_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e21fa17343..e22c860596 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -42,12 +42,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_FSB1_OAM_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_FSB1_OAM_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -104,12 +98,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_FSB1_availability_zone:
type: list
required: true
@@ -166,12 +154,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_FSB2_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_FSB1_OAM_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
index e1a6f40602..82388dac1d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
@@ -38,11 +38,6 @@ topology_template:
port_FSB2_Internal_order:
type: integer
required: true
- port_FSB1_OAM_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_OAM_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -87,11 +82,6 @@ topology_template:
port_FSB1_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_FSB1_availability_zone:
type: list
required: true
@@ -137,11 +127,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_FSB2_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_OAM_network_role_tag:
type: string
required: true
@@ -169,10 +154,7 @@ topology_template:
get_input: port_FSB1_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB1_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_Internal_ip_requirements
network_role_tag:
@@ -203,10 +185,7 @@ topology_template:
get_input: port_FSB2_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB2_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB2_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB2_Internal_ip_requirements
network_role_tag:
@@ -237,10 +216,7 @@ topology_template:
get_input: port_FSB1_OAM_exCP_naming
vlan_requirements:
get_input: port_FSB1_OAM_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_OAM_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_OAM_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8113a8048f..b0861eae74 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -74,12 +74,6 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_FSB1_availability_zone:
type: list
required: true
@@ -122,12 +116,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_FSB2_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_FSB1_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
index 72d2ee6f1f..2978332fac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -63,11 +63,6 @@ topology_template:
port_FSB1_Internal_network_role:
type: string
required: true
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_FSB1_availability_zone:
type: list
required: true
@@ -102,11 +97,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_FSB2_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -126,10 +116,7 @@ topology_template:
get_input: port_FSB1_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB1_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_Internal_ip_requirements
network_role_tag:
@@ -160,10 +147,7 @@ topology_template:
get_input: port_FSB2_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB2_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB2_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB2_Internal_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 52effbbc3a..7aadbaf386 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -42,12 +42,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_FSB1_OAM_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_FSB1_OAM_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -104,12 +98,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_FSB1_availability_zone:
type: list
required: true
@@ -166,12 +154,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_FSB2_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_FSB1_OAM_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
index 0fb34fd252..b3663c8ac4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -38,11 +38,6 @@ topology_template:
port_FSB2_Internal_order:
type: integer
required: true
- port_FSB1_OAM_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_OAM_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -87,11 +82,6 @@ topology_template:
port_FSB1_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_FSB1_availability_zone:
type: list
required: true
@@ -137,11 +127,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_FSB2_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_OAM_network_role_tag:
type: string
required: true
@@ -169,10 +154,7 @@ topology_template:
get_input: port_FSB1_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB1_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_Internal_ip_requirements
network_role_tag:
@@ -203,10 +185,7 @@ topology_template:
get_input: port_FSB2_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB2_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB2_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB2_Internal_ip_requirements
network_role_tag:
@@ -237,10 +216,7 @@ topology_template:
get_input: port_FSB1_OAM_exCP_naming
vlan_requirements:
get_input: port_FSB1_OAM_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_OAM_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_OAM_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c88962628d..3e8b719e50 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,48 +38,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_FSB2_Internal_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- vm_flavor_name:
- type: string
- required: true
- status: SUPPORTED
- port_FSB2_Internal_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_FSB1_Internal_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
- port_FSB1_Internal_vlan_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB2_Internal_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- port_FSB1_Internal_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- port_FSB1_Internal_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
compute_FSB1_availability_zone:
type: list
required: true
@@ -98,30 +56,52 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
+ port_FSB2_Internal_ip_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ vm_flavor_name:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB2_Internal_mac_address:
type: string
required: true
status: SUPPORTED
+ port_FSB2_Internal_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB2_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
+ port_FSB1_Internal_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB1_Internal_order:
type: integer
required: true
status: SUPPORTED
- port_FSB2_Internal_network:
+ port_FSB1_Internal_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
- port_FSB2_Internal_subinterface_indicator:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_FSB2_Internal_network:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: boolean
+ type: string
+ port_FSB2_Internal_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB1_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -132,6 +112,14 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
+ port_FSB1_Internal_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
+ port_FSB1_Internal_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB2_Internal_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
index b1ba634c79..9e616c9ba0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -35,39 +35,6 @@ topology_template:
port_FSB2_Internal_order:
type: integer
required: true
- port_FSB2_Internal_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- vm_flavor_name:
- type: string
- required: true
- port_FSB2_Internal_network_role:
- type: string
- required: true
- port_FSB1_Internal_network_role_tag:
- type: string
- required: true
- port_FSB1_Internal_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB2_Internal_subnetpoolid:
- type: string
- required: true
- port_FSB1_Internal_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- port_FSB1_Internal_network_role:
- type: string
- required: true
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
compute_FSB1_availability_zone:
type: list
required: true
@@ -83,25 +50,42 @@ topology_template:
port_FSB2_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
+ port_FSB2_Internal_ip_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.IpRequirements
+ vm_flavor_name:
+ type: string
+ required: true
port_FSB2_Internal_mac_address:
type: string
required: true
+ port_FSB2_Internal_network_role:
+ type: string
+ required: true
port_FSB2_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
+ port_FSB1_Internal_network_role_tag:
+ type: string
+ required: true
port_FSB1_Internal_order:
type: integer
required: true
- port_FSB2_Internal_network:
+ port_FSB1_Internal_vlan_requirements:
type: list
required: true
entry_schema:
- type: string
- port_FSB2_Internal_subinterface_indicator:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_FSB2_Internal_network:
type: list
required: true
entry_schema:
- type: boolean
+ type: string
+ port_FSB2_Internal_subnetpoolid:
+ type: string
+ required: true
port_FSB1_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -110,6 +94,12 @@ topology_template:
required: true
entry_schema:
type: string
+ port_FSB1_Internal_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ port_FSB1_Internal_network_role:
+ type: string
+ required: true
port_FSB2_Internal_network_role_tag:
type: string
required: true
@@ -121,10 +111,7 @@ topology_template:
get_input: port_FSB1_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB1_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_Internal_ip_requirements
network_role_tag:
@@ -161,10 +148,7 @@ topology_template:
get_input: port_FSB2_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB2_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB2_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB2_Internal_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7fd691c1d9..397a1a0541 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -36,12 +36,6 @@ node_types:
type: integer
required: true
status: SUPPORTED
- port_FSB1_OAM_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_FSB1_OAM_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -98,12 +92,6 @@ node_types:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_FSB1_Internal_network:
type: list
required: true
@@ -154,12 +142,6 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_FSB2_Internal_subinterface_indicator:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: boolean
port_FSB1_OAM_network_role_tag:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
index f0a87d321a..bb7bb359c1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -33,11 +33,6 @@ topology_template:
port_FSB2_Internal_order:
type: integer
required: true
- port_FSB1_OAM_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_OAM_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -82,11 +77,6 @@ topology_template:
port_FSB1_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_FSB1_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_Internal_network:
type: list
required: true
@@ -127,11 +117,6 @@ topology_template:
required: true
entry_schema:
type: string
- port_FSB2_Internal_subinterface_indicator:
- type: list
- required: true
- entry_schema:
- type: boolean
port_FSB1_OAM_network_role_tag:
type: string
required: true
@@ -154,10 +139,7 @@ topology_template:
get_input: port_FSB1_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB1_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_Internal_ip_requirements
network_role_tag:
@@ -188,10 +170,7 @@ topology_template:
get_input: port_FSB2_Internal_exCP_naming
vlan_requirements:
get_input: port_FSB2_Internal_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB2_Internal_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB2_Internal_ip_requirements
network_role_tag:
@@ -222,10 +201,7 @@ topology_template:
get_input: port_FSB1_OAM_exCP_naming
vlan_requirements:
get_input: port_FSB1_OAM_vlan_requirements
- subinterface_indicator:
- get_input:
- - port_FSB1_OAM_subinterface_indicator
- - index_value
+ subinterface_indicator: false
ip_requirements:
get_input: port_FSB1_OAM_ip_requirements
network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
index 53edc4aa75..62e3c5574a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
@@ -74,7 +74,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal2-net
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -86,7 +85,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -103,7 +101,6 @@ topology_template:
- ip_address:
get_input: fsb1-oam-ip
network: jsa_net1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -184,16 +181,12 @@ topology_template:
properties:
port_FSB1_Internal_mac_address:
get_input: fsb1-Internal1-mac
- port_FSB1_OAM_subinterface_indicator:
- - false
vm_flavor_name:
get_input: fsb-flavor
vm_image_name:
get_input: fsb-image
compute_FSB_admin_pass:
- STATIC-DATA-FSB1
- port_FSB1_Internal_subinterface_indicator:
- - false
port_FSB1_Internal_network:
- Internal1-net
port_FSB2_Internal_mac_address:
@@ -206,8 +199,6 @@ topology_template:
- write_files:
- path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
- path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
- port_FSB2_Internal_subinterface_indicator:
- - false
compute_FSB_availability_zone:
- get_input: fsb1_zone
port_FSB1_OAM_fixed_ips:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
index 1ece0e77db..6305a7cae6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
@@ -69,7 +69,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal2-net
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -81,7 +80,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -160,8 +158,6 @@ topology_template:
directives:
- substitutable
properties:
- port_FSB1_Internal_2_subinterface_indicator:
- - false
vm_flavor_name:
get_input: fsb-flavor
vm_image_name:
@@ -170,8 +166,6 @@ topology_template:
- STATIC-DATA-FSB1
port_FSB1_Internal_1_mac_address:
get_input: fsb1-Internal1-mac
- port_FSB1_Internal_1_subinterface_indicator:
- - false
port_FSB1_Internal_1_network:
- Internal1-net
port_FSB1_Internal_2_mac_address:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
index 74af8bd259..ca75560607 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
@@ -94,7 +94,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal2-mac
network: Internal2-net-fsb2-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -106,7 +105,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal1-mac
network: Internal2-net-fsb2-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -118,7 +116,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal1-net-fsb1-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -134,7 +131,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net-fsb1-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -256,9 +252,6 @@ topology_template:
compute_FSB_admin_pass:
- STATIC-DATA-FSB1
- STATIC-DATA-FSB2
- port_FSB1_Internal_subinterface_indicator:
- - false
- - false
port_FSB1_Internal_network:
- Internal1-net-fsb1-Internal1
- Internal1-net-fsb1-Internal2
@@ -274,9 +267,6 @@ topology_template:
- write_files:
- path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
- path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
- port_FSB2_Internal_subinterface_indicator:
- - false
- - false
compute_FSB_availability_zone:
- get_input: fsb1_zone
- get_input: fsb2_zone
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
index cb4c364068..51410677fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
@@ -259,16 +259,12 @@ topology_template:
directives:
- substitutable
properties:
- port_VMI_subinterface_indicator:
- - false
port_FSB1_Port_network:
- Internal1-net
vm_flavor_name:
get_input: fsb1-flavor
port_FSB1_Port_mac_address:
get_input: fsb1-Internal1-mac
- port_FSB1_Port_subinterface_indicator:
- - false
compute_FSB1_availability_zone:
- get_input: fsb_zone
port_VMI_port_tuple_refs:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
index 33cf0ab91a..d4722c1b28 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
@@ -104,7 +104,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal2-mac
network: Internal2-net-fsb2-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -120,7 +119,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal1-mac
network: Internal2-net-fsb2-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -136,7 +134,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal1-net-fsb1-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -152,7 +149,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net-fsb1-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -253,9 +249,6 @@ topology_template:
compute_FSB_admin_pass:
- OPTIONAL-DATA-FSB1
- null
- port_FSB1_Internal_subinterface_indicator:
- - false
- - false
port_FSB1_Internal_network:
- Internal1-net-fsb1-Internal1
- Internal1-net-fsb1-Internal2
@@ -271,9 +264,6 @@ topology_template:
- write_files:
- path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
- path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
- port_FSB2_Internal_subinterface_indicator:
- - false
- - false
compute_FSB_availability_zone:
- get_input: fsb1_zone
- get_input: fsb2_zone
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
index bf66e19579..12db507859 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
@@ -57,7 +57,6 @@ topology_template:
replacement_policy: AUTO
network:
get_input: port_name
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -89,7 +88,6 @@ topology_template:
replacement_policy: AUTO
network:
get_input: port_name
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -108,8 +106,6 @@ topology_template:
- RAW
vm_image_name:
get_input: image_smp_name
- port_port_1_subinterface_indicator:
- - false
port_port_2_replacement_policy:
- AUTO
compute_smp_name:
@@ -118,8 +114,6 @@ topology_template:
- AUTO
port_port_1_network:
- get_input: port_name
- port_port_2_subinterface_indicator:
- - false
port_port_2_network:
- get_input: port_name
compute_smp_metadata:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
index f0d017909c..df2509108f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
@@ -104,7 +104,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal2-mac
network: Internal2-net-fsb2-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -120,7 +119,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal1-mac
network: Internal2-net-fsb2-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -136,7 +134,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal1-net-fsb1-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -152,7 +149,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net-fsb1-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -266,9 +262,6 @@ topology_template:
compute_FSB_admin_pass:
- STATIC-DATA-FSB1
- STATIC-DATA-FSB2
- port_FSB1_Internal_subinterface_indicator:
- - false
- - false
port_FSB1_Internal_network:
- Internal1-net-fsb1-Internal1
- Internal1-net-fsb1-Internal2
@@ -284,9 +277,6 @@ topology_template:
- write_files:
- path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
- path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
- port_FSB2_Internal_subinterface_indicator:
- - false
- - false
compute_FSB_availability_zone:
- get_input: fsb1_zone
- get_input: fsb2_zone
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
index 796d4db974..e4ee3cca82 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
@@ -55,7 +55,6 @@ topology_template:
properties:
network:
get_input: cdr_network
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -66,7 +65,6 @@ topology_template:
properties:
network:
get_input: oam_private_net_name
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -99,22 +97,18 @@ topology_template:
directives:
- substitutable
properties:
- vm_flavor_name: FLAVOR-test
- vm_image_name: Image-test
- port_oam_private_net_network_port_subinterface_indicator:
- - false
compute_QRouter_availability_zone:
- Availability-test
compute_QRouter_config_drive:
- true
port_cdr_network_port_network:
- get_input: cdr_network
+ vm_flavor_name: FLAVOR-test
port_oam_private_net_network_port_network:
- get_input: oam_private_net_name
+ vm_image_name: Image-test
compute_QRouter_name:
- QRouter-name
- port_cdr_network_port_subinterface_indicator:
- - false
service_template_filter:
substitute_service_template: Nested_QRouterServiceTemplate.yaml
count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
index 6315ba5ec4..5071ce06a4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
@@ -104,7 +104,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal2-mac
network: Internal2-net-fsb2-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -120,7 +119,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal1-mac
network: Internal2-net-fsb2-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -136,7 +134,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal1-net-fsb1-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -152,7 +149,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net-fsb1-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -253,9 +249,6 @@ topology_template:
compute_FSB_admin_pass:
- STATIC-DATA-FSB1
- STATIC-DATA-FSB2
- port_FSB1_Internal_subinterface_indicator:
- - false
- - false
port_FSB1_Internal_network:
- Internal1-net-fsb1-Internal1
- Internal1-net-fsb1-Internal2
@@ -271,9 +264,6 @@ topology_template:
- write_files:
- path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
- path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
- port_FSB2_Internal_subinterface_indicator:
- - false
- - false
compute_FSB_availability_zone:
- get_input: fsb1_zone
- get_input: fsb2_zone
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
index 03086cc4a9..a881a1e458 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
@@ -79,7 +79,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal2-net
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -91,7 +90,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -108,7 +106,6 @@ topology_template:
- ip_address:
get_input: fsb1-oam-ip
network: jsa_net1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -178,16 +175,12 @@ topology_template:
properties:
port_FSB1_Internal_mac_address:
get_input: fsb1-Internal1-mac
- port_FSB1_OAM_subinterface_indicator:
- - false
vm_flavor_name:
get_input: fsb-flavor
vm_image_name:
get_input: fsb-image
compute_FSB_admin_pass:
- STATIC-DATA-FSB1
- port_FSB1_Internal_subinterface_indicator:
- - false
port_FSB1_Internal_network:
- Internal1-net
port_FSB2_Internal_mac_address:
@@ -200,8 +193,6 @@ topology_template:
- write_files:
- path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
- path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
- port_FSB2_Internal_subinterface_indicator:
- - false
compute_FSB_availability_zone:
- get_input: fsb1_zone
port_FSB1_OAM_fixed_ips:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
index 511aa0ccbe..6ae9f35a2a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
@@ -104,7 +104,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal2-mac
network: Internal2-net-fsb2-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -120,7 +119,6 @@ topology_template:
mac_address:
get_input: fsb2-Internal1-mac
network: Internal2-net-fsb2-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -136,7 +134,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal1-net-fsb1-Internal2
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -152,7 +149,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net-fsb1-Internal1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -293,9 +289,6 @@ topology_template:
compute_FSB_admin_pass:
- STATIC-DATA-FSB1
- STATIC-DATA-FSB2
- port_FSB1_Internal_subinterface_indicator:
- - false
- - false
port_FSB1_Internal_network:
- Internal1-net-fsb1-Internal1
- Internal1-net-fsb1-Internal2
@@ -311,9 +304,6 @@ topology_template:
- write_files:
- path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
- path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
- port_FSB2_Internal_subinterface_indicator:
- - false
- - false
compute_FSB_availability_zone:
- get_input: fsb1_zone
- get_input: fsb2_zone
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
index 41a5177c3d..99365a8f15 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
@@ -79,7 +79,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal2-mac
network: Internal2-net
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -91,7 +90,6 @@ topology_template:
mac_address:
get_input: fsb1-Internal1-mac
network: Internal1-net
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -108,7 +106,6 @@ topology_template:
- ip_address:
get_input: fsb1-oam-ip
network: jsa_net1
- subinterface_indicator: false
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -198,16 +195,12 @@ topology_template:
properties:
port_FSB1_Internal_mac_address:
get_input: fsb1-Internal1-mac
- port_FSB1_OAM_subinterface_indicator:
- - false
vm_flavor_name:
get_input: fsb-flavor
vm_image_name:
get_input: fsb-image
compute_FSB_admin_pass:
- STATIC-DATA-FSB1
- port_FSB1_Internal_subinterface_indicator:
- - false
port_FSB1_Internal_network:
- Internal1-net
port_FSB2_Internal_mac_address:
@@ -220,8 +213,6 @@ topology_template:
- write_files:
- path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
- path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
- port_FSB2_Internal_subinterface_indicator:
- - false
compute_FSB_availability_zone:
- get_input: fsb1_zone
port_FSB1_OAM_fixed_ips: