diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml')
1 files changed, 208 insertions, 208 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/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 e41c99a6c8..76b51beb75 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 @@ -11,57 +11,46 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cdi_internal_0_port_network_role: + port_cdi_internal_0_port_0_subnetpoolid: type: string required: true - port_cdi_ims_core_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_0_port_ip_requirements: + port_cdi_internal_0_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_cdi_internal_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_0_port_name: - type: list + type: json + port_cdi_ims_core_0_port_1_order: + type: integer required: true - entry_schema: - type: string - port_cdi_internal_0_port_exCP_naming: + port_cdi_ims_core_0_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cdi_ims_core_0_port_network_role: - type: string - required: true - port_cdi_internal_0_port_allowed_address_pairs: + port_cdi_ims_core_0_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cdi_internal_0_port_network_role_tag: - type: string - required: true - port_cdi_internal_0_port_subnetpoolid: - type: string - required: true + type: string vm_image_name: type: string required: true + port_cdi_internal_0_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cdi_scheduler_hints: type: list required: true @@ -72,52 +61,48 @@ topology_template: required: true entry_schema: type: string - port_cdi_ims_core_0_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_network_role_tag: - type: string - required: true compute_cdi_user_data_format: type: list required: true entry_schema: type: string - port_cdi_internal_0_port_name: - type: list - required: true - entry_schema: - type: string - port_cdi_ims_core_0_port_order: - type: integer + port_cdi_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true compute_cdi_availability_zone: type: list required: true entry_schema: type: string - port_cdi_ims_core_0_port_network: + port_cdi_ims_core_0_port_1_network_role_tag: + type: string + required: true + port_cdi_internal_0_port_0_network_role_tag: + type: string + required: true + port_cdi_internal_0_port_0_related_networks: type: list required: true entry_schema: - type: string - port_cdi_internal_0_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_cdi_config_drive: type: list required: true entry_schema: - type: string - port_cdi_internal_0_port_fixed_ips: + type: boolean + port_cdi_internal_0_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_cdi_config_drive: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cdi_internal_0_port_0_security_groups: type: list required: true entry_schema: - type: boolean + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -125,97 +110,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cdi_internal_0_port_security_groups: + port_cdi_ims_core_0_port_1_subnetpoolid: + type: string + required: true + port_cdi_ims_core_0_port_1_related_networks: type: list required: true entry_schema: - type: json - port_cdi_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_internal_0_port_0_network: type: list required: true entry_schema: - type: json - port_cdi_ims_core_0_port_fixed_ips: + type: string + port_cdi_ims_core_0_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cdi_ims_core_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_0_port_0_fixed_ips: + type: list required: true - port_cdi_internal_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_1_fixed_ips: + type: list required: true - port_cdi_internal_0_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_0_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cdi_ims_core_0_port_allowed_address_pairs: + type: string + port_cdi_ims_core_0_port_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string + port_cdi_internal_0_port_0_network_role: + type: string + required: true compute_cdi_metadata: type: list required: true entry_schema: type: json - port_cdi_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cdi_internal_0_port_0_order: + type: integer required: true - port_cdi_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_0_port_1_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_ims_core_0_port_1_network_role: + type: string + required: true + port_cdi_ims_core_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - cdi_cdi_ims_core_0_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_cdi_ims_core_0_port_mac_requirements - allowed_address_pairs: - get_input: port_cdi_ims_core_0_port_allowed_address_pairs - order: - get_input: port_cdi_ims_core_0_port_order - security_groups: - get_input: - - port_cdi_ims_core_0_port_security_groups - - index_value - exCP_naming: - get_input: port_cdi_ims_core_0_port_exCP_naming - vlan_requirements: - get_input: port_cdi_ims_core_0_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_cdi_ims_core_0_port_related_networks - ip_requirements: - get_input: port_cdi_ims_core_0_port_ip_requirements - network_role_tag: - get_input: port_cdi_ims_core_0_port_network_role_tag - network_role: - get_input: port_cdi_ims_core_0_port_network_role - subnetpoolid: - get_input: port_cdi_ims_core_0_port_subnetpoolid - fixed_ips: - get_input: - - port_cdi_ims_core_0_port_fixed_ips - - index_value - name: - get_input: - - port_cdi_ims_core_0_port_name - - index_value - network: - get_input: - - port_cdi_ims_core_0_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: cdi - relationship: tosca.relationships.network.BindsTo cdi: type: org.openecomp.resource.vfc.compute.nodes.heat.cdi properties: @@ -247,45 +202,90 @@ topology_template: get_input: - compute_cdi_user_data_format - index_value - cdi_cdi_internal_0_port: + cdi_cdi_ims_core_0_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_cdi_ims_core_0_port_1_mac_requirements + allowed_address_pairs: + get_input: port_cdi_ims_core_0_port_1_allowed_address_pairs + order: + get_input: port_cdi_ims_core_0_port_1_order + security_groups: + get_input: + - port_cdi_ims_core_0_port_1_security_groups + - index_value + exCP_naming: + get_input: port_cdi_ims_core_0_port_1_exCP_naming + vlan_requirements: + get_input: port_cdi_ims_core_0_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_cdi_ims_core_0_port_1_related_networks + ip_requirements: + get_input: port_cdi_ims_core_0_port_1_ip_requirements + network_role_tag: + get_input: port_cdi_ims_core_0_port_1_network_role_tag + network_role: + get_input: port_cdi_ims_core_0_port_1_network_role + subnetpoolid: + get_input: port_cdi_ims_core_0_port_1_subnetpoolid + fixed_ips: + get_input: + - port_cdi_ims_core_0_port_1_fixed_ips + - index_value + name: + get_input: + - port_cdi_ims_core_0_port_1_name + - index_value + network: + get_input: + - port_cdi_ims_core_0_port_1_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: cdi + relationship: tosca.relationships.network.BindsTo + cdi_cdi_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cdi_internal_0_port_mac_requirements + get_input: port_cdi_internal_0_port_0_mac_requirements allowed_address_pairs: - get_input: port_cdi_internal_0_port_allowed_address_pairs + get_input: port_cdi_internal_0_port_0_allowed_address_pairs order: - get_input: port_cdi_internal_0_port_order + get_input: port_cdi_internal_0_port_0_order security_groups: get_input: - - port_cdi_internal_0_port_security_groups + - port_cdi_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_cdi_internal_0_port_exCP_naming + get_input: port_cdi_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_cdi_internal_0_port_vlan_requirements + get_input: port_cdi_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cdi_internal_0_port_related_networks + get_input: port_cdi_internal_0_port_0_related_networks ip_requirements: - get_input: port_cdi_internal_0_port_ip_requirements + get_input: port_cdi_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_cdi_internal_0_port_network_role_tag + get_input: port_cdi_internal_0_port_0_network_role_tag network_role: - get_input: port_cdi_internal_0_port_network_role + get_input: port_cdi_internal_0_port_0_network_role subnetpoolid: - get_input: port_cdi_internal_0_port_subnetpoolid + get_input: port_cdi_internal_0_port_0_subnetpoolid fixed_ips: get_input: - - port_cdi_internal_0_port_fixed_ips + - port_cdi_internal_0_port_0_fixed_ips - index_value name: get_input: - - port_cdi_internal_0_port_name + - port_cdi_internal_0_port_0_name - index_value network: get_input: - - port_cdi_internal_0_port_network + - port_cdi_internal_0_port_0_network - index_value requirements: - binding: @@ -295,21 +295,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cdi capabilities: - attachment_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - attachment - network.incoming.bytes.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.incoming.bytes.rate - forwarder_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - forwarder - network.outgoing.bytes_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outgoing.bytes - network.outgoing.packets.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outgoing.packets.rate + feature_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - feature + network.outgoing.bytes.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.bytes.rate host_cdi: - cdi - host @@ -322,12 +313,18 @@ topology_template: disk.write.requests.rate_cdi: - cdi - disk.write.requests.rate + network.incoming.packets_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.packets disk.device.write.requests.rate_cdi: - cdi - disk.device.write.requests.rate disk.write.bytes.rate_cdi: - cdi - disk.write.bytes.rate + network.outpoing.packets_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outpoing.packets disk.ephemeral.size_cdi: - cdi - disk.ephemeral.size @@ -337,18 +334,12 @@ topology_template: cpu.delta_cdi: - cdi - cpu.delta - network.incoming.bytes_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.incoming.bytes - network.outgoing.bytes.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outgoing.bytes.rate + network.incoming.packets_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.packets disk.device.write.bytes_cdi: - cdi - disk.device.write.bytes - feature_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - feature disk.device.read.requests.rate_cdi: - cdi - disk.device.read.requests.rate @@ -358,33 +349,36 @@ topology_template: os_cdi: - cdi - os + network.incoming.bytes.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.bytes.rate memory.usage_cdi: - cdi - memory.usage - network.outgoing.bytes.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port + network.incoming.packets.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.packets.rate + network.outgoing.bytes.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - network.outgoing.bytes.rate - network.outpoing.packets_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outpoing.packets vcpus_cdi: - cdi - vcpus - network.incoming.packets_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.packets + network.outgoing.packets.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.packets.rate disk.device.read.requests_cdi: - cdi - disk.device.read.requests + feature_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - feature endpoint_cdi: - cdi - endpoint disk.read.requests_cdi: - cdi - disk.read.requests - network.incoming.bytes.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.bytes.rate memory.resident_cdi: - cdi - memory.resident @@ -394,6 +388,12 @@ topology_template: disk.read.bytes.rate_cdi: - cdi - disk.read.bytes.rate + network.outgoing.bytes_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.bytes + network.outgoing.bytes_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outgoing.bytes memory_cdi: - cdi - memory @@ -403,21 +403,24 @@ topology_template: disk.device.write.requests_cdi: - cdi - disk.device.write.requests - network.outgoing.packets.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outgoing.packets.rate - binding_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - binding - network.incoming.packets.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + network.incoming.packets.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - network.incoming.packets.rate disk.allocation_cdi: - cdi - disk.allocation - forwarder_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + network.incoming.bytes.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.bytes.rate + forwarder_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - forwarder + network.outgoing.packets.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outpoing.packets scalable_cdi: - cdi - scalable @@ -430,33 +433,39 @@ topology_template: disk.device.usage_cdi: - cdi - disk.device.usage + binding_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - binding disk.iops_cdi: - cdi - disk.iops - network.incoming.packets_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.incoming.packets + binding_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - binding disk.usage_cdi: - cdi - disk.usage + attachment_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - attachment + attachment_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - attachment disk.device.write.bytes.rate_cdi: - cdi - disk.device.write.bytes.rate disk.read.bytes_cdi: - cdi - disk.read.bytes - network.incoming.bytes_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.bytes + forwarder_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - forwarder disk.capacity_cdi: - cdi - disk.capacity binding_cdi: - cdi - binding - feature_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - feature disk.device.read.bytes_cdi: - cdi - disk.device.read.bytes @@ -466,46 +475,37 @@ topology_template: disk.device.latency_cdi: - cdi - disk.device.latency - network.incoming.packets.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.packets.rate - binding_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - binding instance_cdi: - cdi - instance - attachment_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - attachment + network.incoming.bytes_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.bytes + network.incoming.bytes_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.bytes disk.device.allocation_cdi: - cdi - disk.device.allocation - network.outgoing.bytes_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outgoing.bytes disk.write.requests_cdi: - cdi - disk.write.requests - network.outpoing.packets_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outpoing.packets requirements: local_storage_cdi: - cdi - local_storage - link_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port + link_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - link - dependency_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - dependency - link_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + link_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 - link + dependency_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - dependency dependency_cdi: - cdi - dependency - dependency_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + dependency_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 - dependency
\ No newline at end of file |