From 56e56b8860cf6e7ad70dc65134e8fd87eaf01123 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Tue, 6 Mar 2018 12:01:54 +0530 Subject: VLAN tagging - VFC Instance Group 1. Create VFC instance group per sub-interface network role 2. Refactored PortTemplateConsolidationData and its references based on review comments 3. Updated test data after rebase 4. Updated to flatMap based on review comments Change-Id: I423593c5156ecae5eff3a4f2ce8591c85db727cc Issue-ID: SDC-1073 Signed-off-by: ojasdubey --- .../out/Nested_vdbe_1ServiceTemplate.yaml | 470 +++++++++++++++++++++ 1 file changed, 470 insertions(+) create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml new file mode 100644 index 0000000000..0d70da9d40 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml @@ -0,0 +1,470 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Nested_vdbe_1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.compute.nodes.heat.vdbe: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + port_vdbe_untr_port_network_role_tag: + type: string + required: true + subinterface_nested2_subinterfaces_name_prefix: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + compute_vdbe_availability_zone: + type: list + required: true + entry_schema: + type: string + subinterface_nested2_aap_untrusted_v6_ip_prefix: + type: list + required: true + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + subinterface_nested2_parent_interface: + type: list + required: true + entry_schema: + type: string + subinterface_nested2_aap_sec_untrusted_ip_prefix: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_order: + type: integer + required: true + subinterface_nested2_vmac_address: + type: list + required: true + entry_schema: + type: string + vm_image_name: + type: string + required: true + port_vdbe_untr_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_vdbe_metadata: + type: list + required: true + entry_schema: + type: json + subinterface_nested2_aap_sec_untrusted_ip_prefix_len: + type: list + required: true + entry_schema: + type: string + subinterface_nested2_mac_address: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + subinterface_nested2_ip_address: + type: list + required: true + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_vdbe_untr_port_name: + type: list + required: true + entry_schema: + type: string + subinterface_nested2_vlan_tag_list: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_nested2_aap_untrusted_ip_prefix_len: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_network_role: + type: string + required: true + subinterface_nested2_counter: + type: list + required: true + entry_schema: + type: float + subinterface_nested2_aap_untrusted_v6_ip_prefix_len: + type: list + required: true + entry_schema: + type: string + subinterface_nested2_ip_v6_address: + type: list + required: true + entry_schema: + type: string + compute_vdbe_name: + type: list + required: true + entry_schema: + type: string + subinterface_nested2_aap_untrusted_ip_prefix: + type: list + required: true + entry_schema: + type: string + subinterface_nested2_aap_address_mode: + type: list + required: true + entry_schema: + type: string + subinterface_nested2_vn_network_list: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + node_templates: + vdbe_vdbe_untr_port_nested2: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested2 + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: + - subinterface_nested2_aap_untrusted_ip_prefix + - index_value + aap_sec_untrusted_ip_prefix: + get_input: + - subinterface_nested2_aap_sec_untrusted_ip_prefix + - index_value + ip_v6_address: + get_input: + - subinterface_nested2_ip_v6_address + - index_value + counter: + get_input: + - subinterface_nested2_counter + - index_value + ip_address: + get_input: + - subinterface_nested2_ip_address + - index_value + subinterfaces_name_prefix: + get_input: + - subinterface_nested2_subinterfaces_name_prefix + - index_value + aap_address_mode: + get_input: + - subinterface_nested2_aap_address_mode + - index_value + service_template_filter: + substitute_service_template: nested2ServiceTemplate.yaml + count: 5 + mandatory: true + aap_untrusted_v6_ip_prefix: + get_input: + - subinterface_nested2_aap_untrusted_v6_ip_prefix + - index_value + parent_interface: + get_input: + - subinterface_nested2_parent_interface + - index_value + vn_network_list: + get_input: + - subinterface_nested2_vn_network_list + - index_value + mac_address: + get_input: + - subinterface_nested2_mac_address + - index_value + vlan_tag_list: + get_input: + - subinterface_nested2_vlan_tag_list + - index_value + aap_sec_untrusted_ip_prefix_len: + get_input: + - subinterface_nested2_aap_sec_untrusted_ip_prefix_len + - index_value + vmac_address: + get_input: + - subinterface_nested2_vmac_address + - index_value + aap_untrusted_v6_ip_prefix_len: + get_input: + - subinterface_nested2_aap_untrusted_v6_ip_prefix_len + - index_value + aap_untrusted_ip_prefix_len: + get_input: + - subinterface_nested2_aap_untrusted_ip_prefix_len + - index_value + requirements: + - binding_vdbe_0_subint_oam_vmi_0: + capability: tosca.capabilities.network.Bindable + node: vdbe_vdbe_untr_port + relationship: tosca.relationships.network.BindsTo + vdbe: + type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe + properties: + availability_zone: + get_input: + - compute_vdbe_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_vdbe_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_vdbe_name + - index_value + vdbe_vdbe_untr_port: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_vdbe_untr_port_exCP_naming + vlan_requirements: + get_input: port_vdbe_untr_port_vlan_requirements + ip_requirements: + get_input: port_vdbe_untr_port_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_network_role_tag + mac_requirements: + get_input: port_vdbe_untr_port_mac_requirements + order: + get_input: port_vdbe_untr_port_order + network_role: + get_input: port_vdbe_untr_port_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.vdbe_1 + capabilities: + network.outgoing.packets.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.packets.rate + network.outgoing.bytes_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.bytes + feature_vdbe: + - vdbe + - feature + feature_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - feature + attachment_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - attachment + disk.device.iops_vdbe: + - vdbe + - disk.device.iops + endpoint_vdbe: + - vdbe + - endpoint + disk.ephemeral.size_vdbe: + - vdbe + - disk.ephemeral.size + cpu_util_vdbe: + - vdbe + - cpu_util + vcpus_vdbe: + - vdbe + - vcpus + disk.write.requests_vdbe: + - vdbe + - disk.write.requests + disk.device.latency_vdbe: + - vdbe + - disk.device.latency + disk.device.write.requests.rate_vdbe: + - vdbe + - disk.device.write.requests.rate + disk.write.bytes.rate_vdbe: + - vdbe + - disk.write.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.packets + scalable_vdbe: + - vdbe + - scalable + disk.iops_vdbe: + - vdbe + - disk.iops + disk.device.write.requests_vdbe: + - vdbe + - disk.device.write.requests + disk.device.capacity_vdbe: + - vdbe + - disk.device.capacity + disk.device.allocation_vdbe: + - vdbe + - disk.device.allocation + disk.usage_vdbe: + - vdbe + - disk.usage + memory.usage_vdbe: + - vdbe + - memory.usage + network.outpoing.packets_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outpoing.packets + network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.outgoing.bytes.rate + disk.read.requests_vdbe: + - vdbe + - disk.read.requests + forwarder_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - forwarder + binding_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - binding + instance_vdbe: + - vdbe + - instance + network.incoming.bytes.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.bytes.rate + cpu.delta_vdbe: + - vdbe + - cpu.delta + disk.device.read.bytes.rate_vdbe: + - vdbe + - disk.device.read.bytes.rate + disk.device.write.bytes.rate_vdbe: + - vdbe + - disk.device.write.bytes.rate + memory.resident_vdbe: + - vdbe + - memory.resident + feature_vdbe_vdbe_untr_port_nested2: + - vdbe_vdbe_untr_port_nested2 + - feature + disk.write.requests.rate_vdbe: + - vdbe + - disk.write.requests.rate + cpu_vdbe: + - vdbe + - cpu + disk.write.bytes_vdbe: + - vdbe + - disk.write.bytes + disk.device.usage_vdbe: + - vdbe + - disk.device.usage + disk.device.read.bytes_vdbe: + - vdbe + - disk.device.read.bytes + disk.latency_vdbe: + - vdbe + - disk.latency + network.incoming.bytes_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.bytes + disk.capacity_vdbe: + - vdbe + - disk.capacity + host_vdbe: + - vdbe + - host + disk.allocation_vdbe: + - vdbe + - disk.allocation + feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - vdbe_vdbe_untr_port_nested2 + - feature_vdbe_0_subint_oam_vmi_0 + disk.read.bytes.rate_vdbe: + - vdbe + - disk.read.bytes.rate + os_vdbe: + - vdbe + - os + disk.device.read.requests_vdbe: + - vdbe + - disk.device.read.requests + disk.root.size_vdbe: + - vdbe + - disk.root.size + memory_vdbe: + - vdbe + - memory + binding_vdbe: + - vdbe + - binding + disk.device.write.bytes_vdbe: + - vdbe + - disk.device.write.bytes + disk.device.read.requests.rate_vdbe: + - vdbe + - disk.device.read.requests.rate + disk.read.bytes_vdbe: + - vdbe + - disk.read.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - network.incoming.packets.rate + requirements: + dependency_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - dependency + dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - vdbe_vdbe_untr_port_nested2 + - dependency_vdbe_0_subint_oam_vmi_0 + link_vdbe_vdbe_untr_port: + - vdbe_vdbe_untr_port + - link + link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - vdbe_vdbe_untr_port_nested2 + - link_vdbe_0_subint_oam_vmi_0 + local_storage_vdbe: + - vdbe + - local_storage + dependency_vdbe_vdbe_untr_port_nested2: + - vdbe_vdbe_untr_port_nested2 + - dependency + dependency_vdbe: + - vdbe + - dependency \ No newline at end of file -- cgit 1.2.3-korg