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/mixPatterns | |
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/mixPatterns')
49 files changed, 277 insertions, 1305 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index f315b706ff..93674458d4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -964,12 +964,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -1068,12 +1062,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -2138,12 +2126,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c2_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -2184,12 +2166,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2706,12 +2682,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -2776,12 +2746,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -3325,12 +3289,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -3385,12 +3343,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -3879,12 +3831,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -4019,12 +3965,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t1_port_order: type: integer required: true @@ -4564,22 +4504,10 @@ node_types: type: integer required: true status: SUPPORTED - port_1a_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -5080,12 +5008,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5140,12 +5062,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t1_port_value_specs: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml index add19141b8..7fe4cc4503 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml @@ -226,8 +226,6 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1b_t2_port_subinterface_indicator: - - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -243,8 +241,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_subinterface_indicator: - - false compute_b_single_1b_metadata: - connectivityTo4PNested: get_attribute: @@ -300,9 +296,6 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_subinterface_indicator: - - false - - false port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -409,9 +402,6 @@ topology_template: get_attribute: - abstract_b_single_1b - b_single_1b_instance_name - port_1c1_t1_port_subinterface_indicator: - - false - - false service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -512,8 +502,6 @@ topology_template: properties: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - port_1c2_t1_port_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -524,8 +512,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c2_t2_port_subinterface_indicator: - - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -600,8 +586,6 @@ topology_template: properties: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - port_1c2_t1_port_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -612,8 +596,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c2_t2_port_subinterface_indicator: - - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -847,10 +829,6 @@ topology_template: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group - port_1a_t2_port_subinterface_indicator: - - false - port_1a_t1_port_subinterface_indicator: - - false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -1048,8 +1026,6 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1b_t2_port_subinterface_indicator: - - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -1065,8 +1041,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_subinterface_indicator: - - false port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a @@ -1206,4 +1180,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 2149ee469a..d83e7cc273 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -24,11 +24,6 @@ topology_template: required: true entry_schema: type: string - port_1c1_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -137,11 +132,6 @@ topology_template: port_1c1_t1_port_network_role: type: string required: true - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c1_t1_port_order: type: integer required: true @@ -157,10 +147,7 @@ topology_template: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c1_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: @@ -224,10 +211,7 @@ topology_template: get_input: port_1c1_t2_port_exCP_naming vlan_requirements: get_input: port_1c1_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c1_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index c47e4d5767..9178a58df9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -22,11 +22,6 @@ topology_template: port_1c2_t2_port_subnetpoolid: type: string required: true - port_1c2_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -58,11 +53,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -160,10 +150,7 @@ topology_template: get_input: port_1c2_t2_port_exCP_naming vlan_requirements: get_input: port_1c2_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c2_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: @@ -192,10 +179,7 @@ topology_template: get_input: port_1c2_t1_port_exCP_naming vlan_requirements: get_input: port_1c2_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c2_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml index 42c86b84bc..3a130a9584 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml @@ -88,19 +88,9 @@ topology_template: port_1a_t1_port_order: type: integer required: true - port_1a_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1a_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -133,10 +123,7 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -192,10 +179,7 @@ topology_template: get_input: port_1a_t2_port_exCP_naming vlan_requirements: get_input: port_1a_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml index 85437cb4cd..35a7e0973a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml @@ -37,11 +37,6 @@ topology_template: port_1b_t2_port_order: type: integer required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -86,11 +81,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -155,10 +145,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -187,10 +174,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml index d41833ab63..1473c76637 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -37,11 +37,6 @@ topology_template: port_1b_t2_port_order: type: integer required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -86,11 +81,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -160,10 +150,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -192,10 +179,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml index 45191338e8..42c8b54010 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml @@ -22,11 +22,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -106,11 +101,6 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -188,10 +178,7 @@ topology_template: get_input: port_pcm_port_3_exCP_naming vlan_requirements: get_input: port_pcm_port_3_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_3_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_3_ip_requirements network_role_tag: @@ -228,10 +215,7 @@ topology_template: get_input: port_pcm_port_2_exCP_naming vlan_requirements: get_input: port_pcm_port_2_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_2_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_2_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml index 7a3ec20712..d42796a554 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,11 +14,6 @@ topology_template: port_pcm_port_0_network_role: type: string required: true - port_pcm_port_0_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -69,11 +64,6 @@ topology_template: port_pcm_port_1_network_role: type: string required: true - port_pcm_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -179,10 +169,7 @@ topology_template: get_input: port_pcm_port_0_exCP_naming vlan_requirements: get_input: port_pcm_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_0_ip_requirements network_role_tag: @@ -219,10 +206,7 @@ topology_template: get_input: port_pcm_port_1_exCP_naming vlan_requirements: get_input: port_pcm_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_1_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 2a7c9e98a5..394046886b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -112,8 +112,6 @@ topology_template: directives: - substitutable properties: - port_pcm_port_0_subinterface_indicator: - - false port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -127,8 +125,6 @@ topology_template: vm_image_name: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps - port_pcm_port_1_subinterface_indicator: - - false port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -181,8 +177,6 @@ topology_template: port_pcm_port_2_fixed_ips: - ip_address: get_input: cps_net_ip - port_pcm_port_2_subinterface_indicator: - - false vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -210,8 +204,6 @@ topology_template: get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW - port_pcm_port_3_subinterface_indicator: - - false port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: @@ -677,4 +669,4 @@ topology_template: - dependency_pcma_server_pcm_port_1 dependency_pcm_port_2: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2
\ No newline at end of file + - dependency_pcma_server_pcm_port_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml index 04e97ca016..5dc6de3055 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -170,6 +170,7 @@ topology_template: get_input: port_pcm_port_00_subnetpoolid mac_requirements: get_input: port_pcm_port_00_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_00_exCP_naming vlan_requirements: @@ -217,6 +218,7 @@ topology_template: get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_01_exCP_naming vlan_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0708c661c5..20f2eca975 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -960,12 +960,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -1064,12 +1058,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -2130,12 +2118,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c2_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -2176,12 +2158,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2692,12 +2668,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -2762,12 +2732,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -3277,64 +3241,6 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer - required: true - status: SUPPORTED - port_1b_t1_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer - required: true - status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - compute_b_single_1b_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3359,6 +3265,10 @@ node_types: status: SUPPORTED entry_schema: type: json + port_1b_t1_port_order: + type: integer + required: true + status: SUPPORTED port_1b_t2_port_vlan_requirements: type: list required: true @@ -3371,13 +3281,29 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: + port_1b_t1_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_1b_t1_port_network_role_tag: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true status: SUPPORTED @@ -3395,18 +3321,44 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1b_t2_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_order: + type: integer + required: true + status: SUPPORTED port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + compute_b_single_1b_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_b_single_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_1b_t2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_subnetpoolid: + type: string + required: true + status: SUPPORTED attributes: b_single_1b_instance_name: type: string @@ -3859,12 +3811,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -3993,12 +3939,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t1_port_order: type: integer required: true @@ -4529,22 +4469,10 @@ node_types: type: integer required: true status: SUPPORTED - port_1a_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -5045,12 +4973,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5105,12 +5027,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index b9c9ae7630..7c8d560c1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -243,20 +243,6 @@ topology_template: directives: - substitutable properties: - vm_flavor_name: - get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_1b_t2_port_subinterface_indicator: - - false - compute_b_single_1b_user_data_format: - - RAW port_1b_t2_port_mac_requirements: mac_count_required: is_required: false @@ -270,13 +256,23 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_subinterface_indicator: - - false + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name port_1b_t1_port_mac_requirements: mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network + compute_b_single_1b_user_data_format: + - RAW compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -302,9 +298,6 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_subinterface_indicator: - - false - - false port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -381,9 +374,6 @@ topology_template: compute_1c1_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_subinterface_indicator: - - false - - false service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -461,8 +451,6 @@ topology_template: properties: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - port_1c2_t1_port_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -473,8 +461,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c2_t2_port_subinterface_indicator: - - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -520,8 +506,6 @@ topology_template: properties: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - port_1c2_t1_port_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -532,8 +516,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c2_t2_port_subinterface_indicator: - - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -744,10 +726,6 @@ topology_template: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group - port_1a_t2_port_subinterface_indicator: - - false - port_1a_t1_port_subinterface_indicator: - - false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -886,8 +864,6 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1b_t2_port_subinterface_indicator: - - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -903,8 +879,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_subinterface_indicator: - - false port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: @@ -1047,4 +1021,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index f52324068f..268118dc64 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -24,11 +24,6 @@ topology_template: required: true entry_schema: type: string - port_1c1_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -132,11 +127,6 @@ topology_template: port_1c1_t1_port_network_role: type: string required: true - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c1_t1_port_order: type: integer required: true @@ -152,10 +142,7 @@ topology_template: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c1_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: @@ -215,10 +202,7 @@ topology_template: get_input: port_1c1_t2_port_exCP_naming vlan_requirements: get_input: port_1c1_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c1_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 30ca14f281..2c11c084ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -22,11 +22,6 @@ topology_template: port_1c2_t2_port_subnetpoolid: type: string required: true - port_1c2_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -58,11 +53,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -151,10 +141,7 @@ topology_template: get_input: port_1c2_t2_port_exCP_naming vlan_requirements: get_input: port_1c2_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c2_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: @@ -183,10 +170,7 @@ topology_template: get_input: port_1c2_t1_port_exCP_naming vlan_requirements: get_input: port_1c2_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c2_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml index c72b1eb54c..5169d022a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml @@ -83,19 +83,9 @@ topology_template: port_1a_t1_port_order: type: integer required: true - port_1a_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1a_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -128,10 +118,7 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -183,10 +170,7 @@ topology_template: get_input: port_1a_t2_port_exCP_naming vlan_requirements: get_input: port_1a_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml index 3ba6c8079f..391eba68f1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,51 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer - required: true - port_1b_t1_port_network_role: - type: string - required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - vm_flavor_name: - type: string - required: true - port_1b_t1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - compute_b_single_1b_user_data_format: - type: list - required: true - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string - required: true port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -76,6 +31,9 @@ topology_template: required: true entry_schema: type: json + port_1b_t1_port_order: + type: integer + required: true port_1b_t2_port_vlan_requirements: type: list required: true @@ -86,12 +44,24 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: + port_1b_t1_port_network_role: + type: string + required: true + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_flavor_name: + type: string + required: true + port_1b_t1_port_network_role_tag: + type: string + required: true + port_1b_t1_port_ip_requirements: type: list required: true entry_schema: - type: boolean - port_1b_t1_port_network_role_tag: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true port_1b_t1_port_subnetpoolid: @@ -105,16 +75,36 @@ topology_template: required: true entry_schema: type: string + port_1b_t2_port_network_role: + type: string + required: true + port_1b_t2_port_order: + type: integer + required: true port_1b_t1_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + compute_b_single_1b_user_data_format: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_b_single_1b_name: type: list required: true entry_schema: type: string + port_1b_t2_port_network_role_tag: + type: string + required: true + port_1b_t2_port_subnetpoolid: + type: string + required: true node_templates: b_single_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b @@ -146,10 +136,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -178,10 +165,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml index 06e90acd93..ed3dde70f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -37,11 +37,6 @@ topology_template: port_1b_t2_port_order: type: integer required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -86,11 +81,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -151,10 +141,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -183,10 +170,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml index 45191338e8..42c8b54010 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml @@ -22,11 +22,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -106,11 +101,6 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -188,10 +178,7 @@ topology_template: get_input: port_pcm_port_3_exCP_naming vlan_requirements: get_input: port_pcm_port_3_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_3_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_3_ip_requirements network_role_tag: @@ -228,10 +215,7 @@ topology_template: get_input: port_pcm_port_2_exCP_naming vlan_requirements: get_input: port_pcm_port_2_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_2_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_2_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml index 9dd220a0a1..502244f096 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,11 +14,6 @@ topology_template: port_pcm_port_0_network_role: type: string required: true - port_pcm_port_0_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -69,11 +64,6 @@ topology_template: port_pcm_port_1_network_role: type: string required: true - port_pcm_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -179,10 +169,7 @@ topology_template: get_input: port_pcm_port_0_exCP_naming vlan_requirements: get_input: port_pcm_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_0_ip_requirements network_role_tag: @@ -219,10 +206,7 @@ topology_template: get_input: port_pcm_port_1_exCP_naming vlan_requirements: get_input: port_pcm_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_1_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 21335a5297..96bccb85ef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -108,8 +108,6 @@ topology_template: directives: - substitutable properties: - port_pcm_port_0_subinterface_indicator: - - false port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -123,8 +121,6 @@ topology_template: vm_image_name: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps - port_pcm_port_1_subinterface_indicator: - - false port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_1_security_groups: @@ -177,8 +173,6 @@ topology_template: port_pcm_port_2_fixed_ips: - ip_address: get_input: cps_net_ip - port_pcm_port_2_subinterface_indicator: - - false vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -206,8 +200,6 @@ topology_template: get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW - port_pcm_port_3_subinterface_indicator: - - false port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: @@ -673,4 +665,4 @@ topology_template: - link_pcma_server_pcm_port_0 link_pcm_port_3_0: - abstract_pcma_server - - link_pcma_server_pcm_port_3
\ No newline at end of file + - link_pcma_server_pcm_port_3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml index d881e9e06f..d8b22559e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -166,6 +166,7 @@ topology_template: get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_1_exCP_naming vlan_requirements: @@ -213,6 +214,7 @@ topology_template: get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_0_exCP_naming vlan_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml index 565834cea3..7a1ce8554b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -960,12 +960,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -1064,12 +1058,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -2130,12 +2118,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c2_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -2176,12 +2158,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2692,12 +2668,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -2762,12 +2732,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -3277,64 +3241,6 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer - required: true - status: SUPPORTED - port_1b_t1_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer - required: true - status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - compute_b_single_1b_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3359,6 +3265,10 @@ node_types: status: SUPPORTED entry_schema: type: json + port_1b_t1_port_order: + type: integer + required: true + status: SUPPORTED port_1b_t2_port_vlan_requirements: type: list required: true @@ -3371,13 +3281,29 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: + port_1b_t1_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_1b_t1_port_network_role_tag: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true status: SUPPORTED @@ -3395,18 +3321,44 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1b_t2_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_order: + type: integer + required: true + status: SUPPORTED port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + compute_b_single_1b_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_b_single_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_1b_t2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_subnetpoolid: + type: string + required: true + status: SUPPORTED attributes: b_single_1b_instance_name: type: string @@ -3859,12 +3811,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -3993,12 +3939,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t1_port_order: type: integer required: true @@ -4529,22 +4469,10 @@ node_types: type: integer required: true status: SUPPORTED - port_1a_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -5045,12 +4973,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5105,12 +5027,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index d920487490..166119ea31 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -216,20 +216,6 @@ topology_template: directives: - substitutable properties: - vm_flavor_name: - get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_1b_t2_port_subinterface_indicator: - - false - compute_b_single_1b_user_data_format: - - RAW port_1b_t2_port_mac_requirements: mac_count_required: is_required: false @@ -243,13 +229,23 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_subinterface_indicator: - - false + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name port_1b_t1_port_mac_requirements: mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network + compute_b_single_1b_user_data_format: + - RAW compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -275,9 +271,6 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_subinterface_indicator: - - false - - false port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -354,9 +347,6 @@ topology_template: compute_1c1_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_subinterface_indicator: - - false - - false service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -425,8 +415,6 @@ topology_template: properties: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - port_1c2_t1_port_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -437,8 +425,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c2_t2_port_subinterface_indicator: - - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -484,8 +470,6 @@ topology_template: properties: compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name - port_1c2_t1_port_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name vm_image_name: @@ -496,8 +480,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c2_t2_port_subinterface_indicator: - - false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -695,10 +677,6 @@ topology_template: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group - port_1a_t2_port_subinterface_indicator: - - false - port_1a_t1_port_subinterface_indicator: - - false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -864,8 +842,6 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1b_t2_port_subinterface_indicator: - - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -881,8 +857,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_subinterface_indicator: - - false port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: @@ -1018,4 +992,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index f52324068f..268118dc64 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -24,11 +24,6 @@ topology_template: required: true entry_schema: type: string - port_1c1_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -132,11 +127,6 @@ topology_template: port_1c1_t1_port_network_role: type: string required: true - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c1_t1_port_order: type: integer required: true @@ -152,10 +142,7 @@ topology_template: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c1_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: @@ -215,10 +202,7 @@ topology_template: get_input: port_1c1_t2_port_exCP_naming vlan_requirements: get_input: port_1c1_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c1_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 30ca14f281..2c11c084ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -22,11 +22,6 @@ topology_template: port_1c2_t2_port_subnetpoolid: type: string required: true - port_1c2_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -58,11 +53,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -151,10 +141,7 @@ topology_template: get_input: port_1c2_t2_port_exCP_naming vlan_requirements: get_input: port_1c2_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c2_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: @@ -183,10 +170,7 @@ topology_template: get_input: port_1c2_t1_port_exCP_naming vlan_requirements: get_input: port_1c2_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c2_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml index c72b1eb54c..5169d022a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml @@ -83,19 +83,9 @@ topology_template: port_1a_t1_port_order: type: integer required: true - port_1a_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1a_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -128,10 +118,7 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -183,10 +170,7 @@ topology_template: get_input: port_1a_t2_port_exCP_naming vlan_requirements: get_input: port_1a_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml index 3ba6c8079f..391eba68f1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,51 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1b_t1_port_order: - type: integer - required: true - port_1b_t1_port_network_role: - type: string - required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - vm_flavor_name: - type: string - required: true - port_1b_t1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - compute_b_single_1b_user_data_format: - type: list - required: true - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string - required: true port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -76,6 +31,9 @@ topology_template: required: true entry_schema: type: json + port_1b_t1_port_order: + type: integer + required: true port_1b_t2_port_vlan_requirements: type: list required: true @@ -86,12 +44,24 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: + port_1b_t1_port_network_role: + type: string + required: true + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_flavor_name: + type: string + required: true + port_1b_t1_port_network_role_tag: + type: string + required: true + port_1b_t1_port_ip_requirements: type: list required: true entry_schema: - type: boolean - port_1b_t1_port_network_role_tag: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true port_1b_t1_port_subnetpoolid: @@ -105,16 +75,36 @@ topology_template: required: true entry_schema: type: string + port_1b_t2_port_network_role: + type: string + required: true + port_1b_t2_port_order: + type: integer + required: true port_1b_t1_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + compute_b_single_1b_user_data_format: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_b_single_1b_name: type: list required: true entry_schema: type: string + port_1b_t2_port_network_role_tag: + type: string + required: true + port_1b_t2_port_subnetpoolid: + type: string + required: true node_templates: b_single_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b @@ -146,10 +136,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -178,10 +165,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml index 06e90acd93..ed3dde70f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -37,11 +37,6 @@ topology_template: port_1b_t2_port_order: type: integer required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -86,11 +81,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -151,10 +141,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -183,10 +170,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml index 45191338e8..42c8b54010 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml @@ -22,11 +22,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -106,11 +101,6 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -188,10 +178,7 @@ topology_template: get_input: port_pcm_port_3_exCP_naming vlan_requirements: get_input: port_pcm_port_3_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_3_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_3_ip_requirements network_role_tag: @@ -228,10 +215,7 @@ topology_template: get_input: port_pcm_port_2_exCP_naming vlan_requirements: get_input: port_pcm_port_2_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_2_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_2_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml index 7a3ec20712..d42796a554 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,11 +14,6 @@ topology_template: port_pcm_port_0_network_role: type: string required: true - port_pcm_port_0_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -69,11 +64,6 @@ topology_template: port_pcm_port_1_network_role: type: string required: true - port_pcm_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -179,10 +169,7 @@ topology_template: get_input: port_pcm_port_0_exCP_naming vlan_requirements: get_input: port_pcm_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_0_ip_requirements network_role_tag: @@ -219,10 +206,7 @@ topology_template: get_input: port_pcm_port_1_exCP_naming vlan_requirements: get_input: port_pcm_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_1_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 564dc8e9f8..3398598b22 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -108,8 +108,6 @@ topology_template: directives: - substitutable properties: - port_pcm_port_0_subinterface_indicator: - - false port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -123,8 +121,6 @@ topology_template: vm_image_name: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps - port_pcm_port_1_subinterface_indicator: - - false port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -177,8 +173,6 @@ topology_template: port_pcm_port_2_fixed_ips: - ip_address: get_input: cps_net_ip - port_pcm_port_2_subinterface_indicator: - - false vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -206,8 +200,6 @@ topology_template: get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW - port_pcm_port_3_subinterface_indicator: - - false port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: @@ -673,4 +665,4 @@ topology_template: - dependency_pcma_server_pcm_port_1 dependency_pcm_port_2: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2
\ No newline at end of file + - dependency_pcma_server_pcm_port_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml index a99b0d53d2..7b34372e08 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -166,6 +166,7 @@ topology_template: get_input: port_pcm_port_00_subnetpoolid mac_requirements: get_input: port_pcm_port_00_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_00_exCP_naming vlan_requirements: @@ -213,6 +214,7 @@ topology_template: get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_01_exCP_naming vlan_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 646e484720..278deb808f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -1034,12 +1034,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t1_port_network: type: list required: true @@ -2065,12 +2059,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t1_port_network: type: list required: true @@ -2447,12 +2435,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -2551,12 +2533,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -3613,12 +3589,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_2c202_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c201_port_vlan_requirements: type: list required: true @@ -3715,12 +3685,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c201_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4176,12 +4140,6 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_2c202_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -4278,12 +4236,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c201_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4830,12 +4782,6 @@ node_types: type: string required: true status: SUPPORTED - port_1a_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t1_port_vlan_requirements: type: list required: true @@ -5201,12 +5147,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -5271,12 +5211,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -5820,12 +5754,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5880,12 +5808,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -6460,22 +6382,10 @@ node_types: type: integer required: true status: SUPPORTED - port_1a_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -6976,12 +6886,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -7036,12 +6940,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -7554,12 +7452,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -7608,12 +7500,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -8135,12 +8021,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -8189,12 +8069,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_b_single_2b_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index e478518c3b..db28dc19e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -274,8 +274,6 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1b_t2_port_subinterface_indicator: - - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -291,8 +289,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_subinterface_indicator: - - false port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a @@ -331,8 +327,6 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_2c202_port_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name port_2c202_port_ip_requirements: @@ -363,8 +357,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_subinterface_indicator: - - false port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -390,8 +382,6 @@ topology_template: properties: compute_2c2_catalog_instance_user_data_format: - RAW1 - port_2c202_port_subinterface_indicator: - - false vm_flavor_name: get_input: pd_flavor_name port_2c202_port_ip_requirements: @@ -422,8 +412,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_subinterface_indicator: - - false port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -447,8 +435,6 @@ topology_template: directives: - substitutable properties: - port_2c202_port_subinterface_indicator: - - false compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name vm_flavor_name: @@ -479,8 +465,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_subinterface_indicator: - - false port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -508,8 +492,6 @@ topology_template: directives: - substitutable properties: - port_2c202_port_subinterface_indicator: - - false compute_1c2_catalog_instance_availability_zone: - get_input: availabilityzone_name vm_flavor_name: @@ -538,8 +520,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1c201_port_subinterface_indicator: - - false port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -724,10 +704,6 @@ topology_template: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: - group: BE_Affinity_group - port_1a_t2_port_subinterface_indicator: - - false - port_1a_t1_port_subinterface_indicator: - - false compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -993,9 +969,6 @@ topology_template: compute_1c11_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group - port_1c1_t1_port_subinterface_indicator: - - false - - false port_1c1_t1_port_network: - 1c1_scalling_instance_network - 1c1_scalling_instance_network @@ -1094,8 +1067,6 @@ topology_template: get_input: pd_image_name compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_subinterface_indicator: - - false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name port_1b_t2_port_mac_requirements: @@ -1111,8 +1082,6 @@ topology_template: - get_input: - b_single_2b_names - 0 - port_1b_t1_port_subinterface_indicator: - - false compute_b_single_2b_user_data_format: - RAW port_1b_t1_port_mac_requirements: @@ -1194,9 +1163,6 @@ topology_template: compute_1c12_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name - port_1c1_t1_port_subinterface_indicator: - - false - - false port_1c1_t1_port_network: - 1c1_scalling_instance_network - 1c1_scalling_instance_network @@ -1373,8 +1339,6 @@ topology_template: - 0 vm_image_name: get_input: pd_image_name - port_1a_t1_port_subinterface_indicator: - - false compute_a_single_2a_metadata: - connectivityTo4PNested_2: get_attribute: @@ -1516,8 +1480,6 @@ topology_template: get_input: pd_image_name compute_b_single_2b_scheduler_hints: - group: BE_Affinity_group - port_1b_t2_port_subinterface_indicator: - - false compute_b_single_2b_availability_zone: - get_input: availabilityzone_name port_1b_t2_port_mac_requirements: @@ -1533,8 +1495,6 @@ topology_template: - get_input: - b_single_2b_names - 1 - port_1b_t1_port_subinterface_indicator: - - false port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a @@ -1938,8 +1898,6 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_1b_t2_port_subinterface_indicator: - - false compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: @@ -1955,8 +1913,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_subinterface_indicator: - - false compute_b_single_1b_metadata: - connectivityTo4PNested_2: get_attribute: @@ -2174,4 +2130,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml index 59f38d2842..a2e1f59327 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml @@ -79,11 +79,6 @@ topology_template: port_1c1_t1_port_network_role: type: string required: true - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c1_t1_port_network: type: list required: true @@ -127,10 +122,7 @@ topology_template: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c1_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml index bec0f575e2..2a4e09b067 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml @@ -79,11 +79,6 @@ topology_template: required: true entry_schema: type: string - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c1_t1_port_network: type: list required: true @@ -104,10 +99,7 @@ topology_template: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c1_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 88d3420e9c..2d3c227a20 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -11,11 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_2c202_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -93,11 +88,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c201_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -164,10 +154,7 @@ topology_template: get_input: port_1c201_port_exCP_naming vlan_requirements: get_input: port_1c201_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c201_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c201_port_ip_requirements network_role_tag: @@ -196,10 +183,7 @@ topology_template: get_input: port_2c202_port_exCP_naming vlan_requirements: get_input: port_2c202_port_vlan_requirements - subinterface_indicator: - get_input: - - port_2c202_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_2c202_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml index 78ef186ce1..eb8dd3909c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -16,11 +16,6 @@ topology_template: required: true entry_schema: type: string - port_2c202_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c201_port_vlan_requirements: type: list required: true @@ -98,11 +93,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c201_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1c201_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -151,10 +141,7 @@ topology_template: get_input: port_2c202_port_exCP_naming vlan_requirements: get_input: port_2c202_port_vlan_requirements - subinterface_indicator: - get_input: - - port_2c202_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_2c202_port_ip_requirements network_role_tag: @@ -183,10 +170,7 @@ topology_template: get_input: port_1c201_port_exCP_naming vlan_requirements: get_input: port_1c201_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1c201_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1c201_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml index 42c86b84bc..3a130a9584 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml @@ -88,19 +88,9 @@ topology_template: port_1a_t1_port_order: type: integer required: true - port_1a_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_1a_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -133,10 +123,7 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -192,10 +179,7 @@ topology_template: get_input: port_1a_t2_port_exCP_naming vlan_requirements: get_input: port_1a_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml index c099fc8050..456e82876b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml @@ -72,11 +72,6 @@ topology_template: vm_image_name: type: string required: true - port_1a_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1a_t1_port_vlan_requirements: type: list required: true @@ -122,10 +117,7 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1a_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml index 7c950fb3b4..0074e70291 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml @@ -37,11 +37,6 @@ topology_template: port_1b_t2_port_order: type: integer required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -86,11 +81,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -160,10 +150,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -192,10 +179,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml index 80e69025cd..00901d49d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -37,11 +37,6 @@ topology_template: port_1b_t2_port_order: type: integer required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -86,11 +81,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -155,10 +145,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -187,10 +174,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml index 3bdd28fc08..49065169de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml @@ -42,11 +42,6 @@ topology_template: port_1b_t2_port_order: type: integer required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -86,11 +81,6 @@ topology_template: required: true entry_schema: type: string - port_1b_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -160,10 +150,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -192,10 +179,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml index 4b997a780a..a7f96eb52f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml @@ -47,11 +47,6 @@ topology_template: port_1b_t2_port_order: type: integer required: true - port_1b_t2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -91,11 +86,6 @@ topology_template: required: true entry_schema: type: string - port_1b_t1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_b_single_2b_user_data_format: type: list required: true @@ -155,10 +145,7 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -187,10 +174,7 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_1b_t2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml index 45191338e8..42c8b54010 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml @@ -22,11 +22,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -106,11 +101,6 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -188,10 +178,7 @@ topology_template: get_input: port_pcm_port_3_exCP_naming vlan_requirements: get_input: port_pcm_port_3_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_3_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_3_ip_requirements network_role_tag: @@ -228,10 +215,7 @@ topology_template: get_input: port_pcm_port_2_exCP_naming vlan_requirements: get_input: port_pcm_port_2_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_2_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_2_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml index 7a3ec20712..d42796a554 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,11 +14,6 @@ topology_template: port_pcm_port_0_network_role: type: string required: true - port_pcm_port_0_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -69,11 +64,6 @@ topology_template: port_pcm_port_1_network_role: type: string required: true - port_pcm_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -179,10 +169,7 @@ topology_template: get_input: port_pcm_port_0_exCP_naming vlan_requirements: get_input: port_pcm_port_0_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_0_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_0_ip_requirements network_role_tag: @@ -219,10 +206,7 @@ topology_template: get_input: port_pcm_port_1_exCP_naming vlan_requirements: get_input: port_pcm_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_pcm_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_pcm_port_1_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 2a7c9e98a5..394046886b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -112,8 +112,6 @@ topology_template: directives: - substitutable properties: - port_pcm_port_0_subinterface_indicator: - - false port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -127,8 +125,6 @@ topology_template: vm_image_name: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps - port_pcm_port_1_subinterface_indicator: - - false port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -181,8 +177,6 @@ topology_template: port_pcm_port_2_fixed_ips: - ip_address: get_input: cps_net_ip - port_pcm_port_2_subinterface_indicator: - - false vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -210,8 +204,6 @@ topology_template: get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW - port_pcm_port_3_subinterface_indicator: - - false port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: @@ -677,4 +669,4 @@ topology_template: - dependency_pcma_server_pcm_port_1 dependency_pcm_port_2: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2
\ No newline at end of file + - dependency_pcma_server_pcm_port_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml index 04e97ca016..5dc6de3055 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -170,6 +170,7 @@ topology_template: get_input: port_pcm_port_00_subnetpoolid mac_requirements: get_input: port_pcm_port_00_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_00_exCP_naming vlan_requirements: @@ -217,6 +218,7 @@ topology_template: get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements + subinterface_indicator: false exCP_naming: get_input: port_pcm_port_01_exCP_naming vlan_requirements: |