From f691a83954e8fe1148d2a4386cba509bddfa95d5 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Mon, 9 Apr 2018 21:40:24 +0530 Subject: Evaluate subinterface_indicator property Corrected the condition to mark subinterface_indicator true/false Change-Id: I3f21924defbc89a5fcd9a89ffc1ea0d28eec8c36 Issue-ID: SDC-1183 Signed-off-by: siddharth0905 --- .../oneComputeTypeOnePort/out/MainServiceTemplate.yaml | 4 ++-- .../oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml | 4 ++-- .../oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml | 6 +++--- .../out/MainServiceTemplate.yaml | 4 ++-- .../out/MainServiceTemplate.yaml | 4 ++-- .../out/MainServiceTemplate.yaml | 4 ++-- .../oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml | 4 ++-- .../out/MainServiceTemplate.yaml | 4 ++-- .../twoComputeTypesOnePort/out/MainServiceTemplate.yaml | 8 ++++---- .../out/MainServiceTemplate.yaml | 8 ++++---- 10 files changed, 25 insertions(+), 25 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances') 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 aeaeda46f0..7ceff7cc35 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 @@ -123,8 +123,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - 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/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 2c371cd6be..7c99fec6b4 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 @@ -137,8 +137,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - 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/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 58d4c54c3f..07266a4bf0 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 @@ -140,8 +140,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - get_attribute: @@ -173,4 +173,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 b8d5cd6647..59f62e25f9 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 @@ -120,8 +120,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - 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/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 7ac39945a6..30634b5291 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 @@ -155,8 +155,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - 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/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 20fd689f56..ab8de4df45 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 @@ -176,8 +176,8 @@ topology_template: - packet_mirror_network - packet_mirror_network port_pd01_port_subinterface_indicator: - - true - - true + - 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/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 972bf385c1..d663003b4a 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 @@ -126,8 +126,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - 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/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 9785f5bf03..348f675567 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 @@ -123,8 +123,8 @@ topology_template: - Network-1 - Network-0 port_pd01_port_subinterface_indicator: - - true - - true + - 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/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 96b39a73f6..c8d10eebb6 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 @@ -174,8 +174,8 @@ topology_template: - Network-PD-1 - Network-PD-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - null - RAW @@ -208,8 +208,8 @@ topology_template: vm_flavor_name: get_input: ps_flavor_name port_ps01_port_subinterface_indicator: - - true - - true + - false + - false vm_image_name: get_input: ps_image_name port_ps01_port_replacement_policy: 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 f1589d077b..9bf6798f1d 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 @@ -174,8 +174,8 @@ topology_template: - Network-PD-1 - Network-PD-0 port_pd01_port_subinterface_indicator: - - true - - true + - false + - false compute_pd_server_user_data_format: - null - get_attribute: @@ -212,8 +212,8 @@ topology_template: vm_flavor_name: get_input: ps_flavor_name port_ps01_port_subinterface_indicator: - - true - - true + - false + - false vm_image_name: get_input: ps_image_name port_ps01_port_replacement_policy: -- cgit 1.2.3-korg