From d60b2a40c15c5952f8a31e2d2aa4be2cf4837fc8 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Thu, 12 Apr 2018 19:29:57 +0530 Subject: Subinterface_indicator property issue It should only be present under port implementation Change-Id: I8b52905c5e5c888cf384bebf1d23168c7906b004 Issue-ID: SDC-1183 Signed-off-by: siddharth0905 --- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 12 ------------ .../diffComputeSubInterface/out/MainServiceTemplate.yaml | 6 +----- .../out/Nested_pd_serverServiceTemplate.yaml | 10 +--------- .../out/Nested_ps_serverServiceTemplate.yaml | 10 +--------- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 12 ------------ .../out/MainServiceTemplate.yaml | 6 +----- .../out/Nested_pd_serverServiceTemplate.yaml | 10 +--------- .../out/Nested_pd_server_1ServiceTemplate.yaml | 10 +--------- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 12 ------------ .../regularNestedSubInterface/out/MainServiceTemplate.yaml | 6 +----- .../out/Nested_pd_serverServiceTemplate.yaml | 10 +--------- .../out/Nested_ps_serverServiceTemplate.yaml | 10 +--------- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 12 ------------ .../out/MainServiceTemplate.yaml | 6 +----- .../out/Nested_pd_serverServiceTemplate.yaml | 10 +--------- .../out/Nested_pd_server_1ServiceTemplate.yaml | 10 +--------- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 12 ------------ .../out/MainServiceTemplate.yaml | 6 +----- .../out/Nested_pd_serverServiceTemplate.yaml | 10 +--------- .../out/Nested_pd_server_1ServiceTemplate.yaml | 10 +--------- 20 files changed, 15 insertions(+), 175 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b') 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: -- cgit 1.2.3-korg