From 153a35821f0d25ce23cca467b76c5a7c5092c744 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Mon, 3 Jul 2017 20:16:55 +0300 Subject: [sdc] - last merges before moving to LF Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557 Signed-off-by: Tal Gitelman --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 224 ++++++--------------- .../out/MainServiceTemplate.yaml | 17 +- ...ested_1c1_scalling_instanceServiceTemplate.yaml | 32 +-- ...sted_1c2_catalog_instance_0ServiceTemplate.yaml | 32 +-- ...sted_1c2_catalog_instance_1ServiceTemplate.yaml | 32 +-- .../out/Nested_a_single_1aServiceTemplate.yaml | 32 +-- .../out/Nested_b_single_1b_0ServiceTemplate.yaml | 32 +-- .../out/Nested_b_single_1b_1ServiceTemplate.yaml | 32 +-- .../out/nested-pcm_v0.1ServiceTemplate.yaml | 32 +-- 9 files changed, 118 insertions(+), 347 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern') 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 958930407c..cb3099c891 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 @@ -923,17 +923,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -951,29 +947,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -998,11 +986,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string server_group: type: string required: true @@ -1074,11 +1060,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -1518,11 +1502,9 @@ node_types: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -1598,17 +1580,13 @@ node_types: constraints: - greater_or_equal: 0 port_1c1_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c1_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1620,11 +1598,9 @@ node_types: entry_schema: type: string port_1c1_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t2_port_name: type: list required: true @@ -1642,29 +1618,21 @@ node_types: required: true status: SUPPORTED port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c1_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: 1c1_scalling_instance_instance_name: type: list @@ -2100,21 +2068,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1a_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -2132,11 +2096,9 @@ node_types: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -2178,23 +2140,17 @@ node_types: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -2206,17 +2162,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_a_single_1a_user_data_format: type: list required: true @@ -2662,17 +2614,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -2692,17 +2640,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -2714,17 +2658,13 @@ node_types: required: true status: SUPPORTED port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2762,17 +2702,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3230,11 +3166,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -3242,27 +3176,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -3278,17 +3206,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -3300,11 +3224,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -3352,11 +3274,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3798,11 +3718,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c2_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -3810,27 +3728,21 @@ node_types: entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED port_1c2_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -3846,17 +3758,13 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -3868,11 +3776,9 @@ node_types: required: true status: SUPPORTED port_1c2_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -3920,11 +3826,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4390,11 +4294,9 @@ node_types: entry_schema: type: json port_1b_t1_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t2_port_vlan_requirements: type: list required: true @@ -4408,11 +4310,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -4422,11 +4322,9 @@ node_types: required: true status: SUPPORTED port_1b_t1_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_ip_requirements: type: list required: true @@ -4438,11 +4336,9 @@ node_types: required: true status: SUPPORTED port_1b_t1_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4454,17 +4350,13 @@ node_types: entry_schema: type: string port_1b_t2_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_1b_t1_port_vlan_requirements: type: list required: true @@ -4488,17 +4380,13 @@ node_types: entry_schema: type: string port_1b_t2_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: b_single_1b_instance_name: type: list 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 2b3b7f6275..286c01ca77 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 @@ -134,8 +134,7 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: - - ppds + port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1c1_t1_port_ip_requirements: @@ -294,8 +293,7 @@ topology_template: is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -352,8 +350,7 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: - - oam + port_1c2_t1_port_network_role_tag: oam port_1c2_t1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -510,8 +507,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1a_t2_port_network_role_tag: - - ppds + port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -713,8 +709,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_1b_t1_port_network_role_tag: - - oam + port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -849,4 +844,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 fae0d4871a..e318ce1578 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 @@ -25,10 +25,8 @@ topology_template: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -91,15 +89,11 @@ topology_template: constraints: - greater_or_equal: 0 port_1c1_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c1_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -109,10 +103,8 @@ topology_template: entry_schema: type: string port_1c1_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t2_port_name: type: list required: true @@ -127,25 +119,17 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c1_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c1_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: 1c1_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port 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_instance_0ServiceTemplate.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_instance_0ServiceTemplate.yaml index fd0276496e..a658c2b03c 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_instance_0ServiceTemplate.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_instance_0ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_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_1c2_catalog_instance_1ServiceTemplate.yaml index 22a98f80ad..2872bb61d3 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_instance_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_1c2_catalog_instance_1ServiceTemplate.yaml @@ -12,33 +12,25 @@ node_types: topology_template: inputs: port_1c2_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_1c2_catalog_instance_availability_zone: type: list required: true entry_schema: type: string port_1c2_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1c2_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_vlan_requirements: type: list required: true @@ -51,15 +43,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1c2_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1c2_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_ip_requirements: type: list required: true @@ -69,10 +57,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_1c2_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t2_port_network: type: list required: true @@ -112,10 +98,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1c2_t1_port_ip_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 595d5d01a0..9730b31935 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 @@ -17,18 +17,14 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true port_1a_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_network: type: list required: true @@ -43,10 +39,8 @@ topology_template: entry_schema: type: string port_1a_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -81,20 +75,14 @@ topology_template: constraints: - greater_or_equal: 0 port_1a_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1a_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -104,15 +92,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1a_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_a_single_1a_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/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.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_0ServiceTemplate.yaml index 28a98f316f..5c28d30768 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_0ServiceTemplate.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_0ServiceTemplate.yaml @@ -32,10 +32,8 @@ topology_template: entry_schema: type: json port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t2_port_vlan_requirements: type: list required: true @@ -47,10 +45,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -58,10 +54,8 @@ topology_template: type: string required: true port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_ip_requirements: type: list required: true @@ -71,10 +65,8 @@ topology_template: type: string required: true port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -84,15 +76,11 @@ topology_template: entry_schema: type: string port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_vlan_requirements: type: list required: true @@ -112,15 +100,11 @@ topology_template: entry_schema: type: string port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string node_templates: b_single_1b: type: org.openecomp.resource.vfc.nodes.heat.b_single_1b 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 35b6ab9b4a..85181a63a8 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 @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_1b_t1_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_1b_t1_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -36,15 +32,11 @@ topology_template: type: string required: true port_1b_t2_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_b_single_1b_user_data_format: type: list required: true @@ -54,15 +46,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_1b_t2_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -94,15 +82,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_1b_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements 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/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 973ca85b4d..6f2b5a7ca4 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 @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string server_group: hidden: false immutable: false @@ -161,10 +147,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port -- cgit 1.2.3-korg