diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns')
9 files changed, 120 insertions, 260 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/hot-mog-0108-bs1271.yml index 3f0f9edaa5..e020410e32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/hot-mog-0108-bs1271.yml @@ -174,7 +174,7 @@ resources: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} - fixed_ips: [{"ip_address": {get_param: [myIPs, 2]}}] + fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] name: 1c1_t2_port_0 1c1_scalling_instance_network: @@ -200,14 +200,14 @@ resources: type: OS::Neutron::Port properties: network: {get_resource: 1c1_scalling_instance_network} - fixed_ips: [{"ip_address": {get_param: [myIPs, 3]}}] + fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] name: 1c1_t1_port_1 1c1_t2_port_1: type: OS::Neutron::Port properties: network: {get_param: ppds_net_name} - fixed_ips: [{"ip_address": {get_param: [myIPs, 4]}}] + fixed_ips: [{"ip_address": {get_param: [myIPs, 1]}}] name: 1c1_t2_port_1 1c201_catalog_instance_1C2: 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 a921a8e328..3c2e834ec6 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 @@ -1500,11 +1500,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 @@ -1514,7 +1512,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -1542,7 +1540,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 @@ -1554,7 +1552,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 @@ -1566,13 +1564,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 @@ -1594,11 +1590,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 @@ -2103,13 +2097,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 @@ -2127,11 +2119,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 @@ -2153,7 +2143,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 @@ -2241,11 +2231,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 @@ -2701,7 +2689,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -2743,11 +2731,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 @@ -2779,7 +2765,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_value_specs: type: list required: true @@ -2787,11 +2773,9 @@ node_types: entry_schema: type: json 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 @@ -2799,11 +2783,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 @@ -3323,13 +3305,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 @@ -3375,11 +3355,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 @@ -3393,17 +3371,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 @@ -3905,13 +3881,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 @@ -3951,11 +3925,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 @@ -3969,17 +3941,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 @@ -4441,7 +4411,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -4483,11 +4453,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 @@ -4519,7 +4487,7 @@ 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 required: true @@ -4539,11 +4507,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 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 700c94ba91..dbdf93429b 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 @@ -146,9 +146,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: @@ -181,11 +179,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 @@ -193,7 +191,7 @@ topology_template: - - ip_address: get_input: - myIPs - - 3 + - 1 - - ip_address: get_input: - myIPs @@ -210,14 +208,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 @@ -289,7 +283,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 @@ -327,7 +321,7 @@ topology_template: - abstract_1c1_scalling_instance - 1c1_scalling_instance_1c1_t1_port_tenant_id port_1b_t1_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network @@ -371,7 +365,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 @@ -411,12 +405,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: @@ -456,7 +449,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 @@ -467,14 +460,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: @@ -667,14 +659,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 @@ -697,7 +688,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 @@ -890,7 +881,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 @@ -906,10 +897,9 @@ topology_template: - get_attribute: - abstract_a_single_1a - a_single_1a_1a_t1_port_tenant_id - 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 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 f6b0a50917..4682b9b82f 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 @@ -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 @@ -172,17 +166,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 @@ -196,9 +186,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 @@ -251,17 +239,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 @@ -275,9 +257,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 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_instance_0ServiceTemplate.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_instance_0ServiceTemplate.yaml index 7a439484d6..29c1fd07de 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_instance_0ServiceTemplate.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_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 @@ -110,10 +108,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 @@ -125,15 +121,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 @@ -179,17 +173,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 @@ -223,17 +213,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 @@ -482,4 +466,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/connectivityBetweenPatterns/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/connectivityBetweenPatterns/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/connectivityBetweenPatterns/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/connectivityBetweenPatterns/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/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 c0ea9ef793..1b03129a90 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 @@ -20,12 +20,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 @@ -40,10 +38,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 @@ -61,7 +57,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 @@ -135,10 +131,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 @@ -152,17 +146,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 @@ -223,17 +213,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 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_0ServiceTemplate.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_0ServiceTemplate.yaml index 1b859d537f..a9aa171c3c 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_0ServiceTemplate.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_0ServiceTemplate.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,7 +96,7 @@ 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 required: true @@ -115,10 +113,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 @@ -174,17 +170,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 @@ -218,17 +210,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 @@ -477,4 +465,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/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 1feba0fca7..8ccdfdcc3e 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 @@ -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,27 +96,23 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_value_specs: type: list required: true entry_schema: type: json 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 @@ -179,17 +173,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 @@ -223,17 +211,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 @@ -482,4 +466,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 |