From 4d97d5fac309ce0d66938e5ccd0349e2660d4e23 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sat, 17 Jun 2017 22:40:44 +0300 Subject: [sdc] update code of sdc Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a Signed-off-by: Michael Lando --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 98 +++++++--------------- .../out/MainServiceTemplate.yaml | 52 +++++------- ...ested_1c1_scalling_instanceServiceTemplate.yaml | 50 ++++------- ...sted_1c2_catalog_instance_0ServiceTemplate.yaml | 38 +++------ ...sted_1c2_catalog_instance_1ServiceTemplate.yaml | 38 +++------ .../out/Nested_a_single_1aServiceTemplate.yaml | 38 +++------ .../out/Nested_b_single_1b_0ServiceTemplate.yaml | 30 ++----- .../out/Nested_b_single_1b_1ServiceTemplate.yaml | 38 +++------ 8 files changed, 121 insertions(+), 261 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out') 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 f0a9da57b6..801b398414 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 @@ -1492,11 +1492,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 @@ -1506,7 +1504,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -1534,7 +1532,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_1c1_t2_port_network: type: list required: true @@ -1546,7 +1544,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_1c1_t1_port_vlan_requirements: type: list required: true @@ -1558,13 +1556,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1c1_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1586,11 +1582,9 @@ node_types: entry_schema: type: integer port_1c1_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_1c1_scalling_instance_availability_zone: type: list required: true @@ -2078,13 +2072,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + 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 @@ -2102,11 +2094,9 @@ node_types: entry_schema: type: string port_1a_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_1a_t1_port_network: type: list required: true @@ -2128,7 +2118,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1a_t1_port_vlan_requirements: type: list required: true @@ -2216,11 +2206,9 @@ node_types: entry_schema: type: string port_1a_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json attributes: a_single_1a_instance_name: type: list @@ -2676,7 +2664,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -2718,11 +2706,9 @@ node_types: entry_schema: type: string port_1b_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_b_single_1b_availability_zone: type: list required: true @@ -2754,13 +2740,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + 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 required: true @@ -2768,11 +2752,9 @@ node_types: entry_schema: type: string port_1b_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network: type: list required: true @@ -3292,13 +3274,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1c2_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network_role: type: list required: true @@ -3338,11 +3318,9 @@ node_types: entry_schema: type: string port_1c2_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t2_port_vlan_requirements: type: list required: true @@ -3356,17 +3334,15 @@ 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 status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -3868,13 +3844,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1c2_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network_role: type: list required: true @@ -3914,11 +3888,9 @@ node_types: entry_schema: type: string port_1c2_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t2_port_vlan_requirements: type: list required: true @@ -3932,17 +3904,15 @@ 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 status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -4378,11 +4348,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1b_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_b_single_1b_availability_zone: type: list required: true @@ -4420,7 +4388,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role: type: list required: true @@ -4448,7 +4416,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -4460,11 +4428,9 @@ node_types: entry_schema: type: string port_1b_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network: type: list required: true @@ -4943,4 +4909,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED \ No newline at end of file + - UNBOUNDED 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 26ab893506..957f77e8d9 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 @@ -114,9 +114,7 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: - - ppds - - ppds + port_1c1_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name port_1c1_t1_port_ip_requirements: @@ -149,11 +147,11 @@ topology_template: - - ip_address: get_input: - myIPs - - 4 + - 1 - - ip_address: get_input: - myIPs - - 2 + - 1 port_1c1_t2_port_network: - get_input: ppds_net_name - get_input: ppds_net_name @@ -161,7 +159,7 @@ topology_template: - - ip_address: get_input: - myIPs - - 3 + - 1 - - ip_address: get_input: - myIPs @@ -178,14 +176,10 @@ topology_template: floating_ip_count_required: is_required: false port_1c1_t1_port_mac_requirements: - - mac_count_required: - is_required: false - - mac_count_required: + mac_count_required: is_required: false port_1c1_t2_port_mac_requirements: - - mac_count_required: - is_required: false - - mac_count_required: + mac_count_required: is_required: false compute_1c1_scalling_instance_availability_zone: - get_input: availabilityzone_name @@ -215,7 +209,7 @@ topology_template: - substitutable properties: port_1b_t2_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name @@ -238,7 +232,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_1b_t1_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network @@ -284,7 +278,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c2_t1_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_1c2_t2_port_network: - 1c2_catalog_instance_network @@ -295,12 +289,11 @@ topology_template: port_1c2_t1_port_network: - get_input: oam_net_name port_1c2_t2_port_mac_requirements: - - mac_count_required: + mac_count_required: 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: @@ -340,7 +333,7 @@ topology_template: floating_ip_count_required: is_required: false port_1c2_t1_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_1c2_t2_port_network: - 1c2_catalog_instance_network @@ -351,14 +344,13 @@ topology_template: port_1c2_t1_port_network: - get_input: oam_net_name port_1c2_t2_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false compute_1c2_catalog_instance_user_data_format: - 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: @@ -515,14 +507,13 @@ 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: - get_input: ppds_net_name port_1a_t1_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_1a_t1_port_network: - a_single_1a_network @@ -545,7 +536,7 @@ topology_template: - a_single_1a_names - 0 port_1a_t2_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false service_template_filter: substitute_service_template: Nested_a_single_1aServiceTemplate.yaml @@ -706,7 +697,7 @@ topology_template: compute_b_single_1b_user_data_format: - RAW port_1b_t2_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false compute_b_single_1b_availability_zone: - get_input: availabilityzone_name @@ -718,10 +709,9 @@ 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: + mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network @@ -854,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 3a93e4c8b9..161490e425 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 @@ -27,10 +27,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 @@ -38,7 +36,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -61,7 +59,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_1c1_t2_port_network: type: list required: true @@ -71,7 +69,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_1c1_t1_port_vlan_requirements: type: list required: true @@ -81,12 +79,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1c1_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -105,10 +101,8 @@ topology_template: entry_schema: type: integer port_1c1_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_1c1_scalling_instance_availability_zone: type: list required: true @@ -167,17 +161,13 @@ topology_template: - port_1c1_t1_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1c1_t1_port_ip_requirements - - index_value + get_input: port_1c1_t1_port_ip_requirements network_role_tag: get_input: - port_1c1_t1_port_network_role_tag - index_value mac_requirements: - get_input: - - port_1c1_t1_port_mac_requirements - - index_value + get_input: port_1c1_t1_port_mac_requirements order: get_input: - port_1c1_t1_port_order @@ -191,9 +181,7 @@ topology_template: - port_1c1_t1_port_subnetpoolid - index_value fixed_ips: - get_input: - - port_1c1_t1_port_fixed_ips - - index_value + get_input: port_1c1_t1_port_fixed_ips name: get_input: - port_1c1_t1_port_name @@ -242,17 +230,11 @@ topology_template: - port_1c1_t2_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1c1_t2_port_ip_requirements - - index_value + get_input: port_1c1_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c1_t2_port_network_role_tag - - index_value + get_input: port_1c1_t2_port_network_role_tag mac_requirements: - get_input: - - port_1c1_t2_port_mac_requirements - - index_value + get_input: port_1c1_t2_port_mac_requirements order: get_input: - port_1c1_t2_port_order @@ -266,9 +248,7 @@ topology_template: - port_1c1_t2_port_subnetpoolid - index_value fixed_ips: - get_input: - - port_1c1_t2_port_fixed_ips - - index_value + get_input: port_1c1_t2_port_fixed_ips name: get_input: - port_1c1_t2_port_name @@ -509,4 +489,4 @@ topology_template: - link local_storage_1c1_scalling_instance: - 1c1_scalling_instance - - local_storage \ No newline at end of file + - local_storage 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 80b876b5ce..01a6ef2c9a 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 @@ -66,12 +66,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1c2_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_1c2_t1_port_network_role: type: list required: true @@ -105,10 +103,8 @@ topology_template: entry_schema: type: string port_1c2_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_1c2_t2_port_vlan_requirements: type: list required: true @@ -120,15 +116,13 @@ 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 entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -170,17 +164,13 @@ topology_template: - port_1c2_t2_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1c2_t2_port_ip_requirements - - index_value + get_input: port_1c2_t2_port_ip_requirements network_role_tag: get_input: - port_1c2_t2_port_network_role_tag - index_value mac_requirements: - get_input: - - port_1c2_t2_port_mac_requirements - - index_value + get_input: port_1c2_t2_port_mac_requirements order: get_input: - port_1c2_t2_port_order @@ -214,17 +204,11 @@ topology_template: - port_1c2_t1_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1c2_t1_port_ip_requirements - - index_value + get_input: port_1c2_t1_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t1_port_network_role_tag - - index_value + get_input: port_1c2_t1_port_network_role_tag mac_requirements: - get_input: - - port_1c2_t1_port_mac_requirements - - index_value + get_input: port_1c2_t1_port_mac_requirements order: get_input: - port_1c2_t1_port_order @@ -473,4 +457,4 @@ topology_template: - dependency link_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - - link \ No newline at end of file + - link 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 ab88e26fa7..5a7b354ee6 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 @@ -66,12 +66,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1c2_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_1c2_t1_port_network_role: type: list required: true @@ -105,10 +103,8 @@ topology_template: entry_schema: type: string port_1c2_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_1c2_t2_port_vlan_requirements: type: list required: true @@ -120,15 +116,13 @@ 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 entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_1c2_catalog_instance_scheduler_hints: type: list required: true @@ -170,17 +164,13 @@ topology_template: - port_1c2_t2_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1c2_t2_port_ip_requirements - - index_value + get_input: port_1c2_t2_port_ip_requirements network_role_tag: get_input: - port_1c2_t2_port_network_role_tag - index_value mac_requirements: - get_input: - - port_1c2_t2_port_mac_requirements - - index_value + get_input: port_1c2_t2_port_mac_requirements order: get_input: - port_1c2_t2_port_order @@ -214,17 +204,11 @@ topology_template: - port_1c2_t1_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1c2_t1_port_ip_requirements - - index_value + get_input: port_1c2_t1_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t1_port_network_role_tag - - index_value + get_input: port_1c2_t1_port_network_role_tag mac_requirements: - get_input: - - port_1c2_t1_port_mac_requirements - - index_value + get_input: port_1c2_t1_port_mac_requirements order: get_input: - port_1c2_t1_port_order @@ -473,4 +457,4 @@ topology_template: - dependency link_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - - link \ No newline at end of file + - link 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 33152e6824..17f4474844 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 @@ -15,12 +15,10 @@ topology_template: type: list required: true entry_schema: - type: json + 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 @@ -35,10 +33,8 @@ topology_template: entry_schema: type: string port_1a_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_1a_t1_port_network: type: list required: true @@ -56,7 +52,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1a_t1_port_vlan_requirements: type: list required: true @@ -130,10 +126,8 @@ topology_template: entry_schema: type: string port_1a_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json node_templates: a_single_1a_1a_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -147,17 +141,13 @@ topology_template: - port_1a_t1_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1a_t1_port_ip_requirements - - index_value + get_input: port_1a_t1_port_ip_requirements network_role_tag: get_input: - port_1a_t1_port_network_role_tag - index_value mac_requirements: - get_input: - - port_1a_t1_port_mac_requirements - - index_value + get_input: port_1a_t1_port_mac_requirements order: get_input: - port_1a_t1_port_order @@ -214,17 +204,11 @@ topology_template: - port_1a_t2_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1a_t2_port_ip_requirements - - index_value + get_input: port_1a_t2_port_ip_requirements network_role_tag: - get_input: - - port_1a_t2_port_network_role_tag - - index_value + get_input: port_1a_t2_port_network_role_tag mac_requirements: - get_input: - - port_1a_t2_port_mac_requirements - - index_value + get_input: port_1a_t2_port_mac_requirements order: get_input: - port_1a_t2_port_order @@ -473,4 +457,4 @@ topology_template: - dependency local_storage_a_single_1a: - a_single_1a - - local_storage \ No newline at end of file + - local_storage 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 cbfebea739..f167185618 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 @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_1b_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_b_single_1b_availability_zone: type: list required: true @@ -47,7 +45,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role: type: list required: true @@ -70,7 +68,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -80,10 +78,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_1b_t2_port_network: type: list required: true @@ -165,17 +161,13 @@ topology_template: - port_1b_t1_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1b_t1_port_ip_requirements - - index_value + get_input: port_1b_t1_port_ip_requirements network_role_tag: get_input: - port_1b_t1_port_network_role_tag - index_value mac_requirements: - get_input: - - port_1b_t1_port_mac_requirements - - index_value + get_input: port_1b_t1_port_mac_requirements order: get_input: - port_1b_t1_port_order @@ -209,17 +201,13 @@ topology_template: - port_1b_t2_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1b_t2_port_ip_requirements - - index_value + get_input: port_1b_t2_port_ip_requirements network_role_tag: get_input: - port_1b_t2_port_network_role_tag - index_value mac_requirements: - get_input: - - port_1b_t2_port_mac_requirements - - index_value + get_input: port_1b_t2_port_mac_requirements order: get_input: - port_1b_t2_port_order @@ -468,4 +456,4 @@ topology_template: - link dependency_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 23f23830ac..33830f7a38 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 @@ -33,7 +33,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -68,10 +68,8 @@ topology_template: entry_schema: type: string port_1b_t2_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_b_single_1b_availability_zone: type: list required: true @@ -98,22 +96,18 @@ topology_template: type: list required: true entry_schema: - type: json + 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 required: true entry_schema: type: string port_1b_t1_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_1b_t2_port_network: type: list required: true @@ -170,17 +164,11 @@ topology_template: - port_1b_t1_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1b_t1_port_ip_requirements - - index_value + get_input: port_1b_t1_port_ip_requirements network_role_tag: - get_input: - - port_1b_t1_port_network_role_tag - - index_value + get_input: port_1b_t1_port_network_role_tag mac_requirements: - get_input: - - port_1b_t1_port_mac_requirements - - index_value + get_input: port_1b_t1_port_mac_requirements order: get_input: - port_1b_t1_port_order @@ -214,17 +202,13 @@ topology_template: - port_1b_t2_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_1b_t2_port_ip_requirements - - index_value + get_input: port_1b_t2_port_ip_requirements network_role_tag: get_input: - port_1b_t2_port_network_role_tag - index_value mac_requirements: - get_input: - - port_1b_t2_port_mac_requirements - - index_value + get_input: port_1b_t2_port_mac_requirements order: get_input: - port_1b_t2_port_order @@ -473,4 +457,4 @@ topology_template: - link dependency_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - - dependency \ No newline at end of file + - dependency -- cgit 1.2.3-korg