diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out')
4 files changed, 731 insertions, 731 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8e98129bbc..b90adc25b2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -122,16 +122,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_vmi_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbeav_subinterface_heat_template_aap_address_mode: type: list required: true @@ -178,6 +168,12 @@ node_types: type: string required: true status: SUPPORTED + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_vdbe_ctrl_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -214,18 +210,28 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_vmi_1_order: + type: integer + required: true + status: SUPPORTED port_vdbe_trst_0_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json subinterface_vdbeav_subinterface_heat_template_parent_interface: type: list required: true @@ -280,14 +286,14 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_vmi_network_role: - type: string - required: true - status: SUPPORTED port_vdbe_trst_0_port_order: type: integer required: true status: SUPPORTED + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED port_vdbe_oam_0_port_network_role_tag: type: string required: true @@ -298,6 +304,14 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix: type: list required: true @@ -320,12 +334,6 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len: type: list required: true @@ -350,10 +358,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true - status: SUPPORTED port_vdbe_oam_0_port_network_role: type: string required: true @@ -378,7 +382,13 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_network_role_tag: + port_vdbe_untr_vmi_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED @@ -414,12 +424,10 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_vdbe_scheduler_hints: type: list required: true @@ -448,26 +456,16 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_vdbe_fabr_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_vdbe_trst_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_vmi_1_network_role_tag: + type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_order: - type: integer + port_vdbe_trst_0_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED port_vdbe_oam_0_port_name: @@ -496,10 +494,18 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix: type: list required: true @@ -548,12 +554,6 @@ node_types: type: integer required: true status: SUPPORTED - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_vdbe_vdbe_fabr_0_port: capability: tosca.capabilities.Node @@ -568,94 +568,94 @@ node_types: occurrences: - 1 - 1 - - dependency_vdbe_vdbe_oam_0_port: + - dependency_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_oam_0_port: + - link_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_trst_0_port: + - dependency_vdbe_vdbe_oam_0_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_trst_0_port: + - link_vdbe_vdbe_oam_0_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe: + - dependency_vdbe_vdbe_trst_0_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vdbe: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_vdbe_vdbe_trst_0_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_vmi: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_vmi: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_ctrl_0_port: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_ctrl_0_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_ctrl_0_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: + - link_vdbe_vdbe_ctrl_0_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -755,6 +755,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_vdbe: type: tosca.capabilities.Scalable occurrences: @@ -797,31 +803,31 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_vdbe: + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_oam_0_port: + instance_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_vdbe: + network.incoming.packets_vdbe_vdbe_oam_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_trst_0_port: + memory.resident_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: + network.outpoing.packets_vdbe_vdbe_trst_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -856,18 +862,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_trst_0_port: + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: + network.outgoing.bytes.rate_vdbe_vdbe_trst_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -908,11 +909,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED network.incoming.packets.rate_vdbe_vdbe_trst_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -948,12 +944,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -983,14 +973,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_oam_0_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_vmi: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_oam_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1031,11 +1022,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1071,12 +1057,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED network.incoming.packets_vdbe_vdbe_fabr_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1107,26 +1087,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_vdbe_vdbe_untr_vmi: - 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 disk.device.usage_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1156,6 +1122,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_vdbe_vdbe_trst_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1168,6 +1140,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_vdbe_vdbe_fabr_0_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -1176,6 +1153,12 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.capacity_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1197,18 +1180,30 @@ node_types: occurrences: - 0 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_vmi_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_vmi: + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_vdbe_vdbe_untr_vmi_1: + 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 feature_vdbe_vdbe_fabr_0_port: type: tosca.capabilities.Node occurrences: @@ -1225,6 +1220,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1240,16 +1240,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_vmi_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbeav_subinterface_heat_template_aap_address_mode: type: list required: true @@ -1280,6 +1270,12 @@ node_types: type: string required: true status: SUPPORTED + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_vdbe_oam_1_port_name: type: list required: true @@ -1320,22 +1316,32 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_vmi_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_vmi_1_order: + type: integer + required: true + status: SUPPORTED port_vdbe_trst_1_port_network_role: type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_ctrl_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_ctrl_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json port_vdbe_fabr_1_port_name: type: list required: true @@ -1376,22 +1382,30 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_network_role: - type: string - required: true - status: SUPPORTED port_vdbe_fabr_1_port_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED subinterface_vdbeav_subinterface_heat_template_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_vdbe_trst_1_port_vlan_requirements: type: list required: true @@ -1416,12 +1430,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_vdbe_untr_vmi_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_vdbe_trst_1_port_network_role_tag: type: string required: true @@ -1446,17 +1454,19 @@ node_types: type: integer required: true status: SUPPORTED - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true - status: SUPPORTED subinterface_vdbeav_subinterface_heat_template_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: type: float - port_vdbe_untr_vmi_network_role_tag: + port_vdbe_untr_vmi_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED @@ -1506,12 +1516,10 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_vdbe_ctrl_1_port_name: type: list required: true @@ -1538,17 +1546,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_fabr_1_port_network_role: + type: string required: true status: SUPPORTED - port_vdbe_fabr_1_port_network_role: + port_vdbe_untr_vmi_1_network_role_tag: type: string required: true status: SUPPORTED @@ -1558,10 +1560,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_vmi_order: - type: integer - required: true - status: SUPPORTED subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix: type: list required: true @@ -1582,6 +1580,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_vmi_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_vdbe_fabr_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -1592,11 +1596,13 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_ctrl_1_port_virtual_network_refs: + type: list required: true status: SUPPORTED - port_vdbe_ctrl_1_port_virtual_network_refs: + entry_schema: + type: json + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED @@ -1666,107 +1672,101 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vdbe: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_vdbe_vdbe_untr_vmi_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_trst_1_port: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_trst_1_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_oam_1_port: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_oam_1_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_untr_vmi: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_trst_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_vmi: + - link_vdbe_vdbe_trst_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_fabr_1_port: + - dependency_vdbe_vdbe_oam_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_fabr_1_port: + - link_vdbe_vdbe_oam_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_ctrl_1_port: + - dependency_vdbe_vdbe_fabr_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_ctrl_1_port: + - link_vdbe_vdbe_fabr_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: + - dependency_vdbe_vdbe_ctrl_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: + - link_vdbe_vdbe_ctrl_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1787,20 +1787,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_fabr_1_port: + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_trst_1_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_vdbe_vdbe_fabr_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_vdbe_vdbe_trst_1_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1874,6 +1874,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_vdbe_vdbe_trst_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1927,6 +1933,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_vdbe_vdbe_oam_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1971,12 +1983,6 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2001,24 +2007,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_fabr_1_port: + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_oam_1_port: + network.outpoing.packets_vdbe_vdbe_fabr_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: + network.outpoing.packets_vdbe_vdbe_oam_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2046,11 +2047,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED network.incoming.bytes_vdbe_vdbe_trst_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2063,12 +2059,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2104,14 +2094,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_trst_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_vmi: - type: tosca.capabilities.Node + network.outgoing.packets.rate_vdbe_vdbe_trst_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -2145,11 +2136,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2202,12 +2188,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED forwarder_vdbe_vdbe_fabr_1_port: type: org.openecomp.capabilities.Forwarder occurrences: @@ -2231,26 +2211,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_vdbe_vdbe_untr_vmi: - 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 disk.device.usage_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2282,6 +2248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_vdbe_vdbe_ctrl_1_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2295,6 +2267,17 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.capacity_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2314,24 +2297,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_vmi_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_vmi: + feature_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_vdbe_vdbe_untr_vmi_1: + 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 network.incoming.bytes_vdbe_vdbe_ctrl_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2354,4 +2354,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/MainServiceTemplate.yaml index c0685e95b0..e56c23ffd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/MainServiceTemplate.yaml @@ -903,6 +903,16 @@ topology_template: get_input: vnf_name subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + port_vdbe_untr_vmi_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_vmi_1_virtual_network_refs: + - - get_input: untrusted_net_name port_vdbe_fabr_1_port_name: - str_replace: template: VM_NAMEDBE001p1n003 @@ -929,14 +939,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - port_vdbe_untr_vmi_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len compute_vdbe_name: @@ -949,8 +951,6 @@ topology_template: - get_input: vdbe_untrusted_ip_1 subinterface_vdbeav_subinterface_heat_template_vmac_address: - get_input: vdbe_untrusted_vmac_address - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 port_vdbe_ctrl_1_port_name: - str_replace: template: VM_NAMEDBE001p1n002 @@ -963,8 +963,6 @@ topology_template: - group: vdbe_ServerGroup_group subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - port_vdbe_untr_vmi_virtual_network_refs: - - - get_input: untrusted_net_name port_vdbe_trst_1_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_trst_mac_1 subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix: @@ -973,6 +971,8 @@ topology_template: - - get_input: oam_net_name port_vdbe_ctrl_1_port_virtual_network_refs: - - control_int_net + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix subinterface_vdbeav_subinterface_heat_template_ip_v6_address: @@ -1030,6 +1030,14 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len port_vdbe_oam_0_port_virtual_network_refs: - - get_input: oam_net_name + port_vdbe_untr_vmi_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_0 port_vdbe_trst_0_port_name: - str_replace: template: VM_NAMEDBE001p1n005 @@ -1038,8 +1046,10 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_0 + port_vdbe_untr_vmi_1_virtual_network_refs: + - - get_input: untrusted_net_name subinterface_vdbeav_subinterface_heat_template_parent_interface: - - vdbe_0_untr_vmi_0 + - vdbe_0_untr_vmi_1 subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbeav_subinterface_heat_template_vlan_tag_list: @@ -1054,14 +1064,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_0 - port_vdbe_untr_vmi_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_0 subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len port_vdbe_fabr_0_port_virtual_network_refs: @@ -1076,14 +1078,10 @@ topology_template: - get_input: vdbe_untrusted_ip_0 subinterface_vdbeav_subinterface_heat_template_vmac_address: - get_input: vdbe_untrusted_vmac_address - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_0 compute_vdbe_scheduler_hints: - group: vdbe_ServerGroup_group subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - port_vdbe_untr_vmi_virtual_network_refs: - - - get_input: untrusted_net_name port_vdbe_oam_0_port_name: - str_replace: template: VM_NAMEDBE001p1n001 @@ -1096,6 +1094,8 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix port_vdbe_oam_0_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_oam_mac_0 + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_0 subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix port_vdbe_fabr_0_port_name: @@ -1171,4 +1171,4 @@ topology_template: properties: container_type: host targets: - - vdbe_ServerGroup_group
\ No newline at end of file + - vdbe_ServerGroup_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml index fb09f4ff5a..a6d3c4542f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml @@ -11,14 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_vmi_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbeav_subinterface_heat_template_aap_address_mode: type: list required: true @@ -56,6 +48,11 @@ topology_template: vm_flavor_name: type: string required: true + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_vdbe_ctrl_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,16 +82,24 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_vmi_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_vmi_1_order: + type: integer + required: true port_vdbe_trst_0_port_name: type: list required: true entry_schema: type: string - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json subinterface_vdbeav_subinterface_heat_template_parent_interface: type: list required: true @@ -139,12 +144,12 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_vmi_network_role: - type: string - required: true port_vdbe_trst_0_port_order: type: integer required: true + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true port_vdbe_oam_0_port_network_role_tag: type: string required: true @@ -153,6 +158,12 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix: type: list required: true @@ -170,11 +181,6 @@ topology_template: port_vdbe_ctrl_0_port_subnetpoolid: type: string required: true - port_vdbe_untr_vmi_name: - type: list - required: true - entry_schema: - type: string subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len: type: list required: true @@ -195,9 +201,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true port_vdbe_oam_0_port_network_role: type: string required: true @@ -217,7 +220,12 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_network_role_tag: + port_vdbe_untr_vmi_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true port_vdbe_fabr_0_port_related_networks: @@ -246,11 +254,9 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_vdbe_scheduler_hints: type: list required: true @@ -274,23 +280,15 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_vdbe_fabr_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_vdbe_untr_vmi_1_network_role_tag: + type: string + required: true port_vdbe_trst_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_vdbe_untr_vmi_order: - type: integer - required: true port_vdbe_oam_0_port_name: type: list required: true @@ -313,9 +311,16 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + type: list required: true + entry_schema: + type: json subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix: type: list required: true @@ -355,11 +360,6 @@ topology_template: port_vdbe_oam_0_port_order: type: integer required: true - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: vdbe_vdbe_fabr_0_port: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface @@ -396,6 +396,49 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_vmi_1_mac_requirements + order: + get_input: port_vdbe_untr_vmi_1_order + exCP_naming: + get_input: port_vdbe_untr_vmi_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_vmi_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_vmi_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_vmi_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_vmi_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_vmi_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_vmi_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_vmi_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_vmi_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo vdbe_vdbe_oam_0_port: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -478,108 +521,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe 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 - scheduler_hints: - get_input: - - compute_vdbe_scheduler_hints - - index_value - vdbe_vdbe_untr_vmi: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_vmi_mac_requirements - order: - get_input: port_vdbe_untr_vmi_order - exCP_naming: - get_input: port_vdbe_untr_vmi_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_vmi_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_vmi_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_vmi_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_vmi_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_vmi_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_vmi_network_role - subnetpoolid: - get_input: port_vdbe_untr_vmi_subnetpoolid - name: - get_input: - - port_vdbe_untr_vmi_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_ctrl_0_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_ctrl_0_port_mac_requirements - order: - get_input: port_vdbe_ctrl_0_port_order - exCP_naming: - get_input: port_vdbe_ctrl_0_port_exCP_naming - vlan_requirements: - get_input: port_vdbe_ctrl_0_port_vlan_requirements - subinterface_indicator: false - virtual_network_refs: - get_input: - - port_vdbe_ctrl_0_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_ctrl_0_port_ip_requirements - related_networks: - get_input: port_vdbe_ctrl_0_port_related_networks - network_role_tag: - get_input: port_vdbe_ctrl_0_port_network_role_tag - network_role: - get_input: port_vdbe_ctrl_0_port_network_role - subnetpoolid: - get_input: port_vdbe_ctrl_0_port_subnetpoolid - name: - get_input: - - port_vdbe_ctrl_0_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: + vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: type: org.openecomp.resource.abstract.nodes.heat.subinterface.vdbeav_subinterface_heat_template directives: - substitutable @@ -659,14 +601,72 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_vmi + node: vdbe_vdbe_untr_vmi_1 + 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 + scheduler_hints: + get_input: + - compute_vdbe_scheduler_hints + - index_value + vdbe_vdbe_ctrl_0_port: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_ctrl_0_port_mac_requirements + order: + get_input: port_vdbe_ctrl_0_port_order + exCP_naming: + get_input: port_vdbe_ctrl_0_port_exCP_naming + vlan_requirements: + get_input: port_vdbe_ctrl_0_port_vlan_requirements + subinterface_indicator: false + virtual_network_refs: + get_input: + - port_vdbe_ctrl_0_port_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_ctrl_0_port_ip_requirements + related_networks: + get_input: port_vdbe_ctrl_0_port_related_networks + network_role_tag: + get_input: port_vdbe_ctrl_0_port_network_role_tag + network_role: + get_input: port_vdbe_ctrl_0_port_network_role + subnetpoolid: + get_input: port_vdbe_ctrl_0_port_subnetpoolid + name: + get_input: + - port_vdbe_ctrl_0_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 capabilities: - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.packets.rate network.incoming.packets_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.incoming.packets @@ -715,6 +715,9 @@ topology_template: disk.device.latency_vdbe: - vdbe - disk.device.latency + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets scalable_vdbe: - vdbe - scalable @@ -736,6 +739,9 @@ topology_template: feature_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - feature + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outpoing.packets instance_vdbe: - vdbe - instance @@ -748,9 +754,6 @@ topology_template: network.outpoing.packets_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.outpoing.packets - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.bytes.rate cpu_vdbe: - vdbe - cpu @@ -766,15 +769,12 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes network.outgoing.bytes.rate_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.outgoing.bytes.rate - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - feature_vdbe_0_subint_untr_vmi_0 - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes.rate network.outgoing.bytes_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.outgoing.bytes @@ -793,9 +793,6 @@ topology_template: os_vdbe: - vdbe - os - forwarder_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - forwarder network.incoming.packets.rate_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.incoming.packets.rate @@ -814,9 +811,6 @@ topology_template: network.incoming.packets_vdbe_vdbe_ctrl_0_port: - vdbe_vdbe_ctrl_0_port - network.incoming.packets - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes memory_vdbe: - vdbe - memory @@ -832,12 +826,12 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes.rate network.outpoing.packets_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - network.outpoing.packets - feature_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - feature disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate @@ -856,9 +850,6 @@ topology_template: disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - feature_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - feature disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests @@ -877,9 +868,6 @@ topology_template: forwarder_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - forwarder - network.outpoing.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outpoing.packets network.incoming.packets_vdbe_vdbe_fabr_0_port: - vdbe_vdbe_fabr_0_port - network.incoming.packets @@ -895,15 +883,9 @@ topology_template: disk.device.write.bytes.rate_vdbe: - vdbe - disk.device.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate - binding_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - binding disk.device.usage_vdbe: - vdbe - disk.device.usage @@ -919,15 +901,24 @@ topology_template: network.incoming.packets.rate_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - network.incoming.packets.rate + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.bytes.rate network.incoming.bytes_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - network.incoming.bytes network.outgoing.packets.rate_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - network.outgoing.packets.rate + forwarder_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - forwarder binding_vdbe_vdbe_fabr_0_port: - vdbe_vdbe_fabr_0_port - binding + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -937,12 +928,18 @@ topology_template: binding_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - binding - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.packets.rate - network.incoming.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi + feature_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - feature + feature_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - feature + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - network.incoming.bytes + binding_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - binding feature_vdbe_vdbe_fabr_0_port: - vdbe_vdbe_fabr_0_port - feature @@ -952,6 +949,9 @@ topology_template: forwarder_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - forwarder + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - feature_vdbe_0_subint_untr_vmi_0 disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -959,6 +959,12 @@ topology_template: - vdbe - disk.read.bytes requirements: + dependency_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - dependency + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - dependency_vdbe_0_subint_untr_vmi_0 link_vdbe_vdbe_ctrl_0_port: - vdbe_vdbe_ctrl_0_port - link @@ -980,27 +986,21 @@ topology_template: link_vdbe_vdbe_oam_0_port: - vdbe_vdbe_oam_0_port - link + dependency_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe: - vdbe - dependency dependency_vdbe_vdbe_ctrl_0_port: - vdbe_vdbe_ctrl_0_port - dependency - link_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - link - dependency_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - dependency dependency_vdbe_vdbe_trst_0_port: - vdbe_vdbe_trst_0_port - dependency - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - dependency_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - dependency - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - subinterface_link_vdbe_0_subint_untr_vmi_0
\ No newline at end of file + link_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/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/vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml index f95d633e60..7b8fb7622d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/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/vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml @@ -11,14 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_vmi_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbeav_subinterface_heat_template_aap_address_mode: type: list required: true @@ -43,6 +35,11 @@ topology_template: vm_flavor_name: type: string required: true + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_vdbe_oam_1_port_name: type: list required: true @@ -75,19 +72,27 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_vmi_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_vmi_1_order: + type: integer + required: true port_vdbe_trst_1_port_network_role: type: string required: true - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_ctrl_1_port_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_ctrl_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json port_vdbe_fabr_1_port_name: type: list required: true @@ -120,19 +125,25 @@ topology_template: port_vdbe_oam_1_port_network_role: type: string required: true - port_vdbe_untr_vmi_network_role: - type: string - required: true port_vdbe_fabr_1_port_virtual_network_refs: type: list required: true entry_schema: type: json + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true subinterface_vdbeav_subinterface_heat_template_vn_network_list: type: list required: true entry_schema: type: json + port_vdbe_untr_vmi_1_network_role: + type: string + required: true + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_vdbe_trst_1_port_vlan_requirements: type: list required: true @@ -152,11 +163,6 @@ topology_template: port_vdbe_ctrl_1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_vdbe_untr_vmi_name: - type: list - required: true - entry_schema: - type: string port_vdbe_trst_1_port_network_role_tag: type: string required: true @@ -176,15 +182,17 @@ topology_template: port_vdbe_trst_1_port_order: type: integer required: true - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true subinterface_vdbeav_subinterface_heat_template_service_template_filter_count: type: list required: true entry_schema: type: float - port_vdbe_untr_vmi_network_role_tag: + port_vdbe_untr_vmi_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true port_vdbe_fabr_1_port_ip_requirements: @@ -225,11 +233,9 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - type: list + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_vdbe_ctrl_1_port_name: type: list required: true @@ -251,25 +257,17 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_vdbe_fabr_1_port_network_role: type: string required: true + port_vdbe_untr_vmi_1_network_role_tag: + type: string + required: true port_vdbe_trst_1_port_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: type: json - port_vdbe_untr_vmi_order: - type: integer - required: true subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix: type: list required: true @@ -287,6 +285,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_vmi_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_vdbe_fabr_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -295,14 +298,16 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_vdbe_ctrl_1_port_virtual_network_refs: type: list required: true entry_schema: type: json + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json port_vdbe_oam_1_port_order: type: integer required: true @@ -355,12 +360,132 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: + vdbe_vdbe_untr_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_vmi_1_mac_requirements + order: + get_input: port_vdbe_untr_vmi_1_order + exCP_naming: + get_input: port_vdbe_untr_vmi_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_vmi_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_vmi_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_vmi_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_vmi_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_vmi_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_vmi_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_vmi_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_vmi_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vdbeav_subinterface_heat_template + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix + - index_value + aap_sec_untrusted_ip_prefix: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix + - index_value + ip_v6_address: + get_input: + - subinterface_vdbeav_subinterface_heat_template_ip_v6_address + - index_value + counter: + get_property: + - SELF + - service_template_filter + - index_value + ip_address: + get_input: + - subinterface_vdbeav_subinterface_heat_template_ip_address + - index_value + subinterfaces_name_prefix: + get_input: + - subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix + - index_value + aap_address_mode: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_address_mode + - index_value + service_template_filter: + count: + get_input: + - subinterface_vdbeav_subinterface_heat_template_service_template_filter_count + - index_value + substitute_service_template: vdbeav_subinterface_heat_templateServiceTemplate.yaml + mandatory: false + aap_untrusted_v6_ip_prefix: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix + - index_value + parent_interface: + get_input: + - subinterface_vdbeav_subinterface_heat_template_parent_interface + - index_value + vn_network_list: + get_input: + - subinterface_vdbeav_subinterface_heat_template_vn_network_list + - index_value + mac_address: + get_input: + - subinterface_vdbeav_subinterface_heat_template_mac_address + - index_value + vlan_tag_list: + get_input: + - subinterface_vdbeav_subinterface_heat_template_vlan_tag_list + - index_value + aap_sec_untrusted_ip_prefix_len: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix_len + - index_value + vmac_address: + get_input: + - subinterface_vdbeav_subinterface_heat_template_vmac_address + - index_value + aap_untrusted_v6_ip_prefix_len: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len + - index_value + aap_untrusted_ip_prefix_len: + get_input: + - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len + - index_value + requirements: + - binding_vdbe_0_subint_untr_vmi_0: + capability: tosca.capabilities.network.Bindable + node: vdbe_vdbe_untr_vmi_1 + relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe properties: @@ -466,49 +591,6 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_vmi: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_vmi_mac_requirements - order: - get_input: port_vdbe_untr_vmi_order - exCP_naming: - get_input: port_vdbe_untr_vmi_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_vmi_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_vmi_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_vmi_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_vmi_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_vmi_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_vmi_network_role - subnetpoolid: - get_input: port_vdbe_untr_vmi_subnetpoolid - name: - get_input: - - port_vdbe_untr_vmi_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo vdbe_vdbe_fabr_1_port: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -579,88 +661,6 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.vdbeav_subinterface_heat_template - directives: - - substitutable - properties: - aap_untrusted_ip_prefix: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix - - index_value - aap_sec_untrusted_ip_prefix: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix - - index_value - ip_v6_address: - get_input: - - subinterface_vdbeav_subinterface_heat_template_ip_v6_address - - index_value - counter: - get_property: - - SELF - - service_template_filter - - index_value - ip_address: - get_input: - - subinterface_vdbeav_subinterface_heat_template_ip_address - - index_value - subinterfaces_name_prefix: - get_input: - - subinterface_vdbeav_subinterface_heat_template_subinterfaces_name_prefix - - index_value - aap_address_mode: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_address_mode - - index_value - service_template_filter: - count: - get_input: - - subinterface_vdbeav_subinterface_heat_template_service_template_filter_count - - index_value - substitute_service_template: vdbeav_subinterface_heat_templateServiceTemplate.yaml - mandatory: false - aap_untrusted_v6_ip_prefix: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix - - index_value - parent_interface: - get_input: - - subinterface_vdbeav_subinterface_heat_template_parent_interface - - index_value - vn_network_list: - get_input: - - subinterface_vdbeav_subinterface_heat_template_vn_network_list - - index_value - mac_address: - get_input: - - subinterface_vdbeav_subinterface_heat_template_mac_address - - index_value - vlan_tag_list: - get_input: - - subinterface_vdbeav_subinterface_heat_template_vlan_tag_list - - index_value - aap_sec_untrusted_ip_prefix_len: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_sec_untrusted_ip_prefix_len - - index_value - vmac_address: - get_input: - - subinterface_vdbeav_subinterface_heat_template_vmac_address - - index_value - aap_untrusted_v6_ip_prefix_len: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_v6_ip_prefix_len - - index_value - aap_untrusted_ip_prefix_len: - get_input: - - subinterface_vdbeav_subinterface_heat_template_aap_untrusted_ip_prefix_len - - index_value - requirements: - - binding_vdbe_0_subint_untr_vmi_0: - capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_vmi - relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe_1 capabilities: @@ -670,15 +670,15 @@ topology_template: network.outpoing.packets_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - network.outpoing.packets + network.outgoing.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.packets.rate network.outgoing.bytes.rate_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - network.outgoing.bytes.rate forwarder_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - forwarder - network.incoming.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets.rate feature_vdbe: - vdbe - feature @@ -715,6 +715,9 @@ topology_template: network.incoming.packets.rate_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - network.incoming.packets.rate + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets network.incoming.packets_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.incoming.packets @@ -742,6 +745,9 @@ topology_template: network.outgoing.bytes.rate_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - network.outgoing.bytes.rate + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outpoing.packets network.outgoing.bytes.rate_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - network.outgoing.bytes.rate @@ -763,9 +769,6 @@ topology_template: binding_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - binding - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.bytes.rate cpu_vdbe: - vdbe - cpu @@ -778,18 +781,15 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - feature_vdbe_0_subint_untr_vmi_0 + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes network.outpoing.packets_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - network.outpoing.packets network.outpoing.packets_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - network.outpoing.packets - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes.rate disk.allocation_vdbe: - vdbe - disk.allocation @@ -802,18 +802,12 @@ topology_template: os_vdbe: - vdbe - os - forwarder_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - forwarder network.incoming.bytes_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.incoming.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes memory_vdbe: - vdbe - memory @@ -832,12 +826,12 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes.rate network.outgoing.packets.rate_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.outgoing.packets.rate - feature_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - feature network.incoming.bytes.rate_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.incoming.bytes.rate @@ -853,9 +847,6 @@ topology_template: disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - feature_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - feature disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests @@ -883,9 +874,6 @@ topology_template: network.incoming.packets_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - network.incoming.packets - network.outpoing.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outpoing.packets forwarder_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - forwarder @@ -898,15 +886,9 @@ topology_template: disk.device.write.bytes.rate_vdbe: - vdbe - disk.device.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate - binding_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - binding disk.device.usage_vdbe: - vdbe - disk.device.usage @@ -922,12 +904,21 @@ topology_template: network.outgoing.bytes_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - network.outgoing.bytes + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.bytes.rate binding_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - binding feature_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - feature + forwarder_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - forwarder + network.incoming.packets.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -937,15 +928,24 @@ topology_template: network.incoming.packets_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - network.incoming.packets - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.packets.rate - network.incoming.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi + feature_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - feature + feature_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - feature + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - network.incoming.bytes + binding_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - binding network.incoming.bytes_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - network.incoming.bytes + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - feature_vdbe_0_subint_untr_vmi_0 disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -962,6 +962,12 @@ topology_template: dependency_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - dependency + dependency_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - dependency + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - dependency_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - dependency @@ -971,36 +977,30 @@ topology_template: link_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - link + dependency_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template: + - vdbe_vdbe_untr_vmi_1_vdbeav_subinterface_heat_template + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe: - vdbe - dependency link_vdbe_vdbe_fabr_1_port: - vdbe_vdbe_fabr_1_port - link - link_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - link link_vdbe_vdbe_trst_1_port: - vdbe_vdbe_trst_1_port - link - dependency_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - dependency - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - dependency_vdbe_0_subint_untr_vmi_0 + link_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - link dependency_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - dependency - dependency_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - dependency dependency_vdbe_vdbe_ctrl_1_port: - vdbe_vdbe_ctrl_1_port - dependency - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template: - - vdbe_vdbe_untr_vmi_vdbeav_subinterface_heat_template - - subinterface_link_vdbe_0_subint_untr_vmi_0 link_vdbe_vdbe_oam_1_port: - vdbe_vdbe_oam_1_port - - link
\ No newline at end of file + - link |