diff options
| author |   siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-03 20:24:59 +0530 |
|---|---|---|
| committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-04 13:54:59 +0530 |
| commit | d6982006c27288936d8b0d9eee18068854036f45 (patch) | |
| tree | 7b71be074b5303d442971d0bd59b2accd7940604 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs | |
| parent | 4b6709601c47050c853e6eaa5525259f066d5277 (diff) | |
Added new nodes type
Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.
Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs')
11 files changed, 863 insertions, 389 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml index 07a842e260..3735042d2d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -128,12 +128,24 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_cdi_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean + port_cdi_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -456,6 +468,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -578,6 +591,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -619,12 +633,6 @@ node_types: org.openecomp.resource.abstract.nodes.lbd: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_lbd_internal_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_lbd_ims_core_1_port_allowed_address_pairs: type: list required: true @@ -637,12 +645,6 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_lbd_internal_1_port_name: type: list required: true @@ -655,22 +657,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_lbd_dpdk_1_port_subnetpoolid: type: string required: true @@ -701,26 +687,16 @@ node_types: type: integer required: true status: SUPPORTED - port_lbd_internal_1_port_ip_requirements: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + port_lbd_dpdk_1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED + type: boolean port_lbd_dpdk_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -749,6 +725,92 @@ node_types: type: string required: true status: SUPPORTED + compute_lbd_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_dpdk_1_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_ims_core_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_lbd_internal_1_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_internal_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + compute_lbd_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_ims_core_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_internal_1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_ims_core_1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_lbd_ims_core_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_internal_1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_ims_core_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED port_lbd_internal_1_port_subnetpoolid: type: string required: true @@ -789,18 +851,6 @@ node_types: type: string required: true status: SUPPORTED - compute_lbd_scheduler_hints: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_lbd_dpdk_1_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_lbd_dpdk_1_port_security_groups: type: list required: true @@ -813,16 +863,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_internal_1_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_lbd_internal_1_port_network_role: type: string required: true @@ -839,26 +879,18 @@ node_types: status: SUPPORTED entry_schema: type: json - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_lbd_dpdk_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_name: + port_lbd_internal_1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: boolean port_lbd_dpdk_1_port_network_role: type: string required: true @@ -994,6 +1026,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1255,6 +1288,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1349,6 +1383,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1407,6 +1442,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_oam_1_port_network_role_tag: type: string required: true @@ -1527,6 +1568,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_oam_internal_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_oam_availability_zone: type: list required: true @@ -1656,6 +1703,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1932,6 +1980,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1988,6 +2037,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_oam_2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_oam_2_port_security_groups: type: list required: true @@ -2086,6 +2141,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_oam_internal_2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2424,6 +2485,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2496,6 +2558,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2894,6 +2957,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3171,6 +3235,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3279,6 +3344,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_cdi_ims_core_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -3413,6 +3484,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_cdi_metadata: type: list required: true @@ -3624,6 +3701,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3631,6 +3709,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3868,18 +3947,6 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - port_lbd_dpdk_0_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_internal_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -3892,22 +3959,10 @@ node_types: type: string required: true status: SUPPORTED - port_lbd_internal_0_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json compute_lbd_availability_zone: type: list required: true @@ -3924,26 +3979,10 @@ node_types: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: - type: string - required: true - status: SUPPORTED port_lbd_dpdk_0_port_ip_requirements: type: list required: true @@ -3954,26 +3993,12 @@ node_types: type: integer required: true status: SUPPORTED - port_lbd_ims_core_0_port_network_role: - type: string - required: true - status: SUPPORTED port_lbd_ims_core_0_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_dpdk_0_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED port_lbd_ims_core_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3990,32 +4015,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_order: - type: integer - required: true - status: SUPPORTED - port_lbd_dpdk_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_internal_0_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 + type: boolean port_lbd_ims_core_0_port_network_role_tag: type: string required: true @@ -4030,12 +4035,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_ims_core_0_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_dpdk_0_port_order: type: integer required: true @@ -4046,16 +4045,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_internal_0_port_fixed_ips: + port_lbd_ims_core_0_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: boolean port_lbd_internal_0_port_network: type: list required: true @@ -4066,42 +4061,144 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_lbd_metadata: + compute_lbd_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_ims_core_0_port_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - compute_lbd_name: + port_lbd_ims_core_0_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_ip_requirements: + port_lbd_internal_0_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_dpdk_0_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_internal_0_port_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_lbd_ims_core_0_port_name: + port_lbd_dpdk_0_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_dpdk_0_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_vlan_requirements: + port_lbd_internal_0_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_lbd_ims_core_0_port_network_role: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_dpdk_0_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_internal_0_port_order: + type: integer + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_network_role: + type: string + required: true + status: SUPPORTED + port_lbd_ims_core_0_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_0_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_lbd_ims_core_0_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_lbd_internal_0_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_lbd_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_internal_0_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_lbd_lbd_ims_core_0_port: capability: tosca.capabilities.Node @@ -4287,6 +4384,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4417,6 +4515,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4436,6 +4535,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4648,10 +4748,22 @@ node_types: type: string required: true status: SUPPORTED + port_cif_internal_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_1_port_3_subnetpoolid: type: string required: true status: SUPPORTED + port_cif_ims_core_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -4662,6 +4774,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cif_ims_li_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_1_port_3_allowed_address_pairs: type: list required: true @@ -4746,6 +4864,12 @@ node_types: type: string required: true status: SUPPORTED + port_cif_oam_1_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_ims_core_1_port_order: type: integer required: true @@ -4960,6 +5084,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_cif_oam_1_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_1_port_3_name: type: list required: true @@ -5483,6 +5613,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5540,6 +5671,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5552,6 +5684,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5588,6 +5721,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5625,6 +5759,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6075,6 +6210,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6207,6 +6343,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_oam_0_port_fixed_ips: type: list required: true @@ -6285,6 +6427,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_oam_0_port_network_role_tag: type: string required: true @@ -6440,6 +6588,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6465,6 +6614,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7088,6 +7238,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7365,6 +7516,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7479,6 +7631,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cif_oam_0_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_0_port_1_order: type: integer required: true @@ -7633,6 +7791,18 @@ node_types: type: integer required: true status: SUPPORTED + port_cif_ims_core_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_cif_ims_li_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_0_port_3_security_groups: type: list required: true @@ -7649,6 +7819,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_cif_oam_0_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_0_port_1_network: type: list required: true @@ -7725,6 +7901,12 @@ node_types: type: string required: true status: SUPPORTED + port_cif_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_internal_0_port_network_role_tag: type: string required: true @@ -8101,6 +8283,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8256,6 +8439,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8269,6 +8453,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8328,6 +8513,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8389,6 +8575,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8889,6 +9076,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index b78169323f..d01b20e756 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -2094,6 +2094,8 @@ topology_template: port_cdi_ims_core_1_port_mac_requirements: mac_count_required: is_required: false + port_cdi_ims_core_1_port_subinterface_indicator: + - true vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: @@ -2168,6 +2170,8 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + port_cdi_internal_1_port_subinterface_indicator: + - true compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2549,8 +2553,6 @@ topology_template: get_input: lbd_ims_core_v6_vip_0 compute_lbd_user_data_format: - RAW - compute_lbd_config_drive: - - true port_lbd_internal_1_port_name: - str_replace: template: $PREFIX$DELeth0 @@ -2564,6 +2566,47 @@ topology_template: - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 + vm_flavor_name: + get_input: lbd_flavor_name + port_lbd_ims_core_1_port_mac_requirements: + mac_count_required: + is_required: false + compute_lbd_availability_zone: + - get_input: availability_zone_1 + vm_image_name: + get_input: lbd_image_name + port_lbd_dpdk_1_port_subinterface_indicator: + - true + port_lbd_dpdk_1_port_network: + - cscf_internal_dpdk_network_0 + port_lbd_ims_core_1_port_name: + - str_replace: + template: $PREFIX$DELeth2 + params: + $PREFIX: + get_input: lbd_name_1 + $DEL: + get_input: vcscf_name_delimeter + compute_lbd_scheduler_hints: + - group: lbd_server_group_group + port_lbd_dpdk_1_port_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: lbd_name_1 + $DEL: + get_input: vcscf_name_delimeter + port_lbd_internal_1_port_network: + - cscf_internal_network_0 + port_lbd_internal_1_port_mac_requirements: + mac_count_required: + is_required: false + compute_lbd_name: + - get_input: lbd_name_1 + port_lbd_ims_core_1_port_network_role_tag: ims_core + compute_lbd_config_drive: + - true port_lbd_ims_core_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2578,13 +2621,8 @@ topology_template: port_lbd_dpdk_1_port_mac_requirements: mac_count_required: is_required: false - vm_flavor_name: - get_input: lbd_flavor_name - port_lbd_ims_core_1_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_availability_zone: - - get_input: availability_zone_1 + port_lbd_ims_core_1_port_subinterface_indicator: + - true port_lbd_internal_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2598,18 +2636,6 @@ topology_template: is_required: false port_lbd_internal_1_port_security_groups: - - cscf_RSG - vm_image_name: - get_input: lbd_image_name - port_lbd_dpdk_1_port_network: - - cscf_internal_dpdk_network_0 - port_lbd_ims_core_1_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: lbd_name_1 - $DEL: - get_input: vcscf_name_delimeter port_lbd_ims_core_1_port_security_groups: - - cscf_RSG port_lbd_ims_core_1_port_fixed_ips: @@ -2620,23 +2646,11 @@ topology_template: get_input: lbd_internal_ip_1 port_lbd_ims_core_1_port_network: - get_input: ims_core_net_id - compute_lbd_scheduler_hints: - - group: lbd_server_group_group - port_lbd_dpdk_1_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: lbd_name_1 - $DEL: - get_input: vcscf_name_delimeter port_lbd_dpdk_1_port_security_groups: - - cscf_RSG port_lbd_dpdk_1_port_fixed_ips: - ip_address: get_input: lbd_internal_dpdk_ip_1 - port_lbd_internal_1_port_network: - - cscf_internal_network_0 port_lbd_dpdk_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2658,12 +2672,8 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_lbd_internal_1_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_name: - - get_input: lbd_name_1 - port_lbd_ims_core_1_port_network_role_tag: ims_core + port_lbd_internal_1_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_lbdServiceTemplate.yaml count: 1 @@ -2921,8 +2931,12 @@ topology_template: get_input: cdi_internal_ip_0 - ip_address: get_input: cdi_internal_v6_ip_0 + port_cdi_ims_core_0_port_subinterface_indicator: + - true compute_cdi_config_drive: - true + port_cdi_internal_0_port_subinterface_indicator: + - true port_cdi_internal_0_port_security_groups: - - cscf_RSG port_cdi_ims_core_0_port_security_groups: @@ -3017,6 +3031,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_oam_oam_1_port_subinterface_indicator: + - true port_oam_oam_1_port_network_role_tag: oam port_oam_oam_1_port_security_groups: - - cscf_RSG @@ -3070,6 +3086,8 @@ topology_template: get_input: vcscf_name_delimeter compute_oam_scheduler_hints: - group: oam_server_group_group + port_oam_internal_1_port_subinterface_indicator: + - true compute_oam_availability_zone: - get_input: availability_zone_1 compute_oam_metadata: @@ -3113,6 +3131,8 @@ topology_template: - substitutable properties: port_oam_oam_2_port_network_role_tag: oam + port_oam_oam_2_port_subinterface_indicator: + - true port_oam_oam_2_port_security_groups: - - cscf_RSG port_oam_oam_2_port_name: @@ -3156,6 +3176,8 @@ topology_template: port_oam_oam_2_port_mac_requirements: mac_count_required: is_required: false + port_oam_internal_2_port_subinterface_indicator: + - true port_oam_oam_2_port_network: - get_input: oam_net_id compute_oam_user_data_format: @@ -3308,6 +3330,8 @@ topology_template: get_input: oam_name_0 $DEL: get_input: vcscf_name_delimeter + port_oam_internal_0_port_subinterface_indicator: + - true port_oam_oam_0_port_fixed_ips: - ip_address: get_input: oam_oam_ip_0 @@ -3349,6 +3373,8 @@ topology_template: port_oam_internal_0_port_fixed_ips: - ip_address: get_input: oam_internal_ip_0 + port_oam_oam_0_port_subinterface_indicator: + - true port_oam_oam_0_port_network_role_tag: oam compute_oam_user_data_format: - RAW @@ -3415,17 +3441,8 @@ topology_template: properties: compute_lbd_user_data_format: - RAW - compute_lbd_config_drive: - - true - port_lbd_dpdk_0_port_fixed_ips: - - ip_address: - get_input: lbd_internal_dpdk_ip_0 - port_lbd_internal_0_port_security_groups: - - - cscf_RSG vm_flavor_name: get_input: lbd_flavor_name - port_lbd_dpdk_0_port_security_groups: - - - cscf_RSG compute_lbd_availability_zone: - get_input: availability_zone_0 port_lbd_dpdk_0_port_allowed_address_pairs: @@ -3435,14 +3452,6 @@ topology_template: - ip_address: 8000::/1 vm_image_name: get_input: lbd_image_name - port_lbd_dpdk_0_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: lbd_name_0 - $DEL: - get_input: vcscf_name_delimeter port_lbd_dpdk_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -3456,8 +3465,6 @@ topology_template: is_required: false port_lbd_ims_core_0_port_network: - get_input: ims_core_net_id - port_lbd_dpdk_0_port_network: - - cscf_internal_dpdk_network_0 port_lbd_ims_core_0_port_mac_requirements: mac_count_required: is_required: false @@ -3472,15 +3479,14 @@ topology_template: get_input: lbd_name_0 $DEL: get_input: vcscf_name_delimeter + port_lbd_internal_0_port_subinterface_indicator: + - true port_lbd_ims_core_0_port_network_role_tag: ims_core compute_lbd_scheduler_hints: - group: lbd_server_group_group port_lbd_internal_0_port_mac_requirements: mac_count_required: is_required: false - port_lbd_ims_core_0_port_fixed_ips: - - ip_address: - get_input: lbd_ims_core_v6_ip_0 port_lbd_ims_core_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -3492,14 +3498,52 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_lbd_internal_0_port_fixed_ips: - - ip_address: - get_input: lbd_internal_ip_0 + port_lbd_ims_core_0_port_subinterface_indicator: + - true port_lbd_internal_0_port_network: - cscf_internal_network_0 port_lbd_dpdk_0_port_mac_requirements: mac_count_required: is_required: false + compute_lbd_name: + - get_input: lbd_name_0 + port_lbd_ims_core_0_port_security_groups: + - - cscf_RSG + port_lbd_ims_core_0_port_name: + - str_replace: + template: $PREFIX$DELeth2 + params: + $PREFIX: + get_input: lbd_name_0 + $DEL: + get_input: vcscf_name_delimeter + compute_lbd_config_drive: + - true + port_lbd_dpdk_0_port_fixed_ips: + - ip_address: + get_input: lbd_internal_dpdk_ip_0 + port_lbd_internal_0_port_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: lbd_name_0 + $DEL: + get_input: vcscf_name_delimeter + port_lbd_dpdk_0_port_network: + - cscf_internal_dpdk_network_0 + port_lbd_dpdk_0_port_subinterface_indicator: + - true + port_lbd_ims_core_0_port_fixed_ips: + - ip_address: + get_input: lbd_ims_core_v6_ip_0 + port_lbd_internal_0_port_fixed_ips: + - ip_address: + get_input: lbd_internal_ip_0 compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -3510,8 +3554,6 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - compute_lbd_name: - - get_input: lbd_name_0 port_lbd_internal_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -3523,16 +3565,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_lbd_ims_core_0_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_0_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: lbd_name_0 - $DEL: - get_input: vcscf_name_delimeter service_template_filter: substitute_service_template: Nested_lbd_1ServiceTemplate.yaml count: 1 @@ -3778,6 +3810,8 @@ topology_template: get_input: cif_name_0 $DEL: get_input: vcscf_name_delimeter + port_cif_oam_0_port_3_subinterface_indicator: + - true vm_image_name: get_input: cif_image_name compute_cif_user_data_format: @@ -3845,6 +3879,10 @@ topology_template: get_input: vcscf_name_delimeter port_cif_internal_0_port_network: - cscf_internal_network_0 + port_cif_ims_core_0_port_subinterface_indicator: + - true + port_cif_ims_li_0_port_subinterface_indicator: + - true port_cif_oam_0_port_3_security_groups: - - cscf_RSG port_cif_ims_core_0_port_ip_requirements: @@ -3861,6 +3899,8 @@ topology_template: port_cif_ims_li_0_port_mac_requirements: mac_count_required: is_required: false + port_cif_oam_0_port_1_subinterface_indicator: + - true port_cif_oam_0_port_1_network: - get_input: oam_net_id port_cif_ims_li_0_port_security_groups: @@ -3883,6 +3923,8 @@ topology_template: port_cif_ims_li_0_port_allowed_address_pairs: - ip_address: get_input: cif_ims_li_v6_vip_0 + port_cif_internal_0_port_subinterface_indicator: + - true port_cif_internal_0_port_mac_requirements: mac_count_required: is_required: false @@ -3981,10 +4023,16 @@ topology_template: - get_input: oam_net_id vm_flavor_name: get_input: cif_flavor_name + port_cif_internal_1_port_subinterface_indicator: + - true + port_cif_ims_core_1_port_subinterface_indicator: + - true vm_image_name: get_input: cif_image_name compute_cif_user_data_format: - RAW + port_cif_ims_li_1_port_subinterface_indicator: + - true port_cif_oam_1_port_3_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_1 @@ -4026,6 +4074,8 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_cif_oam_1_port_1_subinterface_indicator: + - true port_cif_oam_1_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_1 @@ -4139,6 +4189,8 @@ topology_template: get_input: vcscf_name_delimeter compute_cif_config_drive: - true + port_cif_oam_1_port_3_subinterface_indicator: + - true port_cif_oam_1_port_3_name: - str_replace: template: $PREFIX$DELeth3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml index 4f2606ad61..ab4499b8d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml @@ -108,11 +108,21 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_cdi_config_drive: type: list required: true entry_schema: type: boolean + port_cdi_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -178,6 +188,10 @@ topology_template: get_input: port_cdi_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_cdi_ims_core_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cdi_ims_core_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cdi_ims_core_0_port_ip_requirements network_role_tag: @@ -251,6 +265,10 @@ topology_template: get_input: port_cdi_internal_0_port_exCP_naming vlan_requirements: get_input: port_cdi_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cdi_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cdi_internal_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml index ab2fb23db2..462ce4b069 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml @@ -36,6 +36,11 @@ topology_template: port_cdi_ims_core_1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_cdi_ims_core_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -146,6 +151,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_cdi_metadata: type: list required: true @@ -178,6 +188,10 @@ topology_template: get_input: port_cdi_internal_1_port_exCP_naming vlan_requirements: get_input: port_cdi_internal_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cdi_internal_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cdi_internal_1_port_ip_requirements network_role_tag: @@ -251,6 +265,10 @@ topology_template: get_input: port_cdi_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_cdi_ims_core_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cdi_ims_core_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cdi_ims_core_1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml index d413c1ff9a..275a1ecb4d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml @@ -42,6 +42,11 @@ topology_template: required: true entry_schema: type: string + port_cif_oam_0_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_0_port_1_order: type: integer required: true @@ -165,6 +170,16 @@ topology_template: port_cif_ims_core_0_port_order: type: integer required: true + port_cif_ims_core_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_cif_ims_li_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_0_port_3_security_groups: type: list required: true @@ -178,6 +193,11 @@ topology_template: port_cif_ims_li_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_cif_oam_0_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_0_port_1_network: type: list required: true @@ -239,6 +259,11 @@ topology_template: port_cif_ims_core_0_port_subnetpoolid: type: string required: true + port_cif_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_internal_0_port_network_role_tag: type: string required: true @@ -368,6 +393,10 @@ topology_template: get_input: port_cif_internal_0_port_exCP_naming vlan_requirements: get_input: port_cif_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_internal_0_port_ip_requirements network_role_tag: @@ -410,6 +439,10 @@ topology_template: get_input: port_cif_ims_li_0_port_exCP_naming vlan_requirements: get_input: port_cif_ims_li_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_ims_li_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_ims_li_0_port_ip_requirements network_role_tag: @@ -452,6 +485,10 @@ topology_template: get_input: port_cif_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_cif_ims_core_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_ims_core_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_ims_core_0_port_ip_requirements network_role_tag: @@ -494,6 +531,10 @@ topology_template: get_input: port_cif_oam_0_port_1_exCP_naming vlan_requirements: get_input: port_cif_oam_0_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_oam_0_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_oam_0_port_1_ip_requirements network_role_tag: @@ -536,6 +577,10 @@ topology_template: get_input: port_cif_oam_0_port_3_exCP_naming vlan_requirements: get_input: port_cif_oam_0_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_oam_0_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_oam_0_port_3_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml index 380440f67c..a2d95fddbc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml @@ -40,9 +40,19 @@ topology_template: vm_flavor_name: type: string required: true + port_cif_internal_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_1_port_3_subnetpoolid: type: string required: true + port_cif_ims_core_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -51,6 +61,11 @@ topology_template: required: true entry_schema: type: string + port_cif_ims_li_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_1_port_3_allowed_address_pairs: type: list required: true @@ -119,6 +134,11 @@ topology_template: port_cif_ims_li_1_port_network_role: type: string required: true + port_cif_oam_1_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_ims_core_1_port_order: type: integer required: true @@ -292,6 +312,11 @@ topology_template: port_cif_oam_1_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_cif_oam_1_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_1_port_3_name: type: list required: true @@ -368,6 +393,10 @@ topology_template: get_input: port_cif_ims_li_1_port_exCP_naming vlan_requirements: get_input: port_cif_ims_li_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_ims_li_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_ims_li_1_port_ip_requirements network_role_tag: @@ -410,6 +439,10 @@ topology_template: get_input: port_cif_internal_1_port_exCP_naming vlan_requirements: get_input: port_cif_internal_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_internal_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_internal_1_port_ip_requirements network_role_tag: @@ -452,6 +485,10 @@ topology_template: get_input: port_cif_oam_1_port_1_exCP_naming vlan_requirements: get_input: port_cif_oam_1_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_oam_1_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_oam_1_port_1_ip_requirements network_role_tag: @@ -494,6 +531,10 @@ topology_template: get_input: port_cif_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_cif_ims_core_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_ims_core_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_ims_core_1_port_ip_requirements network_role_tag: @@ -536,6 +577,10 @@ topology_template: get_input: port_cif_oam_1_port_3_exCP_naming vlan_requirements: get_input: port_cif_oam_1_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_oam_1_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_oam_1_port_3_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml index 4e544f5c9c..34628a22a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml @@ -11,11 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_lbd_internal_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_lbd_ims_core_1_port_allowed_address_pairs: type: list required: true @@ -26,11 +21,6 @@ topology_template: required: true entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - entry_schema: - type: boolean port_lbd_internal_1_port_name: type: list required: true @@ -41,19 +31,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_lbd_dpdk_1_port_subnetpoolid: type: string required: true @@ -77,22 +54,14 @@ topology_template: port_lbd_internal_1_port_order: type: integer required: true - port_lbd_internal_1_port_ip_requirements: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + port_lbd_dpdk_1_port_subinterface_indicator: type: list required: true entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - vm_image_name: - type: string - required: true + type: boolean port_lbd_dpdk_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -115,6 +84,76 @@ topology_template: port_lbd_ims_core_1_port_network_role: type: string required: true + compute_lbd_scheduler_hints: + type: list + required: true + entry_schema: + type: json + port_lbd_dpdk_1_port_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_internal_1_port_network: + type: list + required: true + entry_schema: + type: string + port_lbd_internal_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + compute_lbd_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_network_role_tag: + type: string + required: true + port_lbd_internal_1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + entry_schema: + type: boolean + port_lbd_ims_core_1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_lbd_ims_core_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_lbd_internal_1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_security_groups: + type: list + required: true + entry_schema: + type: json + port_lbd_ims_core_1_port_subnetpoolid: + type: string + required: true port_lbd_internal_1_port_subnetpoolid: type: string required: true @@ -148,16 +187,6 @@ topology_template: port_lbd_dpdk_1_port_network_role_tag: type: string required: true - compute_lbd_scheduler_hints: - type: list - required: true - entry_schema: - type: json - port_lbd_dpdk_1_port_name: - type: list - required: true - entry_schema: - type: string port_lbd_dpdk_1_port_security_groups: type: list required: true @@ -168,14 +197,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_internal_1_port_network: - type: list - required: true - entry_schema: - type: string port_lbd_internal_1_port_network_role: type: string required: true @@ -189,22 +210,16 @@ topology_template: required: true entry_schema: type: json - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_lbd_dpdk_1_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_name: + port_lbd_internal_1_port_subinterface_indicator: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string - required: true + type: boolean port_lbd_dpdk_1_port_network_role: type: string required: true @@ -226,6 +241,10 @@ topology_template: get_input: port_lbd_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_lbd_ims_core_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_ims_core_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_ims_core_1_port_ip_requirements network_role_tag: @@ -268,6 +287,10 @@ topology_template: get_input: port_lbd_dpdk_1_port_exCP_naming vlan_requirements: get_input: port_lbd_dpdk_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_dpdk_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_dpdk_1_port_ip_requirements network_role_tag: @@ -308,18 +331,22 @@ topology_template: get_input: port_lbd_internal_1_port_exCP_naming vlan_requirements: get_input: port_lbd_internal_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_internal_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_internal_1_port_ip_requirements network_role_tag: get_input: port_lbd_internal_1_port_network_role_tag network_role: get_input: port_lbd_internal_1_port_network_role + subnetpoolid: + get_input: port_lbd_internal_1_port_subnetpoolid fixed_ips: get_input: - port_lbd_internal_1_port_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_1_port_subnetpoolid name: get_input: - port_lbd_internal_1_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml index 86141e1fb2..15b0d89cd5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml @@ -19,16 +19,6 @@ topology_template: required: true entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - entry_schema: - type: boolean - port_lbd_dpdk_0_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_internal_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -38,19 +28,9 @@ topology_template: port_lbd_internal_0_port_network_role: type: string required: true - port_lbd_internal_0_port_security_groups: - type: list - required: true - entry_schema: - type: json vm_flavor_name: type: string required: true - port_lbd_dpdk_0_port_security_groups: - type: list - required: true - entry_schema: - type: json compute_lbd_availability_zone: type: list required: true @@ -64,22 +44,9 @@ topology_template: port_lbd_dpdk_0_port_subnetpoolid: type: string required: true - port_lbd_dpdk_0_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_lbd_dpdk_0_port_name: - type: list - required: true - entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: - type: string - required: true port_lbd_dpdk_0_port_ip_requirements: type: list required: true @@ -88,22 +55,11 @@ topology_template: port_lbd_ims_core_0_port_order: type: integer required: true - port_lbd_ims_core_0_port_network_role: - type: string - required: true port_lbd_ims_core_0_port_network: type: list required: true entry_schema: type: string - port_lbd_dpdk_0_port_network: - type: list - required: true - entry_schema: - type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string - required: true port_lbd_ims_core_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -117,27 +73,11 @@ topology_template: required: true entry_schema: type: string - port_lbd_internal_0_port_order: - type: integer - required: true - port_lbd_dpdk_0_port_network_role: - type: string - required: true - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_internal_0_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string - required: true - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 + type: boolean port_lbd_ims_core_0_port_network_role_tag: type: string required: true @@ -149,11 +89,6 @@ topology_template: port_lbd_internal_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_lbd_ims_core_0_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_dpdk_0_port_order: type: integer required: true @@ -162,14 +97,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_internal_0_port_fixed_ips: + port_lbd_ims_core_0_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: boolean port_lbd_internal_0_port_network: type: list required: true @@ -178,36 +110,119 @@ topology_template: port_lbd_dpdk_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_lbd_metadata: + compute_lbd_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_0_port_security_groups: type: list required: true entry_schema: type: json - compute_lbd_name: + port_lbd_ims_core_0_port_name: type: list required: true entry_schema: type: string - port_lbd_internal_0_port_ip_requirements: + port_lbd_internal_0_port_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + entry_schema: + type: boolean + port_lbd_dpdk_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_internal_0_port_security_groups: type: list required: true entry_schema: type: json - port_lbd_ims_core_0_port_name: + port_lbd_dpdk_0_port_security_groups: + type: list + required: true + entry_schema: + type: json + port_lbd_dpdk_0_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_name: type: list required: true entry_schema: type: string - port_lbd_internal_0_port_vlan_requirements: + port_lbd_internal_0_port_subnetpoolid: + type: string + required: true + port_lbd_ims_core_0_port_network_role: + type: string + required: true + port_lbd_dpdk_0_port_network: + type: list + required: true + entry_schema: + type: string + port_lbd_dpdk_0_port_network_role_tag: + type: string + required: true + port_lbd_dpdk_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_lbd_internal_0_port_order: + type: integer + required: true + port_lbd_dpdk_0_port_network_role: + type: string + required: true + port_lbd_ims_core_0_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_0_port_subnetpoolid: + type: string + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_lbd_ims_core_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_internal_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_lbd_metadata: + type: list + required: true + entry_schema: + type: json + port_lbd_internal_0_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: lbd_lbd_ims_core_0_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -226,6 +241,10 @@ topology_template: get_input: port_lbd_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_lbd_ims_core_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_ims_core_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_ims_core_0_port_ip_requirements network_role_tag: @@ -268,6 +287,10 @@ topology_template: get_input: port_lbd_dpdk_0_port_exCP_naming vlan_requirements: get_input: port_lbd_dpdk_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_dpdk_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_dpdk_0_port_ip_requirements network_role_tag: @@ -308,18 +331,22 @@ topology_template: get_input: port_lbd_internal_0_port_exCP_naming vlan_requirements: get_input: port_lbd_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_internal_0_port_ip_requirements network_role_tag: get_input: port_lbd_internal_0_port_network_role_tag network_role: get_input: port_lbd_internal_0_port_network_role + subnetpoolid: + get_input: port_lbd_internal_0_port_subnetpoolid fixed_ips: get_input: - port_lbd_internal_0_port_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_0_port_subnetpoolid name: get_input: - port_lbd_internal_0_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml index 0925522b81..1448429d91 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_oam_internal_0_port_subnetpoolid: type: string required: true + port_oam_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_oam_0_port_fixed_ips: type: list required: true @@ -85,6 +90,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_oam_0_port_network_role_tag: type: string required: true @@ -178,6 +188,10 @@ topology_template: get_input: port_oam_oam_0_port_exCP_naming vlan_requirements: get_input: port_oam_oam_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_oam_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_oam_0_port_ip_requirements network_role_tag: @@ -220,6 +234,10 @@ topology_template: get_input: port_oam_internal_0_port_exCP_naming vlan_requirements: get_input: port_oam_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_internal_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml index 44fd3f4e6c..08a7d58f36 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml @@ -38,6 +38,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_oam_1_port_network_role_tag: type: string required: true @@ -136,6 +141,11 @@ topology_template: required: true entry_schema: type: json + port_oam_internal_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_oam_availability_zone: type: list required: true @@ -178,6 +188,10 @@ topology_template: get_input: port_oam_internal_1_port_exCP_naming vlan_requirements: get_input: port_oam_internal_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_internal_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_internal_1_port_ip_requirements network_role_tag: @@ -220,6 +234,10 @@ topology_template: get_input: port_oam_oam_1_port_exCP_naming vlan_requirements: get_input: port_oam_oam_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_oam_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_oam_1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml index d5e960758c..2b4a83915e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_oam_oam_2_port_network_role_tag: type: string required: true + port_oam_oam_2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_oam_2_port_security_groups: type: list required: true @@ -92,6 +97,11 @@ topology_template: port_oam_oam_2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_oam_internal_2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -178,6 +188,10 @@ topology_template: get_input: port_oam_internal_2_port_exCP_naming vlan_requirements: get_input: port_oam_internal_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_internal_2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_internal_2_port_ip_requirements network_role_tag: @@ -220,6 +234,10 @@ topology_template: get_input: port_oam_oam_2_port_exCP_naming vlan_requirements: get_input: port_oam_oam_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_oam_2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_oam_2_port_ip_requirements network_role_tag: |