diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-12 19:29:57 +0530 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2018-04-12 14:51:57 +0000 |
commit | d60b2a40c15c5952f8a31e2d2aa4be2cf4837fc8 (patch) | |
tree | d17143ff8d9708103d98b487700efa1bc356f850 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel | |
parent | 8da1beb7fb630954a0c7adfc7ae6fbb175877b49 (diff) |
Subinterface_indicator property issue
It should only be present under port implementation
Change-Id: I8b52905c5e5c888cf384bebf1d23168c7906b004
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel')
37 files changed, 36 insertions, 363 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index 65368cfc2b..f2f4d3479c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -64,12 +64,6 @@ node_types: type: string required: true status: SUPPORTED - port_oam_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -459,12 +453,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_1b_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -3073,12 +3061,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_ps_server_1b_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -3574,12 +3556,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cmaui_port_subnetpoolid: type: string required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml index c79149bea1..61df375cae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -74,11 +74,6 @@ topology_template: required: true entry_schema: type: string - port_cmaui_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -98,10 +93,7 @@ topology_template: get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cmaui_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml index 674a9d6a5b..f7dc996de0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -56,11 +56,6 @@ topology_template: vm_image_name: type: string required: true - port_oam_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_oam_port_exCP_naming vlan_requirements: get_input: port_oam_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml index 71c4d654a2..c3bad7cb18 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml @@ -26,11 +26,6 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_1b_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_server_1b_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml index 633d5d087b..2ee92d2b40 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml @@ -19,11 +19,6 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_1b_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements - subinterface_indicator: - get_input: - - port_ps_server_1b_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml index 5f9c660752..9c22e8f15d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml @@ -172,9 +172,6 @@ topology_template: - get_input: - cmaui_1c1_names - 0 - port_cmaui_port_subinterface_indicator: - - false - - false service_template_filter: substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml count: 2 @@ -199,8 +196,6 @@ topology_template: - 0 vm_flavor_name: get_input: pd_server_1b_flavor - port_pd_server_1b_port_subinterface_indicator: - - false vm_image_name: get_input: pd_server_1b_image port_pd_server_1b_port_replacement_policy: @@ -239,8 +234,6 @@ topology_template: port_ps_server_1b_port_mac_requirements: mac_count_required: is_required: false - port_ps_server_1b_port_subinterface_indicator: - - false port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -309,8 +302,6 @@ topology_template: - 1 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_subinterface_indicator: - - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -357,8 +348,6 @@ topology_template: - 1 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_subinterface_indicator: - - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1441,4 +1430,4 @@ topology_template: - dependency_cmaui_1c1_cmaui_port dependency_packet_external_network: - packet_external_network - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 80f9877600..26be6a1655 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -64,12 +64,6 @@ node_types: type: string required: true status: SUPPORTED - port_oam_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -1021,12 +1015,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_1b_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -3927,12 +3915,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_ps_server_1b_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -4428,12 +4410,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cmaui_port_subnetpoolid: type: string required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml index c79149bea1..61df375cae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -74,11 +74,6 @@ topology_template: required: true entry_schema: type: string - port_cmaui_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -98,10 +93,7 @@ topology_template: get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cmaui_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml index 3b43af97f6..f2c93a18cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -56,11 +56,6 @@ topology_template: vm_image_name: type: string required: true - port_oam_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_oam_port_exCP_naming vlan_requirements: get_input: port_oam_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml index 71c4d654a2..c3bad7cb18 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml @@ -26,11 +26,6 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_1b_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_server_1b_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml index 633d5d087b..2ee92d2b40 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml @@ -19,11 +19,6 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_1b_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements - subinterface_indicator: - get_input: - - port_ps_server_1b_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml index ec4283632d..71db42ec92 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -138,6 +138,7 @@ topology_template: get_input: port_pd_server_port_1_subnetpoolid mac_requirements: get_input: port_pd_server_port_1_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pd_server_port_1_exCP_naming vlan_requirements: @@ -170,6 +171,7 @@ topology_template: get_input: port_pd_server_port_2_subnetpoolid mac_requirements: get_input: port_pd_server_port_2_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pd_server_port_2_exCP_naming vlan_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml index fae66e3338..bb2dbe5815 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml @@ -172,9 +172,6 @@ topology_template: - get_input: - cmaui_1c1_names - 0 - port_cmaui_port_subinterface_indicator: - - false - - false service_template_filter: substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml count: 2 @@ -199,8 +196,6 @@ topology_template: - 0 vm_flavor_name: get_input: pd_server_1b_flavor - port_pd_server_1b_port_subinterface_indicator: - - false vm_image_name: get_input: pd_server_1b_image port_pd_server_1b_port_replacement_policy: @@ -239,8 +234,6 @@ topology_template: port_ps_server_1b_port_mac_requirements: mac_count_required: is_required: false - port_ps_server_1b_port_subinterface_indicator: - - false port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -309,8 +302,6 @@ topology_template: - 1 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_subinterface_indicator: - - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -357,8 +348,6 @@ topology_template: - 1 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_subinterface_indicator: - - false port_oam_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1448,4 +1437,4 @@ topology_template: - dependency_cmaui_1c1_cmaui_port dependency_packet_external_network: - packet_external_network - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0d08845ac3..411b35e31a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -86,12 +86,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cmaui_port_subnetpoolid: type: string required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml index 9786d07c75..9825e925d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml @@ -74,11 +74,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -98,10 +93,7 @@ topology_template: get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cmaui_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml index 9ee6ff47d9..7e77e65af5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml @@ -103,8 +103,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_cmaui_port_subinterface_indicator: - - false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -151,8 +149,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_cmaui_port_subinterface_indicator: - - false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -546,4 +542,4 @@ topology_template: - local_storage_cmaui dependency_packet_external_network: - packet_external_network - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8d6eae184e..0a4871769b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -86,12 +86,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cmaui_port_subnetpoolid: type: string required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml index 9786d07c75..9825e925d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml @@ -74,11 +74,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -98,10 +93,7 @@ topology_template: get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cmaui_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml index b2b6690966..61b74e8f11 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml @@ -105,9 +105,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_cmaui_port_subinterface_indicator: - - false - - false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 2 @@ -469,4 +466,4 @@ topology_template: - dependency_cmaui_cmaui_port local_storage_server_cmaui_1: - abstract_cmaui - - local_storage_cmaui
\ No newline at end of file + - local_storage_cmaui diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index d480eddc00..5448c1ed56 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -48,12 +48,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -1252,12 +1246,6 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_ps_server_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml index 54906d7701..831d03d388 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml @@ -44,11 +44,6 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_pd_server_port_exCP_naming vlan_requirements: get_input: port_pd_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml index de0ad423a0..86d5f4532a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml @@ -58,11 +58,6 @@ topology_template: port_ps_server_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_ps_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -98,10 +93,7 @@ topology_template: get_input: port_ps_server_port_exCP_naming vlan_requirements: get_input: port_ps_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_ps_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml index 4cd0ea0ac4..83240c60ca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml @@ -99,8 +99,6 @@ topology_template: - get_input: net vm_flavor_name: get_input: pd_server_flavor - port_pd_server_port_subinterface_indicator: - - false port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -141,8 +139,6 @@ topology_template: - 0 vm_flavor_name: get_input: ps_server_flavor - port_ps_server_port_subinterface_indicator: - - false port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1849248662..49d43a3cfc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -48,12 +48,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -1975,12 +1969,6 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -2434,12 +2422,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_sm_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_sm_server_name: type: list required: true @@ -2881,12 +2863,6 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_ps_server_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml index 3a5ee71b1a..9287c9a685 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml @@ -26,11 +26,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_oam_server_port_exCP_naming vlan_requirements: get_input: port_oam_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_server_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml index 54906d7701..831d03d388 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml @@ -44,11 +44,6 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_pd_server_port_exCP_naming vlan_requirements: get_input: port_pd_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml index de0ad423a0..86d5f4532a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml @@ -58,11 +58,6 @@ topology_template: port_ps_server_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_ps_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -98,10 +93,7 @@ topology_template: get_input: port_ps_server_port_exCP_naming vlan_requirements: get_input: port_ps_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_ps_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml index bb990b977e..502ee9b957 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml @@ -46,11 +46,6 @@ topology_template: required: true entry_schema: type: string - port_sm_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_sm_server_name: type: list required: true @@ -113,10 +108,7 @@ topology_template: get_input: port_sm_server_port_exCP_naming vlan_requirements: get_input: port_sm_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_sm_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_sm_server_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml index 083ffb8cc4..3044ae9f59 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml @@ -99,8 +99,6 @@ topology_template: - get_input: net vm_flavor_name: get_input: pd_server_flavor - port_pd_server_port_subinterface_indicator: - - false port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -141,8 +139,6 @@ topology_template: - 0 vm_flavor_name: get_input: ps_server_flavor - port_ps_server_port_subinterface_indicator: - - false port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -522,4 +518,4 @@ topology_template: - link_ps_server_ps_server_port local_storage_server_ps: - abstract_ps_server - - local_storage_ps_server
\ No newline at end of file + - local_storage_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml index dba728c8d9..0429c660e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml @@ -87,8 +87,6 @@ topology_template: get_input: sm_server_flavor port_sm_server_port_network: - get_input: net - port_sm_server_port_subinterface_indicator: - - false compute_sm_server_name: - get_input: - sm_server_names @@ -128,8 +126,6 @@ topology_template: properties: port_oam_server_port_network: - get_input: net - port_oam_server_port_subinterface_indicator: - - false port_oam_server_port_replacement_policy: - AUTO vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8c643c711c..0d456cdb90 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -54,12 +54,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -1987,12 +1981,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -2446,12 +2434,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_sm_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_sm_server_name: type: list required: true @@ -2905,12 +2887,6 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_ps_server_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml index 334615f25f..b47f6e936e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml @@ -31,11 +31,6 @@ topology_template: required: true entry_schema: type: json - port_oam_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -122,22 +117,19 @@ topology_template: get_input: port_oam_server_port_exCP_naming vlan_requirements: get_input: port_oam_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_server_port_ip_requirements network_role_tag: get_input: port_oam_server_port_network_role_tag network_role: get_input: port_oam_server_port_network_role - subnetpoolid: - get_input: port_oam_server_port_subnetpoolid fixed_ips: get_input: - port_oam_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_oam_server_port_subnetpoolid network: get_input: - port_oam_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml index 51b0e191db..3130f3cf53 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml @@ -49,11 +49,6 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -122,22 +117,19 @@ topology_template: get_input: port_pd_server_port_exCP_naming vlan_requirements: get_input: port_pd_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_pd_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: get_input: port_pd_server_port_network_role_tag network_role: get_input: port_pd_server_port_network_role - subnetpoolid: - get_input: port_pd_server_port_subnetpoolid fixed_ips: get_input: - port_pd_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_port_subnetpoolid network: get_input: - port_pd_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml index 31dc6da30a..a8789f3705 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml @@ -63,11 +63,6 @@ topology_template: port_ps_server_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_ps_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -107,22 +102,19 @@ topology_template: get_input: port_ps_server_port_exCP_naming vlan_requirements: get_input: port_ps_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_ps_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: get_input: port_ps_server_port_network_role_tag network_role: get_input: port_ps_server_port_network_role - subnetpoolid: - get_input: port_ps_server_port_subnetpoolid fixed_ips: get_input: - port_ps_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_port_subnetpoolid network: get_input: - port_ps_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml index e486f79a06..22ec89c3c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml @@ -46,11 +46,6 @@ topology_template: required: true entry_schema: type: string - port_sm_server_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_sm_server_name: type: list required: true @@ -122,22 +117,19 @@ topology_template: get_input: port_sm_server_port_exCP_naming vlan_requirements: get_input: port_sm_server_port_vlan_requirements - subinterface_indicator: - get_input: - - port_sm_server_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_sm_server_port_ip_requirements network_role_tag: get_input: port_sm_server_port_network_role_tag network_role: get_input: port_sm_server_port_network_role - subnetpoolid: - get_input: port_sm_server_port_subnetpoolid fixed_ips: get_input: - port_sm_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_sm_server_port_subnetpoolid network: get_input: - port_sm_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml index 4b1f8a2f8c..f730407335 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml @@ -102,8 +102,6 @@ topology_template: - get_input: net vm_flavor_name: get_input: pd_server_flavor - port_pd_server_port_subinterface_indicator: - - false port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -146,8 +144,6 @@ topology_template: - 0 vm_flavor_name: get_input: ps_server_flavor - port_ps_server_port_subinterface_indicator: - - false port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -527,4 +523,4 @@ topology_template: - link_ps_server_ps_server_port local_storage_server_ps: - abstract_ps_server - - local_storage_ps_server
\ No newline at end of file + - local_storage_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml index 475bebc7d1..574225ef0a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml @@ -87,8 +87,6 @@ topology_template: get_input: sm_server_flavor port_sm_server_port_network: - get_input: net - port_sm_server_port_subinterface_indicator: - - false compute_sm_server_name: - get_input: - sm_server_names @@ -133,8 +131,6 @@ topology_template: - get_input: net port_oam_server_port_security_groups: - - get_input: p1 - port_oam_server_port_subinterface_indicator: - - false port_oam_server_port_replacement_policy: - AUTO vm_flavor_name: |