diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns')
46 files changed, 1708 insertions, 2358 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3c2e834ec6..f7162f0255 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 @@ -932,6 +932,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string availabilityzone_name: type: string description: availabilityzone name @@ -942,7 +948,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: type: string description: PCRF CM image name @@ -966,6 +972,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string pcm_server_name: type: string description: PCRF CM server name @@ -977,17 +989,13 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pcm_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json oam_net_name: type: string description: OAM network name @@ -1007,6 +1015,12 @@ node_types: type: json required: true status: SUPPORTED + port_pcm_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway @@ -1022,12 +1036,16 @@ node_types: description: CPS network ip required: true status: SUPPORTED + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance @@ -1038,6 +1056,16 @@ node_types: description: CPS Cluman Cinder Volume required: true status: SUPPORTED + port_pcm_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name @@ -1482,17 +1510,15 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c1_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true @@ -1500,9 +1526,11 @@ node_types: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -1558,7 +1586,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t2_port_ip_requirements: type: list required: true @@ -1618,11 +1646,9 @@ node_types: entry_schema: type: json port_1c1_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_1c1_scalling_instance_metadata: type: list required: true @@ -2099,9 +2125,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -2149,13 +2177,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -2195,17 +2221,15 @@ node_types: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -2675,11 +2699,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -2713,11 +2735,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -2759,7 +2779,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -2773,9 +2793,11 @@ node_types: entry_schema: type: json port_1b_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -2797,7 +2819,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -3277,17 +3299,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -3343,11 +3363,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -3363,7 +3381,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3371,9 +3389,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3853,17 +3873,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -3913,11 +3931,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -3933,7 +3949,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3941,9 +3957,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4397,11 +4415,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -4435,11 +4451,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -4481,7 +4495,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -4521,7 +4535,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -4952,4 +4966,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/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 dbdf93429b..92c22476ae 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 @@ -88,11 +88,8 @@ topology_template: directives: - substitutable properties: - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml server_group: BE_Affinity_group + port_pcm_port_1_network_role_tag: oam connectivityChk: connectivityTo1C2_1: get_attribute: @@ -125,9 +122,32 @@ topology_template: get_attribute: - abstract_1c1_scalling_instance - 1c1_scalling_instance_1c1_t2_port_tenant_id + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false pcm_image_name: get_input: pcm_image_name security_group_name: jsa_security_group + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false pcm_server_name: get_input: - pcm_server_names @@ -146,20 +166,16 @@ 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: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_1c1_scalling_instance_name: @@ -174,39 +190,24 @@ topology_template: - 1c1_t1_port_0 port_1c1_t1_port_network: - 1c1_scalling_instance_network - - 1c1_scalling_instance_network port_1c1_t2_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t2_port_network: - get_input: ppds_net_name - - get_input: ppds_net_name port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_1c1_t1_port_mac_requirements: mac_count_required: is_required: false @@ -273,11 +274,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -290,11 +291,11 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_b_single_1b_metadata: - connectivityTo4PNested: get_attribute: @@ -359,11 +360,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -409,13 +410,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -443,11 +445,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -466,13 +468,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -654,12 +657,13 @@ topology_template: - abstract_1c1_scalling_instance - 1c1_scalling_instance_1c1_t2_port_tenant_id port_1a_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: + - ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -672,11 +676,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1a_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -871,11 +875,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -888,16 +892,17 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1b_t1_port_value_specs: - 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: is_required: false 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 4682b9b82f..5879c89c59 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 @@ -12,23 +12,23 @@ node_types: topology_template: inputs: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c1_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -74,7 +74,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t2_port_ip_requirements: type: list required: true @@ -124,10 +124,8 @@ topology_template: entry_schema: type: json port_1c1_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_1c1_scalling_instance_metadata: type: list required: true @@ -158,33 +156,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t1_port_exCP_naming - - index_value + get_input: port_1c1_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t1_port_vlan_requirements - - index_value + get_input: port_1c1_t1_port_vlan_requirements ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: - get_input: - - port_1c1_t1_port_network_role_tag - - index_value + get_input: port_1c1_t1_port_network_role_tag mac_requirements: get_input: port_1c1_t1_port_mac_requirements order: - get_input: - - port_1c1_t1_port_order - - index_value + get_input: port_1c1_t1_port_order network_role: - get_input: - - port_1c1_t1_port_network_role - - index_value + get_input: port_1c1_t1_port_network_role subnetpoolid: - get_input: - - port_1c1_t1_port_subnetpoolid - - index_value + get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: port_1c1_t1_port_fixed_ips name: @@ -231,13 +217,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t2_port_exCP_naming - - index_value + get_input: port_1c1_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t2_port_vlan_requirements - - index_value + get_input: port_1c1_t2_port_vlan_requirements ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: @@ -245,17 +227,11 @@ topology_template: mac_requirements: get_input: port_1c1_t2_port_mac_requirements order: - get_input: - - port_1c1_t2_port_order - - index_value + get_input: port_1c1_t2_port_order network_role: - get_input: - - port_1c1_t2_port_network_role - - index_value + get_input: port_1c1_t2_port_network_role subnetpoolid: - get_input: - - port_1c1_t2_port_subnetpoolid - - index_value + get_input: port_1c1_t2_port_subnetpoolid fixed_ips: get_input: port_1c1_t2_port_fixed_ips name: @@ -506,4 +482,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/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 29c1fd07de..351bfc739e 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 @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -98,10 +96,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -114,15 +110,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -165,33 +163,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -205,13 +191,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -219,17 +201,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_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_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 5a7b354ee6..22a98f80ad 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 @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_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_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 1b03129a90..d2b08144aa 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 @@ -22,8 +22,10 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -62,12 +64,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -101,15 +101,13 @@ topology_template: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -138,33 +136,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t1_port_exCP_naming - - index_value + get_input: port_1a_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t1_port_vlan_requirements - - index_value + get_input: port_1a_t1_port_vlan_requirements ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: - get_input: - - port_1a_t1_port_network_role_tag - - index_value + get_input: port_1a_t1_port_network_role_tag mac_requirements: get_input: port_1a_t1_port_mac_requirements order: - get_input: - - port_1a_t1_port_order - - index_value + get_input: port_1a_t1_port_order network_role: - get_input: - - port_1a_t1_port_network_role - - index_value + get_input: port_1a_t1_port_network_role subnetpoolid: - get_input: - - port_1a_t1_port_subnetpoolid - - index_value + get_input: port_1a_t1_port_subnetpoolid network: get_input: - port_1a_t1_port_network @@ -205,13 +191,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t2_port_exCP_naming - - index_value + get_input: port_1a_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t2_port_vlan_requirements - - index_value + get_input: port_1a_t2_port_vlan_requirements ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: @@ -219,17 +201,11 @@ topology_template: mac_requirements: get_input: port_1a_t2_port_mac_requirements order: - get_input: - - port_1a_t2_port_order - - index_value + get_input: port_1a_t2_port_order network_role: - get_input: - - port_1a_t2_port_network_role - - index_value + get_input: port_1a_t2_port_network_role subnetpoolid: - get_input: - - port_1a_t2_port_subnetpoolid - - index_value + get_input: port_1a_t2_port_subnetpoolid network: get_input: - port_1a_t2_port_network @@ -466,4 +442,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/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 a9aa171c3c..1e323d88b1 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 @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -91,7 +87,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -124,7 +120,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -162,33 +158,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: 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 order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_attribute: - b_single_1b @@ -202,33 +186,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_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_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 8ccdfdcc3e..089fcb545a 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 @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -91,7 +87,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -103,8 +99,10 @@ topology_template: entry_schema: type: json port_1b_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -122,7 +120,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -165,13 +163,9 @@ topology_template: - port_1b_t1_port_value_specs - index_value exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -179,17 +173,11 @@ topology_template: mac_requirements: get_input: port_1b_t1_port_mac_requirements order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_input: - port_1b_t1_port_network @@ -203,33 +191,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_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-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml index eca7550f05..934dada392 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -672,4 +672,4 @@ topology_template: - dependency dependency_pcm_port_2: - pcm_port_2 - - 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-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml index a8e64880b2..f96fc7e5b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -16,6 +16,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -26,7 +31,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false @@ -48,6 +53,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -61,15 +71,11 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pcm_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json oam_net_name: label: OAM network name hidden: false @@ -89,6 +95,11 @@ topology_template: hidden: false immutable: false type: json + port_pcm_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false @@ -107,11 +118,14 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false @@ -124,6 +138,14 @@ topology_template: immutable: false type: string description: CPS Cluman Cinder Volume + port_pcm_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true cps_net_name: label: CPS network name hidden: false @@ -152,42 +174,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_1_network_role - - index_value + get_input: port_pcm_port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_port_1_subnetpoolid - - index_value + get_input: port_pcm_port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_port_1_exCP_naming - - index_value + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_port_1_order - - index_value + get_input: port_pcm_port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -213,42 +221,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_0_network_role - - index_value + get_input: port_pcm_port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_port_0_subnetpoolid - - index_value + get_input: port_pcm_port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_port_0_exCP_naming - - index_value + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_port_0_order - - index_value + get_input: port_pcm_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -478,4 +472,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6884de5d3a..cd7dff0688 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -928,52 +928,28 @@ node_types: status: SUPPORTED entry_schema: type: string - server_group: - type: string + port_pcm_port_1_network_role_tag: + type: list required: true status: SUPPORTED + entry_schema: + type: string availabilityzone_name: type: string description: availabilityzone name required: true status: SUPPORTED - oam_net_gw: - type: string - description: CPS network gateway - required: true - status: SUPPORTED port_pcm_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - security_group_name: - type: string - description: the name of security group - required: true - status: SUPPORTED - cps_net_ip: - type: string - description: CPS network ip - required: true - status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - pcm_flavor_name: - type: string - description: flavor name of PCRF CM instance - required: true - status: SUPPORTED port_pcm_port_0_order: type: list required: true @@ -992,65 +968,117 @@ node_types: status: SUPPORTED entry_schema: type: string - pcm_vol: - type: string - description: CPS Cluman Cinder Volume + port_pcm_port_0_network_role_tag: + type: list required: true status: SUPPORTED + entry_schema: + type: string pcm_server_name: type: string description: PCRF CM server name required: true status: SUPPORTED - cps_net_name: - type: string - description: CPS network name - required: true - status: SUPPORTED cps_net_mask: type: string description: CPS network mask required: true status: SUPPORTED - oam_net_ip: + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + oam_net_name: type: string - description: OAM network ip + description: OAM network name required: true status: SUPPORTED - oam_net_mask: + port_pcm_port_1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + server_group: type: string - description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.network.IpRequirements + oam_net_gw: + type: string + description: CPS network gateway + required: true + status: SUPPORTED + security_group_name: + type: string + description: the name of security group + required: true + status: SUPPORTED + cps_net_ip: + type: string + description: CPS network ip + required: true + status: SUPPORTED + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - oam_net_name: + type: org.openecomp.datatypes.network.VlanRequirements + pcm_flavor_name: type: string - description: OAM network name + description: flavor name of PCRF CM instance required: true status: SUPPORTED - port_pcm_port_1_order: + pcm_vol: + type: string + description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED + port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_pcm_port_1_network_role: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + cps_net_name: + type: string + description: CPS network name + required: true + status: SUPPORTED + oam_net_ip: + type: string + description: OAM network ip + required: true + status: SUPPORTED + oam_net_mask: + type: string + description: CPS network mask + required: true + status: SUPPORTED + port_pcm_port_1_order: type: list required: true status: SUPPORTED entry_schema: - type: string + type: integer attributes: server_pcm_id: type: string @@ -1474,17 +1502,15 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c1_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true @@ -1492,9 +1518,11 @@ node_types: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -1550,7 +1578,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t2_port_ip_requirements: type: list required: true @@ -1610,11 +1638,9 @@ node_types: entry_schema: type: json port_1c1_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c1_t1_port_subnetpoolid: type: list required: true @@ -2074,9 +2100,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -2124,13 +2152,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -2170,17 +2196,15 @@ node_types: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -2650,11 +2674,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -2688,11 +2710,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -2734,7 +2754,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -2742,9 +2762,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -2766,7 +2788,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -3246,17 +3268,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -3306,11 +3326,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -3326,7 +3344,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3334,9 +3352,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3816,17 +3836,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -3876,11 +3894,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -3896,7 +3912,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3904,9 +3920,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4445,7 +4463,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -4459,11 +4477,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -4517,7 +4533,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_user_data_format: type: list required: true @@ -4525,11 +4541,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_b_single_1b_name: type: list required: true @@ -4972,4 +4986,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/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index d9747ff545..f165f9dab4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -88,14 +88,34 @@ topology_template: directives: - substitutable properties: - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml server_group: BE_Affinity_group + port_pcm_port_1_network_role_tag: oam + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false pcm_image_name: get_input: pcm_image_name security_group_name: jsa_security_group + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false pcm_server_name: get_input: - pcm_server_names @@ -118,20 +138,16 @@ 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: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_1c1_scalling_instance_name: @@ -146,39 +162,24 @@ topology_template: - 1c1_t1_port_0 port_1c1_t1_port_network: - 1c1_scalling_instance_network - - 1c1_scalling_instance_network port_1c1_t2_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t2_port_network: - get_input: ppds_net_name - - get_input: ppds_net_name port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_1c1_t1_port_mac_requirements: mac_count_required: is_required: false @@ -224,19 +225,19 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name port_1b_t1_port_mac_requirements: @@ -293,11 +294,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -314,13 +315,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -352,11 +354,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -375,13 +377,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -581,12 +584,13 @@ topology_template: - substitutable properties: port_1a_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: + - ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -599,11 +603,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1a_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -774,11 +778,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -791,12 +795,13 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1b_t1_port_network_role_tag: oam + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_network_role_tag: + - oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index a742c1bb24..fae0d4871a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -12,23 +12,23 @@ node_types: topology_template: inputs: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c1_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -74,7 +74,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t2_port_ip_requirements: type: list required: true @@ -124,10 +124,8 @@ topology_template: entry_schema: type: json port_1c1_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c1_t1_port_subnetpoolid: type: list required: true @@ -153,33 +151,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t1_port_exCP_naming - - index_value + get_input: port_1c1_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t1_port_vlan_requirements - - index_value + get_input: port_1c1_t1_port_vlan_requirements ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: - get_input: - - port_1c1_t1_port_network_role_tag - - index_value + get_input: port_1c1_t1_port_network_role_tag mac_requirements: get_input: port_1c1_t1_port_mac_requirements order: - get_input: - - port_1c1_t1_port_order - - index_value + get_input: port_1c1_t1_port_order network_role: - get_input: - - port_1c1_t1_port_network_role - - index_value + get_input: port_1c1_t1_port_network_role subnetpoolid: - get_input: - - port_1c1_t1_port_subnetpoolid - - index_value + get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: port_1c1_t1_port_fixed_ips name: @@ -222,13 +208,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t2_port_exCP_naming - - index_value + get_input: port_1c1_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t2_port_vlan_requirements - - index_value + get_input: port_1c1_t2_port_vlan_requirements ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: @@ -236,17 +218,11 @@ topology_template: mac_requirements: get_input: port_1c1_t2_port_mac_requirements order: - get_input: - - port_1c1_t2_port_order - - index_value + get_input: port_1c1_t2_port_order network_role: - get_input: - - port_1c1_t2_port_network_role - - index_value + get_input: port_1c1_t2_port_network_role subnetpoolid: - get_input: - - port_1c1_t2_port_subnetpoolid - - index_value + get_input: port_1c1_t2_port_subnetpoolid fixed_ips: get_input: port_1c1_t2_port_fixed_ips name: @@ -489,4 +465,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/dependencyConnectivity/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/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml index 0dcaa54cdb..fd0276496e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_network @@ -457,4 +433,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/dependencyConnectivity/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/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index 89a89270bc..22a98f80ad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_network @@ -457,4 +433,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/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml index 92e508083e..595d5d01a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml @@ -17,8 +17,10 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -57,12 +59,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -96,15 +96,13 @@ topology_template: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -133,33 +131,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t1_port_exCP_naming - - index_value + get_input: port_1a_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t1_port_vlan_requirements - - index_value + get_input: port_1a_t1_port_vlan_requirements ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: - get_input: - - port_1a_t1_port_network_role_tag - - index_value + get_input: port_1a_t1_port_network_role_tag mac_requirements: get_input: port_1a_t1_port_mac_requirements order: - get_input: - - port_1a_t1_port_order - - index_value + get_input: port_1a_t1_port_order network_role: - get_input: - - port_1a_t1_port_network_role - - index_value + get_input: port_1a_t1_port_network_role subnetpoolid: - get_input: - - port_1a_t1_port_subnetpoolid - - index_value + get_input: port_1a_t1_port_subnetpoolid network: get_input: - port_1a_t1_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t2_port_exCP_naming - - index_value + get_input: port_1a_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t2_port_vlan_requirements - - index_value + get_input: port_1a_t2_port_vlan_requirements ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1a_t2_port_mac_requirements order: - get_input: - - port_1a_t2_port_order - - index_value + get_input: port_1a_t2_port_order network_role: - get_input: - - port_1a_t2_port_network_role - - index_value + get_input: port_1a_t2_port_network_role subnetpoolid: - get_input: - - port_1a_t2_port_subnetpoolid - - index_value + get_input: port_1a_t2_port_subnetpoolid network: get_input: - port_1a_t2_port_network @@ -457,4 +433,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/dependencyConnectivity/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/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml index f02eb09e6a..28a98f316f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -40,7 +40,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -52,10 +52,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -99,17 +97,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_user_data_format: type: list required: true entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_b_single_1b_name: type: list required: true @@ -153,33 +149,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: 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 order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_attribute: - b_single_1b @@ -193,33 +177,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network @@ -456,4 +428,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/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml index e277f32857..35b6ab9b4a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -91,15 +87,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -117,7 +115,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -156,13 +154,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -170,17 +164,11 @@ topology_template: mac_requirements: get_input: port_1b_t1_port_mac_requirements order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_input: - port_1b_t1_port_network @@ -194,33 +182,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network @@ -457,4 +433,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/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 8d8e5cc5cb..587ee1d4a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -668,4 +668,4 @@ topology_template: - dependency dependency_pcm_port_2: - pcm_port_2 - - 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/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml index caa366f570..973ca85b4d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -16,33 +16,92 @@ topology_template: required: true entry_schema: type: string - server_group: - hidden: false - immutable: false - type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - oam_net_gw: - label: CPS network gateway - hidden: false - immutable: false - type: string - description: CPS network gateway port_pcm_port_0_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name + port_pcm_port_0_order: + type: list + required: true + entry_schema: + type: integer + port_pcm_port_0_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pcm_port_1_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string + pcm_server_name: + label: PCRF CM server name + hidden: false + immutable: false + type: string + description: PCRF CM server name + cps_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + oam_net_name: + label: OAM network name + hidden: false + immutable: false + type: string + description: OAM network name + port_pcm_port_1_network_role: + type: list + required: true + entry_schema: + type: string + server_group: + hidden: false + immutable: false + type: string + port_pcm_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + oam_net_gw: + label: CPS network gateway + hidden: false + immutable: false + type: string + description: CPS network gateway security_group_name: label: security group name hidden: false @@ -55,56 +114,40 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance - port_pcm_port_0_order: - type: list - required: true - entry_schema: - type: integer - port_pcm_port_0_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_pcm_port_1_subnetpoolid: - type: list - required: true - entry_schema: - type: string pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - pcm_server_name: - label: PCRF CM server name - hidden: false - immutable: false - type: string - description: PCRF CM server name + port_pcm_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true cps_net_name: label: CPS network name hidden: false immutable: false type: string description: CPS network name - cps_net_mask: - label: CPS network mask - hidden: false - immutable: false - type: string - description: CPS network mask oam_net_ip: label: OAM network ip hidden: false @@ -117,73 +160,38 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_pcm_port_0_exCP_naming: - type: list - required: true - entry_schema: - type: json - oam_net_name: - label: OAM network name - hidden: false - immutable: false - type: string - description: OAM network name port_pcm_port_1_order: type: list required: true entry_schema: type: integer - port_pcm_port_1_network_role: - type: list - required: true - entry_schema: - type: string node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_1_network_role - - index_value + get_input: port_pcm_port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_port_1_subnetpoolid - - index_value + get_input: port_pcm_port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_port_1_exCP_naming - - index_value + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_port_1_order - - index_value + get_input: port_pcm_port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -209,42 +217,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_0_network_role - - index_value + get_input: port_pcm_port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_port_0_subnetpoolid - - index_value + get_input: port_pcm_port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_port_0_exCP_naming - - index_value + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_port_0_order - - index_value + get_input: port_pcm_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -474,4 +468,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/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 801b398414..958930407c 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 @@ -928,52 +928,28 @@ node_types: status: SUPPORTED entry_schema: type: string - server_group: - type: string + port_pcm_port_1_network_role_tag: + type: list required: true status: SUPPORTED + entry_schema: + type: string availabilityzone_name: type: string description: availabilityzone name required: true status: SUPPORTED - oam_net_gw: - type: string - description: CPS network gateway - required: true - status: SUPPORTED port_pcm_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - security_group_name: - type: string - description: the name of security group - required: true - status: SUPPORTED - cps_net_ip: - type: string - description: CPS network ip - required: true - status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - pcm_flavor_name: - type: string - description: flavor name of PCRF CM instance - required: true - status: SUPPORTED port_pcm_port_0_order: type: list required: true @@ -992,65 +968,117 @@ node_types: status: SUPPORTED entry_schema: type: string - pcm_vol: - type: string - description: CPS Cluman Cinder Volume + port_pcm_port_0_network_role_tag: + type: list required: true status: SUPPORTED + entry_schema: + type: string pcm_server_name: type: string description: PCRF CM server name required: true status: SUPPORTED - cps_net_name: - type: string - description: CPS network name - required: true - status: SUPPORTED cps_net_mask: type: string description: CPS network mask required: true status: SUPPORTED - oam_net_ip: + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + oam_net_name: type: string - description: OAM network ip + description: OAM network name required: true status: SUPPORTED - oam_net_mask: + port_pcm_port_1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + server_group: type: string - description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.network.IpRequirements + oam_net_gw: + type: string + description: CPS network gateway + required: true + status: SUPPORTED + security_group_name: + type: string + description: the name of security group + required: true + status: SUPPORTED + cps_net_ip: + type: string + description: CPS network ip + required: true + status: SUPPORTED + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - oam_net_name: + type: org.openecomp.datatypes.network.VlanRequirements + pcm_flavor_name: type: string - description: OAM network name + description: flavor name of PCRF CM instance required: true status: SUPPORTED - port_pcm_port_1_order: + pcm_vol: + type: string + description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED + port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_pcm_port_1_network_role: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + cps_net_name: + type: string + description: CPS network name + required: true + status: SUPPORTED + oam_net_ip: + type: string + description: OAM network ip + required: true + status: SUPPORTED + oam_net_mask: + type: string + description: CPS network mask + required: true + status: SUPPORTED + port_pcm_port_1_order: type: list required: true status: SUPPORTED entry_schema: - type: string + type: integer attributes: server_pcm_id: type: string @@ -1474,17 +1502,15 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c1_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true @@ -1492,9 +1518,11 @@ node_types: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -1550,7 +1578,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t2_port_ip_requirements: type: list required: true @@ -1610,11 +1638,9 @@ node_types: entry_schema: type: json port_1c1_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c1_t1_port_subnetpoolid: type: list required: true @@ -2074,9 +2100,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -2124,13 +2152,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -2170,17 +2196,15 @@ node_types: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -2650,11 +2674,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -2688,11 +2710,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -2734,7 +2754,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -2742,9 +2762,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -2766,7 +2788,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -3246,17 +3268,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -3306,11 +3326,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -3326,7 +3344,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3334,9 +3352,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3816,17 +3836,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -3876,11 +3894,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -3896,7 +3912,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3904,9 +3920,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4382,7 +4400,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -4396,11 +4414,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -4454,7 +4470,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_user_data_format: type: list required: true @@ -4462,11 +4478,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_b_single_1b_name: 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/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 957f77e8d9..2b3b7f6275 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 @@ -88,14 +88,34 @@ topology_template: directives: - substitutable properties: - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml server_group: BE_Affinity_group + port_pcm_port_1_network_role_tag: oam + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false pcm_image_name: get_input: pcm_image_name security_group_name: jsa_security_group + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false pcm_server_name: get_input: - pcm_server_names @@ -114,20 +134,16 @@ 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: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_1c1_scalling_instance_name: @@ -142,39 +158,24 @@ topology_template: - 1c1_t1_port_0 port_1c1_t1_port_network: - 1c1_scalling_instance_network - - 1c1_scalling_instance_network port_1c1_t2_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t2_port_network: - get_input: ppds_net_name - - get_input: ppds_net_name port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_1c1_t1_port_mac_requirements: mac_count_required: is_required: false @@ -216,19 +217,19 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name port_1b_t1_port_mac_requirements: @@ -272,11 +273,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -293,13 +294,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -327,11 +329,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -350,13 +352,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -502,12 +505,13 @@ topology_template: - substitutable properties: port_1a_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: + - ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -520,11 +524,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1a_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -687,11 +691,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -704,12 +708,13 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1b_t1_port_network_role_tag: oam + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_network_role_tag: + - oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -844,4 +849,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group
\ No newline at end of file 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 161490e425..fae0d4871a 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 @@ -12,23 +12,23 @@ node_types: topology_template: inputs: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c1_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -74,7 +74,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t2_port_ip_requirements: type: list required: true @@ -124,10 +124,8 @@ topology_template: entry_schema: type: json port_1c1_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c1_t1_port_subnetpoolid: type: list required: true @@ -153,33 +151,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t1_port_exCP_naming - - index_value + get_input: port_1c1_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t1_port_vlan_requirements - - index_value + get_input: port_1c1_t1_port_vlan_requirements ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: - get_input: - - port_1c1_t1_port_network_role_tag - - index_value + get_input: port_1c1_t1_port_network_role_tag mac_requirements: get_input: port_1c1_t1_port_mac_requirements order: - get_input: - - port_1c1_t1_port_order - - index_value + get_input: port_1c1_t1_port_order network_role: - get_input: - - port_1c1_t1_port_network_role - - index_value + get_input: port_1c1_t1_port_network_role subnetpoolid: - get_input: - - port_1c1_t1_port_subnetpoolid - - index_value + get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: port_1c1_t1_port_fixed_ips name: @@ -222,13 +208,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t2_port_exCP_naming - - index_value + get_input: port_1c1_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t2_port_vlan_requirements - - index_value + get_input: port_1c1_t2_port_vlan_requirements ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: @@ -236,17 +218,11 @@ topology_template: mac_requirements: get_input: port_1c1_t2_port_mac_requirements order: - get_input: - - port_1c1_t2_port_order - - index_value + get_input: port_1c1_t2_port_order network_role: - get_input: - - port_1c1_t2_port_network_role - - index_value + get_input: port_1c1_t2_port_network_role subnetpoolid: - get_input: - - port_1c1_t2_port_subnetpoolid - - index_value + get_input: port_1c1_t2_port_subnetpoolid fixed_ips: get_input: port_1c1_t2_port_fixed_ips name: 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 01a6ef2c9a..fd0276496e 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 @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_network 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 5a7b354ee6..22a98f80ad 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 @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_network 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 17f4474844..595d5d01a0 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,8 +17,10 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -57,12 +59,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -96,15 +96,13 @@ topology_template: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -133,33 +131,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t1_port_exCP_naming - - index_value + get_input: port_1a_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t1_port_vlan_requirements - - index_value + get_input: port_1a_t1_port_vlan_requirements ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: - get_input: - - port_1a_t1_port_network_role_tag - - index_value + get_input: port_1a_t1_port_network_role_tag mac_requirements: get_input: port_1a_t1_port_mac_requirements order: - get_input: - - port_1a_t1_port_order - - index_value + get_input: port_1a_t1_port_order network_role: - get_input: - - port_1a_t1_port_network_role - - index_value + get_input: port_1a_t1_port_network_role subnetpoolid: - get_input: - - port_1a_t1_port_subnetpoolid - - index_value + get_input: port_1a_t1_port_subnetpoolid network: get_input: - port_1a_t1_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t2_port_exCP_naming - - index_value + get_input: port_1a_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t2_port_vlan_requirements - - index_value + get_input: port_1a_t2_port_vlan_requirements ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1a_t2_port_mac_requirements order: - get_input: - - port_1a_t2_port_order - - index_value + get_input: port_1a_t2_port_order network_role: - get_input: - - port_1a_t2_port_network_role - - index_value + get_input: port_1a_t2_port_network_role subnetpoolid: - get_input: - - port_1a_t2_port_subnetpoolid - - index_value + get_input: port_1a_t2_port_subnetpoolid network: get_input: - port_1a_t2_port_network 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 f167185618..28a98f316f 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 @@ -40,7 +40,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -52,10 +52,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -99,17 +97,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_user_data_format: type: list required: true entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_b_single_1b_name: type: list required: true @@ -153,33 +149,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: 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 order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_attribute: - b_single_1b @@ -193,33 +177,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network 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 33830f7a38..35b6ab9b4a 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 @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -91,15 +87,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -117,7 +115,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -156,13 +154,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -170,17 +164,11 @@ topology_template: mac_requirements: get_input: port_1b_t1_port_mac_requirements order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_input: - port_1b_t1_port_network @@ -194,33 +182,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 8d8e5cc5cb..587ee1d4a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -668,4 +668,4 @@ topology_template: - dependency dependency_pcm_port_2: - pcm_port_2 - - 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-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 caa366f570..973ca85b4d 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 @@ -16,33 +16,92 @@ topology_template: required: true entry_schema: type: string - server_group: - hidden: false - immutable: false - type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - oam_net_gw: - label: CPS network gateway - hidden: false - immutable: false - type: string - description: CPS network gateway port_pcm_port_0_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name + port_pcm_port_0_order: + type: list + required: true + entry_schema: + type: integer + port_pcm_port_0_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pcm_port_1_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string + pcm_server_name: + label: PCRF CM server name + hidden: false + immutable: false + type: string + description: PCRF CM server name + cps_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + oam_net_name: + label: OAM network name + hidden: false + immutable: false + type: string + description: OAM network name + port_pcm_port_1_network_role: + type: list + required: true + entry_schema: + type: string + server_group: + hidden: false + immutable: false + type: string + port_pcm_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + oam_net_gw: + label: CPS network gateway + hidden: false + immutable: false + type: string + description: CPS network gateway security_group_name: label: security group name hidden: false @@ -55,56 +114,40 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance - port_pcm_port_0_order: - type: list - required: true - entry_schema: - type: integer - port_pcm_port_0_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_pcm_port_1_subnetpoolid: - type: list - required: true - entry_schema: - type: string pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - pcm_server_name: - label: PCRF CM server name - hidden: false - immutable: false - type: string - description: PCRF CM server name + port_pcm_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true cps_net_name: label: CPS network name hidden: false immutable: false type: string description: CPS network name - cps_net_mask: - label: CPS network mask - hidden: false - immutable: false - type: string - description: CPS network mask oam_net_ip: label: OAM network ip hidden: false @@ -117,73 +160,38 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_pcm_port_0_exCP_naming: - type: list - required: true - entry_schema: - type: json - oam_net_name: - label: OAM network name - hidden: false - immutable: false - type: string - description: OAM network name port_pcm_port_1_order: type: list required: true entry_schema: type: integer - port_pcm_port_1_network_role: - type: list - required: true - entry_schema: - type: string node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_1_network_role - - index_value + get_input: port_pcm_port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_port_1_subnetpoolid - - index_value + get_input: port_pcm_port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_port_1_exCP_naming - - index_value + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_port_1_order - - index_value + get_input: port_pcm_port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -209,42 +217,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_0_network_role - - index_value + get_input: port_pcm_port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_port_0_subnetpoolid - - index_value + get_input: port_pcm_port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_port_0_exCP_naming - - index_value + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_port_0_order - - index_value + get_input: port_pcm_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -474,4 +468,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 54047d53f1..2f8d03a1f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -927,11 +927,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_1c12_scalling_instance_scheduler_hints: type: list required: true @@ -955,7 +953,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1381,11 +1379,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c1_t1_port_fixed_ips: type: list required: true @@ -1397,7 +1393,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1840,6 +1836,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string availabilityzone_name: type: string description: availabilityzone name @@ -1850,7 +1852,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: type: string description: PCRF CM image name @@ -1874,6 +1876,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string pcm_server_name: type: string description: PCRF CM server name @@ -1885,17 +1893,13 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pcm_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json oam_net_name: type: string description: OAM network name @@ -1915,6 +1919,12 @@ node_types: type: json required: true status: SUPPORTED + port_pcm_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway @@ -1930,12 +1940,16 @@ node_types: description: CPS network ip required: true status: SUPPORTED + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance @@ -1946,6 +1960,16 @@ node_types: description: CPS Cluman Cinder Volume required: true status: SUPPORTED + port_pcm_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name @@ -2396,11 +2420,9 @@ node_types: entry_schema: type: string port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2480,7 +2502,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_a_single_2a_metadata: type: list required: true @@ -2871,17 +2893,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -2931,11 +2951,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -2951,7 +2969,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -2959,9 +2977,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3410,9 +3430,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -3460,13 +3482,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -3506,17 +3526,15 @@ node_types: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -4012,17 +4030,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -4072,11 +4088,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -4092,7 +4106,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -4100,9 +4114,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4556,11 +4572,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -4594,11 +4608,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -4640,7 +4652,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -4680,7 +4692,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -5154,17 +5166,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -5220,11 +5230,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -5240,7 +5248,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -5248,9 +5256,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -5730,17 +5740,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -5790,11 +5798,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -5810,7 +5816,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -5818,9 +5824,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -6269,11 +6277,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -6313,11 +6319,9 @@ node_types: entry_schema: type: integer port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -6353,7 +6357,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -6399,7 +6403,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements attributes: b_single_2b_instance_name: type: list @@ -6836,11 +6840,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -6874,11 +6876,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -6920,7 +6920,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -6934,9 +6934,11 @@ node_types: entry_schema: type: json port_1b_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -6958,7 +6960,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -7412,11 +7414,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -7450,11 +7450,9 @@ node_types: entry_schema: type: integer port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -7490,7 +7488,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -7516,9 +7514,11 @@ node_types: entry_schema: type: string port_1b_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -7540,7 +7540,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_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/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index fa3ffd61dc..2c5b8abe4c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -100,11 +100,8 @@ topology_template: directives: - substitutable properties: - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml server_group: BE_Affinity_group + port_pcm_port_1_network_role_tag: oam connectivityChk: connectivityTo4PNested_2: get_attribute: @@ -174,9 +171,32 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false pcm_image_name: get_input: pcm_image_name security_group_name: jsa_security_group + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false pcm_server_name: get_input: - pcm_server_names @@ -192,11 +212,8 @@ topology_template: directives: - substitutable properties: - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml server_group: BE_Affinity_group + port_pcm_port_1_network_role_tag: oam connectivityChk: connectivityTo1C1_T1_02: get_attribute: @@ -266,9 +283,32 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false pcm_image_name: get_input: pcm_image_name security_group_name: jsa_security_group + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false pcm_server_name: get_input: - pcm_server_names @@ -291,11 +331,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -314,13 +354,14 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_1 - 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -348,11 +389,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -371,13 +412,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -405,11 +447,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -495,13 +537,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -529,11 +572,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -550,13 +593,14 @@ 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: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -705,12 +749,13 @@ topology_template: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name port_1a_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: + - ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -723,11 +768,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1a_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -858,11 +903,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_b_single_2b_scheduler_hints: @@ -873,11 +918,11 @@ topology_template: mac_count_required: is_required: false port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_b_single_2b_name: - get_input: - b_single_2b_names @@ -888,7 +933,8 @@ topology_template: - a_single_1a_1a_t1_port_tenant_id compute_b_single_2b_user_data_format: - RAW - 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 @@ -1011,14 +1057,10 @@ topology_template: - substitutable properties: port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t1_port_mac_requirements: mac_count_required: is_required: false @@ -1038,16 +1080,11 @@ topology_template: - RAW1 - RAW1 port_1c1_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name port_1c1_t1_port_name: @@ -1058,7 +1095,6 @@ topology_template: - group: BE_Affinity_group port_1c1_t1_port_network: - 1c1_scalling_instance_network - - 1c1_scalling_instance_network service_template_filter: substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml count: 2 @@ -1145,11 +1181,11 @@ topology_template: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_b_single_2b_scheduler_hints: @@ -1160,11 +1196,11 @@ topology_template: mac_count_required: is_required: false port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_b_single_2b_name: - get_input: - b_single_2b_names @@ -1208,14 +1244,10 @@ topology_template: - group: BE_Affinity_group - group: BE_Affinity_group port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 compute_1c12_scalling_instance_name: - get_input: - 1c12_scalling_instance_names @@ -1232,16 +1264,11 @@ topology_template: - RAW1 - RAW1 port_1c1_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name port_1c1_t1_port_name: @@ -1252,7 +1279,6 @@ topology_template: - get_input: availabilityzone_name port_1c1_t1_port_network: - 1c1_scalling_instance_network - - 1c1_scalling_instance_network service_template_filter: substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml count: 2 @@ -1404,11 +1430,11 @@ topology_template: compute_a_single_2a_user_data_format: - RAW port_1a_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_a_single_2a_scheduler_hints: - group: BE_Affinity_group compute_a_single_2a_availability_zone: @@ -1511,11 +1537,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -1528,16 +1554,17 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1b_t1_port_value_specs: - 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: is_required: false @@ -1754,11 +1781,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -1771,11 +1798,11 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_b_single_1b_metadata: - connectivityTo4PNested_2: get_attribute: @@ -1993,4 +2020,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml index 05bdd392f8..4e16efbe82 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c1_t1_port_fixed_ips: type: list required: true @@ -25,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -125,33 +123,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t1_port_exCP_naming - - index_value + get_input: port_1c1_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t1_port_vlan_requirements - - index_value + get_input: port_1c1_t1_port_vlan_requirements ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: - get_input: - - port_1c1_t1_port_network_role_tag - - index_value + get_input: port_1c1_t1_port_network_role_tag mac_requirements: get_input: port_1c1_t1_port_mac_requirements order: - get_input: - - port_1c1_t1_port_order - - index_value + get_input: port_1c1_t1_port_order network_role: - get_input: - - port_1c1_t1_port_network_role - - index_value + get_input: port_1c1_t1_port_network_role subnetpoolid: - get_input: - - port_1c1_t1_port_subnetpoolid - - index_value + get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: port_1c1_t1_port_fixed_ips name: @@ -355,4 +341,4 @@ topology_template: - link dependency_1c11_scalling_instance: - 1c11_scalling_instance - - 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/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml index 451e87cb41..195f916993 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_1c12_scalling_instance_scheduler_hints: type: list required: true @@ -35,7 +33,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -102,33 +100,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t1_port_exCP_naming - - index_value + get_input: port_1c1_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t1_port_vlan_requirements - - index_value + get_input: port_1c1_t1_port_vlan_requirements ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: - get_input: - - port_1c1_t1_port_network_role_tag - - index_value + get_input: port_1c1_t1_port_network_role_tag mac_requirements: get_input: port_1c1_t1_port_mac_requirements order: - get_input: - - port_1c1_t1_port_order - - index_value + get_input: port_1c1_t1_port_order network_role: - get_input: - - port_1c1_t1_port_network_role - - index_value + get_input: port_1c1_t1_port_network_role subnetpoolid: - get_input: - - port_1c1_t1_port_subnetpoolid - - index_value + get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: port_1c1_t1_port_fixed_ips name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml index 29c1fd07de..351bfc739e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -98,10 +96,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -114,15 +110,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -165,33 +163,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -205,13 +191,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -219,17 +201,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index b3db9f4bbe..767c177abe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml index 399b551a48..172cfbb589 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml index d62c28bb12..dc503608e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid network: get_input: - port_1c2_t1_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml index a1ba0b63a9..d2b08144aa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml @@ -22,8 +22,10 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -62,12 +64,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -101,15 +101,13 @@ topology_template: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -138,33 +136,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t1_port_exCP_naming - - index_value + get_input: port_1a_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t1_port_vlan_requirements - - index_value + get_input: port_1a_t1_port_vlan_requirements ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: - get_input: - - port_1a_t1_port_network_role_tag - - index_value + get_input: port_1a_t1_port_network_role_tag mac_requirements: get_input: port_1a_t1_port_mac_requirements order: - get_input: - - port_1a_t1_port_order - - index_value + get_input: port_1a_t1_port_order network_role: - get_input: - - port_1a_t1_port_network_role - - index_value + get_input: port_1a_t1_port_network_role subnetpoolid: - get_input: - - port_1a_t1_port_subnetpoolid - - index_value + get_input: port_1a_t1_port_subnetpoolid network: get_input: - port_1a_t1_port_network @@ -205,13 +191,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t2_port_exCP_naming - - index_value + get_input: port_1a_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t2_port_vlan_requirements - - index_value + get_input: port_1a_t2_port_vlan_requirements ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: @@ -219,17 +201,11 @@ topology_template: mac_requirements: get_input: port_1a_t2_port_mac_requirements order: - get_input: - - port_1a_t2_port_order - - index_value + get_input: port_1a_t2_port_order network_role: - get_input: - - port_1a_t2_port_network_role - - index_value + get_input: port_1a_t2_port_network_role subnetpoolid: - get_input: - - port_1a_t2_port_subnetpoolid - - index_value + get_input: port_1a_t2_port_subnetpoolid network: get_input: - port_1a_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml index 3e93b30562..b82ccec156 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -86,7 +84,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_a_single_2a_metadata: type: list required: true @@ -124,33 +122,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t1_port_exCP_naming - - index_value + get_input: port_1a_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t1_port_vlan_requirements - - index_value + get_input: port_1a_t1_port_vlan_requirements ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: - get_input: - - port_1a_t1_port_network_role_tag - - index_value + get_input: port_1a_t1_port_network_role_tag mac_requirements: get_input: port_1a_t1_port_mac_requirements order: - get_input: - - port_1a_t1_port_order - - index_value + get_input: port_1a_t1_port_order network_role: - get_input: - - port_1a_t1_port_network_role - - index_value + get_input: port_1a_t1_port_network_role subnetpoolid: - get_input: - - port_1a_t1_port_subnetpoolid - - index_value + get_input: port_1a_t1_port_subnetpoolid network: get_input: - port_1a_t1_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml index 4ec6028a85..a33804d6bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -91,7 +87,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -103,8 +99,10 @@ topology_template: entry_schema: type: json port_1b_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -122,7 +120,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -165,13 +163,9 @@ topology_template: - port_1b_t1_port_value_specs - index_value exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -179,17 +173,11 @@ topology_template: mac_requirements: get_input: port_1b_t1_port_mac_requirements order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_input: - port_1b_t1_port_network @@ -203,33 +191,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml index 2c022044ae..32b8575153 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -91,7 +87,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -124,7 +120,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_name: type: list required: true @@ -162,33 +158,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: 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 order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_attribute: - b_single_1b @@ -202,33 +186,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml index c479dcb2b5..462ec0395a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: integer port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -86,7 +82,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -108,8 +104,10 @@ topology_template: entry_schema: type: string port_1b_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -127,7 +125,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -165,13 +163,9 @@ topology_template: - port_1b_t1_port_value_specs - index_value exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -179,17 +173,11 @@ topology_template: mac_requirements: get_input: port_1b_t1_port_mac_requirements order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_input: - port_1b_t1_port_network @@ -203,33 +191,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml index ce479e9984..3d7c15ce93 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -58,10 +56,8 @@ topology_template: entry_schema: type: integer port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -91,7 +87,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -129,7 +125,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements node_templates: b_single_2b: type: org.openecomp.resource.vfc.nodes.heat.b_single_2b @@ -162,33 +158,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: 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 order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_attribute: - b_single_2b @@ -202,33 +186,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml index eca7550f05..934dada392 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -672,4 +672,4 @@ topology_template: - dependency dependency_pcm_port_2: - pcm_port_2 - - 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/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml index a8e64880b2..f96fc7e5b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -16,6 +16,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -26,7 +31,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false @@ -48,6 +53,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -61,15 +71,11 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pcm_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json oam_net_name: label: OAM network name hidden: false @@ -89,6 +95,11 @@ topology_template: hidden: false immutable: false type: json + port_pcm_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false @@ -107,11 +118,14 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false @@ -124,6 +138,14 @@ topology_template: immutable: false type: string description: CPS Cluman Cinder Volume + port_pcm_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true cps_net_name: label: CPS network name hidden: false @@ -152,42 +174,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_1_network_role - - index_value + get_input: port_pcm_port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_port_1_subnetpoolid - - index_value + get_input: port_pcm_port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_port_1_exCP_naming - - index_value + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_port_1_order - - index_value + get_input: port_pcm_port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -213,42 +221,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_0_network_role - - index_value + get_input: port_pcm_port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_port_0_subnetpoolid - - index_value + get_input: port_pcm_port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_port_0_exCP_naming - - index_value + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_port_0_order - - index_value + get_input: port_pcm_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -478,4 +472,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency |