summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-translator-lib
diff options
context:
space:
mode:
authorojasdubey <ojas.dubey@amdocs.com>2018-04-24 16:51:01 +0530
committerOren Kleks <orenkle@amdocs.com>2018-04-24 13:08:15 +0000
commit814961c44cbd8123f92860f1b2095b2c3dcaf181 (patch)
treefc7f0f9057906bf79859df008d51642b0500d66c /openecomp-be/lib/openecomp-sdc-translator-lib
parentc033cdce906efc3b6ccd1d2f45544af47e328ed4 (diff)
Fixed create VF for vOTA and vmstore heats
Updated code for handling identical value property 'ip_requirements' from list of list to list of identical value Change-Id: I1c3571f218fcc18ecfb22dd62112e1496109e3fa Issue-ID: SDC-1255 Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib')
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java26
-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.yaml32
-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.yaml32
-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.yaml32
-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.yaml32
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml17
-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.yaml32
-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.yaml32
-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.yaml17
-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.yaml27
-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.yaml32
-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.yaml17
27 files changed, 203 insertions, 380 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 c4aea2b6a4..57f3d7351b 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
@@ -2819,19 +2819,17 @@ public class UnifiedCompositionService {
UnifiedCompositionEntity inputUnifiedCompositionEntity =
getInputCompositionEntity(substitutionTemplateInputName);
- if (!inputType.equalsIgnoreCase(PropertyType.LIST.getDisplayName())) {
- if (isIdenticalValueProperty(
- substitutionTemplateInputName, inputUnifiedCompositionEntity)) {
- //Handle identical value properties
- Optional<String> identicalValuePropertyName =
- getIdenticalValuePropertyName(substitutionTemplateInputName,
- inputUnifiedCompositionEntity);
-
- identicalValuePropertyName.ifPresent(propertyName -> updateIdenticalPropertyValue(propertyName,
- substitutionTemplateInputName, inputUnifiedCompositionEntity,
- unifiedCompositionDataList.get(0), serviceTemplate, abstractSubstituteProperties,
- context));
- }
+ if (isIdenticalValueProperty(substitutionTemplateInputName, inputUnifiedCompositionEntity)
+ || !inputType.equalsIgnoreCase(PropertyType.LIST.getDisplayName())) {
+ //Handle identical value properties
+ Optional<String> identicalValuePropertyName =
+ getIdenticalValuePropertyName(substitutionTemplateInputName,
+ inputUnifiedCompositionEntity);
+
+ identicalValuePropertyName.ifPresent(propertyName -> updateIdenticalPropertyValue(propertyName,
+ substitutionTemplateInputName, inputUnifiedCompositionEntity,
+ unifiedCompositionDataList.get(0), serviceTemplate, abstractSubstituteProperties,
+ context));
continue;
}
@@ -3663,7 +3661,7 @@ public class UnifiedCompositionService {
private Optional<String> getPortPropertyNameFromInput(String inputName,
List<String> identicalValuePropertyList) {
for (String identicalProperty : identicalValuePropertyList) {
- if (inputName.contains(identicalProperty)) {
+ if (inputName.endsWith(identicalProperty)) {
return Optional.of(identicalProperty);
}
}
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 7fe4cc4503..b1459386a0 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
@@ -300,16 +300,11 @@ topology_template:
vm_flavor_name:
get_input: pd_flavor_name
port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
compute_1c1_scalling_instance_name:
@@ -347,16 +342,11 @@ topology_template:
- myIPs
- 1
port_1c1_t2_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
port_1c1_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -1180,4 +1170,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group
+ - BE_Affinity_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 7c8d560c1e..de39122572 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
@@ -302,16 +302,11 @@ topology_template:
vm_flavor_name:
get_input: pd_flavor_name
port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
compute_1c1_scalling_instance_name:
@@ -349,16 +344,11 @@ topology_template:
- myIPs
- 1
port_1c1_t2_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
port_1c1_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -1021,4 +1011,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group
+ - BE_Affinity_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 166119ea31..0930c1528f 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
@@ -275,16 +275,11 @@ topology_template:
vm_flavor_name:
get_input: pd_flavor_name
port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
compute_1c1_scalling_instance_name:
@@ -322,16 +317,11 @@ topology_template:
- myIPs
- 1
port_1c1_t2_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
port_1c1_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -992,4 +982,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group
+ - BE_Affinity_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 db28dc19e1..58b33a492e 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
@@ -951,16 +951,11 @@ topology_template:
- RAW1
- RAW1
port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
port_1c1_t1_port_name:
@@ -1145,16 +1140,11 @@ topology_template:
- RAW1
- RAW1
port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
vm_image_name:
get_input: pd_image_name
port_1c1_t1_port_name:
@@ -2130,4 +2120,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group
+ - BE_Affinity_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml
index e958a9199c..c9b64ed6f0 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
@@ -363,16 +363,11 @@ topology_template:
vm_image_name:
get_input: cmaui_1c1_main_image
port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
compute_cmaui_1c1_main_availability_zone:
- get_input: availability_zone_0
- get_input: availability_zone_0
@@ -441,4 +436,4 @@ topology_template:
- test_nested_pattern_4_main_0
- abstract_pd_server_main_1b_1
- abstract_ps_server_main_1b_1
- - abstract_cmaui_1c1_main_1
+ - abstract_cmaui_1c1_main_1 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/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 11949e3798..7d4ac036a6 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
@@ -200,16 +200,11 @@ topology_template:
vm_image_name:
get_input: cmaui_1c1_main_image
port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
compute_cmaui_1c1_main_availability_zone:
- get_input: availability_zone_0
- get_input: availability_zone_0
@@ -2373,4 +2368,4 @@ topology_template:
- dependency_test_nested_pattern_4_nested2
dependency_test_nested3Level_test_nested2Level:
- test_nested2Level
- - dependency_test_nested3Level
+ - dependency_test_nested3Level \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml
index d6aadd1e4b..8e569f47cd 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
@@ -293,16 +293,11 @@ topology_template:
vm_image_name:
get_input: cmaui_1c1_nested2_image
port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
compute_cmaui_1c1_nested2_name:
- get_input:
- cmaui_1c1_nested2_names
@@ -1509,4 +1504,4 @@ topology_template:
- local_storage_cmaui_1c1_nested2
dependency_test_nested_pattern_4_nested2:
- test_nested_pattern_4_nested2
- - dependency
+ - dependency \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml
index 3599ca2da1..8269732bdf 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
@@ -625,16 +625,11 @@ topology_template:
- packet_internal_network_2
- packet_internal_network_2
port_BE_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
vm_image_name:
get_input: BE_1c1_image
compute_BE_1c1_name:
@@ -707,4 +702,4 @@ topology_template:
value:
get_attribute:
- abstract_osm_server_1c2_1
- - osm_server_1c2_accessIPv4
+ - osm_server_1c2_accessIPv4 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/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 c53a03545d..327ade922e 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
@@ -196,16 +196,11 @@ topology_template:
vm_image_name:
get_input: cmaui_1c1_image
port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
compute_cmaui_1c1_name:
- get_input:
- cmaui_1c1_names
@@ -1701,4 +1696,4 @@ topology_template:
- dependency
dependency_server_1b_pd_2:
- abstract_pd_server_1b
- - dependency_pd_server_1b
+ - dependency_pd_server_1b \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/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 9c22e8f15d..0b54217586 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
@@ -155,16 +155,11 @@ topology_template:
vm_image_name:
get_input: cmaui_1c1_image
port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
compute_cmaui_1c1_name:
- get_input:
- cmaui_1c1_names
@@ -1430,4 +1425,4 @@ topology_template:
- dependency_cmaui_1c1_cmaui_port
dependency_packet_external_network:
- packet_external_network
- - dependency
+ - dependency \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/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 bb2dbe5815..f6b369aee2 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
@@ -155,16 +155,11 @@ topology_template:
vm_image_name:
get_input: cmaui_1c1_image
port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
compute_cmaui_1c1_name:
- get_input:
- cmaui_1c1_names
@@ -1437,4 +1432,4 @@ topology_template:
- dependency_cmaui_1c1_cmaui_port
dependency_packet_external_network:
- packet_external_network
- - dependency
+ - dependency \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/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 61b74e8f11..5ea441dfea 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
@@ -95,16 +95,11 @@ topology_template:
vm_image_name:
get_input: cmaui_image
port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
service_template_filter:
substitute_service_template: Nested_cmauiServiceTemplate.yaml
count: 2
@@ -466,4 +461,4 @@ topology_template:
- dependency_cmaui_cmaui_port
local_storage_server_cmaui_1:
- abstract_cmaui
- - local_storage_cmaui
+ - local_storage_cmaui \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 917fb38587..27902bc77b 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
@@ -99,16 +99,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-1
- Network-0
@@ -130,4 +125,4 @@ topology_template:
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server
+ - abstract_pd_server \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 2e7a929f6e..dd4e11a31a 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
@@ -113,16 +113,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-1
- Network-0
@@ -154,4 +149,4 @@ topology_template:
- network_policy_server_pd_01
- network_policy_server_pd_02
- network_policy_port0
- - abstract_pd_server
+ - abstract_pd_server \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 b54e72b70b..aa9558e0f4 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
@@ -116,16 +116,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-1
- Network-0
@@ -160,4 +155,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- network_policy_server
- - abstract_pd_server
+ - abstract_pd_server \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 fc2a7312b9..091e767de5 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
@@ -96,16 +96,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-1
- Network-0
@@ -124,4 +119,4 @@ topology_template:
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server
+ - abstract_pd_server \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 726f16c1a9..fab4956ec6 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
@@ -131,16 +131,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-1
- Network-0
@@ -174,4 +169,4 @@ topology_template:
members:
- jsa_security_group
- resource_with_dependOn
- - abstract_pd_server
+ - abstract_pd_server \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 a350c15168..bdf50b94e4 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
@@ -152,16 +152,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- packet_mirror_network
- packet_mirror_network
@@ -213,4 +208,4 @@ topology_template:
members:
- packet_mirror_network
- pd01_volume
- - abstract_pd_server
+ - abstract_pd_server \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 9f518755b5..41df4372dd 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
@@ -102,16 +102,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-1
- Network-0
@@ -145,4 +140,4 @@ topology_template:
name: Policy_BE_Affinity
affinity: host
targets:
- - BE_Affinity_group
+ - BE_Affinity_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 32f8f48d22..f0de88c8cc 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
@@ -99,16 +99,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-1
- Network-0
@@ -149,4 +144,4 @@ topology_template:
value:
get_attribute:
- abstract_pd_server
- - pd_server_accessIPv6
+ - pd_server_accessIPv6 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 29712de461..95d4c73702 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
@@ -150,16 +150,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-PD-1
- Network-PD-0
@@ -206,16 +201,11 @@ topology_template:
- Network-PS-0
- Network-PS-1
port_ps01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
service_template_filter:
substitute_service_template: Nested_ps_serverServiceTemplate.yaml
count: 2
@@ -232,4 +222,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_ps_server
+ - abstract_ps_server \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 f69da5ba75..78b4cc40d4 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
@@ -150,16 +150,11 @@ topology_template:
vm_image_name:
get_input: pd_image_name
port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
port_pd01_port_network:
- Network-PD-1
- Network-PD-0
@@ -210,16 +205,11 @@ topology_template:
- Network-PS-0
- Network-PS-1
port_ps01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
service_template_filter:
substitute_service_template: Nested_ps_serverServiceTemplate.yaml
count: 2
@@ -236,4 +226,4 @@ topology_template:
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_ps_server
+ - abstract_ps_server \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 cf76c3e13c..f0f55f27cc 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
@@ -106,16 +106,11 @@ topology_template:
- packet_ext_network
- packet_ext_network
port_ps_server_1b_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
vm_image_name:
get_input: ps_server_1b_image
port_ps_server_1b_port_replacement_policy:
@@ -554,4 +549,4 @@ topology_template:
- dependency_ps_server_1b
dependency_server_1b_ps_2:
- abstract_ps_server_1b
- - dependency_ps_server_1b
+ - dependency_ps_server_1b \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 c76ef1bf49..fa1596322b 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
@@ -187,26 +187,11 @@ topology_template:
- get_input: availability_zone_0
- get_input: availability_zone_0
port_pd_server_1b_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
service_template_filter:
substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml
count: 4
@@ -252,4 +237,4 @@ topology_template:
- packet_internalmain_network
- test_nested_level1
- packet_externalmain_network
- - abstract_pd_server_1b_1
+ - abstract_pd_server_1b_1 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 b706d0cfb8..873ade14f4 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
@@ -126,16 +126,11 @@ topology_template:
- get_input: availability_zone_0
- get_input: availability_zone_0
port_pd_server_1b_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
service_template_filter:
substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml
count: 2
@@ -188,16 +183,11 @@ topology_template:
- packet_ext_network
- packet_ext_network
port_ps_server_1b_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
vm_image_name:
get_input: ps_server_1b_image
port_ps_server_1b_port_replacement_policy:
@@ -973,4 +963,4 @@ topology_template:
- dependency_pd_server_1b
dependency_server_1b_pd_3:
- abstract_pd_server_1b
- - dependency_pd_server_1b
+ - dependency_pd_server_1b \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 a9ce4973af..b822c5efa3 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
@@ -151,16 +151,11 @@ topology_template:
- get_input: availability_zone_0
- get_input: availability_zone_0
port_pd_server_1b_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
service_template_filter:
substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml
count: 2
@@ -581,4 +576,4 @@ topology_template:
- dependency_pd_server_1b_pd_server_1b_port
dependency_packet_external_network:
- packet_external_network
- - dependency
+ - dependency \ No newline at end of file