diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup')
17 files changed, 1707 insertions, 1707 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/oneSubInterfaceNetworkRole/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/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml index 43ce925d02..b63bc3034c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_port_network_role_tag: - type: string - required: true - status: SUPPORTED subinterface_vdbe_untr_1_subports_ip_address: type: list required: true @@ -52,10 +48,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true - status: SUPPORTED subinterface_vdbe_untr_1_subports_mac_address: type: list required: true @@ -72,10 +64,6 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -100,6 +88,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbe_untr_1_subports_aap_address_mode: type: list required: true @@ -112,22 +106,20 @@ node_types: status: SUPPORTED entry_schema: type: json - subinterface_vdbe_untr_1_subports_vn_network_list: - type: list + port_vdbe_untr_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_vdbe_untr_2_subports_vn_network_list: type: list required: true @@ -170,24 +162,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements subinterface_vdbe_untr_1_subports_vlan_tag_list: type: list required: true @@ -206,18 +186,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_network_role_tag: type: string required: true status: SUPPORTED + port_vdbe_untr_port_1_order: + type: integer + required: true + status: SUPPORTED subinterface_vdbe_untr_1_subports_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string required: true status: SUPPORTED index_value: @@ -246,7 +246,7 @@ node_types: status: SUPPORTED entry_schema: type: float - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED @@ -289,101 +289,89 @@ node_types: entry_schema: type: string requirements: - - dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports: + - 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_port_vdbe_untr_1_subports: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port_1: 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_port_vdbe_untr_1_subports: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_port_vdbe_untr_2_subports: + - dependency_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: 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_port_vdbe_untr_2_subports: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: 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_port_vdbe_untr_2_subports: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: 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 - occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_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_vdbe_vdbe_untr_port: - 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_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - feature_vdbe: + feature_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: + feature_vdbe: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_vdbe_vdbe_untr_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -431,13 +419,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.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 - network.incoming.packets_vdbe_vdbe_untr_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_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.rate_vdbe_vdbe_untr_port_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: @@ -460,64 +459,49 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_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.device.allocation_vdbe: + disk.device.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. occurrences: - 1 - UNBOUNDED - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_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 - memory.usage_vdbe: + disk.device.allocation_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.outpoing.packets_vdbe_vdbe_untr_port: + disk.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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + memory.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. occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.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. occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -525,13 +509,24 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_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_port_1_vdbe_untr_1_subports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED 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 - network.incoming.bytes.rate_vdbe_vdbe_untr_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_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: @@ -597,14 +592,8 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -627,28 +616,45 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_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.read.bytes.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 - os_vdbe: - type: tosca.capabilities.OperatingSystem + network.incoming.packets_vdbe_vdbe_untr_port_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_port_vdbe_untr_2_subports: + feature_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + os_vdbe: + type: tosca.capabilities.OperatingSystem + 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. occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.root.size_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -684,12 +690,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_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 org.openecomp.resource.abstract.nodes.heat.subinterface.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -801,4 +801,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml index 32ad867f3c..0944af6c71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml @@ -457,16 +457,11 @@ topology_template: - get_input: aap_address_mode subinterface_vdbe_untr_2_subports_vlan_tag_list: - get_input: untrusted_vlan_tags + port_vdbe_untr_port_1_mac_requirements: + mac_count_required: + is_required: false subinterface_vdbe_untr_1_subports_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vdbe_untr_2_subports_vn_network_list: - get_input: untrusted_vn_networks subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: @@ -483,22 +478,27 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false subinterface_vdbe_untr_1_subports_vlan_tag_list: - get_input: untrusted_vlan_tags subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_vdbe_untr_1_subports_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: - mac_count_required: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false subinterface_vdbe_untr_1_subports_parent_interface: - vdbe_1_untr_port_1 @@ -552,4 +552,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml index dccbc264f1..699f13b97c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: 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_vdbe_untr_1_subports_ip_address: type: list required: true @@ -47,9 +44,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true subinterface_vdbe_untr_1_subports_mac_address: type: list required: true @@ -63,9 +57,6 @@ topology_template: vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -86,6 +77,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbe_untr_1_subports_aap_address_mode: type: list required: true @@ -96,19 +92,17 @@ topology_template: required: true entry_schema: type: json - subinterface_vdbe_untr_1_subports_vn_network_list: - type: list + port_vdbe_untr_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true subinterface_vdbe_untr_2_subports_vn_network_list: type: list required: true @@ -144,21 +138,11 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: 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 subinterface_vdbe_untr_1_subports_vlan_tag_list: type: list required: true @@ -174,16 +158,32 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: type: string required: true + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_port_1_order: + type: integer + required: true subinterface_vdbe_untr_1_subports_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string required: true index_value: type: integer @@ -207,7 +207,7 @@ topology_template: required: true entry_schema: type: float - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: @@ -243,7 +243,57 @@ topology_template: entry_schema: type: string node_templates: - vdbe_vdbe_untr_port_vdbe_untr_1_subports: + 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_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + vlan_requirements: + get_input: port_vdbe_untr_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_port_1_related_networks + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + network_role: + get_input: port_vdbe_untr_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -323,9 +373,9 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_port_vdbe_untr_2_subports: + vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -404,76 +454,20 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_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 - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - 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 + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe 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 + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder + feature_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports + - feature 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 @@ -498,12 +492,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -513,9 +513,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -525,33 +531,24 @@ topology_template: 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 - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - feature_vdbe_0_subint_untr_vmi_0 disk.read.requests_vdbe: - vdbe - disk.read.requests - forwarder_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - forwarder - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports - - feature_vdbe_0_subint_untr_vmi_0 - binding_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + binding_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports + - feature_vdbe_0_subint_untr_vmi_0 instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -582,12 +579,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - feature_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - feature - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -597,18 +591,27 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets + feature_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports + - feature os_vdbe: - vdbe - os - feature_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports - - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports + - feature_vdbe_0_subint_untr_vmi_0 disk.root.size_vdbe: - vdbe - disk.root.size @@ -627,37 +630,34 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - dependency - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link - dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - dependency - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - subinterface_link_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports - - dependency_vdbe_0_subint_untr_vmi_0 local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports - dependency_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports + - subinterface_link_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports + - dependency + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports + - dependency_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_untr_port_1_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_1_subports - dependency - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_1_vdbe_untr_2_subports - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml index 0a6b109e67..1c98fa09e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml @@ -136,7 +136,7 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_2_untr_port_2} + - port: {get_resource: vdbe_2_untr_port_1} vdbe_1_untr_port_1: type: OS::Neutron::Port properties: @@ -149,7 +149,7 @@ resources: get_param: vdbe_name_1 template: VM_NAMEDBE001p1n004 - vdbe_2_untr_port_2: + vdbe_2_untr_port_1: type: OS::Neutron::Port properties: name: @@ -236,7 +236,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_2_untr_port_2 + get_resource: vdbe_2_untr_port_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index ae99281d24..acb814e35d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_port_network_role_tag: - type: string - required: true - status: SUPPORTED subinterface_nested_parent_interface: type: list required: true @@ -30,10 +26,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_vdbe_availability_zone: type: list required: true @@ -52,12 +44,22 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: @@ -66,12 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -110,16 +112,36 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -140,22 +162,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -180,76 +192,57 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_1_nested: 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 - occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_port_nested: + - 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_port_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_port_1: 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_port_nested: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_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_vdbe_vdbe_untr_port: - 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_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -258,16 +251,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_vdbe_vdbe_untr_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -279,6 +262,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -315,20 +303,26 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.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 - network.incoming.packets_vdbe_vdbe_untr_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_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_port_nested: - type: tosca.capabilities.Node + network.incoming.packets.rate_vdbe_vdbe_untr_port_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 @@ -349,37 +343,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_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.device.allocation_vdbe: + disk.device.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. occurrences: - 1 - UNBOUNDED - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_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 - memory.usage_vdbe: + disk.device.allocation_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.outpoing.packets_vdbe_vdbe_untr_port: + disk.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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + memory.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. occurrences: @@ -391,12 +385,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -404,13 +393,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_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 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 - network.incoming.bytes.rate_vdbe_vdbe_untr_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_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: @@ -440,11 +435,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - 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. @@ -481,9 +471,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -506,17 +495,34 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_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.read.bytes.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 + network.incoming.packets_vdbe_vdbe_untr_port_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 os_vdbe: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1_nested: + 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. @@ -558,12 +564,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_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 org.openecomp.resource.abstract.nodes.heat.subinterface.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -675,4 +675,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 5dac40ecee..03b085ff1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -417,6 +417,14 @@ topology_template: - get_input: untrusted_num_vn subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 vm_flavor_name: get_input: vdbe_flavor_name subinterface_nested_aap_untrusted_ip_prefix: @@ -442,21 +450,19 @@ topology_template: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_nested_counter: @@ -474,12 +480,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -503,7 +503,7 @@ topology_template: - substitutable properties: subinterface_nested_parent_interface: - - vdbe_2_untr_port_2 + - vdbe_2_untr_port_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -514,6 +514,14 @@ topology_template: - 5 subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 vm_flavor_name: get_input: vdbe_flavor_name subinterface_nested_aap_untrusted_ip_prefix: @@ -539,21 +547,19 @@ topology_template: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_nested_counter: @@ -568,12 +574,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index d962ae0bac..397bf3a939 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: 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_nested_parent_interface: type: list required: true @@ -29,9 +26,6 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string - required: true compute_vdbe_availability_zone: type: list required: true @@ -47,23 +41,31 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: - type: integer + port_vdbe_untr_port_1_network_role_tag: + type: string required: true subinterface_nested_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string + port_vdbe_untr_port_1_order: + type: integer + required: true vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -94,14 +96,30 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -119,19 +137,11 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string - required: true subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -152,68 +162,8 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements node_templates: - 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 - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - 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 - vdbe_vdbe_untr_port_nested: + vdbe_vdbe_untr_port_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -292,32 +242,76 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_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 + vdbe_vdbe_untr_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + vlan_requirements: + get_input: port_vdbe_untr_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_port_1_related_networks + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + network_role: + get_input: port_vdbe_untr_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_port_1_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.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 + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder 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 + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature_vdbe_0_subint_untr_vmi_0 disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size @@ -336,15 +330,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature_vdbe_0_subint_untr_vmi_0 + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -354,9 +351,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -366,27 +369,21 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -399,9 +396,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - feature_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -420,9 +414,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -432,12 +426,21 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets os_vdbe: - vdbe - os + feature_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests @@ -459,28 +462,25 @@ topology_template: 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_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency_vdbe_0_subint_untr_vmi_0 + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - subinterface_link_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - dependency - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency_vdbe_0_subint_untr_vmi_0 - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - subinterface_link_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml index 923c53d41f..5a35661871 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml @@ -136,7 +136,7 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_2_untr_port_2} + - port: {get_resource: vdbe_2_untr_port_1} vdbe_1_untr_port_1: type: OS::Neutron::Port properties: @@ -149,7 +149,7 @@ resources: get_param: vdbe_name_1 template: VM_NAMEDBE001p1n004 - vdbe_2_untr_port_2: + vdbe_2_untr_port_1: type: OS::Neutron::Port properties: name: @@ -236,7 +236,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_2_untr_port_2 + get_resource: vdbe_2_untr_port_1 subinterfaces_name_prefix: str_replace: params: 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/GlobalSubstitutionTypesServiceTemplate.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/GlobalSubstitutionTypesServiceTemplate.yaml index f514c6153c..39cfc595b6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -120,10 +120,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_port_network_role_tag: - type: string - required: true - status: SUPPORTED subinterface_nested1_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -136,10 +132,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED subinterface_nested1_vn_network_list: type: list required: true @@ -152,11 +144,25 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_order: type: integer required: true status: SUPPORTED @@ -164,10 +170,6 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED subinterface_nested1_vmac_address: type: list required: true @@ -210,6 +212,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_untrusted_ip_prefix_len: type: list required: true @@ -222,10 +230,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -234,13 +256,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED @@ -252,10 +268,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_nested1_aap_untrusted_ip_prefix: type: list required: true @@ -280,40 +292,28 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe_vdbe_untr_port_nested1: + - dependency_vdbe_vdbe_untr_port_1_nested1: 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_port_nested1: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: 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_port_nested1: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -333,47 +333,35 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_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_vdbe_vdbe_untr_port: - 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_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - feature_vdbe: + feature_vdbe_vdbe_untr_port_1_nested1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: + feature_vdbe: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_vdbe_vdbe_untr_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -421,13 +409,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.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 - network.incoming.packets_vdbe_vdbe_untr_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_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.rate_vdbe_vdbe_untr_port_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: @@ -450,42 +449,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_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_port_nested1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.allocation_vdbe: + disk.device.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. occurrences: - 1 - UNBOUNDED - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_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 - memory.usage_vdbe: + disk.device.allocation_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.outpoing.packets_vdbe_vdbe_untr_port: + disk.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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + memory.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. occurrences: @@ -497,12 +491,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -510,13 +499,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_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 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 - network.incoming.bytes.rate_vdbe_vdbe_untr_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_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: @@ -540,11 +535,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -587,9 +577,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -612,12 +601,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_port_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.read.bytes.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 + network.incoming.packets_vdbe_vdbe_untr_port_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_port_1_nested1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem occurrences: @@ -664,12 +670,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_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 org.openecomp.resource.abstract.nodes.heat.subinterface.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -785,20 +785,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_port_network_role_tag: - type: string - required: true - status: SUPPORTED subinterface_nested2_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_vdbe_availability_zone: type: list required: true @@ -811,6 +803,16 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true @@ -821,28 +823,28 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested2_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true - status: SUPPORTED subinterface_nested2_vmac_address: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED compute_vdbe_metadata: @@ -851,6 +853,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested2_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -863,10 +871,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_nested2_ip_address: type: list required: true @@ -881,34 +903,24 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_vlan_tag_list: type: list required: true status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_nested2_service_template_filter_count: type: list required: true @@ -957,34 +969,22 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe_vdbe_untr_port_nested2: + - dependency_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1004,29 +1004,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_port: - 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_port_1_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_port: - 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_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1035,16 +1033,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_vdbe_vdbe_untr_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1092,13 +1080,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.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 - network.incoming.packets_vdbe_vdbe_untr_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_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.rate_vdbe_vdbe_untr_port_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: @@ -1121,37 +1120,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_port_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.device.allocation_vdbe: + disk.device.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. occurrences: - 1 - UNBOUNDED - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_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 - memory.usage_vdbe: + disk.device.allocation_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.outpoing.packets_vdbe_vdbe_untr_port: + disk.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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: + memory.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. occurrences: @@ -1163,12 +1162,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1176,13 +1170,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_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 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 - network.incoming.bytes.rate_vdbe_vdbe_untr_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_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: @@ -1194,6 +1194,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.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. @@ -1212,11 +1217,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested2: - type: tosca.capabilities.Node - 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. @@ -1253,9 +1253,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1278,8 +1277,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_port_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 @@ -1289,6 +1289,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_port_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 os_vdbe: type: tosca.capabilities.OperatingSystem occurrences: @@ -1335,9 +1341,3 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_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
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index e71657f3c9..88088e4d67 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -432,10 +432,18 @@ topology_template: - get_input: availability_zone_1 subinterface_nested2_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 vm_flavor_name: get_input: vdbe_flavor_name subinterface_nested2_parent_interface: - - vdbe_2_untr_port_2 + - vdbe_2_untr_port_1 subinterface_nested2_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix subinterface_nested2_vmac_address: @@ -453,19 +461,17 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_nested2_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false subinterface_nested2_ip_address: - get_input: vdbe_untrusted_ip_1 - port_vdbe_untr_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested2_vlan_tag_list: - get_input: untrusted_vlan_tags subinterface_nested2_aap_untrusted_ip_prefix_len: @@ -486,12 +492,6 @@ topology_template: - get_input: aap_address_mode subinterface_nested2_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_vdbe_1ServiceTemplate.yaml count: 1 @@ -513,6 +513,14 @@ topology_template: - get_input: untrusted_vn_networks compute_vdbe_availability_zone: - get_input: availability_zone_1 + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 vm_flavor_name: get_input: vdbe_flavor_name vm_image_name: @@ -546,17 +554,15 @@ topology_template: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_nested1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false - port_vdbe_untr_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested1_mac_address: - get_input: vdbe_hw_untr_mac_1 subinterface_nested1_aap_untrusted_ip_prefix: @@ -569,12 +575,6 @@ topology_template: - get_input: vdbe_name_1 subinterface_nested1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 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_vdbeServiceTemplate.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_vdbeServiceTemplate.yaml index 67fb90607c..f36cad822b 100644 --- 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_vdbeServiceTemplate.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_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: 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_nested1_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -24,9 +21,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true subinterface_nested1_vn_network_list: type: list required: true @@ -37,18 +31,26 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_port_1_order: type: integer required: true vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested1_vmac_address: type: list required: true @@ -84,6 +86,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_untrusted_ip_prefix_len: type: list required: true @@ -94,9 +101,20 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,12 +122,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: @@ -119,9 +132,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true subinterface_nested1_aap_untrusted_ip_prefix: type: list required: true @@ -142,23 +152,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_sec_untrusted_ip_prefix: 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_nested1: + vdbe_vdbe_untr_port_1_nested1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1 directives: - substitutable @@ -238,7 +238,7 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe @@ -259,31 +259,31 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_port: + vdbe_vdbe_untr_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming + get_input: port_vdbe_untr_port_1_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_1_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_1_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_1_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_1_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_1_name - index_value requirements: - binding: @@ -293,21 +293,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe 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 + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder + feature_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - feature 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 @@ -332,12 +326,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -347,12 +347,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - feature_vdbe_0_subint_untr_vmi_0 + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -362,27 +365,21 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -392,9 +389,6 @@ topology_template: disk.device.write.bytes.rate_vdbe: - vdbe - disk.device.write.bytes.rate - feature_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - feature memory.resident_vdbe: - vdbe - memory.resident @@ -416,9 +410,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -428,9 +422,18 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - feature_vdbe_0_subint_untr_vmi_0 os_vdbe: - vdbe - os @@ -455,28 +458,25 @@ topology_template: 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: - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 - subinterface_link_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - dependency - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 - dependency_vdbe_0_subint_untr_vmi_0 - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - dependency + dependency_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - dependency + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 index f6128a3dc0..443dcd5610 100644 --- 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 @@ -11,17 +11,11 @@ node_types: 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 @@ -32,6 +26,14 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true @@ -40,30 +42,35 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true 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 + port_vdbe_untr_port_1_order: + type: integer + required: true 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 + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested2_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -74,9 +81,20 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_nested2_ip_address: type: list required: true @@ -89,29 +107,21 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements 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_service_template_filter_count: type: list required: true @@ -152,18 +162,8 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - 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: + vdbe_vdbe_untr_port_1_nested2: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested2 directives: - substitutable @@ -242,7 +242,7 @@ topology_template: requirements: - binding_vdbe_0_subint_oam_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe @@ -263,31 +263,31 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_port: + vdbe_vdbe_untr_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming + get_input: port_vdbe_untr_port_1_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_1_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_1_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_1_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_1_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_1_name - index_value requirements: - binding: @@ -297,21 +297,15 @@ topology_template: 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_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - feature + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder 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 @@ -336,12 +330,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -351,9 +351,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -363,30 +369,27 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta + feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - feature_vdbe_0_subint_oam_vmi_0 disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -396,9 +399,6 @@ topology_template: 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 @@ -417,9 +417,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -429,12 +429,15 @@ topology_template: 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 + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets os_vdbe: - vdbe - os @@ -459,28 +462,25 @@ topology_template: 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_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - 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 - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - subinterface_link_vdbe_0_subint_oam_vmi_0 - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - dependency + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link + subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - subinterface_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_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - dependency_vdbe_0_subint_oam_vmi_0 dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml index ba730546ea..be85be4308 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml @@ -252,7 +252,7 @@ resources: network: get_resource: fabric_int_net type: "OS::Neutron::Subnet" - vdbe_0_untr_vmi_0: + vdbe_0_untr_vmi_1: properties: name: str_replace: @@ -502,7 +502,7 @@ resources: get_resource: vdbe_fabr_0_port - port: - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 - port: get_resource: vdbe_trst_0_port @@ -772,7 +772,7 @@ resources: get_param: trusted_net_name type: "OS::ContrailV2::InstanceIp" vdbe_untr_0_subports: - depends_on: vdbe_0_untr_vmi_0 + depends_on: vdbe_0_untr_vmi_1 properties: count: get_param: untrusted_num_vn @@ -800,7 +800,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_0 parent_interface: - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -865,13 +865,13 @@ resources: type: "OS::Heat::ResourceGroup" vdbe_untrusted_Iip_0: depends_on: - - vdbe_0_untr_vmi_0 + - vdbe_0_untr_vmi_1 properties: instance_ip_address: get_param: vdbe_untrusted_ip_0 virtual_machine_interface_refs: - - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 virtual_network_refs: - get_param: untrusted_net_name @@ -891,14 +891,14 @@ resources: type: "OS::ContrailV2::InstanceIp" vdbe_untrusted_v6_Iip_0: depends_on: - - vdbe_0_untr_vmi_0 + - vdbe_0_untr_vmi_1 properties: instance_ip_address: get_param: vdbe_untrusted_v6_ip_0 instance_ip_family: v6 virtual_machine_interface_refs: - - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 virtual_network_refs: - get_param: untrusted_net_name 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 |