diff options
| author |   ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
| commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
| tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging | |
| parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) | |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging')
115 files changed, 11651 insertions, 11652 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2846399798..b5981ebfaa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,26 +8,22 @@ 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 + subinterface_nested_parent_interface: + type: list required: true status: SUPPORTED - port_vdbe_untr_vmi_related_networks: + entry_schema: + type: string + port_vdbe_untr_vmi_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_nested_parent_interface: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_nested_aap_address_mode: type: list required: true @@ -62,12 +58,16 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: + port_vdbe_untr_vmi_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: type: list required: true @@ -108,14 +108,14 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_virtual_network_refs: + port_vdbe_untr_vmi_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_vdbe_untr_vmi_1_order: + type: integer required: true status: SUPPORTED subinterface_nested_ip_address: @@ -124,22 +124,22 @@ node_types: 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 + port_vdbe_untr_vmi_1_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_order: - type: integer - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -160,21 +160,31 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_network_role: - type: string + port_vdbe_untr_vmi_1_ip_requirements: + type: list required: true status: SUPPORTED - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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_nested_aap_untrusted_ip_prefix_len: + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_vmi_name: + 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_nested_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED @@ -192,71 +202,56 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: - type: string - 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: + - 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: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_vmi: + - 1 + - 1 + - dependency_vdbe: 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 + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_untr_vmi_nested: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_vmi_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: + - dependency_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: + - subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - feature_vdbe_vdbe_untr_vmi_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - 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: @@ -284,26 +279,27 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_vdbe: + 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 - vcpus_vdbe: + cpu_util_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.write.requests_vdbe: + vcpus_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_vdbe_untr_vmi: - type: tosca.capabilities.Node + disk.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. occurrences: - 1 - UNBOUNDED @@ -325,6 +321,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: @@ -366,19 +368,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: + 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 - 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.outpoing.packets_vdbe_vdbe_untr_vmi: + 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: @@ -408,68 +415,60 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_untr_vmi: + 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 - disk.write.requests.rate_vdbe: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: + disk.write.bytes_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 - cpu_vdbe: + 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. occurrences: - 1 - UNBOUNDED - disk.write.bytes_vdbe: + disk.device.read.bytes_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: + disk.latency_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.device.read.bytes_vdbe: + 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 - disk.latency_vdbe: + 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 - feature_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - type: tosca.capabilities.Node + forwarder_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: + 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: @@ -494,19 +493,18 @@ node_types: 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. + feature_vdbe_vdbe_untr_vmi_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_vmi: + 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.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: @@ -517,24 +515,26 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.Forwarder + 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: - - 1 + - 0 - 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. + feature_vdbe_vdbe_untr_vmi_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.root.size_vdbe: + 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 - network.outgoing.bytes_vdbe_vdbe_untr_vmi: + 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. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml index 46d5688f80..9d84173051 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml @@ -409,8 +409,6 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -430,26 +428,28 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_vmi_virtual_network_refs: - - - control_int_net + 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 subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 + port_vdbe_untr_vmi_1_virtual_network_refs: + - - control_int_net subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len - 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_nested_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -469,7 +469,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_vmi: + - link_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -482,4 +482,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe + - abstract_vdbe
\ 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/pattern1a/computePortNetworkSubInterface/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/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml index e4782a5120..10531d12b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/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/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -11,22 +11,19 @@ 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: + subinterface_nested_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_network_role_tag: - type: string - required: true - subinterface_nested_parent_interface: + type: string + port_vdbe_untr_vmi_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: + type: string + required: true subinterface_nested_aap_address_mode: type: list required: true @@ -55,11 +52,14 @@ topology_template: vm_flavor_name: type: string required: true - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: + port_vdbe_untr_vmi_1_related_networks: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_nested_aap_untrusted_ip_prefix: type: list required: true @@ -93,32 +93,32 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_virtual_network_refs: + port_vdbe_untr_vmi_1_name: type: list required: true entry_schema: - type: json - port_vdbe_untr_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_vdbe_untr_vmi_1_order: + type: integer required: true subinterface_nested_ip_address: 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 + port_vdbe_untr_vmi_1_network_role_tag: + type: string + required: true subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_vmi_order: - type: integer - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -136,18 +136,26 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_network_role: - type: string + port_vdbe_untr_vmi_1_ip_requirements: + type: list required: true - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true - subinterface_nested_aap_untrusted_ip_prefix_len: + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: string - port_vdbe_untr_vmi_name: + 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_nested_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: @@ -162,78 +170,70 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: - type: string - required: true - port_vdbe_untr_vmi_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements 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_vmi: + vdbe_vdbe_untr_vmi_1: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_vdbe_untr_vmi_mac_requirements + get_input: port_vdbe_untr_vmi_1_mac_requirements order: - get_input: port_vdbe_untr_vmi_order + get_input: port_vdbe_untr_vmi_1_order exCP_naming: - get_input: port_vdbe_untr_vmi_exCP_naming + get_input: port_vdbe_untr_vmi_1_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs + - port_vdbe_untr_vmi_1_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_vdbe_untr_vmi_vlan_requirements + get_input: port_vdbe_untr_vmi_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_vmi_related_networks + get_input: port_vdbe_untr_vmi_1_related_networks virtual_network_refs: get_input: - - port_vdbe_untr_vmi_virtual_network_refs + - port_vdbe_untr_vmi_1_virtual_network_refs - index_value ip_requirements: - get_input: port_vdbe_untr_vmi_ip_requirements + get_input: port_vdbe_untr_vmi_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_vmi_network_role_tag + get_input: port_vdbe_untr_vmi_1_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses + - port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses - index_value network_role: - get_input: port_vdbe_untr_vmi_network_role + get_input: port_vdbe_untr_vmi_1_network_role subnetpoolid: - get_input: port_vdbe_untr_vmi_subnetpoolid + get_input: port_vdbe_untr_vmi_1_subnetpoolid name: get_input: - - port_vdbe_untr_vmi_name + - 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_nested: + 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_vmi_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -313,17 +313,14 @@ topology_template: requirements: - binding_vdbe_0_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_vmi + node: vdbe_vdbe_untr_vmi_1 relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe capabilities: - feature_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested - - feature - 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 feature_vdbe: - vdbe - feature @@ -336,6 +333,9 @@ 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 cpu_util_vdbe: - vdbe - cpu_util @@ -345,9 +345,6 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - feature disk.device.latency_vdbe: - vdbe - disk.device.latency @@ -357,6 +354,9 @@ topology_template: disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets scalable_vdbe: - vdbe - scalable @@ -378,15 +378,18 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage + feature_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested + - feature_vdbe_0_untr_vmi_0 disk.read.requests_vdbe: - vdbe - disk.read.requests + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outpoing.packets instance_vdbe: - vdbe - instance - network.outpoing.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outpoing.packets cpu.delta_vdbe: - vdbe - cpu.delta @@ -399,24 +402,15 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - network.incoming.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.bytes.rate cpu_vdbe: - vdbe - cpu disk.write.bytes_vdbe: - vdbe - disk.write.bytes - binding_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - binding disk.device.usage_vdbe: - vdbe - disk.device.usage @@ -426,12 +420,18 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - feature_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested - - feature_vdbe_0_untr_vmi_0 - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes.rate + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.bytes.rate + 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 @@ -441,30 +441,30 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + feature_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate - 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 + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - network.incoming.bytes os_vdbe: - vdbe - os - forwarder_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - forwarder + binding_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - binding + feature_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested + - feature disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests 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 @@ -481,24 +481,24 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - link - dependency_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested + dependency_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - dependency - dependency_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested + dependency_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested - dependency_vdbe_0_untr_vmi_0 + dependency_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested + - dependency local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - dependency + link_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - link + subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_1_nested: + - vdbe_vdbe_untr_vmi_1_nested + - subinterface_link_vdbe_0_untr_vmi_0 dependency_vdbe: - vdbe - - dependency - subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested - - subinterface_link_vdbe_0_untr_vmi_0
\ No newline at end of file + - dependency
\ 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/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7fbaeed9c2..1fd158a6c8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/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_nested1_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -24,10 +20,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 @@ -40,11 +32,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 @@ -52,10 +58,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 @@ -98,6 +100,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 @@ -110,10 +118,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 @@ -122,13 +144,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 @@ -140,10 +156,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 @@ -168,40 +180,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: @@ -221,47 +221,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. @@ -309,13 +297,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: @@ -338,42 +337,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: @@ -385,12 +379,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 @@ -398,13 +387,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: @@ -428,11 +423,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. @@ -475,9 +465,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 @@ -500,12 +489,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: @@ -552,12 +558,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: @@ -673,14 +673,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 - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_2_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -689,46 +687,56 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_vdbe_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: - type: list + port_vdbe_untr_port_2_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_vdbe_untr_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_port_2_ip_requirements: + type: list required: true status: SUPPORTED - port_vdbe_untr_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_port_2_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_2_network_role: + type: string required: true status: SUPPORTED compute_vdbe_metadata: @@ -743,56 +751,41 @@ 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 + port_vdbe_untr_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_port_2: 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_port_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - 1 + - 1 + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: - 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. + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - 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. + capabilities: + forwarder_vdbe_vdbe_untr_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -801,16 +794,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. @@ -846,6 +829,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_port_2: + 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.latency_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -858,15 +847,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_2: + 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: - 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_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -875,6 +868,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_vdbe_vdbe_untr_port_2: + 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.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. @@ -893,48 +892,49 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_port_2: 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: + 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 - memory.usage_vdbe: + network.incoming.packets.rate_vdbe_vdbe_untr_port_2: 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: + network.incoming.bytes.rate_vdbe_vdbe_untr_port_2: 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: + 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 - disk.read.requests_vdbe: + 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 - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder + 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 - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -942,13 +942,13 @@ node_types: occurrences: - 0 - UNBOUNDED - instance_vdbe: + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_2: 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: + 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: @@ -960,6 +960,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_2: + 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.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. @@ -1014,7 +1020,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_port: + network.outpoing.packets_vdbe_vdbe_untr_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1090,10 +1096,4 @@ node_types: 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: - 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/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml index 66cbff9d89..edb427c692 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml @@ -414,12 +414,22 @@ topology_template: directives: - substitutable properties: - port_vdbe_untr_port_mac_requirements: - mac_count_required: - is_required: false compute_vdbe_availability_zone: - get_input: availability_zone_1 - port_vdbe_untr_port_name: + vm_flavor_name: + get_input: vdbe_flavor_name + port_vdbe_untr_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_2_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: vdbe_image_name + port_vdbe_untr_port_2_name: - str_replace: template: VM_NAMEDBE001p1n004 params: @@ -427,10 +437,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - vm_flavor_name: - get_input: vdbe_flavor_name - vm_image_name: - get_input: vdbe_image_name compute_vdbe_metadata: - vf_module_id: get_input: vf_module_id @@ -440,12 +446,6 @@ topology_template: get_input: vnf_name 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_vdbe_1ServiceTemplate.yaml count: 1 @@ -467,6 +467,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: @@ -500,17 +508,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: @@ -523,12 +529,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 @@ -558,4 +558,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - abstract_vdbe + - abstract_vdbe
\ 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/pattern1a/twoPortOnlyOneConnectedWithSubInf/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/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml index 67fb90607c..bc6f9eab32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/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/pattern1a/twoPortOnlyOneConnectedWithSubInf/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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/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/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml index f3cc4049b1..a1b1ff5462 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/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/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml @@ -11,12 +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 - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_2_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -24,38 +23,46 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_port_subnetpoolid: - type: string - required: true compute_vdbe_availability_zone: type: list required: true entry_schema: type: string - port_vdbe_untr_port_name: - type: list + port_vdbe_untr_port_2_order: + type: integer required: true - entry_schema: - type: string vm_flavor_name: type: string required: true - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_vdbe_untr_port_2_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_port_network_role: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_untr_port_2_ip_requirements: + type: list required: true - port_vdbe_untr_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_port_2_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_2_network_role: + type: string required: true compute_vdbe_metadata: type: list @@ -67,85 +74,69 @@ 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 + port_vdbe_untr_port_2_network_role_tag: + type: string 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: + vdbe_vdbe_untr_port_2: 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_2_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_2_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_2_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_2_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_2_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_2_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_2_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_2_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_2_name - index_value requirements: - binding: 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 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 + forwarder_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - 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 @@ -164,21 +155,30 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests + network.incoming.packets_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.incoming.packets disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - 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 + attachment_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - attachment scalable_vdbe: - vdbe - scalable + network.outgoing.packets.rate_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.outgoing.packets.rate disk.iops_vdbe: - vdbe - disk.iops @@ -188,39 +188,42 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation + network.incoming.packets.rate_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.incoming.packets.rate + network.incoming.bytes.rate_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.incoming.bytes.rate disk.usage_vdbe: - vdbe - disk.usage memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outpoing.packets - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.bytes.rate disk.read.requests_vdbe: - vdbe - disk.read.requests - forwarder_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - forwarder - binding_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + binding_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 - binding + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.outgoing.bytes.rate instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta + network.incoming.bytes_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.incoming.bytes disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -248,9 +251,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + network.outpoing.packets_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - network.outpoing.packets disk.capacity_vdbe: - vdbe - disk.capacity @@ -287,19 +290,16 @@ 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 - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + link_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 - link local_storage_vdbe: - vdbe - local_storage + dependency_vdbe_vdbe_untr_port_2: + - vdbe_vdbe_untr_port_2 + - dependency dependency_vdbe: - vdbe - dependency
\ 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/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8a0a77b277..fd261d6cf3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,77 +8,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,20 +92,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -109,54 +109,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -168,11 +176,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -191,12 +194,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -208,9 +205,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_template_Vlan_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -244,7 +240,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -268,7 +264,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -286,6 +294,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -297,17 +310,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -331,8 +344,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -347,27 +361,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - 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.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,6 +403,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,14 +428,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -439,36 +445,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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.latency_pd_server: + disk.device.latency_pd_server: 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.capacity_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -564,7 +564,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED @@ -580,6 +580,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -588,18 +594,24 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -610,13 +622,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -624,102 +634,86 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - subinterface_nested_net1: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: string requirements: - - dependency_ps_server_ps01_port_nested: + - dependency_ps_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_1_ps_server_ps01_port_nested: + - dependency_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_ps_server: + - dependency_ps_server_ps01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_ps_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_ps_server_ps01_port: + - 1 + - 1 + - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_ps_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: instance_ps_server: 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_ps_server_ps01_port: + network.incoming.packets_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -732,12 +726,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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 cpu.delta_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -750,17 +738,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_ps_server_ps01_port: + feature_ps_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_ps_server: + feature_ps_server_ps01_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -807,12 +790,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_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 disk.device.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -878,24 +855,29 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_ps_server: + network.outpoing.packets_ps_server_ps01_port_0: 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_ps_server: + cpu_util_ps_server: 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_ps_server_ps01_port: + memory.resident_ps_server: 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_template_Vlan_1_ps_server_ps01_port_0_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -908,12 +890,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_1_ps_server_ps01_port_nested: - type: tosca.capabilities.Node + network.incoming.bytes_ps_server_ps01_port_0: + 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_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -948,8 +931,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment + feature_ps_server_ps01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -964,7 +947,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: + binding_ps_server_ps01_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -972,7 +955,7 @@ node_types: occurrences: - 0 - UNBOUNDED - forwarder_ps_server_ps01_port: + forwarder_ps_server_ps01_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -989,6 +972,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1012,7 +1000,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: + network.outgoing.bytes_ps_server_ps01_port_0: + 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.packets.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1024,7 +1018,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_ps01_port: + network.incoming.packets.rate_ps_server_ps01_port_0: + 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_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml index ca498b2bff..08dd21d0eb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml @@ -708,6 +708,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -720,22 +732,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -764,28 +764,28 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW + port_ps01_port_0_network: + - get_input: oam_net_name + port_ps01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false subinterface_nested_service_template_filter_count: - 9 vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 - vm_image_name: - get_input: pd_image_name - port_ps01_port_mac_requirements: + port_ps01_port_0_mac_requirements: mac_count_required: is_required: false - port_ps01_port_network: - - get_input: oam_net_name + vm_image_name: + get_input: pd_image_name + port_ps01_port_0_network_role_tag: oam subinterface_nested_net1: - test_net1 - port_ps01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -809,4 +809,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server + - abstract_ps_server
\ 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/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 174544b79d..50b0adbe52 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,52 +135,33 @@ topology_template: requirements: - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -171,15 +171,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - feature_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_1 memory.usage_pd_server: - pd_server - memory.usage @@ -189,18 +189,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + feature_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_1 cpu_pd_server: - pd_server - cpu @@ -216,9 +213,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -228,27 +225,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -261,27 +267,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +297,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,24 +309,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +333,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency dependency_pd_server: - pd_server - dependency - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested - subinterface_link_template_Vlan_1 - dependency_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_1
\ No newline at end of file + dependency_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_1 + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ 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/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml index 6f9292285b..843e8c7d30 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true compute_ps_server_availability_zone: @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -36,16 +41,21 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -54,46 +64,36 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps01_port_0_subnetpoolid: + type: string required: true - port_ps01_port_network: + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_net1: type: list required: true entry_schema: type: string - port_ps01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: - ps_server_ps01_port_nested: + ps_server_ps01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,91 +116,82 @@ topology_template: requirements: - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable - node: ps_server_ps01_port + node: ps_server_ps01_port_0 relationship: tosca.relationships.network.BindsTo - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value - ps_server_ps01_port: + ps_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets + network.incoming.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - feature - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature feature_ps_server: - ps_server - feature + feature_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - feature disk.root.size_ps_server: - ps_server - disk.root.size @@ -222,9 +213,6 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -258,26 +246,29 @@ topology_template: disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate + network.outpoing.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outpoing.packets cpu_util_ps_server: - ps_server - cpu_util memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes + feature_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - feature_template_Vlan_1 disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - feature_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - feature_template_Vlan_1 - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port + network.incoming.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - network.outgoing.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server @@ -294,20 +285,20 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment + feature_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - feature os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port + binding_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port + forwarder_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - forwarder disk.device.write.bytes.rate_ps_server: - ps_server @@ -315,6 +306,9 @@ topology_template: vcpus_ps_server: - ps_server - vcpus + attachment_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - attachment disk.usage_ps_server: - ps_server - disk.usage @@ -327,34 +321,40 @@ topology_template: disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate + network.outgoing.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.bytes + network.outgoing.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.packets.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes + network.incoming.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes.rate requirements: - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested + dependency_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - dependency + subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested - subinterface_link_template_Vlan_1 + dependency_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - dependency_template_Vlan_1 dependency_ps_server: - ps_server - dependency - dependency_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested + dependency_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port + link_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port - - dependency - dependency_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - dependency_template_Vlan_1 local_storage_ps_server: - ps_server - local_storage
\ 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/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0924527c8d..f31af57507 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,48 +48,42 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -148,12 +156,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -165,12 +167,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -201,13 +197,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.incoming.packets.rate_pd_server_pd01_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.bytes.rate_pd_server_pd01_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: @@ -225,7 +227,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_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: @@ -254,12 +261,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_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: @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - 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.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_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.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -368,14 +385,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -420,12 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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 disk.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -435,77 +435,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -515,20 +519,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -536,54 +536,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -613,12 +621,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -630,21 +632,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -666,7 +667,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -690,7 +691,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -708,6 +721,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -719,19 +737,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -758,8 +771,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -774,27 +788,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - 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.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -824,6 +830,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -843,14 +855,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -866,36 +872,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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.latency_pd_server: + disk.device.latency_pd_server: 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.capacity_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml index e873e659f2..4fef6d6222 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml @@ -708,6 +708,12 @@ topology_template: directives: - substitutable properties: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -716,20 +722,14 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network_role_tag: oam + port_pd01_port_1_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -745,6 +745,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -757,22 +769,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -784,7 +784,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -798,4 +798,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1 + - abstract_pd_server_1
\ 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/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..734675faec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,39 +44,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,21 +170,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,12 +203,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link
\ 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/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml index dc53df8166..16c362eacb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,52 +135,33 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -171,6 +171,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -186,24 +189,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_vmi_1 disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -213,9 +213,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -261,27 +267,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +297,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,24 +309,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +333,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ 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/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8a0a77b277..fd261d6cf3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,77 +8,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,20 +92,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -109,54 +109,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -168,11 +176,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -191,12 +194,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -208,9 +205,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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_template_Vlan_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -244,7 +240,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -268,7 +264,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -286,6 +294,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -297,17 +310,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -331,8 +344,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -347,27 +361,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - 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.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,6 +403,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,14 +428,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -439,36 +445,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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.latency_pd_server: + disk.device.latency_pd_server: 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.capacity_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -564,7 +564,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED @@ -580,6 +580,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -588,18 +594,24 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -610,13 +622,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -624,102 +634,86 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - subinterface_nested_net1: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: string requirements: - - dependency_ps_server_ps01_port_nested: + - dependency_ps_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_1_ps_server_ps01_port_nested: + - dependency_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_ps_server: + - dependency_ps_server_ps01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_ps_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_ps_server_ps01_port: + - 1 + - 1 + - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_ps_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: instance_ps_server: 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_ps_server_ps01_port: + network.incoming.packets_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -732,12 +726,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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 cpu.delta_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -750,17 +738,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_ps_server_ps01_port: + feature_ps_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_ps_server: + feature_ps_server_ps01_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -807,12 +790,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_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 disk.device.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -878,24 +855,29 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_ps_server: + network.outpoing.packets_ps_server_ps01_port_0: 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_ps_server: + cpu_util_ps_server: 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_ps_server_ps01_port: + memory.resident_ps_server: 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_template_Vlan_1_ps_server_ps01_port_0_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -908,12 +890,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_1_ps_server_ps01_port_nested: - type: tosca.capabilities.Node + network.incoming.bytes_ps_server_ps01_port_0: + 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_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -948,8 +931,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment + feature_ps_server_ps01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -964,7 +947,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: + binding_ps_server_ps01_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -972,7 +955,7 @@ node_types: occurrences: - 0 - UNBOUNDED - forwarder_ps_server_ps01_port: + forwarder_ps_server_ps01_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -989,6 +972,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1012,7 +1000,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: + network.outgoing.bytes_ps_server_ps01_port_0: + 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.packets.rate_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1024,7 +1018,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_ps01_port: + network.incoming.packets.rate_ps_server_ps01_port_0: + 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_ps_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml index 22aa789154..192f34f1a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -708,6 +708,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -718,22 +730,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -745,7 +745,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -762,26 +762,26 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW + port_ps01_port_0_network: + - get_input: oam_net_name + port_ps01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 - vm_image_name: - get_input: pd_image_name - port_ps01_port_mac_requirements: + port_ps01_port_0_mac_requirements: mac_count_required: is_required: false - port_ps01_port_network: - - get_input: oam_net_name + vm_image_name: + get_input: pd_image_name + port_ps01_port_0_network_role_tag: oam subinterface_nested_net1: - test_net1 - port_ps01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -791,7 +791,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -805,4 +805,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server + - abstract_ps_server
\ 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/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 92f4690704..162ffbde33 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -115,52 +134,33 @@ topology_template: requirements: - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -170,15 +170,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - feature_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_1 memory.usage_pd_server: - pd_server - memory.usage @@ -188,18 +188,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + feature_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_1 cpu_pd_server: - pd_server - cpu @@ -215,9 +212,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -227,27 +224,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -260,27 +266,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -293,6 +296,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -302,24 +308,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -329,9 +332,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -339,21 +339,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency dependency_pd_server: - pd_server - dependency - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + subinterface_link_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested - subinterface_link_template_Vlan_1 - dependency_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_1
\ No newline at end of file + dependency_template_Vlan_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_1 + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ 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/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml index fa71d6f0df..7e453b3114 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true compute_ps_server_availability_zone: @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -36,16 +41,21 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -54,46 +64,36 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps01_port_0_subnetpoolid: + type: string required: true - port_ps01_port_network: + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_net1: type: list required: true entry_schema: type: string - port_ps01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: - ps_server_ps01_port_nested: + ps_server_ps01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -115,91 +115,82 @@ topology_template: requirements: - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable - node: ps_server_ps01_port + node: ps_server_ps01_port_0 relationship: tosca.relationships.network.BindsTo - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value - ps_server_ps01_port: + ps_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets + network.incoming.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - feature - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature feature_ps_server: - ps_server - feature + feature_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - feature disk.root.size_ps_server: - ps_server - disk.root.size @@ -221,9 +212,6 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -257,26 +245,29 @@ topology_template: disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate + network.outpoing.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outpoing.packets cpu_util_ps_server: - ps_server - cpu_util memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes + feature_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - feature_template_Vlan_1 disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - feature_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - feature_template_Vlan_1 - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port + network.incoming.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - network.outgoing.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server @@ -293,20 +284,20 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment + feature_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - feature os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port + binding_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port + forwarder_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - forwarder disk.device.write.bytes.rate_ps_server: - ps_server @@ -314,6 +305,9 @@ topology_template: vcpus_ps_server: - ps_server - vcpus + attachment_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - attachment disk.usage_ps_server: - ps_server - disk.usage @@ -326,34 +320,40 @@ topology_template: disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate + network.outgoing.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.bytes + network.outgoing.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.packets.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes + network.incoming.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes.rate requirements: - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested + dependency_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - dependency + subinterface_link_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested - subinterface_link_template_Vlan_1 + dependency_template_Vlan_1_ps_server_ps01_port_0_nested: + - ps_server_ps01_port_0_nested + - dependency_template_Vlan_1 dependency_ps_server: - ps_server - dependency - dependency_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested + dependency_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port + link_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port - - dependency - dependency_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - dependency_template_Vlan_1 local_storage_ps_server: - ps_server - local_storage
\ 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/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index aea332012e..0c17a3cd9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,10 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED + port_ps01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -32,18 +38,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -54,13 +66,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -68,75 +78,52 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - subinterface_nested_net1: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: string compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED requirements: - - dependency_pd_server_ps01_port_nested: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - dependency_pd_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server_ps01_port: + - dependency_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_ps01_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -156,7 +143,25 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_pd_server_ps01_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: + forwarder_pd_server_ps01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -191,6 +196,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -221,43 +231,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + network.incoming.packets_pd_server_ps01_port_0: 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_pd_server_ps01_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 - disk.iops_pd_server: + disk.device.read.bytes.rate_pd_server: 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_pd_server: + network.outpoing.packets_pd_server_ps01_port_0: 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.delta_pd_server: + disk.iops_pd_server: 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.packets.rate_pd_server_ps01_port: + memory.resident_pd_server: 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_pd_server_ps01_port: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -286,23 +290,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_ps01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_pd_server_ps01_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 disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -326,33 +319,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_ps01_port: + network.incoming.bytes_pd_server_ps01_port_0: 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_pd_server_ps01_port_nested: + feature_pd_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_ps01_port: + network.outgoing.bytes.rate_pd_server_ps01_port_0: 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_pd_server: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_ps01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -371,41 +354,47 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_ps01_port: + disk.root.size_pd_server: 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.root.size_pd_server: + disk.device.read.bytes_pd_server: 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.read.bytes_pd_server: + disk.device.write.bytes_pd_server: 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.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_ps01_port_0: 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_template_Vlan_vmi_1_pd_server_ps01_port_nested: - type: tosca.capabilities.Node + disk.device.read.requests_pd_server: + 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.read.requests_pd_server: + network.incoming.bytes.rate_pd_server_ps01_port_0: 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_pd_server_ps01_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED instance_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -419,15 +408,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_ps01_port: - 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 + attachment_pd_server_ps01_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes_pd_server_ps01_port: + network.outgoing.packets.rate_pd_server_ps01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -445,14 +431,20 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_ps01_port_0_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.requests_pd_server: 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 - attachment_pd_server_ps01_port: - type: tosca.capabilities.Attachment + network.outgoing.bytes_pd_server_ps01_port_0: + 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 @@ -474,6 +466,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_ps01_port_0: + 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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -483,77 +483,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -563,20 +567,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -584,54 +584,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -661,12 +669,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -678,21 +680,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -714,7 +715,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -738,7 +739,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -756,6 +769,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -767,19 +785,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -806,8 +819,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -822,27 +836,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - 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.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -872,6 +878,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -891,14 +903,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -914,36 +920,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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.latency_pd_server: + disk.device.latency_pd_server: 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.capacity_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml index b902522d1c..8c0a766525 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml @@ -708,34 +708,34 @@ topology_template: directives: - substitutable properties: + port_ps01_port_0_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 + port_ps01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false subinterface_nested_service_template_filter_count: - 9 vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 - vm_image_name: - get_input: pd_image_name - port_ps01_port_mac_requirements: + port_ps01_port_0_mac_requirements: mac_count_required: is_required: false - port_ps01_port_network: - - get_input: oam_net_name + vm_image_name: + get_input: pd_image_name + port_ps01_port_0_network_role_tag: oam subinterface_nested_net1: - test_net1 - port_ps01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_ps01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -756,6 +756,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -768,22 +780,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -809,4 +809,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1 + - abstract_pd_server_1
\ 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/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 4ffb7466f9..560bd31f43 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -11,9 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true + port_ps01_port_0_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -31,16 +36,21 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float + port_ps01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -49,51 +59,41 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps01_port_network: + port_ps01_port_0_subnetpoolid: + type: string + required: true + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_net1: type: list required: true entry_schema: type: string - port_ps01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: - pd_server_ps01_port_nested: + pd_server_ps01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,61 +116,64 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_ps01_port + node: pd_server_ps01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server_ps01_port: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + forwarder_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - forwarder scalable_pd_server: - pd_server - scalable @@ -189,6 +192,9 @@ topology_template: os_pd_server: - pd_server - os + feature_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested + - feature_template_Vlan_vmi_1 disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate @@ -204,12 +210,15 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + network.incoming.packets_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.incoming.packets disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.bytes.rate_pd_server_ps01_port: - - pd_server_ps01_port - - network.incoming.bytes.rate + network.outpoing.packets_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops @@ -219,12 +228,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.packets.rate_pd_server_ps01_port: - - pd_server_ps01_port - - network.outgoing.packets.rate - network.incoming.packets_pd_server_ps01_port: - - pd_server_ps01_port - - network.incoming.packets vcpus_pd_server: - pd_server - vcpus @@ -237,15 +240,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - feature_pd_server_ps01_port: - - pd_server_ps01_port - - feature disk.capacity_pd_server: - pd_server - disk.capacity - network.outgoing.bytes.rate_pd_server_ps01_port: - - pd_server_ps01_port - - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -258,21 +255,15 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outpoing.packets_pd_server_ps01_port: - - pd_server_ps01_port - - network.outpoing.packets - feature_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - feature - network.incoming.packets.rate_pd_server_ps01_port: - - pd_server_ps01_port - - network.incoming.packets.rate + network.incoming.bytes_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature - forwarder_pd_server_ps01_port: - - pd_server_ps01_port - - forwarder + network.outgoing.bytes.rate_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.outgoing.bytes.rate disk.usage_pd_server: - pd_server - disk.usage @@ -282,9 +273,6 @@ topology_template: disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate - network.outgoing.bytes_pd_server_ps01_port: - - pd_server_ps01_port - - network.outgoing.bytes disk.root.size_pd_server: - pd_server - disk.root.size @@ -294,36 +282,45 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - feature_template_Vlan_vmi_1_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - feature_template_Vlan_vmi_1 + network.incoming.packets.rate_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.incoming.packets.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests + network.incoming.bytes.rate_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.incoming.bytes.rate + feature_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - feature instance_pd_server: - pd_server - instance host_pd_server: - pd_server - host - binding_pd_server_ps01_port: - - pd_server_ps01_port - - binding - network.incoming.bytes_pd_server_ps01_port: - - pd_server_ps01_port - - network.incoming.bytes + attachment_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - attachment + network.outgoing.packets.rate_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - attachment_pd_server_ps01_port: - - pd_server_ps01_port - - attachment + network.outgoing.bytes_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - network.outgoing.bytes disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -333,6 +330,9 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity + binding_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - binding disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_ps01_port: - - pd_server_ps01_port + dependency_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - dependency + dependency_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested - dependency - dependency_template_Vlan_vmi_1_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - dependency_template_Vlan_vmi_1 - link_pd_server_ps01_port: - - pd_server_ps01_port - - link dependency_pd_server: - pd_server - dependency - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested + subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - dependency
\ No newline at end of file + dependency_template_Vlan_vmi_1_pd_server_ps01_port_0_nested: + - pd_server_ps01_port_0_nested + - dependency_template_Vlan_vmi_1 + link_pd_server_ps01_port_0: + - pd_server_ps01_port_0 + - link
\ 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/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml index dc53df8166..16c362eacb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,52 +135,33 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -171,6 +171,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -186,24 +189,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_vmi_1 disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -213,9 +213,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -261,27 +267,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +297,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,24 +309,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +333,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ 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/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0924527c8d..f31af57507 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,48 +48,42 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_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 memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -148,12 +156,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -165,12 +167,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -201,13 +197,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + disk.iops_pd_server: 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.iops_pd_server: + network.incoming.packets.rate_pd_server_pd01_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.bytes.rate_pd_server_pd01_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: @@ -225,7 +227,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_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: @@ -254,12 +261,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + disk.capacity_pd_server: + 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_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_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: @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - 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.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_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.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -368,14 +385,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -420,12 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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 disk.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -435,77 +435,81 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_service_template_filter_count: - type: list + port_pd01_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: float - port_pd01_port_related_networks: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: + type: list required: true status: SUPPORTED - subinterface_nested_p1: + entry_schema: + type: string + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + subinterface_nested_service_template_filter_count: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: float + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -515,20 +519,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -536,54 +536,62 @@ node_types: entry_schema: type: string requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server: + - dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - 1 + - 1 + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + 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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -613,12 +621,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -630,21 +632,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_pd_server: 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_pd_server: + cpu_util_pd_server: 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_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -666,7 +667,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -690,7 +691,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_0: + 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_pd_server_pd01_port_0: + 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.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -708,6 +721,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -719,19 +737,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -758,8 +771,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd01_port_0: + 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 @@ -774,27 +788,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - 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.write.bytes_pd_server: 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_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: 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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -824,6 +830,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + 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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -843,14 +855,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -866,36 +872,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - 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_pd_server_pd01_port: + feature_pd_server_pd01_port_0_nested: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: 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.latency_pd_server: + disk.device.latency_pd_server: 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.capacity_pd_server: + disk.latency_pd_server: 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_pd_server_pd01_port: + disk.device.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml index e873e659f2..4fef6d6222 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml @@ -708,6 +708,12 @@ topology_template: directives: - substitutable properties: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -716,20 +722,14 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network_role_tag: oam + port_pd01_port_1_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -745,6 +745,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -757,22 +769,10 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - pd01_port_0 - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name subinterface_nested_net1: - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -784,7 +784,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -798,4 +798,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1 + - abstract_pd_server_1
\ 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/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..734675faec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,39 +44,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,21 +170,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,12 +203,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link
\ 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/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml index dc53df8166..16c362eacb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,47 +52,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - subinterface_nested_p1: - type: list - required: true - entry_schema: - type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + subinterface_nested_p1: type: list required: true entry_schema: type: string - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,24 +79,40 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - pd_server_pd01_port_nested: + pd_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server + properties: + availability_zone: + get_input: + - compute_pd_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_name + - index_value + user_data_format: + get_input: + - compute_pd_server_user_data_format + - index_value + pd_server_pd01_port_0_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -116,52 +135,33 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port + node: pd_server_pd01_port_0 relationship: tosca.relationships.network.BindsTo - pd_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server - properties: - availability_zone: - get_input: - - compute_pd_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_name - - index_value - user_data_format: - get_input: - - compute_pd_server_user_data_format - - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -171,6 +171,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -186,24 +189,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + feature_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature_template_Vlan_vmi_1 disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -213,9 +213,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -261,27 +267,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +297,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,24 +309,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + feature_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - feature disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +333,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file + dependency_pd_server_pd01_port_0_nested: + - pd_server_pd01_port_0_nested + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ 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/pattern1c1/allConnectivities/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/in/main.yml index d4590c8a4b..662eef8732 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/in/main.yml @@ -196,8 +196,8 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_untr_1_port_2} - - port: {get_resource: vdbe_untr_2_port_2} + - port: {get_resource: vdbe_1_untr_1_port_1} + - port: {get_resource: vdbe_1_untr_2_port_1} vdbe_untr_1_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -294,7 +294,7 @@ resources: - vdbe_untr_1_port_2: + vdbe_1_untr_1_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -344,7 +344,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_untr_2_port_2: + vdbe_1_untr_2_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Port_4 @@ -420,7 +420,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_1_port_2 + get_resource: vdbe_1_untr_1_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/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index b7b6ef9288..0156a9af57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,31 +8,43 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_vdbe_availability_zone: + type: json + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: + compute_vdbe_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + type: string + port_vdbe_untr_1_port_1_network_role: type: string required: true status: SUPPORTED @@ -40,71 +52,67 @@ node_types: type: string required: true status: SUPPORTED - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: float - vm_image_name: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_network_role: - type: string - required: true - status: SUPPORTED - compute_vdbe_metadata: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED @@ -120,6 +128,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vlan1_ip_address: type: list required: true @@ -132,76 +144,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vlan1_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -220,6 +224,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -228,45 +236,37 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED subinterface_vlan1_optional_property_1: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_1_port_vlan_requirements: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true status: SUPPORTED @@ -279,7 +279,7 @@ node_types: entry_schema: type: json attributes: - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode: + vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode: type: string status: SUPPORTED requirements: @@ -297,47 +297,47 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_2_port: + - dependency_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_2_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_untr_1_port_vlan1: + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_1_port: + - dependency_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -366,13 +366,15 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_2_port: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_1_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_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_2_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 @@ -394,47 +396,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_2_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.write.requests.rate_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_1_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_vdbe_vdbe_untr_2_port: + disk.device.latency_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_vdbe_untr_1_port: - type: tosca.capabilities.Node + disk.device.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 - disk.write.bytes.rate_vdbe: + network.incoming.bytes_vdbe_vdbe_untr_1_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.bytes.rate_vdbe_vdbe_untr_1_port: + 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.rate_vdbe_vdbe_untr_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_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: @@ -463,79 +461,83 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: + binding_vdbe_vdbe_untr_1_port_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 + 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.outgoing.bytes_vdbe_vdbe_untr_1_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 - disk.device.allocation_vdbe: + 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 - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_1_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.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 - network.outpoing.packets_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_1_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.requests_vdbe: + network.incoming.packets_vdbe_vdbe_untr_2_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.bytes_vdbe_vdbe_untr_1_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_2_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. + forwarder_vdbe_vdbe_untr_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu.delta_vdbe: + 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.outgoing.packets.rate_vdbe_vdbe_untr_2_port: + cpu.delta_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_1_port: - 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 + forwarder_vdbe_vdbe_untr_2_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.device.read.bytes.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer @@ -555,17 +557,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.Forwarder - 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 + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node + 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. @@ -578,11 +580,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - 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. @@ -595,13 +592,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_2_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.latency_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.packets.rate_vdbe_vdbe_untr_1_port: + network.incoming.bytes_vdbe_vdbe_untr_2_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.outgoing.bytes.rate_vdbe_vdbe_untr_1_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: @@ -626,15 +634,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_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_vdbe_vdbe_untr_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. + feature_vdbe_vdbe_untr_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -644,11 +645,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vdbe_vdbe_untr_2_port_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: - - 1 + - 0 - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem @@ -661,7 +664,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: + network.outgoing.bytes_vdbe_vdbe_untr_2_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: @@ -673,44 +676,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_2_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 - binding_vdbe_vdbe_untr_2_port: - 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 + feature_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - memory_vdbe: + network.incoming.packets_vdbe_vdbe_untr_1_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 - binding_vdbe: - type: tosca.capabilities.network.Bindable + network.incoming.bytes.rate_vdbe_vdbe_untr_1_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.write.bytes_vdbe: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vdbe: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + disk.device.write.bytes_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: @@ -849,4 +849,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/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml index 70051fa4b7..0fe1683c3f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml @@ -471,17 +471,35 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - get_input: vdbe_aap_untrusted_v6_ip_prefix + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: Port 3 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_name: + - Port_2 + - Port_4 subinterface_vlan1_counter: - get_input: counter - get_input: counter @@ -503,6 +521,9 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_mac_address: - get_input: vdbe_hw_untr_mac_1 - get_input: vdbe_hw_untr_mac_1 @@ -515,15 +536,15 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan1_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix - port_vdbe_untr_2_port_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net subinterface_vlan1_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -539,12 +560,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - port_vdbe_untr_2_port_name: - - Port_2 - - Port_4 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_vlan1_vn_network_list: - control_int_net - control_int_net @@ -553,37 +568,22 @@ topology_template: - get_input: untrusted_num_vn subinterface_vlan1_parent_interface: - vdbe_untr_1_port_1 - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 subinterface_vlan1_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode subinterface_vlan1_optional_property_1: - OPTIONAL_VALUE_SUBPORT_1 - null - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: Port 3 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vlan1_optional_property_2: - null - OPTIONAL_VALUE_SUBPORT_2 subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net subinterface_vlan1_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -596,15 +596,15 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_vdbe_untr_2_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -625,4 +625,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
\ No newline at end of file + - vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/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/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml index 3b803ba26b..c316709067 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/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/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml @@ -11,84 +11,91 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: string - compute_vdbe_availability_zone: + type: json + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: + compute_vdbe_availability_zone: type: list required: true entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + type: string + port_vdbe_untr_1_port_1_network_role: type: string required: true vm_flavor_name: type: string required: true - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: type: list required: true entry_schema: - type: float - vm_image_name: - type: string - required: true - port_vdbe_untr_2_port_network_role: - type: string - required: true - compute_vdbe_metadata: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true subinterface_vlan1_mac_address: @@ -101,6 +108,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vlan1_ip_address: type: list required: true @@ -111,63 +121,56 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -183,6 +186,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -190,38 +196,32 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_vlan1_optional_property_1: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_1_port_vlan_requirements: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true entry_schema: @@ -251,50 +251,7 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_2_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_2_port_mac_requirements - order: - get_input: port_vdbe_untr_2_port_order - exCP_naming: - get_input: port_vdbe_untr_2_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_2_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_vdbe_untr_2_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_2_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_2_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_2_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_2_port_network_role - subnetpoolid: - get_input: port_vdbe_untr_2_port_subnetpoolid - name: - get_input: - - port_vdbe_untr_2_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port_vlan1: + vdbe_vdbe_untr_1_port_1_vlan1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 directives: - substitutable @@ -381,45 +338,88 @@ topology_template: requirements: - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_1_port + node: vdbe_vdbe_untr_1_port_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port: + vdbe_vdbe_untr_1_port_1: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_vdbe_untr_1_port_mac_requirements + get_input: port_vdbe_untr_1_port_1_mac_requirements order: - get_input: port_vdbe_untr_1_port_order + get_input: port_vdbe_untr_1_port_1_order exCP_naming: - get_input: port_vdbe_untr_1_port_exCP_naming + get_input: port_vdbe_untr_1_port_1_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs + - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_vdbe_untr_1_port_vlan_requirements + get_input: port_vdbe_untr_1_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_1_port_related_networks + get_input: port_vdbe_untr_1_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_2_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_2_port_1_mac_requirements + order: + get_input: port_vdbe_untr_2_port_1_order + exCP_naming: + get_input: port_vdbe_untr_2_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_2_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_vdbe_untr_2_port_1_related_networks virtual_network_refs: get_input: - - port_vdbe_untr_1_port_virtual_network_refs + - port_vdbe_untr_2_port_1_virtual_network_refs - index_value ip_requirements: - get_input: port_vdbe_untr_1_port_ip_requirements + get_input: port_vdbe_untr_2_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_1_port_network_role_tag + get_input: port_vdbe_untr_2_port_1_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses + - port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses - index_value network_role: - get_input: port_vdbe_untr_1_port_network_role + get_input: port_vdbe_untr_2_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_1_port_subnetpoolid + get_input: port_vdbe_untr_2_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_1_port_name + - port_vdbe_untr_2_port_1_name - index_value requirements: - binding: @@ -427,11 +427,11 @@ topology_template: node: vdbe relationship: tosca.relationships.network.BindsTo outputs: - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode: + vdbe_vdbe_untr_1_port_1_vlan1_aap_address_mode: type: string value: get_attribute: - - vdbe_vdbe_untr_1_port_vlan1 + - vdbe_vdbe_untr_1_port_1_vlan1 - aap_address_mode substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe @@ -448,12 +448,12 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - feature - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outpoing.packets + network.outpoing.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outpoing.packets cpu_util_vdbe: - vdbe - cpu_util @@ -463,30 +463,27 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature + network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.packets.rate disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate - network.incoming.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.packets - feature_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - feature + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes.rate - network.incoming.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes.rate scalable_vdbe: - vdbe - scalable @@ -499,12 +496,9 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.bytes.rate - network.outgoing.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes + binding_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - binding disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -514,27 +508,33 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outpoing.packets + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes disk.read.requests_vdbe: - vdbe - disk.read.requests - network.incoming.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets.rate + network.incoming.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes.rate + forwarder_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - forwarder instance_vdbe: - vdbe - instance cpu.delta_vdbe: - vdbe - cpu.delta - network.outgoing.packets.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.packets.rate - binding_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - binding + forwarder_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - forwarder disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -544,33 +544,36 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - forwarder_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - forwarder disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport cpu_vdbe: - vdbe - cpu disk.write.bytes_vdbe: - vdbe - disk.write.bytes - forwarder_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - forwarder disk.device.usage_vdbe: - vdbe - disk.device.usage disk.device.read.bytes_vdbe: - vdbe - disk.device.read.bytes + feature_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - feature disk.latency_vdbe: - vdbe - disk.latency - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.packets.rate + network.incoming.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -580,36 +583,39 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outpoing.packets - network.incoming.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets + feature_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate - network.incoming.bytes_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.bytes + binding_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - binding os_vdbe: - vdbe - os disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.packets.rate + network.outgoing.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port + network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets.rate + feature_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature + network.incoming.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - network.incoming.bytes.rate - binding_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - binding memory_vdbe: - vdbe - memory @@ -619,12 +625,6 @@ topology_template: disk.device.write.bytes_vdbe: - vdbe - disk.device.write.bytes - network.outgoing.bytes_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.bytes - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_vdbe: - vdbe - disk.device.read.requests.rate @@ -632,30 +632,30 @@ topology_template: - vdbe - disk.read.bytes requirements: - dependency_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + dependency_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - dependency + dependency_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - dependency + dependency_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency - link_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - dependency - dependency_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - dependency - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 + link_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - link + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport - link_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + link_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - link dependency_vdbe: - vdbe - dependency - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ 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/pattern1c1/multiplePortsMultipleVlans/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml index 42b84b7734..59afff7776 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml @@ -139,7 +139,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_untr_vmi_1 + get_resource: vdbe_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -173,8 +173,8 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_1_untr_vmi_1} - - port: {get_resource: vdbe_1_oam_vmi_1} + - port: {get_resource: vdbe_untr_vmi_1} + - port: {get_resource: vdbe_oam_vmi_1} vdbe_node_2: type: OS::Nova::Server properties: @@ -194,9 +194,9 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_1_untr_vmi_2} - - port: {get_resource: vdbe_2_oam_vmi_2} - vdbe_1_untr_vmi_1: + - port: {get_resource: vdbe_1_untr_vmi_1} + - port: {get_resource: vdbe_1_oam_vmi_1} + vdbe_untr_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -246,7 +246,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_1_oam_vmi_1: + vdbe_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Port_2 @@ -292,7 +292,7 @@ resources: - vdbe_1_untr_vmi_2: + vdbe_1_untr_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -342,7 +342,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_2_oam_vmi_2: + vdbe_1_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Port_4 @@ -415,7 +415,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_oam_vmi_1 + get_resource: vdbe_oam_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -462,7 +462,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_untr_vmi_2 + get_resource: vdbe_1_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -508,7 +508,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_2_oam_vmi_2 + get_resource: vdbe_1_oam_vmi_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/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index 51a1003a95..52446f0fb1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,51 +8,57 @@ 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: + subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_v6_ip_prefix: + type: string + port_vdbe_oam_vmi_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_oam_vmi_virtual_machine_interface_mac_addresses: + subinterface_vlan1_vmac_address: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_vmac_address: + type: string + compute_vdbe_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_availability_zone: + port_vdbe_oam_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_vdbe_oam_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_oam_vmi_subnetpoolid: + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_oam_vmi_1_network_role_tag: type: string required: true status: SUPPORTED @@ -72,8 +78,8 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_oam_vmi_network_role_tag: - type: string + port_vdbe_oam_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED compute_vdbe_metadata: @@ -88,34 +94,28 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_oam_vmi_virtual_network_refs: + port_vdbe_untr_vmi_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_vmi_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_oam_vmi_order: + type: string + port_vdbe_untr_vmi_1_order: type: integer required: true status: SUPPORTED - port_vdbe_oam_vmi_vlan_requirements: + port_vdbe_oam_vmi_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_oam_vmi_name: + type: string + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json subinterface_vlan2_ip_address: type: list required: true @@ -128,12 +128,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_network_role: - type: string + port_vdbe_oam_vmi_1_ip_requirements: + type: list required: true status: SUPPORTED - port_vdbe_oam_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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_untr_vmi_1_network_role: + type: string required: true status: SUPPORTED subinterface_vlan2_parent_interface: @@ -148,6 +154,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vlan1_mac_address: type: list required: true @@ -178,29 +188,29 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_name: + compute_vdbe_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_name: + subinterface_vlan2_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: + port_vdbe_oam_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_vlan2_aap_untrusted_ip_prefix: + port_vdbe_untr_vmi_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_vmi_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true status: SUPPORTED @@ -216,6 +226,14 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_oam_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_vmi_1_order: + type: integer + required: true + status: SUPPORTED subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -228,32 +246,16 @@ 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 subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_oam_vmi_network_role: - type: string - required: true - status: SUPPORTED - 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 subinterface_vlan2_vlan_tag_list: type: list required: true @@ -272,14 +274,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_oam_vmi_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_oam_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_vlan1_service_template_filter_count: @@ -294,10 +290,6 @@ node_types: status: SUPPORTED entry_schema: type: float - port_vdbe_untr_vmi_order: - type: integer - required: true - status: SUPPORTED subinterface_vlan1_parent_interface: type: list required: true @@ -336,36 +328,44 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_ip_requirements: + type: list required: true status: SUPPORTED - subinterface_vlan2_service_template_filter_count: + 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: float - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: json + port_vdbe_oam_vmi_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_oam_vmi_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan2_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_vlan_requirements: + type: float + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_oam_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + type: string + port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_oam_vmi_1_network_role: + type: string required: true status: SUPPORTED subinterface_vlan1_vlan_tag_list: @@ -375,6 +375,19 @@ node_types: entry_schema: type: json requirements: + - dependency_vdbe_vdbe_untr_vmi_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_vdbe_untr_vmi_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -389,85 +402,71 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_vmi_vlan1: + - dependency_vdbe_vdbe_oam_vmi_1_vlan2: 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_vlan1: + - dependency_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: 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_vlan1: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_vmi: + - dependency_vdbe_vdbe_untr_vmi_1_vlan1: 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_oam_vmi: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_oam_vmi: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_oam_vmi_vlan2: + - dependency_vdbe_vdbe_oam_vmi_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - link_vdbe_vdbe_oam_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - feature_vdbe_vdbe_oam_vmi: + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_oam_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_oam_vmi_1_vlan2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - 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: @@ -484,6 +483,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_vdbe_vdbe_oam_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 endpoint_vdbe: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -495,18 +500,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_oam_vmi_vlan2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - cpu_util_vdbe: + 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 - network.incoming.bytes.rate_vdbe_vdbe_oam_vmi: + cpu_util_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: @@ -524,8 +524,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_vmi: - type: tosca.capabilities.Node + network.outgoing.bytes_vdbe_vdbe_oam_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 @@ -547,8 +548,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - type: tosca.capabilities.Node + 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 @@ -575,8 +577,8 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_oam_vmi: - type: org.openecomp.capabilities.Forwarder + feature_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -586,11 +588,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -603,39 +600,47 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_vdbe: + forwarder_vdbe_vdbe_oam_vmi_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vdbe_vdbe_oam_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.packets.rate_vdbe_vdbe_oam_vmi: + 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 - network.incoming.packets_vdbe_vdbe_oam_vmi: + network.outgoing.bytes.rate_vdbe_vdbe_oam_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 - instance_vdbe: + feature_vdbe_vdbe_oam_vmi_1: + type: tosca.capabilities.Node + 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 - binding_vdbe_vdbe_oam_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 + network.outpoing.packets_vdbe_vdbe_oam_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: - - 0 + - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_vmi: + 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: @@ -647,6 +652,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_vdbe_vdbe_oam_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 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. @@ -665,80 +678,72 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_vdbe_vdbe_untr_vmi: + 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 - disk.write.requests.rate_vdbe: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: + disk.write.bytes_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 - cpu_vdbe: + network.incoming.bytes.rate_vdbe_vdbe_oam_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.write.bytes_vdbe: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_oam_vmi: + disk.device.read.bytes_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 - network.outgoing.bytes.rate_vdbe_vdbe_oam_vmi: + disk.latency_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.device.usage_vdbe: + 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 - disk.device.read.bytes_vdbe: + 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 - disk.latency_vdbe: + network.incoming.packets.rate_vdbe_vdbe_oam_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_vlan1: - type: tosca.capabilities.Node + forwarder_vdbe_vdbe_untr_vmi_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: + 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: @@ -763,9 +768,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_oam_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 @@ -775,13 +779,12 @@ 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_vlan1: + 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: @@ -792,10 +795,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_vmi: - type: org.openecomp.capabilities.Forwarder + 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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_vdbe: type: org.openecomp.capabilities.metric.Ceilometer @@ -803,19 +809,13 @@ node_types: 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. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_oam_vmi: + network.incoming.bytes_vdbe_vdbe_oam_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_vdbe_vdbe_untr_vmi: + 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. occurrences: @@ -1073,4 +1073,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/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index 226d35e920..dc1bb1e431 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -486,15 +486,15 @@ topology_template: subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix - port_vdbe_oam_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_vmac_address: - get_input: vdbe_untrusted_vmac_address - get_input: vdbe_untrusted_vmac_address compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 + port_vdbe_oam_vmi_1_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net vm_flavor_name: get_input: vdbe_flavor_name subinterface_vlan1_counter: @@ -521,12 +521,27 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - port_vdbe_oam_vmi_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net - port_vdbe_oam_vmi_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_1 + - str_replace: + template: Port 3 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_oam_vmi_1_name: - Port_2 - Port_4 + port_vdbe_untr_vmi_1_virtual_network_refs: + - - control_int_net + - - control_int_net subinterface_vlan2_ip_address: - get_input: vdbe_untrusted_ip_1 - get_input: vdbe_untrusted_ip_1 @@ -534,8 +549,8 @@ topology_template: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan2_parent_interface: + - vdbe_oam_vmi_1 - vdbe_1_oam_vmi_1 - - vdbe_2_oam_vmi_2 subinterface_vlan2_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -554,21 +569,6 @@ topology_template: subinterface_vlan2_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix - port_vdbe_untr_vmi_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: Port 3 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 @@ -587,9 +587,6 @@ topology_template: subinterface_vlan2_vn_network_list: - fabric_int_net - fabric_int_net - port_vdbe_untr_vmi_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -605,9 +602,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - port_vdbe_untr_vmi_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_vlan2_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -624,8 +618,8 @@ topology_template: - get_input: counter - get_input: counter subinterface_vlan1_parent_interface: + - vdbe_untr_vmi_1 - vdbe_1_untr_vmi_1 - - vdbe_1_untr_vmi_2 subinterface_vlan1_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -650,12 +644,18 @@ topology_template: subinterface_vlan2_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan2_service_template_filter_count: - 5 - 5 subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -668,15 +668,15 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_vmi: + - link_vdbe_vdbe_untr_vmi_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_vdbe_oam_vmi: + - link_vdbe_vdbe_oam_vmi_1: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml index 196ba8fdd6..9406e5cb10 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml @@ -11,29 +11,21 @@ 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_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_oam_vmi_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_vdbe_oam_vmi_virtual_machine_interface_mac_addresses: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: - type: json + type: string subinterface_vlan1_vmac_address: type: list required: true @@ -44,10 +36,23 @@ topology_template: required: true entry_schema: type: string + port_vdbe_oam_vmi_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_vdbe_oam_vmi_1_virtual_network_refs: + type: list + required: true + entry_schema: + type: json vm_flavor_name: type: string required: true - port_vdbe_oam_vmi_subnetpoolid: + port_vdbe_untr_vmi_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_vdbe_oam_vmi_1_network_role_tag: type: string required: true subinterface_vlan1_counter: @@ -63,8 +68,8 @@ topology_template: vm_image_name: type: string required: true - port_vdbe_oam_vmi_network_role_tag: - type: string + port_vdbe_oam_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true compute_vdbe_metadata: type: list @@ -76,29 +81,24 @@ topology_template: required: true entry_schema: type: string - port_vdbe_oam_vmi_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_vmi_ip_requirements: + port_vdbe_untr_vmi_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_oam_vmi_order: + type: string + port_vdbe_untr_vmi_1_order: type: integer required: true - port_vdbe_oam_vmi_vlan_requirements: + port_vdbe_oam_vmi_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_oam_vmi_name: + type: string + port_vdbe_untr_vmi_1_virtual_network_refs: type: list required: true entry_schema: - type: string + type: json subinterface_vlan2_ip_address: type: list required: true @@ -109,11 +109,16 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_network_role: - type: string + port_vdbe_oam_vmi_1_ip_requirements: + type: list required: true - port_vdbe_oam_vmi_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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_untr_vmi_1_network_role: + type: string required: true subinterface_vlan2_parent_interface: type: list @@ -125,6 +130,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_vmi_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vlan1_mac_address: type: list required: true @@ -150,25 +158,25 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_vmi_name: + compute_vdbe_name: type: list required: true entry_schema: type: string - compute_vdbe_name: + subinterface_vlan2_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_vmi_subnetpoolid: + port_vdbe_oam_vmi_1_subnetpoolid: type: string required: true - subinterface_vlan2_aap_untrusted_ip_prefix: + port_vdbe_untr_vmi_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_vdbe_untr_vmi_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_vmi_1_subnetpoolid: type: string required: true subinterface_vlan1_ip_v6_address: @@ -181,6 +189,12 @@ topology_template: required: true entry_schema: type: string + port_vdbe_oam_vmi_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + port_vdbe_oam_vmi_1_order: + type: integer + required: true subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -191,27 +205,14 @@ 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 subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_oam_vmi_network_role: - type: string - required: true - 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 subinterface_vlan2_vlan_tag_list: type: list required: true @@ -227,13 +228,8 @@ topology_template: required: true entry_schema: type: string - port_vdbe_oam_vmi_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_oam_vmi_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_vmi_1_network_role_tag: + type: string required: true subinterface_vlan1_service_template_filter_count: type: list @@ -245,9 +241,6 @@ topology_template: required: true entry_schema: type: float - port_vdbe_untr_vmi_order: - type: integer - required: true subinterface_vlan1_parent_interface: type: list required: true @@ -280,9 +273,21 @@ topology_template: required: true entry_schema: type: string - 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 + port_vdbe_oam_vmi_1_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_vlan2_service_template_filter_count: type: list required: true @@ -293,18 +298,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_oam_vmi_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_vmi_vlan_requirements: + port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_oam_vmi_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + type: json + port_vdbe_oam_vmi_1_network_role: + type: string required: true subinterface_vlan1_vlan_tag_list: type: list @@ -312,6 +312,49 @@ topology_template: entry_schema: type: json 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: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe properties: @@ -331,296 +374,253 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_vmi_vlan1: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 + vdbe_vdbe_oam_vmi_1_vlan2: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan2 directives: - substitutable properties: aap_untrusted_ip_prefix: get_input: - - subinterface_vlan1_aap_untrusted_ip_prefix + - subinterface_vlan2_aap_untrusted_ip_prefix - index_value aap_sec_untrusted_ip_prefix: get_input: - - subinterface_vlan1_aap_sec_untrusted_ip_prefix + - subinterface_vlan2_aap_sec_untrusted_ip_prefix - index_value ip_v6_address: get_input: - - subinterface_vlan1_ip_v6_address + - subinterface_vlan2_ip_v6_address - index_value counter: get_input: - - subinterface_vlan1_counter + - subinterface_vlan2_counter - index_value ip_address: get_input: - - subinterface_vlan1_ip_address + - subinterface_vlan2_ip_address - index_value subinterfaces_name_prefix: get_input: - - subinterface_vlan1_subinterfaces_name_prefix + - subinterface_vlan2_subinterfaces_name_prefix - index_value aap_address_mode: get_input: - - subinterface_vlan1_aap_address_mode + - subinterface_vlan2_aap_address_mode - index_value service_template_filter: count: get_input: - - subinterface_vlan1_service_template_filter_count + - subinterface_vlan2_service_template_filter_count - index_value - substitute_service_template: vlan1ServiceTemplate.yaml - mandatory: false + substitute_service_template: vlan2ServiceTemplate.yaml + mandatory: true aap_untrusted_v6_ip_prefix: get_input: - - subinterface_vlan1_aap_untrusted_v6_ip_prefix + - subinterface_vlan2_aap_untrusted_v6_ip_prefix - index_value parent_interface: get_input: - - subinterface_vlan1_parent_interface + - subinterface_vlan2_parent_interface - index_value vn_network_list: get_input: - - subinterface_vlan1_vn_network_list + - subinterface_vlan2_vn_network_list - index_value mac_address: get_input: - - subinterface_vlan1_mac_address + - subinterface_vlan2_mac_address - index_value vlan_tag_list: get_input: - - subinterface_vlan1_vlan_tag_list + - subinterface_vlan2_vlan_tag_list - index_value aap_sec_untrusted_ip_prefix_len: get_input: - - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len + - subinterface_vlan2_aap_sec_untrusted_ip_prefix_len - index_value vmac_address: get_input: - - subinterface_vlan1_vmac_address + - subinterface_vlan2_vmac_address - index_value aap_untrusted_v6_ip_prefix_len: get_input: - - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len + - subinterface_vlan2_aap_untrusted_v6_ip_prefix_len - index_value aap_untrusted_ip_prefix_len: get_input: - - subinterface_vlan1_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 - 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_oam_vmi: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_oam_vmi_mac_requirements - order: - get_input: port_vdbe_oam_vmi_order - exCP_naming: - get_input: port_vdbe_oam_vmi_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_oam_vmi_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_oam_vmi_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_oam_vmi_related_networks - virtual_network_refs: - get_input: - - port_vdbe_oam_vmi_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_oam_vmi_ip_requirements - network_role_tag: - get_input: port_vdbe_oam_vmi_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_oam_vmi_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_oam_vmi_network_role - subnetpoolid: - get_input: port_vdbe_oam_vmi_subnetpoolid - name: - get_input: - - port_vdbe_oam_vmi_name + - subinterface_vlan2_aap_untrusted_ip_prefix_len - index_value requirements: - - binding: + - binding_vdbe_1_subint_oam_vmi_1: capability: tosca.capabilities.network.Bindable - node: vdbe + node: vdbe_vdbe_oam_vmi_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_oam_vmi_vlan2: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan2 + vdbe_vdbe_untr_vmi_1_vlan1: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 directives: - substitutable properties: aap_untrusted_ip_prefix: get_input: - - subinterface_vlan2_aap_untrusted_ip_prefix + - subinterface_vlan1_aap_untrusted_ip_prefix - index_value aap_sec_untrusted_ip_prefix: get_input: - - subinterface_vlan2_aap_sec_untrusted_ip_prefix + - subinterface_vlan1_aap_sec_untrusted_ip_prefix - index_value ip_v6_address: get_input: - - subinterface_vlan2_ip_v6_address + - subinterface_vlan1_ip_v6_address - index_value counter: get_input: - - subinterface_vlan2_counter + - subinterface_vlan1_counter - index_value ip_address: get_input: - - subinterface_vlan2_ip_address + - subinterface_vlan1_ip_address - index_value subinterfaces_name_prefix: get_input: - - subinterface_vlan2_subinterfaces_name_prefix + - subinterface_vlan1_subinterfaces_name_prefix - index_value aap_address_mode: get_input: - - subinterface_vlan2_aap_address_mode + - subinterface_vlan1_aap_address_mode - index_value service_template_filter: count: get_input: - - subinterface_vlan2_service_template_filter_count + - subinterface_vlan1_service_template_filter_count - index_value - substitute_service_template: vlan2ServiceTemplate.yaml - mandatory: true + substitute_service_template: vlan1ServiceTemplate.yaml + mandatory: false aap_untrusted_v6_ip_prefix: get_input: - - subinterface_vlan2_aap_untrusted_v6_ip_prefix + - subinterface_vlan1_aap_untrusted_v6_ip_prefix - index_value parent_interface: get_input: - - subinterface_vlan2_parent_interface + - subinterface_vlan1_parent_interface - index_value vn_network_list: get_input: - - subinterface_vlan2_vn_network_list + - subinterface_vlan1_vn_network_list - index_value mac_address: get_input: - - subinterface_vlan2_mac_address + - subinterface_vlan1_mac_address - index_value vlan_tag_list: get_input: - - subinterface_vlan2_vlan_tag_list + - subinterface_vlan1_vlan_tag_list - index_value aap_sec_untrusted_ip_prefix_len: get_input: - - subinterface_vlan2_aap_sec_untrusted_ip_prefix_len + - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len - index_value vmac_address: get_input: - - subinterface_vlan2_vmac_address + - subinterface_vlan1_vmac_address - index_value aap_untrusted_v6_ip_prefix_len: get_input: - - subinterface_vlan2_aap_untrusted_v6_ip_prefix_len + - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len - index_value aap_untrusted_ip_prefix_len: get_input: - - subinterface_vlan2_aap_untrusted_ip_prefix_len + - subinterface_vlan1_aap_untrusted_ip_prefix_len - index_value requirements: - - binding_vdbe_1_subint_oam_vmi_1: + - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_oam_vmi + node: vdbe_vdbe_untr_vmi_1 + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_oam_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_oam_vmi_1_mac_requirements + order: + get_input: port_vdbe_oam_vmi_1_order + exCP_naming: + get_input: port_vdbe_oam_vmi_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_oam_vmi_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_oam_vmi_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_oam_vmi_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_oam_vmi_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_oam_vmi_1_ip_requirements + network_role_tag: + get_input: port_vdbe_oam_vmi_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_oam_vmi_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_oam_vmi_1_network_role + subnetpoolid: + get_input: port_vdbe_oam_vmi_1_subnetpoolid + name: + get_input: + - port_vdbe_oam_vmi_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: - feature_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 + - feature_vdbe_0_subint_untr_vmi_0 + feature_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 - feature - network.incoming.bytes_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.incoming.bytes - 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 feature_vdbe: - vdbe - feature disk.device.iops_vdbe: - vdbe - disk.device.iops + network.outgoing.packets.rate_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.outgoing.packets.rate endpoint_vdbe: - vdbe - endpoint disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - feature + network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes.rate cpu_util_vdbe: - vdbe - cpu_util - network.incoming.bytes.rate_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.incoming.bytes.rate vcpus_vdbe: - vdbe - vcpus disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - feature + network.outgoing.bytes_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.outgoing.bytes disk.device.latency_vdbe: - vdbe - disk.device.latency @@ -630,9 +630,9 @@ topology_template: disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - feature_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - feature_vdbe_1_subint_oam_vmi_1 + network.incoming.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.packets scalable_vdbe: - vdbe - scalable @@ -645,42 +645,48 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - forwarder_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - forwarder + feature_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 + - feature_vdbe_1_subint_oam_vmi_1 disk.device.allocation_vdbe: - vdbe - disk.device.allocation - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - feature_vdbe_0_subint_untr_vmi_0 disk.usage_vdbe: - vdbe - disk.usage memory.usage_vdbe: - vdbe - memory.usage + forwarder_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - forwarder + network.incoming.packets_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.incoming.packets disk.read.requests_vdbe: - vdbe - disk.read.requests - network.outgoing.packets.rate_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.outgoing.packets.rate - network.incoming.packets_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.incoming.packets + network.outgoing.bytes.rate_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.outgoing.bytes.rate + feature_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - feature + network.outpoing.packets_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outpoing.packets + network.outpoing.packets_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.outpoing.packets instance_vdbe: - vdbe - instance - binding_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - binding - network.outpoing.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outpoing.packets cpu.delta_vdbe: - vdbe - cpu.delta + binding_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - binding disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -690,30 +696,18 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - network.incoming.packets_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.packets disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.incoming.bytes.rate cpu_vdbe: - vdbe - cpu disk.write.bytes_vdbe: - vdbe - disk.write.bytes - network.incoming.packets.rate_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.incoming.packets.rate - binding_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - binding - network.outgoing.bytes.rate_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.outgoing.bytes.rate + network.incoming.bytes.rate_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.incoming.bytes.rate disk.device.usage_vdbe: - vdbe - disk.device.usage @@ -723,12 +717,21 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - feature_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - feature - network.outgoing.bytes.rate_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes.rate + network.outgoing.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.outgoing.bytes + network.incoming.bytes.rate_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.incoming.packets.rate + 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 @@ -738,36 +741,33 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.outpoing.packets + feature_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate - 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_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 + - feature + network.incoming.bytes_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 - network.incoming.bytes os_vdbe: - vdbe - os - forwarder_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - forwarder + binding_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - binding disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests + network.incoming.bytes_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - network.incoming.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.outgoing.bytes_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - network.outgoing.bytes - network.outgoing.bytes_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - network.outgoing.bytes memory_vdbe: - vdbe - memory @@ -784,39 +784,39 @@ topology_template: - vdbe - disk.read.bytes requirements: - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - subinterface_link_vdbe_0_subint_untr_vmi_0 - link_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - link - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - dependency_vdbe_0_subint_untr_vmi_0 - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - subinterface_link_vdbe_1_subint_oam_vmi_1 - dependency_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi + dependency_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 - dependency - link_vdbe_vdbe_oam_vmi: - - vdbe_vdbe_oam_vmi - - link - dependency_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 + dependency_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - dependency + subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 + - subinterface_link_vdbe_1_subint_oam_vmi_1 + dependency_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 - dependency local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_vmi: - - vdbe_vdbe_untr_vmi - - dependency - dependency_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 + link_vdbe_vdbe_untr_vmi_1: + - vdbe_vdbe_untr_vmi_1 + - link + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 + - dependency_vdbe_0_subint_untr_vmi_0 + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_1_vlan1: + - vdbe_vdbe_untr_vmi_1_vlan1 + - subinterface_link_vdbe_0_subint_untr_vmi_0 + dependency_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 - dependency - dependency_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - dependency_vdbe_1_subint_oam_vmi_1 + link_vdbe_vdbe_oam_vmi_1: + - vdbe_vdbe_oam_vmi_1 + - link dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency + dependency_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_1_vlan2: + - vdbe_vdbe_oam_vmi_1_vlan2 + - dependency_vdbe_1_subint_oam_vmi_1
\ 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/pattern1c1/onePortVlanSameType/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/in/main.yml index 3bf6d050ff..486a0f8bf0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/in/main.yml @@ -154,7 +154,7 @@ resources: name: get_param: vdbe_name_2 networks: - - port: {get_resource: vdbe_untr_port_2} + - port: {get_resource: vdbe_1_untr_port_1} vdbe_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -198,7 +198,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_untr_port_2: + vdbe_1_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Untr_Port_2 @@ -317,7 +317,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_port_2 + get_resource: vdbe_1_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/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index f1fc7d9e85..3a0a9ff451 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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,8 +26,8 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED compute_vdbe_availability_zone: @@ -52,12 +48,28 @@ 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_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_port_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: @@ -66,12 +78,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: @@ -104,32 +116,42 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED subinterface_nested_ip_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + 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 @@ -150,28 +172,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 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -196,76 +202,63 @@ 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: + port_vdbe_untr_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json 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_untr_x_int_vmi_subport_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_untr_x_int_vmi_subport_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_untr_x_int_vmi_subport_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_untr_x_int_vmi_subport_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 @@ -274,11 +267,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - 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. @@ -296,11 +284,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -331,13 +314,29 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: + type: tosca.capabilities.Node + 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: @@ -360,37 +359,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: @@ -402,12 +401,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 @@ -415,13 +409,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: @@ -451,11 +451,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. @@ -492,12 +487,6 @@ 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. - 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. @@ -517,17 +506,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. @@ -569,12 +575,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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml index dda3d09c8d..562d5fc9a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml @@ -488,7 +488,7 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_port_1 - - vdbe_untr_port_2 + - vdbe_1_untr_port_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -504,8 +504,14 @@ topology_template: subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_name: + - Untr_Port_1 + - Untr_Port_2 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -539,9 +545,6 @@ topology_template: subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 - get_input: vdbe_untrusted_ip_1 - port_vdbe_untr_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -551,12 +554,6 @@ topology_template: subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - Untr_Port_1 - - Untr_Port_2 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len - get_input: vdbe_aap_untrusted_ip_prefix_len @@ -584,6 +581,9 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_2 + port_vdbe_untr_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 2 @@ -593,7 +593,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -606,4 +606,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe + - abstract_vdbe
\ 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/pattern1c1/onePortVlanSameType/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/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml index 1e55c60396..66aa427c11 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/pattern1c1/onePortVlanSameType/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,8 +26,8 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true compute_vdbe_availability_zone: type: list @@ -47,23 +44,36 @@ 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_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + 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 @@ -89,27 +99,35 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true subinterface_nested_ip_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true entry_schema: - type: json + 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 @@ -127,24 +145,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 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -165,80 +170,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 - port_vdbe_untr_port_ip_requirements: + port_vdbe_untr_port_1_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json 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.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements - order: - get_input: port_vdbe_untr_port_order - exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_mac_addresses - - index_value - 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 @@ -317,23 +255,79 @@ topology_template: requirements: - binding_vdbe_untr_x_int_vmi_subport: 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.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + 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 + virtual_network_refs: + get_input: + - port_vdbe_untr_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses + - index_value + 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 disk.device.iops_vdbe: - vdbe - disk.device.iops @@ -343,9 +337,6 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature_vdbe_untr_x_int_vmi_subport cpu_util_vdbe: - vdbe - cpu_util @@ -361,12 +352,21 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature_vdbe_untr_x_int_vmi_subport + 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 @@ -376,9 +376,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 @@ -388,27 +394,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 @@ -421,9 +421,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 @@ -442,9 +439,6 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes disk.capacity_vdbe: - vdbe - disk.capacity @@ -454,12 +448,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 @@ -481,28 +484,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_nested: + - vdbe_vdbe_untr_port_1_nested - dependency - dependency_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency_vdbe_untr_x_int_vmi_subport - link_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_1: + - vdbe_vdbe_untr_port_1 - link + dependency_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency_vdbe_untr_x_int_vmi_subport local_storage_vdbe: - vdbe - local_storage - subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested + subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested - subinterface_link_vdbe_untr_x_int_vmi_subport - dependency_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency dependency_vdbe: - vdbe - dependency
\ 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/pattern1c1/optionalPropertiesConsolidation/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml index 47280fa625..5f49fce709 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/in/main.yml @@ -1,473 +1,473 @@ -heat_template_version: 2013-05-23
-
-description: >
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
-
-parameters:
- aap_address_mode:
- description: "Address mode for the vDBE cluster IP"
- type: string
- control_int_net_forwarding_mode:
- description: "forwarding mode of the control virtual network"
- type: string
- control_int_net_rpf:
- description: "Reverse Path Filtering enable or disable for the control virtual network"
- type: string
- control_int_net_shared:
- description: "control virtual network shared"
- type: boolean
- control_int_net_flood_unknown_unicast:
- description: "forwarding mode of the control virtual network"
- type: boolean
- fabric_int_net_flood_unknown_unicast:
- description: "forwarding mode of the fabric virtual network"
- type: boolean
- fabric_int_net_forwarding_mode:
- description: "forwarding mode of the fabric virtual network"
- type: string
- fabric_int_net_rpf:
- description: "Reverse Path Filtering enable or disable for the fabric virtual network"
- type: string
- fabric_int_net_shared:
- description: "fabric virtual network shared"
- oam_net_name:
- description: "Name of NSDNet network from which the management IP addresses will be allocated"
- type: string
- untrusted_net_name:
- description: "Name of public untrusted network into which this vDBE HA cluster is deployed"
- type: string
- untrusted_num_vn:
- constraints:
- -
- range:
- max: 77
- min: 1
- description: "Number of vDBE subinterface virtual Networks"
- type: number
- untrusted_vlan_tags:
- description: "List of subinterface vlan tags"
- type: comma_delimited_list
- untrusted_vn_networks:
- description: "List of subinterface virtual networks"
- type: comma_delimited_list
- vdbe_aap_sec_untrusted_ip_prefix:
- description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network"
- type: string
- vdbe_aap_sec_untrusted_ip_prefix_len:
- description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network"
- type: string
- vdbe_aap_untrusted_ip_prefix:
- description: "ip prefix for primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_aap_untrusted_ip_prefix_len:
- description: "ip prefix length for the primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_aap_untrusted_v6_ip_prefix:
- description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_aap_untrusted_v6_ip_prefix_len:
- description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_device_name:
- description: "VDBE device Name for this vdbe VNF"
- type: string
- vdbe_hw_untr_mac_1:
- description: "Secondary MAC address of the secondary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_name_1:
- description: "VM Name for this vdbe node 1"
- type: string
- vdbe_untrusted_ip_1:
- description: "IPV4 address of the secondary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_untrusted_v6_ip_1:
- description: "IPV6 address of the secondary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_untrusted_vmac_address:
- description: "Virtual MAC of the primary vDBE VM on the VAN untrusted network"
- type: string
- vdbe_flavor_name:
- description: "Flavor to use for vDBE"
- type: string
- vdbe_image_name:
- description: "Image to use for vDBE"
- type: string
- vnf_id:
- description: "Unique ID for this VF inst"
- type: string
- vnf_name:
- description: "Unique name for this VF instance"
- type: string
- vf_module_id:
- description: "Unique ID for this VF module inst"
- type: string
- availability_zone_1:
- description: "The availability zone of secondary node1 vDBE vm in the local HA pair."
- type: string
- counter:
- description: "Counter."
- type: number
-resources:
- vdbe_untr_1_subports:
- type: OS::Heat::ResourceGroup
- properties:
- count:
- get_param: untrusted_num_vn
- resource_def:
- type: vlan1.yml
- properties:
- aap_address_mode:
- get_param: aap_address_mode
- aap_sec_untrusted_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- aap_sec_untrusted_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- aap_untrusted_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- aap_untrusted_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- aap_untrusted_v6_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- aap_untrusted_v6_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- counter:
- get_param: counter
- ip_address:
- get_param: vdbe_untrusted_ip_1
- ip_v6_address:
- get_param: vdbe_untrusted_v6_ip_1
- mac_address:
- get_param: vdbe_hw_untr_mac_1
- parent_interface:
- get_resource: vdbe_untr_1_port_1
- subinterfaces_name_prefix:
- str_replace:
- params:
- DBE:
- get_param: vdbe_device_name
- VM_NAME:
- get_param: vdbe_name_1
- template: VM_NAMEDBE001p1n004
- vlan_tag_list:
- get_param: untrusted_vlan_tags
- vmac_address:
- get_param: vdbe_untrusted_vmac_address
- vn_network_list:
- get_param: untrusted_vn_networks
- optional_property_1: OPTIONAL_VALUE_SUBPORT_1
- vdbe_node_1:
- type: OS::Nova::Server
- properties:
- availability_zone:
- get_param: availability_zone_1
- flavor:
- get_param: vdbe_flavor_name
- image:
- get_param: vdbe_image_name
- metadata:
- vf_module_id:
- get_param: vf_module_id
- vnf_id:
- get_param: vnf_id
- vnf_name:
- get_param: vnf_name
- name:
- get_param: vdbe_name_1
- networks:
- - port: {get_resource: vdbe_untr_1_port_1}
- - port: {get_resource: vdbe_untr_2_port_1}
- vdbe_node_2:
- type: OS::Nova::Server
- properties:
- availability_zone:
- get_param: availability_zone_1
- flavor:
- get_param: vdbe_flavor_name
- image:
- get_param: vdbe_image_name
- metadata:
- vf_module_id:
- get_param: vf_module_id
- vnf_id:
- get_param: vnf_id
- vnf_name:
- get_param: vnf_name
- name:
- get_param: vdbe_name_1
- networks:
- - port: {get_resource: vdbe_untr_1_port_2}
- - port: {get_resource: vdbe_untr_2_port_2}
- vdbe_untr_1_port_1:
- type: OS::ContrailV2::VirtualMachineInterface
- properties:
- name:
- str_replace:
- params:
- DBE:
- get_param: vdbe_device_name
- VM_NAME:
- get_param: vdbe_name_1
- template: VM_NAMEDBE001p1n004
- virtual_machine_interface_allowed_address_pairs:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_hw_untr_mac_1
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- virtual_machine_interface_mac_addresses:
- virtual_machine_interface_mac_addresses_mac_address:
- -
- get_param: vdbe_hw_untr_mac_1
- virtual_network_refs:
- -
- get_resource: control_int_net
- vdbe_untr_2_port_1:
- type: OS::ContrailV2::VirtualMachineInterface
- properties:
- name: Port_2
- virtual_machine_interface_allowed_address_pairs:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_hw_untr_mac_1
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- virtual_machine_interface_mac_addresses:
- virtual_machine_interface_mac_addresses_mac_address:
- -
- get_param: vdbe_hw_untr_mac_1
- virtual_network_refs:
- -
- get_resource: fabric_int_net
-
-
-
- vdbe_untr_1_port_2:
- type: OS::ContrailV2::VirtualMachineInterface
- properties:
- name:
- str_replace:
- params:
- DBE:
- get_param: vdbe_device_name
- VM_NAME:
- get_param: vdbe_name_1
- template: Port 3
- virtual_machine_interface_allowed_address_pairs:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_hw_untr_mac_1
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- virtual_machine_interface_mac_addresses:
- virtual_machine_interface_mac_addresses_mac_address:
- -
- get_param: vdbe_hw_untr_mac_1
- virtual_network_refs:
- -
- get_resource: control_int_net
- vdbe_untr_2_port_2:
- type: OS::ContrailV2::VirtualMachineInterface
- properties:
- name: Port_4
- virtual_machine_interface_allowed_address_pairs:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair:
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_hw_untr_mac_1
- -
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:
- get_param: aap_address_mode
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:
- get_param: vdbe_untrusted_vmac_address
- virtual_machine_interface_mac_addresses:
- virtual_machine_interface_mac_addresses_mac_address:
- -
- get_param: vdbe_hw_untr_mac_1
- virtual_network_refs:
- -
- get_resource: fabric_int_net
-
- vdbe_untr_2_subports:
- type: OS::Heat::ResourceGroup
- properties:
- count:
- get_param: untrusted_num_vn
- resource_def:
- type: vlan1.yml
- properties:
- aap_address_mode:
- get_param: aap_address_mode
- aap_sec_untrusted_ip_prefix:
- get_param: vdbe_aap_sec_untrusted_ip_prefix
- aap_sec_untrusted_ip_prefix_len:
- get_param: vdbe_aap_sec_untrusted_ip_prefix_len
- aap_untrusted_ip_prefix:
- get_param: vdbe_aap_untrusted_ip_prefix
- aap_untrusted_ip_prefix_len:
- get_param: vdbe_aap_untrusted_ip_prefix_len
- aap_untrusted_v6_ip_prefix:
- get_param: vdbe_aap_untrusted_v6_ip_prefix
- aap_untrusted_v6_ip_prefix_len:
- get_param: vdbe_aap_untrusted_v6_ip_prefix_len
- counter:
- get_param: counter
- ip_address:
- get_param: vdbe_untrusted_ip_1
- ip_v6_address:
- get_param: vdbe_untrusted_v6_ip_1
- mac_address:
- get_param: vdbe_hw_untr_mac_1
- parent_interface:
- get_resource: vdbe_untr_1_port_2
- subinterfaces_name_prefix:
- str_replace:
- params:
- DBE:
- get_param: vdbe_device_name
- VM_NAME:
- get_param: vdbe_name_1
- template: VM_NAMEDBE001p1n004
- vlan_tag_list:
- get_param: untrusted_vlan_tags
- vmac_address:
- get_param: vdbe_untrusted_vmac_address
- vn_network_list:
- get_param: untrusted_vn_networks
- optional_property_2: OPTIONAL_VALUE_SUBPORT_2
-
- control_int_net:
- type: OS::ContrailV2::VirtualNetwork
- properties:
- flood_unknown_unicast:
- get_param: control_int_net_flood_unknown_unicast
- is_shared:
- get_param: control_int_net_shared
- name:
- str_replace:
- params:
- VNF_NAME:
- get_param: vnf_name
- template: VNF_NAME_control_net
- virtual_network_properties:
- virtual_network_properties_forwarding_mode:
- get_param: control_int_net_forwarding_mode
- virtual_network_properties_rpf:
- get_param: control_int_net_rpf
- fabric_int_net:
- type: OS::ContrailV2::VirtualNetwork
- properties:
- flood_unknown_unicast:
- get_param: fabric_int_net_flood_unknown_unicast
- is_shared:
- get_param: fabric_int_net_shared
- name:
- str_replace:
- params:
- VNF_NAME:
- get_param: vnf_name
- template: template-fabric-int
- virtual_network_properties:
- virtual_network_properties_forwarding_mode:
- get_param: fabric_int_net_forwarding_mode
- virtual_network_properties_rpf:
- get_param: fabric_int_net_rpf
\ No newline at end of file +heat_template_version: 2013-05-23 + +description: > + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + +parameters: + aap_address_mode: + description: "Address mode for the vDBE cluster IP" + type: string + control_int_net_forwarding_mode: + description: "forwarding mode of the control virtual network" + type: string + control_int_net_rpf: + description: "Reverse Path Filtering enable or disable for the control virtual network" + type: string + control_int_net_shared: + description: "control virtual network shared" + type: boolean + control_int_net_flood_unknown_unicast: + description: "forwarding mode of the control virtual network" + type: boolean + fabric_int_net_flood_unknown_unicast: + description: "forwarding mode of the fabric virtual network" + type: boolean + fabric_int_net_forwarding_mode: + description: "forwarding mode of the fabric virtual network" + type: string + fabric_int_net_rpf: + description: "Reverse Path Filtering enable or disable for the fabric virtual network" + type: string + fabric_int_net_shared: + description: "fabric virtual network shared" + oam_net_name: + description: "Name of NSDNet network from which the management IP addresses will be allocated" + type: string + untrusted_net_name: + description: "Name of public untrusted network into which this vDBE HA cluster is deployed" + type: string + untrusted_num_vn: + constraints: + - + range: + max: 77 + min: 1 + description: "Number of vDBE subinterface virtual Networks" + type: number + untrusted_vlan_tags: + description: "List of subinterface vlan tags" + type: comma_delimited_list + untrusted_vn_networks: + description: "List of subinterface virtual networks" + type: comma_delimited_list + vdbe_aap_sec_untrusted_ip_prefix: + description: "ip prefix for secondary vDBE VM aap on the VAN untrusted network" + type: string + vdbe_aap_sec_untrusted_ip_prefix_len: + description: "ip prefix length for the secondary DBE VM aap on the VAN untrusted network" + type: string + vdbe_aap_untrusted_ip_prefix: + description: "ip prefix for primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_ip_prefix_len: + description: "ip prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_v6_ip_prefix: + description: "ipv6 prefix for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_aap_untrusted_v6_ip_prefix_len: + description: "ipv6 prefix length for the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_device_name: + description: "VDBE device Name for this vdbe VNF" + type: string + vdbe_hw_untr_mac_1: + description: "Secondary MAC address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_name_1: + description: "VM Name for this vdbe node 1" + type: string + vdbe_untrusted_ip_1: + description: "IPV4 address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_untrusted_v6_ip_1: + description: "IPV6 address of the secondary vDBE VM on the VAN untrusted network" + type: string + vdbe_untrusted_vmac_address: + description: "Virtual MAC of the primary vDBE VM on the VAN untrusted network" + type: string + vdbe_flavor_name: + description: "Flavor to use for vDBE" + type: string + vdbe_image_name: + description: "Image to use for vDBE" + type: string + vnf_id: + description: "Unique ID for this VF inst" + type: string + vnf_name: + description: "Unique name for this VF instance" + type: string + vf_module_id: + description: "Unique ID for this VF module inst" + type: string + availability_zone_1: + description: "The availability zone of secondary node1 vDBE vm in the local HA pair." + type: string + counter: + description: "Counter." + type: number +resources: + vdbe_untr_1_subports: + type: OS::Heat::ResourceGroup + properties: + count: + get_param: untrusted_num_vn + resource_def: + type: vlan1.yml + properties: + aap_address_mode: + get_param: aap_address_mode + aap_sec_untrusted_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + aap_untrusted_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + aap_untrusted_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + aap_untrusted_v6_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + aap_untrusted_v6_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + counter: + get_param: counter + ip_address: + get_param: vdbe_untrusted_ip_1 + ip_v6_address: + get_param: vdbe_untrusted_v6_ip_1 + mac_address: + get_param: vdbe_hw_untr_mac_1 + parent_interface: + get_resource: vdbe_untr_1_port_1 + subinterfaces_name_prefix: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + vlan_tag_list: + get_param: untrusted_vlan_tags + vmac_address: + get_param: vdbe_untrusted_vmac_address + vn_network_list: + get_param: untrusted_vn_networks + optional_property_1: OPTIONAL_VALUE_SUBPORT_1 + vdbe_node_1: + type: OS::Nova::Server + properties: + availability_zone: + get_param: availability_zone_1 + flavor: + get_param: vdbe_flavor_name + image: + get_param: vdbe_image_name + metadata: + vf_module_id: + get_param: vf_module_id + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + name: + get_param: vdbe_name_1 + networks: + - port: {get_resource: vdbe_untr_1_port_1} + - port: {get_resource: vdbe_untr_2_port_1} + vdbe_node_2: + type: OS::Nova::Server + properties: + availability_zone: + get_param: availability_zone_1 + flavor: + get_param: vdbe_flavor_name + image: + get_param: vdbe_image_name + metadata: + vf_module_id: + get_param: vf_module_id + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + name: + get_param: vdbe_name_1 + networks: + - port: {get_resource: vdbe_1_untr_1_port_1} + - port: {get_resource: vdbe_1_untr_2_port_1} + vdbe_untr_1_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: control_int_net + vdbe_untr_2_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: Port_2 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: fabric_int_net + + + + vdbe_1_untr_1_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: Port 3 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: control_int_net + vdbe_1_untr_2_port_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: Port_4 + virtual_machine_interface_allowed_address_pairs: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_hw_untr_mac_1 + - + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: + get_param: aap_address_mode + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: + get_param: vdbe_untrusted_vmac_address + virtual_machine_interface_mac_addresses: + virtual_machine_interface_mac_addresses_mac_address: + - + get_param: vdbe_hw_untr_mac_1 + virtual_network_refs: + - + get_resource: fabric_int_net + + vdbe_untr_2_subports: + type: OS::Heat::ResourceGroup + properties: + count: + get_param: untrusted_num_vn + resource_def: + type: vlan1.yml + properties: + aap_address_mode: + get_param: aap_address_mode + aap_sec_untrusted_ip_prefix: + get_param: vdbe_aap_sec_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix_len: + get_param: vdbe_aap_sec_untrusted_ip_prefix_len + aap_untrusted_ip_prefix: + get_param: vdbe_aap_untrusted_ip_prefix + aap_untrusted_ip_prefix_len: + get_param: vdbe_aap_untrusted_ip_prefix_len + aap_untrusted_v6_ip_prefix: + get_param: vdbe_aap_untrusted_v6_ip_prefix + aap_untrusted_v6_ip_prefix_len: + get_param: vdbe_aap_untrusted_v6_ip_prefix_len + counter: + get_param: counter + ip_address: + get_param: vdbe_untrusted_ip_1 + ip_v6_address: + get_param: vdbe_untrusted_v6_ip_1 + mac_address: + get_param: vdbe_hw_untr_mac_1 + parent_interface: + get_resource: vdbe_1_untr_1_port_1 + subinterfaces_name_prefix: + str_replace: + params: + DBE: + get_param: vdbe_device_name + VM_NAME: + get_param: vdbe_name_1 + template: VM_NAMEDBE001p1n004 + vlan_tag_list: + get_param: untrusted_vlan_tags + vmac_address: + get_param: vdbe_untrusted_vmac_address + vn_network_list: + get_param: untrusted_vn_networks + optional_property_2: OPTIONAL_VALUE_SUBPORT_2 + + control_int_net: + type: OS::ContrailV2::VirtualNetwork + properties: + flood_unknown_unicast: + get_param: control_int_net_flood_unknown_unicast + is_shared: + get_param: control_int_net_shared + name: + str_replace: + params: + VNF_NAME: + get_param: vnf_name + template: VNF_NAME_control_net + virtual_network_properties: + virtual_network_properties_forwarding_mode: + get_param: control_int_net_forwarding_mode + virtual_network_properties_rpf: + get_param: control_int_net_rpf + fabric_int_net: + type: OS::ContrailV2::VirtualNetwork + properties: + flood_unknown_unicast: + get_param: fabric_int_net_flood_unknown_unicast + is_shared: + get_param: fabric_int_net_shared + name: + str_replace: + params: + VNF_NAME: + get_param: vnf_name + template: template-fabric-int + virtual_network_properties: + virtual_network_properties_forwarding_mode: + get_param: fabric_int_net_forwarding_mode + virtual_network_properties_rpf: + get_param: fabric_int_net_rpf diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8f31c10481..5f71804e20 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,37 +8,49 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_vmac_address: + type: json + subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_availability_zone: + subinterface_vlan1_vmac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: + compute_vdbe_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + type: string + port_vdbe_untr_1_port_1_network_role: type: string required: true status: SUPPORTED @@ -46,71 +58,67 @@ node_types: type: string required: true status: SUPPORTED - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: float - vm_image_name: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_network_role: - type: string - required: true - status: SUPPORTED - compute_vdbe_metadata: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED @@ -126,6 +134,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED subinterface_vlan1_ip_address: type: list required: true @@ -138,76 +150,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true status: SUPPORTED - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vlan1_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -226,6 +230,10 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -234,45 +242,37 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED subinterface_vlan1_optional_property_1: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_vdbe_untr_1_port_vlan_requirements: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true status: SUPPORTED @@ -299,47 +299,47 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_2_port: + - dependency_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_2_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_vdbe_vdbe_untr_1_port_vlan1: + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe_vdbe_untr_1_port: + - dependency_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -368,13 +368,15 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_2_port: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_1_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_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_2_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 @@ -396,47 +398,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_1_port_vlan1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_2_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.write.requests.rate_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_1_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_vdbe_vdbe_untr_2_port: + disk.device.latency_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_vdbe_untr_1_port: - type: tosca.capabilities.Node + disk.device.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 - disk.write.bytes.rate_vdbe: + network.incoming.bytes_vdbe_vdbe_untr_1_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.bytes.rate_vdbe_vdbe_untr_1_port: + 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.rate_vdbe_vdbe_untr_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_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: @@ -465,79 +463,83 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: + binding_vdbe_vdbe_untr_1_port_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 + 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.outgoing.bytes_vdbe_vdbe_untr_1_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 - disk.device.allocation_vdbe: + 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 - disk.usage_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_1_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.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 - network.outpoing.packets_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_1_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.requests_vdbe: + network.incoming.packets_vdbe_vdbe_untr_2_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.bytes_vdbe_vdbe_untr_1_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_2_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. + forwarder_vdbe_vdbe_untr_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu.delta_vdbe: + 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.outgoing.packets.rate_vdbe_vdbe_untr_2_port: + cpu.delta_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_1_port: - 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 + forwarder_vdbe_vdbe_untr_2_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.device.read.bytes.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer @@ -557,17 +559,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.Forwarder - 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 + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node + 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. @@ -580,11 +582,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - 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. @@ -597,13 +594,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_2_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.latency_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.packets.rate_vdbe_vdbe_untr_1_port: + network.incoming.bytes_vdbe_vdbe_untr_2_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.outgoing.bytes.rate_vdbe_vdbe_untr_1_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: @@ -628,15 +636,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_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_vdbe_vdbe_untr_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. + feature_vdbe_vdbe_untr_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -646,11 +647,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vdbe_vdbe_untr_2_port_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: - - 1 + - 0 - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem @@ -663,7 +666,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: + network.outgoing.bytes_vdbe_vdbe_untr_2_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: @@ -675,44 +678,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: + network.incoming.packets.rate_vdbe_vdbe_untr_2_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 - binding_vdbe_vdbe_untr_2_port: - 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 + feature_vdbe_vdbe_untr_1_port_1_vlan1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - memory_vdbe: + network.incoming.packets_vdbe_vdbe_untr_1_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 - binding_vdbe: - type: tosca.capabilities.network.Bindable + network.incoming.bytes.rate_vdbe_vdbe_untr_1_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.write.bytes_vdbe: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_2_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_vdbe: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + disk.device.write.bytes_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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml index d7306a1a23..02412befd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml @@ -471,6 +471,9 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - get_input: vdbe_aap_untrusted_v6_ip_prefix + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix @@ -480,11 +483,26 @@ topology_template: compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: Port 3 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_name: + - Port_2 + - Port_4 subinterface_vlan1_counter: - get_input: counter - get_input: counter @@ -506,6 +524,9 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_vlan1_mac_address: - get_input: vdbe_hw_untr_mac_1 - get_input: vdbe_hw_untr_mac_1 @@ -518,15 +539,15 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 + port_vdbe_untr_2_port_1_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan1_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix - port_vdbe_untr_2_port_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net subinterface_vlan1_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -542,12 +563,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - port_vdbe_untr_2_port_name: - - Port_2 - - Port_4 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_vlan1_vn_network_list: - get_input: untrusted_vn_networks - get_input: untrusted_vn_networks @@ -556,37 +571,22 @@ topology_template: - get_input: untrusted_num_vn subinterface_vlan1_parent_interface: - vdbe_untr_1_port_1 - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 subinterface_vlan1_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode subinterface_vlan1_optional_property_1: - OPTIONAL_VALUE_SUBPORT_1 - null - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: Port 3 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vlan1_optional_property_2: - null - OPTIONAL_VALUE_SUBPORT_2 subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net subinterface_vlan1_vlan_tag_list: - get_input: untrusted_vlan_tags - get_input: untrusted_vlan_tags @@ -599,11 +599,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_vdbe_untr_2_port: + - link_vdbe_vdbe_untr_2_port_1: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -617,4 +617,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe + - abstract_vdbe
\ 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/pattern1c1/optionalPropertiesConsolidation/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/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml index 4fac95aa24..0f096464ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/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/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml @@ -11,11 +11,25 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_vlan1_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string + port_vdbe_untr_2_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -31,69 +45,62 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_2_port_network_role_tag: + port_vdbe_untr_1_port_1_network_role: type: string required: true vm_flavor_name: type: string required: true - subinterface_vlan1_counter: + port_vdbe_untr_1_port_1_ip_requirements: type: list required: true entry_schema: - type: float - vm_image_name: - type: string - required: true - port_vdbe_untr_2_port_network_role: - type: string - required: true - compute_vdbe_metadata: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: type: list required: true entry_schema: - type: json - subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: string + port_vdbe_untr_2_port_1_name: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_ip_requirements: + port_vdbe_untr_2_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_2_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vlan1_counter: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: float + vm_image_name: + type: string required: true - port_vdbe_untr_2_port_ip_requirements: + compute_vdbe_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: json + subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: + type: list required: true - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses: + type: list required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: json + port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_2_port_1_network_role: + type: string required: true - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true subinterface_vlan1_mac_address: @@ -106,6 +113,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_vlan1_ip_address: type: list required: true @@ -116,63 +126,56 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: + port_vdbe_untr_2_port_1_subnetpoolid: type: string required: true - subinterface_vlan1_ip_v6_address: - type: list + port_vdbe_untr_2_port_1_order: + type: integer required: true - entry_schema: - type: string - port_vdbe_untr_1_port_related_networks: + port_vdbe_untr_2_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - subinterface_vlan1_aap_untrusted_ip_prefix: + port_vdbe_untr_2_port_1_virtual_network_refs: type: list required: true entry_schema: - type: string - port_vdbe_untr_2_port_virtual_network_refs: + type: json + port_vdbe_untr_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: - type: json - subinterface_vlan1_subinterfaces_name_prefix: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true - port_vdbe_untr_2_port_name: + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_1_port_virtual_network_refs: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true - entry_schema: - type: json subinterface_vlan1_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string - required: true - port_vdbe_untr_2_port_order: - type: integer + port_vdbe_untr_1_port_1_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements subinterface_vlan1_service_template_filter_count: type: list required: true @@ -188,6 +191,9 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -195,38 +201,32 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_vlan1_optional_property_1: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_2_port_1_ip_requirements: type: list required: true entry_schema: - type: string - subinterface_vlan1_optional_property_2: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_related_networks: type: list required: true entry_schema: - type: string - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_vlan1_optional_property_2: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_vdbe_untr_1_port_vlan_requirements: + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true entry_schema: @@ -256,50 +256,7 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_2_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_2_port_mac_requirements - order: - get_input: port_vdbe_untr_2_port_order - exCP_naming: - get_input: port_vdbe_untr_2_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_2_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_vdbe_untr_2_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_2_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_2_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_2_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_2_port_network_role - subnetpoolid: - get_input: port_vdbe_untr_2_port_subnetpoolid - name: - get_input: - - port_vdbe_untr_2_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe - relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port_vlan1: + vdbe_vdbe_untr_1_port_1_vlan1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 directives: - substitutable @@ -386,45 +343,88 @@ topology_template: requirements: - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_1_port + node: vdbe_vdbe_untr_1_port_1 relationship: tosca.relationships.network.BindsTo - vdbe_vdbe_untr_1_port: + vdbe_vdbe_untr_1_port_1: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_vdbe_untr_1_port_mac_requirements + get_input: port_vdbe_untr_1_port_1_mac_requirements order: - get_input: port_vdbe_untr_1_port_order + get_input: port_vdbe_untr_1_port_1_order exCP_naming: - get_input: port_vdbe_untr_1_port_exCP_naming + get_input: port_vdbe_untr_1_port_1_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs + - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_vdbe_untr_1_port_vlan_requirements + get_input: port_vdbe_untr_1_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_1_port_related_networks + get_input: port_vdbe_untr_1_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_2_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_2_port_1_mac_requirements + order: + get_input: port_vdbe_untr_2_port_1_order + exCP_naming: + get_input: port_vdbe_untr_2_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_2_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_2_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_vdbe_untr_2_port_1_related_networks virtual_network_refs: get_input: - - port_vdbe_untr_1_port_virtual_network_refs + - port_vdbe_untr_2_port_1_virtual_network_refs - index_value ip_requirements: - get_input: port_vdbe_untr_1_port_ip_requirements + get_input: port_vdbe_untr_2_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_1_port_network_role_tag + get_input: port_vdbe_untr_2_port_1_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses + - port_vdbe_untr_2_port_1_virtual_machine_interface_mac_addresses - index_value network_role: - get_input: port_vdbe_untr_1_port_network_role + get_input: port_vdbe_untr_2_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_1_port_subnetpoolid + get_input: port_vdbe_untr_2_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_1_port_name + - port_vdbe_untr_2_port_1_name - index_value requirements: - binding: @@ -446,12 +446,12 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - feature - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outpoing.packets + network.outpoing.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outpoing.packets cpu_util_vdbe: - vdbe - cpu_util @@ -461,30 +461,27 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests - feature_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - feature + network.outgoing.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.packets.rate + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.packets.rate disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate - network.incoming.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.packets - feature_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - feature + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes.rate - network.incoming.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes.rate scalable_vdbe: - vdbe - scalable @@ -497,12 +494,9 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - network.outgoing.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.bytes.rate - network.outgoing.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes + binding_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - binding disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -512,27 +506,33 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outpoing.packets + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes disk.read.requests_vdbe: - vdbe - disk.read.requests - network.incoming.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets.rate + network.incoming.packets_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes.rate + forwarder_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - forwarder instance_vdbe: - vdbe - instance cpu.delta_vdbe: - vdbe - cpu.delta - network.outgoing.packets.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.packets.rate - binding_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - binding + forwarder_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - forwarder disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -542,33 +542,36 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - forwarder_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - forwarder disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport cpu_vdbe: - vdbe - cpu disk.write.bytes_vdbe: - vdbe - disk.write.bytes - forwarder_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - forwarder disk.device.usage_vdbe: - vdbe - disk.device.usage disk.device.read.bytes_vdbe: - vdbe - disk.device.read.bytes + feature_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - feature disk.latency_vdbe: - vdbe - disk.latency - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.packets.rate + network.incoming.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.bytes + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -578,36 +581,39 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outpoing.packets - network.incoming.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets + feature_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate - network.incoming.bytes_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.bytes + binding_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - binding os_vdbe: - vdbe - os disk.device.read.requests_vdbe: - vdbe - disk.device.read.requests - network.incoming.packets.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.incoming.packets.rate + network.outgoing.bytes_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.outgoing.bytes disk.root.size_vdbe: - vdbe - disk.root.size - network.incoming.bytes.rate_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port + network.incoming.packets.rate_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - network.incoming.packets.rate + feature_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - feature + network.incoming.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - network.incoming.bytes.rate - binding_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - binding memory_vdbe: - vdbe - memory @@ -617,12 +623,6 @@ topology_template: disk.device.write.bytes_vdbe: - vdbe - disk.device.write.bytes - network.outgoing.bytes_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - network.outgoing.bytes - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_vdbe: - vdbe - disk.device.read.requests.rate @@ -630,30 +630,30 @@ topology_template: - vdbe - disk.read.bytes requirements: - dependency_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + dependency_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - dependency + dependency_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - dependency + dependency_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency - link_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_2_port: - - vdbe_vdbe_untr_2_port - - dependency - dependency_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - dependency - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 + link_vdbe_vdbe_untr_2_port_1: + - vdbe_vdbe_untr_2_port_1 + - link + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_1_vlan1: + - vdbe_vdbe_untr_1_port_1_vlan1 - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport - link_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + link_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - link dependency_vdbe: - vdbe - - dependency - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file + - dependency
\ 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/pattern1c1/regularNestedSubInterface/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml index 5d2410ce66..490ae7caf5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/in/main.yml @@ -154,7 +154,7 @@ resources: name: get_param: vdbe_name_2 networks: - - port: {get_resource: vdbe_untr_port_2} + - port: {get_resource: vdbe_1_untr_port_1} vdbe_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -198,7 +198,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_untr_port_2: + vdbe_1_untr_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Untr_Port_2 @@ -310,7 +310,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_port_2 + get_resource: vdbe_1_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/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 27074c4f90..7ac84b0fcf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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,8 +26,8 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED compute_vdbe_availability_zone: @@ -52,12 +48,28 @@ 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_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_port_1_network_role_tag: + type: string required: true status: SUPPORTED subinterface_nested_aap_untrusted_ip_prefix: @@ -66,12 +78,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: @@ -104,32 +116,42 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED subinterface_nested_ip_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + 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 @@ -150,28 +172,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 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -208,76 +214,68 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: + port_vdbe_untr_port_1_virtual_network_refs: 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 + type: json 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_untr_x_vlan1-Network-Role_vmi_subport_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_untr_x_vlan1-Network-Role_vmi_subport_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_untr_x_vlan1-Network-Role_vmi_subport_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_untr_x_vlan1-Network-Role_vmi_subport_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. + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + 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 @@ -286,11 +284,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - 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. @@ -338,13 +331,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: @@ -367,37 +371,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: @@ -409,17 +413,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - 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 @@ -427,13 +421,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: @@ -463,11 +463,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. @@ -504,12 +499,6 @@ 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. - 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. @@ -529,17 +518,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. @@ -581,12 +587,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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml index 60c5fb643a..f5c296dd4f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -488,7 +488,7 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_port_1 - - vdbe_untr_port_2 + - vdbe_1_untr_port_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -501,8 +501,14 @@ topology_template: subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_name: + - Untr_Port_1 + - Untr_Port_2 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -536,9 +542,6 @@ topology_template: subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 - get_input: vdbe_untrusted_ip_1 - port_vdbe_untr_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -548,12 +551,6 @@ topology_template: subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - Untr_Port_1 - - Untr_Port_2 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len - get_input: vdbe_aap_untrusted_ip_prefix_len @@ -584,6 +581,9 @@ topology_template: subinterface_nested_optional_property_2: - null - OPTIONAL_VALUE_SUBPORT_2 + port_vdbe_untr_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 2 @@ -593,7 +593,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -606,4 +606,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe + - abstract_vdbe
\ 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/pattern1c1/regularNestedSubInterface/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/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml index c25df79fc7..b04f04dd3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/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/pattern1c1/regularNestedSubInterface/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,8 +26,8 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_subnetpoolid: - type: string + port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true compute_vdbe_availability_zone: type: list @@ -47,23 +44,36 @@ 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_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + 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 @@ -89,27 +99,35 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true subinterface_nested_ip_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_virtual_network_refs: + port_vdbe_untr_port_1_related_networks: type: list required: true entry_schema: - type: json + 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 @@ -127,24 +145,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 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true @@ -175,80 +180,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: + port_vdbe_untr_port_1_virtual_network_refs: 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 + type: json 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.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements - order: - get_input: port_vdbe_untr_port_order - exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_port_virtual_machine_interface_mac_addresses - - index_value - 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 @@ -334,23 +272,82 @@ topology_template: requirements: - binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: 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.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_port_1_mac_requirements + order: + get_input: port_vdbe_untr_port_1_order + exCP_naming: + get_input: port_vdbe_untr_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + 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 + virtual_network_refs: + get_input: + - port_vdbe_untr_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses + - index_value + 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 + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport + 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 disk.device.iops_vdbe: - vdbe - disk.device.iops @@ -375,12 +372,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 @@ -390,9 +393,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 @@ -402,30 +411,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 - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport - 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 @@ -438,9 +438,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 @@ -459,9 +456,6 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes disk.capacity_vdbe: - vdbe - disk.capacity @@ -471,12 +465,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 @@ -498,28 +501,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_nested: + - vdbe_vdbe_untr_port_1_nested - dependency - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - dependency + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_1_nested: + - vdbe_vdbe_untr_port_1_nested + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport - dependency_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency dependency_vdbe: - vdbe - - dependency - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file + - dependency
\ 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/pattern1c2/differentNetwork/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml index a7f27a34cb..78be5c1ca7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml @@ -177,10 +177,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_port_1} user_data_format: RAW - pd01_port_0: + pd_server_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -194,10 +194,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_1} user_data_format: RAW - pd01_port_1: + pd_server_1_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -209,7 +209,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_0} + p1: { get_resource: pd_server_port_1} net1: { get_resource: test_net1} test_resourceGroup2: @@ -219,7 +219,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_1} + p1: { get_resource: pd_server_1_port_1} net1: { get_resource: test_net2} test_net1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3e2ef2c327..2204cc5703 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -16,6 +22,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,8 +44,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true status: SUPPORTED subinterface_nested_service_template_filter_count: @@ -38,12 +54,6 @@ node_types: status: SUPPORTED entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -54,31 +64,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,69 +88,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd_server_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - link_pd_server_pd_server_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server: + - dependency_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -168,6 +168,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -186,9 +192,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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_pd_server_pd_server_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -203,7 +208,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_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: @@ -239,12 +244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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 disk.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -263,19 +262,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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 - vcpus_pd_server: + disk.device.write.bytes.rate_pd_server: 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.write.bytes.rate_pd_server: + attachment_pd_server_pd_server_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_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: @@ -292,18 +296,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: + feature_pd_server_pd_server_port_1_nested: type: tosca.capabilities.Node occurrences: - 1 @@ -325,14 +324,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server: + network.incoming.bytes_pd_server_pd_server_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_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + disk.read.requests_pd_server: + 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 @@ -347,7 +347,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + binding_pd_server_pd_server_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -355,21 +355,19 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.write.bytes_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_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_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,6 +395,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd_server_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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,17 +420,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -445,11 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -468,7 +462,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd_server_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.outpoing.packets_pd_server_pd_server_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: @@ -554,4 +554,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/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml index cd1888879e..98d3d8e56e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml @@ -708,6 +708,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -719,23 +722,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_1 - port_pd01_port_mac_requirements: + - pd_server_1_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net2 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net2 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo @@ -756,6 +756,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -767,23 +770,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_0 - port_pd01_port_mac_requirements: + - pd_server_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml index 80a1b10e27..20ef055bce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + port_pd_server_port_1_network: + type: list + required: true + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,19 +41,14 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -49,26 +57,18 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,48 +76,23 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_port_1_subnetpoolid: + type: string + required: true node_templates: - pd_server_pd01_port_nested: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested - directives: - - substitutable - properties: - p1: - get_input: - - subinterface_nested_p1 - - index_value - service_template_filter: - count: - get_input: - - subinterface_nested_service_template_filter_count - - index_value - substitute_service_template: nestedServiceTemplate.yaml - mandatory: true - net1: - get_input: - - subinterface_nested_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port - relationship: tosca.relationships.network.BindsTo pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server properties: @@ -137,37 +112,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server_pd_server_port_1_nested: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + directives: + - substitutable + properties: + p1: + get_input: + - subinterface_nested_p1 + - index_value + service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value + substitute_service_template: nestedServiceTemplate.yaml + mandatory: true + net1: + get_input: + - subinterface_nested_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_pd_server_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -177,6 +177,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -186,18 +189,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -213,9 +216,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes.rate disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + feature_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -258,30 +258,30 @@ topology_template: binding_pd_server: - pd_server - binding + network.incoming.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + binding_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 - binding + feature_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - feature disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + feature_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature_template_Vlan_vmi_1 disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +294,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,12 +306,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -318,9 +318,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +327,12 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outpoing.packets disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file + link_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - link + dependency_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - dependency + dependency_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml index 75ff05f142..78cf3f37e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml @@ -177,10 +177,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_port_1} user_data_format: RAW - pd01_port_0: + pd_server_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -193,10 +193,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_1} user_data_format: RAW - pd01_port_1: + pd_server_1_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -209,7 +209,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_0} + p1: { get_resource: pd_server_port_1} net1: { get_resource: test_net1} test_resourceGroup2: @@ -219,7 +219,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_1} + p1: { get_resource: pd_server_1_port_1} net1: { get_resource: test_net1} test_net1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3e2ef2c327..2204cc5703 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -16,6 +22,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,8 +44,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true status: SUPPORTED subinterface_nested_service_template_filter_count: @@ -38,12 +54,6 @@ node_types: status: SUPPORTED entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -54,31 +64,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,69 +88,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd_server_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - link_pd_server_pd_server_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server: + - dependency_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -168,6 +168,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -186,9 +192,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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_pd_server_pd_server_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -203,7 +208,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_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: @@ -239,12 +244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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 disk.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -263,19 +262,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: 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 - vcpus_pd_server: + disk.device.write.bytes.rate_pd_server: 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.write.bytes.rate_pd_server: + attachment_pd_server_pd_server_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_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: @@ -292,18 +296,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: 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_template_Vlan_vmi_1_pd_server_pd01_port_nested: + feature_pd_server_pd_server_port_1_nested: type: tosca.capabilities.Node occurrences: - 1 @@ -325,14 +324,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server: + network.incoming.bytes_pd_server_pd_server_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_pd_server_pd01_port_nested: - type: tosca.capabilities.Node + disk.read.requests_pd_server: + 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 @@ -347,7 +347,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + binding_pd_server_pd_server_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -355,21 +355,19 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.write.bytes_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: 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_pd_server_pd01_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_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,6 +395,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd_server_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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,17 +420,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -445,11 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -468,7 +462,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd_server_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.outpoing.packets_pd_server_pd_server_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: @@ -554,4 +554,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/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml index b4bd810ae8..b0ead5c67e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml @@ -708,6 +708,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -719,23 +722,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_1 - port_pd01_port_mac_requirements: + - pd_server_1_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -756,6 +756,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -767,23 +770,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_0 - port_pd01_port_mac_requirements: + - pd_server_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -809,4 +809,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server_0 - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 80a1b10e27..20ef055bce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + port_pd_server_port_1_network: + type: list + required: true + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,19 +41,14 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -49,26 +57,18 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,48 +76,23 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_port_1_subnetpoolid: + type: string + required: true node_templates: - pd_server_pd01_port_nested: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested - directives: - - substitutable - properties: - p1: - get_input: - - subinterface_nested_p1 - - index_value - service_template_filter: - count: - get_input: - - subinterface_nested_service_template_filter_count - - index_value - substitute_service_template: nestedServiceTemplate.yaml - mandatory: true - net1: - get_input: - - subinterface_nested_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port - relationship: tosca.relationships.network.BindsTo pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server properties: @@ -137,37 +112,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server_pd_server_port_1_nested: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + directives: + - substitutable + properties: + p1: + get_input: + - subinterface_nested_p1 + - index_value + service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value + substitute_service_template: nestedServiceTemplate.yaml + mandatory: true + net1: + get_input: + - subinterface_nested_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_pd_server_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -177,6 +177,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -186,18 +189,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -213,9 +216,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes.rate disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + feature_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -258,30 +258,30 @@ topology_template: binding_pd_server: - pd_server - binding + network.incoming.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + binding_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 - binding + feature_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - feature disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + feature_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature_template_Vlan_vmi_1 disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +294,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,12 +306,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -318,9 +318,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +327,12 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outpoing.packets disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file + link_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - link + dependency_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - dependency + dependency_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml index b4eb432e8d..4e7e15e638 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml @@ -187,8 +187,8 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_untr_1_port_2} - vdbe_untr_1_port_2: + - port: {get_resource: vdbe_1_untr_1_port_1} + vdbe_1_untr_1_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -313,7 +313,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_1_port_2 + get_resource: vdbe_1_untr_1_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/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml index 094898920f..54a6020581 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_nested_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json subinterface_nested_aap_address_mode: type: list required: true @@ -32,12 +46,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_service_template_filter_count: type: list required: true @@ -50,21 +58,37 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED + port_vdbe_untr_1_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string subinterface_nested_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED @@ -92,44 +116,34 @@ node_types: status: SUPPORTED entry_schema: type: json - subinterface_nested_mac_address: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_virtual_network_refs: + subinterface_nested_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_1_port_ip_requirements: + type: string + subinterface_nested_ip_address: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_nested_ip_address: + type: string + port_vdbe_untr_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -150,30 +164,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_1_port_1_related_networks: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_aap_untrusted_ip_prefix_len: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_name: + entry_schema: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: json + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - subinterface_nested_aap_untrusted_ip_prefix_len: - type: list + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string subinterface_nested_counter: type: list required: true @@ -192,65 +208,49 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json requirements: - - dependency_vdbe_vdbe_untr_1_port_nested: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_1_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_1_port: + - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_1_port: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -279,8 +279,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_1_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 @@ -302,36 +303,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_1_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.write.requests.rate_vdbe: + disk.device.latency_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_vdbe_untr_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_vdbe: + disk.device.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 - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: + network.incoming.bytes_vdbe_vdbe_untr_1_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_1_port: + 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: @@ -360,12 +356,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_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. + feature_vdbe_vdbe_untr_1_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + binding_vdbe_vdbe_untr_1_port_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 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. @@ -384,18 +387,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_vdbe_vdbe_untr_1_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.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 - network.incoming.bytes_vdbe_vdbe_untr_1_port: + network.incoming.packets.rate_vdbe_vdbe_untr_1_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 + forwarder_vdbe_vdbe_untr_1_port_1: + type: org.openecomp.capabilities.Forwarder + 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. @@ -408,14 +422,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_vdbe_vdbe_untr_1_port: - 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.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. @@ -434,16 +440,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_vdbe_vdbe_untr_1_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. @@ -468,6 +464,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -480,7 +481,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_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: @@ -505,15 +506,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_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_vdbe_vdbe_untr_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. + feature_vdbe_vdbe_untr_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -540,24 +534,30 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_vdbe: + network.incoming.packets_vdbe_vdbe_untr_1_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 - binding_vdbe: - type: tosca.capabilities.network.Bindable + network.incoming.bytes.rate_vdbe_vdbe_untr_1_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.write.bytes_vdbe: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + binding_vdbe: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_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: @@ -686,4 +686,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/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml index 8a3bf941d1..e5c29a52c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml @@ -401,6 +401,8 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_1_port_1 + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -413,6 +415,14 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_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: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -432,8 +442,6 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: @@ -442,16 +450,10 @@ topology_template: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_1_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 + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net subinterface_nested_counter: - get_property: - SELF @@ -467,8 +469,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -478,7 +478,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -497,7 +497,9 @@ topology_template: - substitutable properties: subinterface_nested_parent_interface: - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -510,6 +512,14 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_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: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -529,8 +539,6 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: @@ -539,16 +547,10 @@ topology_template: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_1_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 + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net subinterface_nested_counter: - get_input: counter subinterface_nested_subinterfaces_name_prefix: @@ -561,8 +563,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -572,7 +572,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml index 39bf635d05..3563d416a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml @@ -11,11 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_nested_parent_interface: type: list required: true entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json subinterface_nested_aap_address_mode: type: list required: true @@ -31,11 +42,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_service_template_filter_count: type: list required: true @@ -46,18 +52,31 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true + port_vdbe_untr_1_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: + type: list + required: true + entry_schema: + type: string subinterface_nested_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - vm_image_name: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true - port_vdbe_untr_1_port_network_role: + vm_image_name: type: string required: true subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -80,37 +99,29 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_1_port_1_subnetpoolid: + type: string + required: true subinterface_nested_mac_address: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_1_port_ip_requirements: + subinterface_nested_ip_address: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_nested_ip_address: + type: string + port_vdbe_untr_1_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vdbe_untr_1_port_order: - type: integer - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -128,25 +139,27 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string - required: true - port_vdbe_untr_1_port_name: + port_vdbe_untr_1_port_1_related_networks: type: list required: true entry_schema: - type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_network_refs: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_nested_counter: type: list required: true @@ -162,21 +175,70 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string - required: true - port_vdbe_untr_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json node_templates: - vdbe_vdbe_untr_1_port_nested: + 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_1_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_1_port_1_mac_requirements + order: + get_input: port_vdbe_untr_1_port_1_order + exCP_naming: + get_input: port_vdbe_untr_1_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_1_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_1_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_1_port_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -255,69 +317,7 @@ topology_template: requirements: - binding_vdbe_untr_x_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_1_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_1_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_1_port_mac_requirements - order: - get_input: port_vdbe_untr_1_port_order - exCP_naming: - get_input: port_vdbe_untr_1_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_1_port_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_1_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_1_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_1_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_1_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_1_port_network_role - subnetpoolid: - get_input: port_vdbe_untr_1_port_subnetpoolid - name: - get_input: - - port_vdbe_untr_1_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe + node: vdbe_vdbe_untr_1_port_1 relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe @@ -334,9 +334,9 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - feature_vdbe_untr_x_subport + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outpoing.packets cpu_util_vdbe: - vdbe - cpu_util @@ -346,24 +346,21 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.packets.rate disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate - feature_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - feature + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes.rate - network.incoming.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -376,9 +373,12 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - network.outgoing.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes + feature_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - feature + binding_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - binding disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -388,21 +388,24 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes disk.read.requests_vdbe: - vdbe - disk.read.requests - network.incoming.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets.rate + forwarder_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - forwarder instance_vdbe: - vdbe - instance cpu.delta_vdbe: - vdbe - cpu.delta - binding_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - binding disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -412,12 +415,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - forwarder_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - forwarder - feature_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -430,15 +427,18 @@ topology_template: disk.device.usage_vdbe: - vdbe - disk.device.usage + feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - feature_vdbe_untr_x_subport disk.device.read.bytes_vdbe: - vdbe - disk.device.read.bytes disk.latency_vdbe: - vdbe - disk.latency - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -448,12 +448,9 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outpoing.packets - network.incoming.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets + feature_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate @@ -466,6 +463,12 @@ topology_template: disk.root.size_vdbe: - vdbe - disk.root.size + network.incoming.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes.rate memory_vdbe: - vdbe - memory @@ -475,9 +478,6 @@ topology_template: disk.device.write.bytes_vdbe: - vdbe - disk.device.write.bytes - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_vdbe: - vdbe - disk.device.read.requests.rate @@ -485,23 +485,23 @@ topology_template: - vdbe - disk.read.bytes requirements: - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested + dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - dependency_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested - subinterface_link_vdbe_untr_x_subport - dependency_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + dependency_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - dependency local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - dependency_vdbe_untr_x_subport - dependency_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested + dependency_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested - dependency - link_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + link_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - link dependency_vdbe: - vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index de35f9126e..0aaf991239 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -918,6 +918,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_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 @@ -926,108 +934,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1047,14 +1047,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1067,11 +1067,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1091,34 +1086,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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.delta_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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.read.requests_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1131,14 +1123,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - 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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1174,7 +1158,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1204,14 +1188,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1227,13 +1212,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1250,18 +1245,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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.write.bytes.rate_pd_server_1b: + disk.root.size_pd_server_1b: 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.root.size_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1273,6 +1269,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1296,15 +1297,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1319,24 +1319,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1360,19 +1360,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1966,4 +1966,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/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml index 033465e290..35faea70fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -104,34 +104,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -141,11 +141,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -186,19 +186,19 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -324,7 +324,7 @@ topology_template: - feature_template_Vlan_vmi_1_test_resourceGroup_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 @@ -342,7 +342,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -351,7 +351,7 @@ topology_template: - feature_server_1b_ps_1 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -414,10 +414,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -450,7 +450,7 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -489,7 +489,7 @@ topology_template: - link_packet_ext_network binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 disk.device.read.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b @@ -522,7 +522,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -540,7 +540,7 @@ topology_template: - disk.latency_pd_server_1b network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 @@ -553,7 +553,7 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index a27844365a..0e7a681e1b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -409,4 +409,4 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_server_1b_ps_1: - server_1b_ps_1 - - 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/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml index 57e3d22955..51358a7c38 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup @@ -100,5 +100,5 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_2} + parent_interface: { get_resource: ps_server_1b_1_port_1} net1: { get_resource: packet_ext_network}
\ 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/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1fe62b6cad..fe48762a9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -171,7 +171,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2_test_nested_level2: + - dependency_ps_server_1b_1_port_1_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -213,14 +213,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_1b_ps_1_test_nested_level2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_server_1b_ps_1_test_nested_level2: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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 @@ -253,6 +253,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + 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.requests_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -297,12 +303,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1_test_nested_level2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_pd_server_1b_port_0: 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_ps_server_1b_1_port_1_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -315,6 +331,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_pd_server_1b_port_0: type: tosca.capabilities.Node occurrences: @@ -336,12 +358,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - 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.root.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -387,12 +403,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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.latency_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -492,6 +502,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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.write.bytes.rate_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -550,23 +566,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_port_2_test_nested_level2: - 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 endpoint_server_1b_ps_1_test_nested_level2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -600,11 +605,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -640,6 +640,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1_test_nested_level2: + 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_ps_server_1b_1_port_1_test_nested_level2: + 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.write.requests.rate_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -668,12 +682,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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.requests_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -871,12 +897,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_pd_0: type: tosca.capabilities.OperatingSystem occurrences: @@ -966,14 +986,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_port_2_test_nested_level2: - 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.ephemeral.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1015,6 +1027,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,29 +1123,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: + disk.write.requests_server_1b_pd_0: 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_server_1b_pd_0: + disk.device.allocation_server_1b_ps_1_test_nested_level2: 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 - attachment_ps_server_1b_port_2_test_nested_level2: + attachment_ps_server_1b_1_port_1_test_nested_level2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_1b_ps_1_test_nested_level2: - 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.read.bytes.rate_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1145,12 +1157,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: tosca.capabilities.OperatingSystem occurrences: @@ -1237,12 +1243,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - 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_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1276,6 +1276,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_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 @@ -1284,108 +1292,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1405,14 +1405,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1425,11 +1425,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1449,34 +1444,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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.delta_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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.read.requests_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1489,14 +1481,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - 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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1532,7 +1516,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1562,14 +1546,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1585,13 +1570,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1608,18 +1603,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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.write.bytes.rate_pd_server_1b: + disk.root.size_pd_server_1b: 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.root.size_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1631,6 +1627,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1654,15 +1655,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1677,24 +1677,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1718,19 +1718,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1852,7 +1852,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_ps_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1888,14 +1888,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_ps_server_1b_port_2: - 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.latency_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1970,12 +1962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2: - 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.root.size_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2005,12 +1991,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2: - 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_ps_server_1b_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. @@ -2123,17 +2103,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2: - 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 link_packet_int_network: type: tosca.capabilities.network.Linkable occurrences: @@ -2155,6 +2124,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_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.capacity_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2172,7 +2147,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_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: @@ -2202,20 +2177,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2: + network.outpoing.packets_ps_server_1b_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.outpoing.packets_ps_server_1b_port_1: + endpoint_server_1b_ps_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_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 - endpoint_server_1b_ps_1: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_server_1b_1_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 @@ -2256,14 +2237,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_int_network: - type: tosca.capabilities.Node + attachment_ps_server_1b_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_packet_int_network: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2314,6 +2294,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_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 scalable_server_1b_ps_2: type: tosca.capabilities.Scalable occurrences: @@ -2347,12 +2333,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_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 vcpus_server_1b_ps_2: 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_ps_server_1b_1_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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2401,12 +2399,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2: - 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.latency_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2474,13 +2466,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_port_2: + attachment_packet_ext_network: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_packet_ext_network: - type: tosca.capabilities.Attachment + network.incoming.packets_ps_server_1b_1_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 @@ -2494,20 +2487,27 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_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_test_resourceGroup_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_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.outgoing.bytes_ps_server_1b_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. + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2523,6 +2523,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2557,11 +2562,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2577,32 +2577,22 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2611,72 +2601,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -2698,34 +2698,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_ps_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2744,6 +2744,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2767,30 +2772,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_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.latency_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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.iops_ps_server_1b: + disk.device.latency_ps_server_1b: 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 - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_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.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2802,11 +2808,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2856,11 +2857,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2873,7 +2869,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_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: @@ -2891,72 +2887,70 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.root.size_ps_server_1b: + disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b: - type: tosca.capabilities.network.Bindable + network.incoming.packets_ps_server_1b_ps_server_1b_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.resident_ps_server_1b: + disk.root.size_ps_server_1b: 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_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_ps_server_1b: + memory.resident_ps_server_1b: 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_ps_server_1b: + memory_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.write.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.device.write.bytes.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.read.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -2972,6 +2966,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2990,12 +2989,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_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 + binding_ps_server_1b_ps_server_1b_port_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 memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3008,23 +3015,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_ps_server_1b_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 endpoint_ps_server_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + vcpus_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -3042,15 +3050,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_port: - 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_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_1: type: tosca.capabilities.Node occurrences: - 1 @@ -3121,4 +3121,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/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..9b142fd46b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_1_network_role_tag: + type: string + required: true + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,59 +31,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_1b_port_1_network_role: + type: string + required: true + subinterface_nested_vlan_net1: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -113,70 +113,70 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port - relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server_1b relationship: tosca.relationships.network.BindsTo + ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: ps_server_1b_ps_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_1b capabilities: @@ -186,6 +186,9 @@ topology_template: disk.device.usage_ps_server_1b: - ps_server_1b - disk.device.usage + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.allocation_ps_server_1b: - ps_server_1b - disk.device.allocation @@ -198,27 +201,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -243,17 +243,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -261,12 +258,21 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature binding_ps_server_1b: - ps_server_1b - binding @@ -285,17 +291,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -303,6 +300,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -312,58 +312,58 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - 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/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml index bbc680fb1c..d252cfcc6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -95,34 +95,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -132,11 +132,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -157,12 +157,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_ps_1 - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.packets.rate_ps_server_1b_port_2 scalable_server_1b_ps_1_test_nested_level2: - test_nested_level2 - scalable_server_1b_ps_1 + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes.rate_ps_server_1b_1_port_1 end_point_packet_ext_network_test_nested_level2: - test_nested_level2 - end_point_packet_ext_network @@ -178,6 +178,9 @@ topology_template: disk.device.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_2 @@ -198,22 +201,31 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b + forwarder_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - forwarder_ps_server_1b_1_port_1 network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 + feature_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - feature_ps_server_1b_1_port_1 cpu_util_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_ps_2 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outpoing.packets_ps_server_1b_1_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -223,9 +235,6 @@ topology_template: os_server_1b_ps_1_test_nested_level2: - test_nested_level2 - os_server_1b_ps_1 - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes_ps_server_1b_port_2 disk.root.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.root.size_server_1b_ps_1 @@ -250,9 +259,6 @@ topology_template: disk.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests.rate_pd_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes.rate_ps_server_1b_port_2 disk.latency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.latency_server_1b_ps_1 @@ -304,6 +310,9 @@ topology_template: disk.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.read.requests_pd_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.packets.rate_ps_server_1b_1_port_1 disk.device.write.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -334,15 +343,9 @@ topology_template: disk.capacity_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_ps_1 - feature_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - feature_ps_server_1b_port_2 disk.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.allocation_server_1b_ps_1 - network.outgoing.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes_ps_server_1b_port_2 endpoint_server_1b_ps_1_test_nested_level2: - test_nested_level2 - endpoint_server_1b_ps_1 @@ -361,9 +364,6 @@ topology_template: end_point_packet_external_network: - packet_external_network - end_point - forwarder_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - forwarder_ps_server_1b_port_2 disk.write.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -382,6 +382,12 @@ topology_template: disk.device.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.requests_server_1b_ps_2 + binding_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - binding_ps_server_1b_1_port_1 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes_ps_server_1b_1_port_1 disk.device.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b @@ -396,10 +402,16 @@ topology_template: - feature_template_Vlan_vmi_1_test_resourceGroup_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets.rate_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 + network.outgoing.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes_ps_server_1b_1_port_1 memory.usage_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory.usage_server_1b_ps_1 @@ -417,7 +429,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -429,7 +441,7 @@ topology_template: - vcpus_server_1b_ps_2 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -498,13 +510,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets_ps_server_1b_port_2 + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -546,13 +555,10 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b - binding_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - binding_ps_server_1b_port_2 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.ephemeral.size_server_1b_ps_1 @@ -574,6 +580,9 @@ topology_template: disk.device.usage_server_1b_pd_0: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes.rate_ps_server_1b_1_port_1 cpu_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_server_1b_ps_2 @@ -609,7 +618,7 @@ topology_template: - disk.write.bytes_server_1b_ps_2 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 host_server_1b_ps_2_test_nested_level2: - test_nested_level2 - host_server_1b_ps_2 @@ -619,18 +628,15 @@ topology_template: link_packet_internal_network: - packet_internal_network - link - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets.rate_ps_server_1b_port_2 disk.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests_pd_server_1b - attachment_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - attachment_ps_server_1b_port_2 disk.device.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.allocation_server_1b_ps_1 + attachment_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - attachment_ps_server_1b_1_port_1 disk.device.read.bytes.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.bytes.rate_server_1b_ps_2 @@ -640,9 +646,6 @@ topology_template: memory_server_1b_ps_2_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_2 - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes.rate_ps_server_1b_port_2 os_server_1b_ps_2_test_nested_level2: - test_nested_level2 - os_server_1b_ps_2 @@ -672,7 +675,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -688,12 +691,9 @@ topology_template: disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outpoing.packets_ps_server_1b_port_2 network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_2 @@ -701,6 +701,9 @@ topology_template: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 requirements: + dependency_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - dependency_ps_server_1b_1_port_1 dependency_server_1b_ps_2_test_nested_level2: - test_nested_level2 - dependency_server_1b_ps_2 @@ -712,13 +715,10 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 - dependency_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - dependency_ps_server_1b_port_2 dependency_test_resourceGroup_2_test_nested_level2: - test_nested_level2 - dependency_test_resourceGroup_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index f0f55f27cc..34216708d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -82,43 +82,43 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - port_ps_server_1b_port_fixed_ips: - - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - - - ip_address: - get_input: - - ps_server_1b_ips - - 1 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO - AUTO + port_ps_server_1b_port_1_fixed_ips: + - - ip_address: + get_input: + - ps_server_1b_ips + - 0 + - - ip_address: + get_input: + - ps_server_1b_ips + - 1 subinterface_nested_vlan_parent_interface: - ps_server_1b_port_1 - - ps_server_1b_port_2 + - ps_server_1b_1_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -138,11 +138,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -159,9 +159,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5_levelTwo capabilities: - binding_ps_server_1b_port_2: - - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port disk.device.latency_server_1b_ps_1: - abstract_ps_server_1b - disk.device.latency_ps_server_1b @@ -185,7 +182,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b binding_ps_server_1b_port_1: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 disk.read.bytes_server_1b_ps_1: - abstract_ps_server_1b - disk.read.bytes_ps_server_1b @@ -198,15 +195,12 @@ topology_template: disk.root.size_server_1b_ps_1: - abstract_ps_server_1b - disk.root.size_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_ps_2: - abstract_ps_server_1b - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.requests.rate_ps_server_1b @@ -216,12 +210,9 @@ topology_template: feature_test_resourceGroup_1: - test_resourceGroup_1 - feature - network.incoming.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 attachment_packet_int_network: - packet_int_network - attachment @@ -263,7 +254,7 @@ topology_template: - memory_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.capacity_ps_server_1b @@ -275,13 +266,7 @@ topology_template: - instance_ps_server_1b forwarder_ps_server_1b_port_1: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_2: - - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - network.outgoing.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_1 link_packet_int_network: - packet_int_network - link @@ -294,6 +279,9 @@ topology_template: feature_template_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 - feature_template_Vlan_vmi_1 + network.outgoing.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.device.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -303,9 +291,9 @@ topology_template: disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.device.iops_ps_server_1b @@ -314,19 +302,22 @@ topology_template: - disk.device.iops_ps_server_1b network.incoming.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port - network.outpoing.packets_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 network.outpoing.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 endpoint_server_1b_ps_1: - abstract_ps_server_1b - endpoint_ps_server_1b + network.incoming.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 + network.incoming.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.allocation_server_1b_ps_1: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b @@ -345,12 +336,12 @@ topology_template: host_server_1b_ps_1: - abstract_ps_server_1b - host_ps_server_1b + attachment_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - attachment_ps_server_1b_ps_server_1b_port_1 feature_packet_int_network: - packet_int_network - feature - network.outgoing.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port disk.write.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.write.bytes.rate_ps_server_1b @@ -375,6 +366,9 @@ topology_template: scalable_server_1b_ps_1: - abstract_ps_server_1b - scalable_ps_server_1b + network.outpoing.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 scalable_server_1b_ps_2: - abstract_ps_server_1b - scalable_ps_server_1b @@ -393,9 +387,15 @@ topology_template: vcpus_server_1b_ps_1: - abstract_ps_server_1b - vcpus_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 vcpus_server_1b_ps_2: - abstract_ps_server_1b - vcpus_ps_server_1b + network.incoming.bytes_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 disk.read.bytes.rate_server_1b_ps_2: - abstract_ps_server_1b - disk.read.bytes.rate_ps_server_1b @@ -420,9 +420,6 @@ topology_template: disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.latency_server_1b_ps_2: - abstract_ps_server_1b - disk.latency_ps_server_1b @@ -431,7 +428,7 @@ topology_template: - disk.latency_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 binding_server_1b_ps_1: - abstract_ps_server_1b - binding_ps_server_1b @@ -458,34 +455,40 @@ topology_template: - end_point attachment_ps_server_1b_port_1: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port - attachment_ps_server_1b_port_2: - - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_1 attachment_packet_ext_network: - packet_ext_network - attachment + network.incoming.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 os_server_1b_ps_2: - abstract_ps_server_1b - os_ps_server_1b os_server_1b_ps_1: - abstract_ps_server_1b - os_ps_server_1b + binding_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port_1 feature_test_resourceGroup_2: - test_resourceGroup_2 - feature - network.outgoing.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port network.outgoing.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 + feature_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - feature_ps_server_1b_ps_server_1b_port_1 disk.usage_server_1b_ps_2: - abstract_ps_server_1b - disk.usage_ps_server_1b disk.usage_server_1b_ps_1: - abstract_ps_server_1b - disk.usage_ps_server_1b + forwarder_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -503,10 +506,7 @@ topology_template: - feature feature_ps_server_1b_port_1: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_2: - - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.bytes.rate_ps_server_1b @@ -517,21 +517,21 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - dependency_ps_server_1b_port_2: - - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency dependency_ps_server_1b_port_1: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_int_network: - packet_int_network - dependency local_storage_server_1b_ps_1: - abstract_ps_server_1b - local_storage_ps_server_1b + dependency_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_ext_network: - packet_ext_network - dependency @@ -549,4 +549,4 @@ topology_template: - dependency_ps_server_1b dependency_server_1b_ps_2: - abstract_ps_server_1b - - dependency_ps_server_1b
\ No newline at end of file + - dependency_ps_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index bd9cb40b38..6cbf3dfc19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -849,6 +849,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_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 @@ -857,108 +865,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -978,14 +978,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -998,11 +998,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1022,34 +1017,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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.delta_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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.read.requests_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1062,14 +1054,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - 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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,7 +1089,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1135,14 +1119,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1158,13 +1143,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1181,18 +1176,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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.write.bytes.rate_pd_server_1b: + disk.root.size_pd_server_1b: 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.root.size_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1204,6 +1200,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1227,15 +1228,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1250,24 +1250,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1291,19 +1291,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1870,4 +1870,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/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml index fc9893df82..2fea17fae4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml @@ -113,34 +113,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - get_input: port_net subinterface_nested_vlan_net1: - get_input: sub_inf_net vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - get_input: port_net - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -175,7 +175,7 @@ topology_template: - disk.write.bytes_server_1b_pd_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 network.outpoing.packets_pd_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.outpoing.packets_pd_server_1b_port_1 @@ -187,13 +187,13 @@ topology_template: - disk.capacity_pd_server_1b network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 disk.device.read.requests.rate_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.read.requests.rate_server_1b_pd_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 cpu_util_server_1b_pd_1_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_pd_1 @@ -319,7 +319,7 @@ topology_template: - disk.usage_server_1b_pd_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 disk.device.write.requests_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.write.requests_server_1b_pd_1 @@ -340,13 +340,13 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 disk.device.write.bytes.rate_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_pd_1 @@ -367,10 +367,10 @@ topology_template: - network.outgoing.packets.rate_pd_server_1b_port_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -391,7 +391,7 @@ topology_template: - host_pd_server_1b network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -424,7 +424,7 @@ topology_template: - memory.resident_server_1b_pd_1 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_pd_1 @@ -460,7 +460,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.read.bytes_server_1b_pd_1 @@ -490,20 +490,20 @@ topology_template: - disk.latency_pd_server_1b network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.write.requests_server_1b_pd_1 requirements: dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_server_1b_pd_1_test_nested_level2: - test_nested_level2 - dependency_server_1b_pd_1 link_pd_server_1b_port_0: - abstract_pd_server_1b - - link_pd_server_1b_pd_server_1b_port + - link_pd_server_1b_pd_server_1b_port_0 subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 4f11d4d3c4..e3b7cb6aa1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -382,4 +382,4 @@ topology_template: - dependency dependency_pd_server_1b_port_1: - pd_server_1b_port_1 - - 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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml index 1fa93606cc..4aef865a20 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml @@ -52,7 +52,7 @@ resources: name: get_param: packet_externalmain_network_name - pd_server_1b_port_0: + pd_server_1b_1_port_1: type: OS::Neutron::Port properties: network: { get_resource: packet_internalmain_network } @@ -66,14 +66,14 @@ resources: fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 1]}}] replacement_policy: AUTO - pd_server_1b_port_01: + pd_server_1b_2_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internalmain_network} fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 0]}}] replacement_policy: AUTO - pd_server_1b_port_11: + pd_server_1b_3_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internalmain_network} @@ -88,7 +88,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_0 } + - port: { get_resource: pd_server_1b_1_port_1 } server_1b_pd_1: type: OS::Nova::Server @@ -108,7 +108,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_01 } + - port: { get_resource: pd_server_1b_2_port_1 } server_1b_pd_11: type: OS::Nova::Server @@ -118,7 +118,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_11 } + - port: { get_resource: pd_server_1b_3_port_1 } test_resourceGroup_0: type: OS::Heat::ResourceGroup @@ -127,7 +127,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_0} + parent_interface: { get_resource: pd_server_1b_1_port_1} net1: { get_resource: packet_externalmain_network} test_resourceGroup_1: @@ -147,7 +147,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_01} + parent_interface: { get_resource: pd_server_1b_2_port_1} net1: { get_resource: packet_externalmain_network} test_resourceGroup_11: @@ -157,7 +157,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_11} + parent_interface: { get_resource: pd_server_1b_3_port_1} net1: { get_resource: packet_externalmain_network} test_nested_level1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml index d3ca9e5cca..5dcc2d8285 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml @@ -77,7 +77,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_2 } - ps_server_1b_port_3: + ps_server_1b_1_port_2: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -92,7 +92,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_3 } + - port: { get_resource: ps_server_1b_1_port_2 } test_resourceGroup_2: type: OS::Heat::ResourceGroup @@ -111,7 +111,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_3} + parent_interface: { get_resource: ps_server_1b_1_port_2} net1: { get_resource: packet_ext_network} pd_server_1b_port_2: @@ -131,7 +131,7 @@ resources: networks: - port: { get_resource: pd_server_1b_port_2 } - pd_server_1b_port_3: + pd_server_1b_1_port_2: type: OS::Neutron::Port properties: network: { get_resource: packet_int_network } @@ -146,4 +146,4 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_3 }
\ No newline at end of file + - port: { get_resource: pd_server_1b_1_port_2 }
\ 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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5a6cedc9f4..6d8d1684d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -20,143 +20,143 @@ node_types: status: SUPPORTED entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_1b: + - dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -169,11 +169,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -193,28 +188,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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.delta_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 - forwarder_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -233,14 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - 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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -264,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_server_1b_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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -276,7 +266,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_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: @@ -306,14 +296,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -335,7 +326,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_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: @@ -352,7 +343,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -363,6 +354,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_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.root.size_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -375,6 +372,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -398,12 +405,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -415,15 +416,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_pd_server_1b: 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_pd_server_1b_pd_server_1b_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_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -433,12 +438,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_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: @@ -462,25 +462,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + disk.write.requests.rate_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_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: @@ -582,14 +582,21 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_pd_server_1b_1_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_3: + - dependency_ps_server_1b_1_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_ps_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -673,13 +680,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_port_3: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_server_1b_ps_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -703,14 +703,6 @@ node_types: occurrences: - 0 - UNBOUNDED - binding_ps_server_1b_port_3: - 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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -746,11 +738,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -762,23 +749,12 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_1b_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED network.outpoing.packets_pd_server_1b_port_2: 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_pd_server_1b_port_3: - 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.iops_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -846,12 +822,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_3: - 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_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -910,6 +880,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_2: + 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.capacity_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -928,25 +904,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_3: + disk.device.iops_server_1b_ps_2: 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.iops_server_1b_ps_2: + network.outgoing.bytes_pd_server_1b_1_port_2: 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_pd_server_1b_port_2: + attachment_pd_server_1b_1_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_2: 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_pd_server_1b_port_3: + network.incoming.bytes.rate_ps_server_1b_1_port_2: + 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_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -969,12 +956,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_3: - 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_packet_int_network: type: tosca.capabilities.Node occurrences: @@ -1016,7 +997,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_port_3: + network.outpoing.packets_ps_server_1b_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1028,13 +1009,19 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1b_1_port_2: + 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.allocation_server_1b_ps_3: 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_pd_server_1b_port_3: + network.incoming.bytes_ps_server_1b_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1098,31 +1085,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_1b_ps_2: + network.outpoing.packets_pd_server_1b_1_port_2: 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_ps_server_1b_port_2: + disk.write.requests_server_1b_ps_2: 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.root.size_server_1b_pd_3: + network.incoming.packets.rate_ps_server_1b_port_2: 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.latency_server_1b_ps_3: + disk.root.size_server_1b_pd_3: 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_ps_server_1b_port_3: + disk.latency_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1192,19 +1179,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_port_3: - 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 - attachment_ps_server_1b_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED attachment_ps_server_1b_port_2: type: tosca.capabilities.Attachment occurrences: @@ -1279,12 +1253,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_3: - 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_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1434,12 +1402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_3: - 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.root.size_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1488,12 +1450,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_3: - 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 attachment_packet_int_network: type: tosca.capabilities.Attachment occurrences: @@ -1612,11 +1568,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_server_1b_pd_3: type: tosca.capabilities.Node occurrences: @@ -1671,7 +1622,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_3: + network.outgoing.bytes_ps_server_1b_1_port_2: + 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.packets.rate_pd_server_1b_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1683,12 +1640,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_1b_1_port_2: + 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_server_1b_ps_2: 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_pd_server_1b_1_port_2: + 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 + attachment_ps_server_1b_1_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1736,11 +1710,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1793,11 +1762,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_1_port_2: + 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_server_1b_ps_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_port_2: + 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_server_1b_ps_3: type: tosca.capabilities.Node occurrences: @@ -1861,24 +1842,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_port_3: - 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_pd_server_1b_port_2: 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_pd_server_1b_port_3: - 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_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1915,28 +1884,66 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_1_port_2: + 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 + forwarder_pd_server_1b_1_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_server_1b_pd_2: 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_ps_server_1b_1_port_2: + 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.latency_server_1b_pd_3: 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_ps_server_1b_1_port_2: + 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 scalable_server_1b_pd_3: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_1_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_server_1b_pd_2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_1b_1_port_2: + 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.delta_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1955,9 +1962,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_1b_1_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1973,25 +1979,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_1b_ps_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_ps_server_1b_1_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_1b_ps_3: + disk.device.read.bytes_server_1b_ps_2: 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_pd_server_1b_port_2: + disk.device.read.bytes_server_1b_ps_3: 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_pd_server_1b_port_3: + network.incoming.bytes.rate_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2002,11 +2007,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -2016,6 +2016,22 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2028,76 +2044,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + port_pd_server_1b_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_2_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_1b_availability_zone: - type: list + port_pd_server_1b_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1b_port_2_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: string requirements: - dependency_pd_server_1b: capability: tosca.capabilities.Node @@ -2113,14 +2113,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2133,8 +2133,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_1b_pd_server_1b_port_2: + 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 @@ -2157,29 +2158,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_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 cpu.delta_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_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 disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2197,7 +2181,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: + cpu_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2205,19 +2195,19 @@ node_types: occurrences: - 0 - UNBOUNDED - cpu_pd_server_1b: + disk.write.bytes.rate_pd_server_1b: 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.bytes.rate_pd_server_1b: + disk.device.read.requests.rate_pd_server_1b: 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.read.requests.rate_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2234,13 +2224,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server_1b: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_2: 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_pd_server_1b_pd_server_1b_port: + memory.usage_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2276,8 +2266,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2: + 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 @@ -2299,7 +2290,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2328,12 +2319,28 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2: + 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.iops_pd_server_1b: 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_pd_server_1b_pd_server_1b_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2357,12 +2364,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2380,25 +2381,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_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 memory.resident_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + disk.device.write.requests.rate_pd_server_1b: 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.write.requests.rate_pd_server_1b: + network.incoming.packets_pd_server_1b_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2416,25 +2411,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + attachment_pd_server_1b_pd_server_1b_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2443,32 +2443,28 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + type: string + port_ps_server_1b_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_1b_port_2_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2477,51 +2473,53 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_2_vlan_requirements: + type: list required: true status: SUPPORTED - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_1b_port_2_network_role: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_1b_port_2_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: type: list required: true status: SUPPORTED @@ -2533,10 +2531,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string + port_ps_server_1b_port_2_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_1b_availability_zone: type: list required: true @@ -2564,34 +2564,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2622,6 +2622,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2: + 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_util_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2633,6 +2639,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2651,12 +2662,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2668,11 +2674,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2697,12 +2698,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_ps_server_1b_port_2: + 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.read.requests_ps_server_1b: 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 + attachment_ps_server_1b_ps_server_1b_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED host_ps_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -2722,11 +2734,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2739,7 +2746,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2774,6 +2781,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_ps_server_1b_port_2_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory.resident_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2804,25 +2816,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2838,6 +2832,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2856,19 +2855,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + memory.usage_ps_server_1b: 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_ps_server_1b: + binding_ps_server_1b_ps_server_1b_port_2: + 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.latency_ps_server_1b: 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.latency_ps_server_1b: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2879,18 +2886,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + network.outpoing.packets_ps_server_1b_ps_server_1b_port_2: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node + vcpus_ps_server_1b: + 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 - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2908,15 +2916,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_port: - 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_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_2: type: tosca.capabilities.Node occurrences: - 1 @@ -2987,4 +2987,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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml index fa1596322b..e6cc52a094 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml @@ -137,29 +137,7 @@ topology_template: - 9 - 9 - 9 - vm_flavor_name: - get_input: pd_server_1b_flavor - subinterface_nested_vlan_net1: - - packet_externalmain_network - - packet_externalmain_network - - packet_externalmain_network - - packet_externalmain_network - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - - pd_server_1b_port_01 - - pd_server_1b_port_11 - - pd_server_1b_port_1 - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -176,22 +154,44 @@ topology_template: get_input: - pd_server_1b_ips - 1 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_externalmain_network + - packet_externalmain_network + - packet_externalmain_network + - packet_externalmain_network + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - packet_internalmain_network - packet_internalmain_network - packet_internalmain_network - packet_internalmain_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_1_port_1 + - pd_server_1b_2_port_1 + - pd_server_1b_3_port_1 + - pd_server_1b_port_1 + port_pd_server_1b_port_1_replacement_policy: + - AUTO + - AUTO + - AUTO + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml count: 4 @@ -201,11 +201,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_internalmain_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_externalmain_network relationship: tosca.relationships.network.LinksTo @@ -237,4 +237,4 @@ topology_template: - packet_internalmain_network - test_nested_level1 - packet_externalmain_network - - abstract_pd_server_1b_1
\ No newline at end of file + - abstract_pd_server_1b_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index d0921140a5..e2354d22f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -16,6 +16,19 @@ topology_template: required: true entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,62 +39,49 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - vm_image_name: - type: string - required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + port_pd_server_1b_port_2_network_role_tag: + type: string required: true - entry_schema: - type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_2_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_network_role: + type: string required: true - port_pd_server_1b_port_exCP_naming: + port_pd_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_1b_port_2_order: + type: integer + required: true + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: string node_templates: pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -98,39 +98,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_2_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_2_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_2_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_2_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_2_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_2_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_2_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_2_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_2_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_2_network - index_value requirements: - binding: @@ -143,9 +143,9 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature + network.incoming.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes host_pd_server_1b: - pd_server_1b - host @@ -155,18 +155,9 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -176,30 +167,33 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu + binding_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - binding disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate disk.device.read.requests.rate_pd_server_1b: - pd_server_1b - disk.device.read.requests.rate + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets.rate endpoint_pd_server_1b: - pd_server_1b - endpoint disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation + network.outpoing.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outpoing.packets memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets memory_pd_server_1b: - pd_server_1b - memory @@ -215,9 +209,9 @@ topology_template: disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes.rate disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -227,9 +221,9 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -242,9 +236,18 @@ topology_template: disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - forwarder + feature_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -257,9 +260,6 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -269,36 +269,36 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate + network.incoming.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets disk.device.capacity_pd_server_1b: - pd_server_1b - disk.device.capacity disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + attachment_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - attachment disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -306,9 +306,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + dependency_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - dependency + link_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 - link - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml index 9920d7e27f..3ee9e8faad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -21,108 +21,83 @@ topology_template: required: true entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port - relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b properties: @@ -138,54 +113,76 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_1b_pd_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b_1 capabilities: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,18 +192,15 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -216,9 +210,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -231,15 +222,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,12 +246,12 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -267,27 +261,36 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +303,26 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance binding_pd_server_1b: - pd_server_1b - binding + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,9 +333,6 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity @@ -345,6 +342,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + link_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..048e4146de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - subinterface_nested_vlan_service_template_filter_count: + type: string + port_ps_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_1b_port_2_order: + type: integer required: true - port_ps_server_1b_port_fixed_ips: + subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,42 +36,43 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_2_vlan_requirements: + type: list required: true - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_1b_port_2_network_role: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_2_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_1b_port_2_network_role_tag: + type: string + required: true subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_2_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_1b_port_network_role: + vm_image_name: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: type: list required: true entry_schema: @@ -84,9 +82,11 @@ topology_template: required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string + port_ps_server_1b_port_2_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_1b_availability_zone: type: list required: true @@ -113,7 +113,7 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: + ps_server_1b_ps_server_1b_port_2_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -136,41 +136,41 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port + node: ps_server_1b_ps_server_1b_port_2 relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_2_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_2_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_2_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_2_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_2_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_2_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_2_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_2_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_2_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_2_network - index_value requirements: - binding: @@ -192,12 +192,18 @@ topology_template: disk.device.write.requests_ps_server_1b: - ps_server_1b - disk.device.write.requests + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.outgoing.bytes cpu_util_ps_server_1b: - ps_server_1b - cpu_util scalable_ps_server_1b: - ps_server_1b - scalable + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate @@ -207,18 +213,12 @@ topology_template: disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -231,9 +231,15 @@ topology_template: disk.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.read.bytes.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.packets disk.device.read.requests_ps_server_1b: - ps_server_1b - disk.device.read.requests + attachment_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - attachment host_ps_server_1b: - ps_server_1b - host @@ -243,17 +249,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -270,6 +273,9 @@ topology_template: binding_ps_server_1b: - ps_server_1b - binding + feature_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - feature memory.resident_ps_server_1b: - ps_server_1b - memory.resident @@ -285,17 +291,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -303,6 +300,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -312,58 +312,58 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets memory.usage_ps_server_1b: - ps_server_1b - memory.usage + binding_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - binding disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.packets.rate endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature + network.outpoing.packets_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.outpoing.packets vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - feature requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - dependency + link_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - link + dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - dependency local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - 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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml index 873ade14f4..8a89b5699d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -100,17 +100,7 @@ topology_template: - get_input: - pd_server_1b_names - 0 - vm_flavor_name: - get_input: pd_server_1b_flavor - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_2_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -119,18 +109,28 @@ topology_template: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_int_network - - packet_int_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + vm_flavor_name: + get_input: pd_server_1b_flavor + port_pd_server_1b_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pd_server_1b_port_2_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_2_network: + - packet_int_network + - packet_int_network + port_pd_server_1b_port_2_mac_requirements: + mac_count_required: + is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 2 @@ -140,7 +140,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo @@ -159,13 +159,24 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: + port_ps_server_1b_port_2_network: + - packet_int_network + - packet_int_network + port_ps_server_1b_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - port_ps_server_1b_port_fixed_ips: + vm_flavor_name: + get_input: ps_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_ext_network + - packet_ext_network + port_ps_server_1b_port_2_fixed_ips: - - ip_address: get_input: - ps_server_1b_ips @@ -174,27 +185,16 @@ topology_template: get_input: - ps_server_1b_ips - 0 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - - packet_ext_network - port_ps_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_ps_server_1b_port_2_mac_requirements: + mac_count_required: is_required: false vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: - AUTO - AUTO subinterface_nested_vlan_parent_interface: - - ps_server_1b_port_3 + - ps_server_1b_1_port_2 - ps_server_1b_port_2 compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 @@ -215,11 +215,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_2: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -239,10 +239,7 @@ topology_template: capabilities: binding_ps_server_1b_port_2: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port - binding_ps_server_1b_port_3: - - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_2 disk.device.usage_server_1b_ps_2: - abstract_ps_server_1b - disk.device.usage_ps_server_1b @@ -257,28 +254,19 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b feature_pd_server_1b_port_2: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_2 disk.capacity_server_1b_pd_3: - abstract_pd_server_1b - disk.capacity_pd_server_1b - feature_pd_server_1b_port_3: - - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port disk.capacity_server_1b_pd_2: - abstract_pd_server_1b - disk.capacity_pd_server_1b forwarder_pd_server_1b_port_2: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port - forwarder_pd_server_1b_port_3: - - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_2 network.outpoing.packets_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - network.outpoing.packets_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_2 disk.device.iops_server_1b_pd_3: - abstract_pd_server_1b - disk.device.iops_pd_server_1b @@ -312,15 +300,12 @@ topology_template: memory_server_1b_ps_2: - abstract_ps_server_1b - memory_ps_server_1b - network.outgoing.packets.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port instance_server_1b_ps_3: - abstract_ps_server_1b - instance_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2 instance_server_1b_ps_2: - abstract_ps_server_1b - instance_ps_server_1b @@ -345,6 +330,9 @@ topology_template: disk.device.iops_server_1b_ps_3: - abstract_ps_server_1b - disk.device.iops_ps_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2 disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -353,19 +341,25 @@ topology_template: - disk.device.capacity_ps_server_1b network.incoming.packets_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port - network.incoming.packets_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_2 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.device.iops_ps_server_1b - network.outgoing.bytes_pd_server_1b_port_2: + network.outgoing.bytes_pd_server_1b_1_port_2: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port - network.outgoing.bytes_pd_server_1b_port_3: + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2 + attachment_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port_2 + network.incoming.packets.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2 + network.incoming.bytes.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2 + network.outgoing.bytes_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2 endpoint_server_1b_ps_3: - abstract_ps_server_1b - endpoint_ps_server_1b @@ -375,18 +369,15 @@ topology_template: host_server_1b_ps_2: - abstract_ps_server_1b - host_ps_server_1b - network.outgoing.bytes.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port feature_packet_int_network: - packet_int_network - feature network.outgoing.bytes.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2 network.outgoing.packets.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2 memory.resident_server_1b_pd_2: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -399,18 +390,21 @@ topology_template: disk.device.allocation_server_1b_ps_2: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b - network.outgoing.packets.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + network.outpoing.packets_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_2 disk.allocation_server_1b_ps_2: - abstract_ps_server_1b - disk.allocation_ps_server_1b + network.incoming.bytes_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_2 disk.allocation_server_1b_ps_3: - abstract_ps_server_1b - disk.allocation_ps_server_1b - network.outgoing.bytes.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + network.incoming.bytes_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_2 vcpus_server_1b_ps_2: - abstract_ps_server_1b - vcpus_ps_server_1b @@ -419,7 +413,7 @@ topology_template: - vcpus_ps_server_1b network.outgoing.bytes.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2 disk.write.requests_server_1b_ps_3: - abstract_ps_server_1b - disk.write.requests_ps_server_1b @@ -441,21 +435,21 @@ topology_template: os_server_1b_pd_2: - abstract_pd_server_1b - os_pd_server_1b + network.outpoing.packets_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_2 disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2 disk.root.size_server_1b_pd_3: - abstract_pd_server_1b - disk.root.size_pd_server_1b disk.latency_server_1b_ps_3: - abstract_ps_server_1b - disk.latency_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_pd_2: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -489,15 +483,9 @@ topology_template: end_point_packet_int_network: - packet_int_network - end_point - binding_pd_server_1b_port_3: - - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port - attachment_ps_server_1b_port_3: - - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port attachment_ps_server_1b_port_2: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_2 cpu_server_1b_ps_3: - abstract_ps_server_1b - cpu_ps_server_1b @@ -506,7 +494,7 @@ topology_template: - attachment binding_pd_server_1b_port_2: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_2 disk.allocation_server_1b_pd_3: - abstract_pd_server_1b - disk.allocation_pd_server_1b @@ -533,10 +521,7 @@ topology_template: - feature network.outgoing.bytes_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port - network.outgoing.bytes_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2 disk.usage_server_1b_ps_3: - abstract_ps_server_1b - disk.usage_ps_server_1b @@ -611,10 +596,7 @@ topology_template: - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port - network.incoming.bytes.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2 disk.root.size_server_1b_ps_2: - abstract_ps_server_1b - disk.root.size_ps_server_1b @@ -638,10 +620,7 @@ topology_template: - disk.write.requests.rate_pd_server_1b network.incoming.bytes_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port - network.incoming.bytes_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_2 attachment_packet_int_network: - packet_int_network - attachment @@ -701,10 +680,7 @@ topology_template: - cpu_util_pd_server_1b forwarder_ps_server_1b_port_2: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_3: - - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_2 feature_server_1b_pd_3: - abstract_pd_server_1b - feature_pd_server_1b @@ -735,15 +711,27 @@ topology_template: end_point_packet_ext_network: - packet_ext_network - end_point - network.outpoing.packets_ps_server_1b_port_3: + network.outgoing.bytes_ps_server_1b_1_port_2: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2 + network.outgoing.packets.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2 network.outpoing.packets_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_2 + network.incoming.bytes.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2 disk.write.requests.rate_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests.rate_ps_server_1b + network.incoming.packets.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2 + attachment_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - attachment_ps_server_1b_ps_server_1b_port_2 cpu_util_server_1b_pd_3: - abstract_pd_server_1b - cpu_util_pd_server_1b @@ -755,7 +743,7 @@ topology_template: - disk.write.requests.rate_ps_server_1b attachment_pd_server_1b_port_2: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_2 disk.write.bytes_server_1b_ps_3: - abstract_ps_server_1b - disk.write.bytes_ps_server_1b @@ -768,9 +756,6 @@ topology_template: disk.device.write.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.write.bytes_ps_server_1b - attachment_pd_server_1b_port_3: - - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port disk.device.read.bytes_server_1b_pd_3: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -798,9 +783,15 @@ topology_template: disk.device.capacity_server_1b_pd_3: - abstract_pd_server_1b - disk.device.capacity_pd_server_1b + network.outgoing.bytes.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2 feature_server_1b_ps_2: - abstract_ps_server_1b - feature_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2 feature_server_1b_ps_3: - abstract_ps_server_1b - feature_ps_server_1b @@ -824,7 +815,7 @@ topology_template: - disk.read.bytes_pd_server_1b network.incoming.packets.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2 disk.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.iops_ps_server_1b @@ -834,15 +825,9 @@ topology_template: endpoint_server_1b_pd_2: - abstract_pd_server_1b - endpoint_pd_server_1b - network.incoming.packets.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port network.incoming.bytes_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port - network.incoming.bytes_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_2 memory_server_1b_pd_2: - abstract_pd_server_1b - memory_pd_server_1b @@ -861,18 +846,36 @@ topology_template: disk.device.usage_server_1b_pd_3: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + binding_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port_2 + forwarder_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port_2 disk.device.latency_server_1b_pd_2: - abstract_pd_server_1b - disk.device.latency_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.packets_ps_server_1b_ps_server_1b_port_2 disk.device.latency_server_1b_pd_3: - abstract_pd_server_1b - disk.device.latency_pd_server_1b + binding_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port_2 scalable_server_1b_pd_3: - abstract_pd_server_1b - scalable_pd_server_1b + feature_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - feature_ps_server_1b_ps_server_1b_port_2 scalable_server_1b_pd_2: - abstract_pd_server_1b - scalable_pd_server_1b + network.incoming.packets_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port_2 cpu.delta_server_1b_pd_2: - abstract_pd_server_1b - cpu.delta_pd_server_1b @@ -882,15 +885,18 @@ topology_template: disk.device.read.requests_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b - network.incoming.packets_pd_server_1b_port_3: + feature_pd_server_1b_1_port_2: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_2 network.incoming.packets_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_2 disk.device.read.requests_server_1b_pd_3: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + forwarder_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port_2 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -899,16 +905,10 @@ topology_template: - disk.device.read.bytes_ps_server_1b network.incoming.bytes.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port - network.incoming.bytes.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2 feature_ps_server_1b_port_2: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_3: - - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_2 requirements: dependency_template_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 @@ -922,9 +922,6 @@ topology_template: local_storage_server_1b_pd_2: - abstract_pd_server_1b - local_storage_pd_server_1b - dependency_pd_server_1b_port_3: - - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port dependency_server_1b_ps_2: - abstract_ps_server_1b - dependency_ps_server_1b @@ -933,16 +930,16 @@ topology_template: - dependency_ps_server_1b dependency_pd_server_1b_port_2: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_2 dependency_ps_server_1b_port_2: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_2 dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency - dependency_ps_server_1b_port_3: + dependency_ps_server_1b_1_port_2: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_2 dependency_packet_int_network: - packet_int_network - dependency @@ -952,6 +949,9 @@ topology_template: dependency_test_resourceGroup_3: - test_resourceGroup_3 - dependency + dependency_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port_2 local_storage_server_1b_ps_2: - abstract_ps_server_1b - local_storage_ps_server_1b @@ -963,4 +963,4 @@ topology_template: - dependency_pd_server_1b dependency_server_1b_pd_3: - abstract_pd_server_1b - - dependency_pd_server_1b
\ No newline at end of file + - dependency_pd_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml index 8998579aef..e4b250261f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml @@ -50,7 +50,7 @@ parameters: type: string resources: - pd_server_1b_port_0: + pd_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} @@ -72,7 +72,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_0 } + - port: { get_resource: pd_server_1b_1_port_1 } server_1b_pd_1: type: OS::Nova::Server @@ -103,7 +103,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_0} + parent_interface: { get_resource: pd_server_1b_1_port_1} net1: { get_resource: packet_external_network} test_resourceGroup_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index eba8068126..e53e4ad2c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -121,28 +121,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_port_0: + - dependency_packet_external_network: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_packet_external_network: + - dependency_test_resourceGroup_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_test_resourceGroup_0: + - dependency_template_Vlan_vmi_1_test_resourceGroup_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_test_resourceGroup_0: + - dependency_pd_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -190,11 +190,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_1b_port_0: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -212,23 +207,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_port_0: - 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_pd_server_1b_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_pd_server_1b_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED feature_pd_server_1b_port_1: type: tosca.capabilities.Node occurrences: @@ -452,18 +436,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_port_0: + network.outgoing.bytes_pd_server_1b_1_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.outgoing.packets.rate_pd_server_1b_1_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 + attachment_pd_server_1b_1_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_pd_server_1b_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_pd_server_1b_1_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.bytes.rate_pd_server_1b_1_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 link_packet_external_network: type: tosca.capabilities.network.Linkable occurrences: @@ -486,12 +493,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_port_0: - 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_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -510,18 +511,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_port_0: - type: tosca.capabilities.Attachment + disk.ephemeral.size_server_1b_pd_0: + 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.ephemeral.size_server_1b_pd_0: + disk.ephemeral.size_server_1b_pd_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.ephemeral.size_server_1b_pd_1: + network.incoming.bytes_pd_server_1b_1_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: @@ -537,43 +539,37 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_1b_pd_0: + network.outgoing.bytes.rate_pd_server_1b_1_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.capacity_server_1b_pd_0: - 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_server_1b_pd_1: + instance_server_1b_pd_0: 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.capacity_server_1b_pd_1: + disk.device.capacity_server_1b_pd_0: 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_pd_server_1b_port_1: + instance_server_1b_pd_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_pd_server_1b_port_0: + disk.device.capacity_server_1b_pd_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_pd_server_1b_port_0: + network.outgoing.bytes.rate_pd_server_1b_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: @@ -600,6 +596,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_1_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_pd_server_1b_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. @@ -637,12 +639,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_1b_port_0: - 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.root.size_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -696,19 +692,24 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_1_port_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 disk.allocation_server_1b_pd_0: 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_pd_server_1b_port_0: - 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 + forwarder_pd_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.device.latency_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -769,6 +770,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_1b_1_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 cpu.delta_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -793,19 +800,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_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. + feature_pd_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - vcpus_server_1b_pd_1: + network.incoming.packets_pd_server_1b_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_pd_server_1b_port_0: + vcpus_server_1b_pd_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: @@ -858,12 +864,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_port_0: - 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.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -879,143 +879,143 @@ node_types: status: SUPPORTED entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_1b: + - dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1028,11 +1028,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1052,28 +1047,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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.delta_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 - forwarder_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_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: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -1092,14 +1084,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - 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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1123,6 +1107,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_server_1b_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_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1135,7 +1125,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_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: @@ -1165,14 +1155,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1194,7 +1185,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_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: @@ -1211,7 +1202,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -1222,6 +1213,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_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.root.size_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1234,6 +1231,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1257,12 +1264,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1274,15 +1275,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_pd_server_1b: 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_pd_server_1b_pd_server_1b_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_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1292,12 +1297,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_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: @@ -1321,25 +1321,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + disk.write.requests.rate_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_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: @@ -1411,4 +1411,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/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..c0531975e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,108 +21,83 @@ topology_template: required: true entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port - relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b properties: @@ -138,54 +113,76 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_1b_pd_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b capabilities: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,18 +192,15 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -216,9 +210,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -231,15 +222,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,12 +246,12 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -267,27 +261,36 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +303,26 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance binding_pd_server_1b: - pd_server_1b - binding + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,9 +333,6 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity @@ -345,6 +342,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + link_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml index b822c5efa3..1eac7cb338 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -119,23 +119,7 @@ topology_template: subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - vm_flavor_name: - get_input: pd_server_1b_flavor - subinterface_nested_vlan_net1: - - packet_external_network - - packet_external_network - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - - pd_server_1b_port_1 - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -144,18 +128,34 @@ topology_template: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_external_network + - packet_external_network + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - packet_internal_network - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_1_port_1 + - pd_server_1b_port_1 + port_pd_server_1b_port_1_replacement_policy: + - AUTO + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 2 @@ -165,11 +165,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -192,30 +192,21 @@ topology_template: disk.device.write.requests_server_1b_pd_1: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b - forwarder_pd_server_1b_port_0: - - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port disk.capacity_server_1b_pd_1: - abstract_pd_server_1b - disk.capacity_pd_server_1b forwarder_pd_server_1b_port_1: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_1 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b - network.outpoing.packets_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port network.outpoing.packets_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - feature_pd_server_1b_port_0: - - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1 feature_pd_server_1b_port_1: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_1 attachment_packet_internal_network: - packet_internal_network - attachment @@ -330,12 +321,24 @@ topology_template: binding_server_1b_pd_1: - abstract_pd_server_1b - binding_pd_server_1b - network.outgoing.bytes_pd_server_1b_port_0: + network.outgoing.bytes_pd_server_1b_1_port_1: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1 + network.outgoing.packets.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1 + attachment_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port_1 network.outgoing.bytes_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1 + network.incoming.packets.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1 + network.incoming.bytes.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1 link_packet_external_network: - packet_external_network - link @@ -344,13 +347,10 @@ topology_template: - memory.resident_pd_server_1b attachment_pd_server_1b_port_1: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_1 network.outgoing.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port - network.outgoing.packets.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1 memory.resident_server_1b_pd_1: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -360,21 +360,24 @@ topology_template: disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b - attachment_pd_server_1b_port_0: - - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port disk.ephemeral.size_server_1b_pd_0: - abstract_pd_server_1b - disk.ephemeral.size_pd_server_1b disk.ephemeral.size_server_1b_pd_1: - abstract_pd_server_1b - disk.ephemeral.size_pd_server_1b + network.incoming.bytes_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1 end_point_packet_internal_network: - packet_internal_network - end_point feature_packet_internal_network: - packet_internal_network - feature + network.outgoing.bytes.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1 instance_server_1b_pd_0: - abstract_pd_server_1b - instance_pd_server_1b @@ -389,13 +392,7 @@ topology_template: - disk.device.capacity_pd_server_1b network.outgoing.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port - network.outgoing.bytes.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1 os_server_1b_pd_1: - abstract_pd_server_1b - os_pd_server_1b @@ -408,9 +405,12 @@ topology_template: disk.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes_pd_server_1b + network.outpoing.packets_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1 network.incoming.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1 disk.read.bytes_server_1b_pd_1: - abstract_pd_server_1b - disk.read.bytes_pd_server_1b @@ -419,16 +419,13 @@ topology_template: - endpoint_pd_server_1b network.incoming.bytes_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1 host_server_1b_pd_1: - abstract_pd_server_1b - host_pd_server_1b host_server_1b_pd_0: - abstract_pd_server_1b - host_pd_server_1b - network.incoming.bytes_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port disk.root.size_server_1b_pd_1: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -456,18 +453,21 @@ topology_template: disk.allocation_server_1b_pd_1: - abstract_pd_server_1b - disk.allocation_pd_server_1b + binding_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port_1 disk.allocation_server_1b_pd_0: - abstract_pd_server_1b - disk.allocation_pd_server_1b - binding_pd_server_1b_port_0: + forwarder_pd_server_1b_1_port_1: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_1 disk.device.latency_server_1b_pd_1: - abstract_pd_server_1b - disk.device.latency_pd_server_1b binding_pd_server_1b_port_1: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_1 disk.device.read.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b @@ -492,6 +492,9 @@ topology_template: cpu.delta_server_1b_pd_0: - abstract_pd_server_1b - cpu.delta_pd_server_1b + network.incoming.packets_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port_1 cpu.delta_server_1b_pd_1: - abstract_pd_server_1b - cpu.delta_pd_server_1b @@ -504,15 +507,15 @@ topology_template: disk.device.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + feature_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - feature_pd_server_1b_pd_server_1b_port_1 network.incoming.packets_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_1 vcpus_server_1b_pd_1: - abstract_pd_server_1b - vcpus_pd_server_1b - network.incoming.packets_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port disk.read.bytes.rate_server_1b_pd_1: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -530,16 +533,13 @@ topology_template: - attachment network.incoming.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1 disk.latency_server_1b_pd_1: - abstract_pd_server_1b - disk.latency_pd_server_1b disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.incoming.bytes.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port requirements: dependency_test_resourceGroup_1: - test_resourceGroup_1 @@ -556,15 +556,15 @@ topology_template: dependency_template_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - dependency_template_Vlan_vmi_1 - dependency_pd_server_1b_port_0: - - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port local_storage_server_1b_pd_1: - abstract_pd_server_1b - local_storage_pd_server_1b dependency_server_1b_pd_0: - abstract_pd_server_1b - dependency_pd_server_1b + dependency_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port_1 dependency_server_1b_pd_1: - abstract_pd_server_1b - dependency_pd_server_1b @@ -573,7 +573,7 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_pd_server_1b_port_1: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_1 dependency_packet_external_network: - packet_external_network - - 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/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml index 68afa6b380..f8df24b534 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index fcbfe72539..3c0d996aeb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -157,7 +157,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2_test_nested_level2: + - dependency_ps_server_1b_1_port_1_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -199,14 +199,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_1b_ps_1_test_nested_level2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_server_1b_ps_1_test_nested_level2: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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 @@ -239,6 +239,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + 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.requests_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -283,12 +289,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1_test_nested_level2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_pd_server_1b_port_0: 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_ps_server_1b_1_port_1_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -301,6 +317,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_pd_server_1b_port_0: type: tosca.capabilities.Node occurrences: @@ -322,12 +344,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - 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.root.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -373,12 +389,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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.latency_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -478,6 +488,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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.write.bytes.rate_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -536,23 +552,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_port_2_test_nested_level2: - 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 endpoint_server_1b_ps_1_test_nested_level2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -586,11 +591,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -626,6 +626,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1_test_nested_level2: + 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_ps_server_1b_1_port_1_test_nested_level2: + 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.write.requests.rate_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -649,12 +663,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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.requests_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -852,12 +878,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_pd_0: type: tosca.capabilities.OperatingSystem occurrences: @@ -947,14 +967,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_port_2_test_nested_level2: - 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.ephemeral.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -996,6 +1008,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1086,29 +1104,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: + disk.write.requests_server_1b_pd_0: 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_server_1b_pd_0: + disk.device.allocation_server_1b_ps_1_test_nested_level2: 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 - attachment_ps_server_1b_port_2_test_nested_level2: + attachment_ps_server_1b_1_port_1_test_nested_level2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_1b_ps_1_test_nested_level2: - 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.read.bytes.rate_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1126,12 +1138,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: tosca.capabilities.OperatingSystem occurrences: @@ -1213,12 +1219,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - 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_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1252,6 +1252,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_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 @@ -1260,108 +1268,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1381,14 +1381,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1401,11 +1401,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1425,34 +1420,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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.delta_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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.read.requests_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1465,14 +1457,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - 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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1508,7 +1492,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1538,14 +1522,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1561,13 +1546,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1584,18 +1579,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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.write.bytes.rate_pd_server_1b: + disk.root.size_pd_server_1b: 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.root.size_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1607,6 +1603,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1630,15 +1631,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1653,24 +1653,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1694,19 +1694,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1814,7 +1814,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_ps_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1850,14 +1850,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_ps_server_1b_port_2: - 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.latency_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1932,12 +1924,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2: - 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.root.size_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1967,12 +1953,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2: - 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_ps_server_1b_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. @@ -2085,17 +2065,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2: - 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 link_packet_int_network: type: tosca.capabilities.network.Linkable occurrences: @@ -2112,6 +2081,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_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.capacity_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2129,7 +2104,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_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: @@ -2159,20 +2134,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2: + network.outpoing.packets_ps_server_1b_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.outpoing.packets_ps_server_1b_port_1: + endpoint_server_1b_ps_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_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 - endpoint_server_1b_ps_1: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_server_1b_1_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 @@ -2213,14 +2194,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_int_network: - type: tosca.capabilities.Node + attachment_ps_server_1b_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_packet_int_network: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2271,6 +2251,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_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 scalable_server_1b_ps_2: type: tosca.capabilities.Scalable occurrences: @@ -2304,12 +2290,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_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 vcpus_server_1b_ps_2: 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_ps_server_1b_1_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_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2358,12 +2356,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2: - 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.latency_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2431,13 +2423,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_port_2: + attachment_packet_ext_network: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_packet_ext_network: - type: tosca.capabilities.Attachment + network.incoming.packets_ps_server_1b_1_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 @@ -2451,11 +2444,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_1b_1_port_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: - - 1 + - 0 - UNBOUNDED network.outgoing.bytes_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -2463,6 +2458,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.usage_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2475,6 +2475,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2509,11 +2514,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2529,26 +2529,16 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_ps_server_1b_port_network_role_tag: + port_ps_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2557,60 +2547,70 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -2632,14 +2632,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2681,30 +2681,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_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.latency_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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.iops_ps_server_1b: + disk.device.latency_ps_server_1b: 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 - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_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.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2716,11 +2717,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2782,7 +2778,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_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: @@ -2800,12 +2796,23 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_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.root.size_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2847,25 +2854,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -2881,6 +2870,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2899,12 +2893,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_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 + binding_ps_server_1b_ps_server_1b_port_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 memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2917,23 +2919,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_ps_server_1b_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 endpoint_ps_server_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + vcpus_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -2951,43 +2954,30 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_port: - 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 + feature_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2996,72 +2986,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -3083,34 +3083,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_ps_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3129,6 +3129,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3152,30 +3157,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_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.latency_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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.iops_ps_server_1b: + disk.device.latency_ps_server_1b: 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 - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_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.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3187,11 +3193,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3241,11 +3242,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3258,7 +3254,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_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: @@ -3276,72 +3272,70 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.root.size_ps_server_1b: + disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b: - type: tosca.capabilities.network.Bindable + network.incoming.packets_ps_server_1b_ps_server_1b_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.resident_ps_server_1b: + disk.root.size_ps_server_1b: 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_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_ps_server_1b: + memory.resident_ps_server_1b: 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_ps_server_1b: + memory_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.write.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.device.write.bytes.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.read.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -3357,6 +3351,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3375,12 +3374,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_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 + binding_ps_server_1b_ps_server_1b_port_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 memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3393,23 +3400,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_ps_server_1b_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 endpoint_ps_server_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + vcpus_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -3427,15 +3435,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_port: - 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_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_1: type: tosca.capabilities.Node occurrences: - 1 @@ -3506,4 +3506,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/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ 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/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..9b142fd46b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_1_network_role_tag: + type: string + required: true + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,59 +31,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_1b_port_1_network_role: + type: string + required: true + subinterface_nested_vlan_net1: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -113,70 +113,70 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port - relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server_1b relationship: tosca.relationships.network.BindsTo + ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: ps_server_1b_ps_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_1b capabilities: @@ -186,6 +186,9 @@ topology_template: disk.device.usage_ps_server_1b: - ps_server_1b - disk.device.usage + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.allocation_ps_server_1b: - ps_server_1b - disk.device.allocation @@ -198,27 +201,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -243,17 +243,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -261,12 +258,21 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature binding_ps_server_1b: - ps_server_1b - binding @@ -285,17 +291,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -303,6 +300,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -312,58 +312,58 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - 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/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml index 258a426b3c..56530f684e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml @@ -11,22 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps_server_1b_port_network_role_tag: + port_ps_server_1b_port_1_network_role_tag: type: string required: true - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,49 +26,57 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -98,39 +98,39 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: @@ -158,27 +158,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -209,8 +206,8 @@ topology_template: disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -218,9 +215,15 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size @@ -242,17 +245,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -260,6 +254,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -269,46 +266,49 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - 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/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml index 5b9bd4c74d..b71828bdba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml @@ -95,34 +95,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -132,11 +132,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -157,12 +157,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_ps_1 - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.packets.rate_ps_server_1b_port_2 scalable_server_1b_ps_1_test_nested_level2: - test_nested_level2 - scalable_server_1b_ps_1 + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes.rate_ps_server_1b_1_port_1 end_point_packet_ext_network_test_nested_level2: - test_nested_level2 - end_point_packet_ext_network @@ -178,6 +178,9 @@ topology_template: disk.device.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_2 @@ -198,22 +201,31 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b + forwarder_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - forwarder_ps_server_1b_1_port_1 network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 + feature_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - feature_ps_server_1b_1_port_1 cpu_util_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_ps_2 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outpoing.packets_ps_server_1b_1_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -223,9 +235,6 @@ topology_template: os_server_1b_ps_1_test_nested_level2: - test_nested_level2 - os_server_1b_ps_1 - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes_ps_server_1b_port_2 disk.root.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.root.size_server_1b_ps_1 @@ -250,9 +259,6 @@ topology_template: disk.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests.rate_pd_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes.rate_ps_server_1b_port_2 disk.latency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.latency_server_1b_ps_1 @@ -304,6 +310,9 @@ topology_template: disk.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.read.requests_pd_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.packets.rate_ps_server_1b_1_port_1 disk.device.write.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -334,15 +343,9 @@ topology_template: disk.capacity_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_ps_1 - feature_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - feature_ps_server_1b_port_2 disk.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.allocation_server_1b_ps_1 - network.outgoing.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes_ps_server_1b_port_2 endpoint_server_1b_ps_1_test_nested_level2: - test_nested_level2 - endpoint_server_1b_ps_1 @@ -361,9 +364,6 @@ topology_template: end_point_packet_external_network: - packet_external_network - end_point - forwarder_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - forwarder_ps_server_1b_port_2 disk.write.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -382,6 +382,12 @@ topology_template: disk.device.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.requests_server_1b_ps_2 + binding_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - binding_ps_server_1b_1_port_1 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes_ps_server_1b_1_port_1 disk.device.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b @@ -393,10 +399,16 @@ topology_template: - feature_template_Vlan_vmi_1_test_resourceGroup_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets.rate_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 + network.outgoing.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes_ps_server_1b_1_port_1 memory.usage_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory.usage_server_1b_ps_1 @@ -414,7 +426,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -426,7 +438,7 @@ topology_template: - vcpus_server_1b_ps_2 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -495,13 +507,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets_ps_server_1b_port_2 + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -543,13 +552,10 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b - binding_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - binding_ps_server_1b_port_2 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.ephemeral.size_server_1b_ps_1 @@ -571,6 +577,9 @@ topology_template: disk.device.usage_server_1b_pd_0: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes.rate_ps_server_1b_1_port_1 cpu_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_server_1b_ps_2 @@ -606,7 +615,7 @@ topology_template: - disk.write.bytes_server_1b_ps_2 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 host_server_1b_ps_2_test_nested_level2: - test_nested_level2 - host_server_1b_ps_2 @@ -616,18 +625,15 @@ topology_template: link_packet_internal_network: - packet_internal_network - link - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets.rate_ps_server_1b_port_2 disk.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests_pd_server_1b - attachment_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - attachment_ps_server_1b_port_2 disk.device.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.allocation_server_1b_ps_1 + attachment_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - attachment_ps_server_1b_1_port_1 disk.device.read.bytes.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.bytes.rate_server_1b_ps_2 @@ -637,9 +643,6 @@ topology_template: memory_server_1b_ps_2_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_2 - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes.rate_ps_server_1b_port_2 os_server_1b_ps_2_test_nested_level2: - test_nested_level2 - os_server_1b_ps_2 @@ -666,7 +669,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -682,12 +685,9 @@ topology_template: disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outpoing.packets_ps_server_1b_port_2 network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_2 @@ -695,6 +695,9 @@ topology_template: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 requirements: + dependency_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - dependency_ps_server_1b_1_port_1 dependency_server_1b_ps_2_test_nested_level2: - test_nested_level2 - dependency_server_1b_ps_2 @@ -706,13 +709,10 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 - dependency_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - dependency_ps_server_1b_port_2 dependency_test_resourceGroup_0: - test_resourceGroup_0 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 5aa4c84390..08a98daf1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -82,28 +82,28 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 1 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -119,7 +119,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo @@ -128,34 +128,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 subinterface_nested_vlan_parent_interface: - ps_server_1b_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -171,11 +171,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -193,9 +193,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5_levelTwo capabilities: - binding_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - binding_ps_server_1b_ps_server_1b_port disk.device.latency_server_1b_ps_1: - abstract_ps_server_1b - disk.device.latency_ps_server_1b @@ -219,7 +216,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b binding_ps_server_1b_port_1: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 disk.read.bytes_server_1b_ps_1: - abstract_ps_server_1b - disk.read.bytes_ps_server_1b @@ -232,15 +229,12 @@ topology_template: disk.root.size_server_1b_ps_1: - abstract_ps_server_1b - disk.root.size_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.requests.rate_ps_server_1b @@ -250,12 +244,9 @@ topology_template: feature_test_resourceGroup_1: - test_resourceGroup_1 - feature - network.incoming.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 attachment_packet_int_network: - packet_int_network - attachment @@ -297,7 +288,7 @@ topology_template: - memory_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.capacity_ps_server_1b @@ -309,13 +300,7 @@ topology_template: - instance_ps_server_1b forwarder_ps_server_1b_port_1: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - forwarder_ps_server_1b_ps_server_1b_port - network.outgoing.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_1 link_packet_int_network: - packet_int_network - link @@ -325,6 +310,9 @@ topology_template: feature_template_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - feature_template_Vlan_vmi_1 + network.outgoing.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.device.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -334,9 +322,9 @@ topology_template: disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.capacity_ps_server_1b - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: - abstract_ps_server_1b_1 - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.iops_ps_server_1b @@ -345,19 +333,22 @@ topology_template: - disk.device.iops_ps_server_1b network.incoming.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port - network.outpoing.packets_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 network.outpoing.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 endpoint_server_1b_ps_1: - abstract_ps_server_1b - endpoint_ps_server_1b + network.incoming.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 + network.incoming.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.allocation_server_1b_ps_1: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b @@ -376,12 +367,12 @@ topology_template: host_server_1b_ps_1: - abstract_ps_server_1b - host_ps_server_1b + attachment_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - attachment_ps_server_1b_ps_server_1b_port_1 feature_packet_int_network: - packet_int_network - feature - network.outgoing.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port disk.write.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.write.bytes.rate_ps_server_1b @@ -406,6 +397,9 @@ topology_template: scalable_server_1b_ps_1: - abstract_ps_server_1b - scalable_ps_server_1b + network.outpoing.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 scalable_server_1b_ps_2: - abstract_ps_server_1b_1 - scalable_ps_server_1b @@ -424,9 +418,15 @@ topology_template: vcpus_server_1b_ps_1: - abstract_ps_server_1b - vcpus_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 vcpus_server_1b_ps_2: - abstract_ps_server_1b_1 - vcpus_ps_server_1b + network.incoming.bytes_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 disk.read.bytes.rate_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.read.bytes.rate_ps_server_1b @@ -451,9 +451,6 @@ topology_template: disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.write.requests_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.latency_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.latency_ps_server_1b @@ -462,7 +459,7 @@ topology_template: - disk.latency_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 binding_server_1b_ps_1: - abstract_ps_server_1b - binding_ps_server_1b @@ -489,31 +486,37 @@ topology_template: - end_point attachment_ps_server_1b_port_1: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port - attachment_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_1 attachment_packet_ext_network: - packet_ext_network - attachment + network.incoming.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 os_server_1b_ps_2: - abstract_ps_server_1b_1 - os_ps_server_1b os_server_1b_ps_1: - abstract_ps_server_1b - os_ps_server_1b - network.outgoing.bytes_ps_server_1b_port_2: + binding_ps_server_1b_1_port_1: - abstract_ps_server_1b_1 - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 + feature_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - feature_ps_server_1b_ps_server_1b_port_1 disk.usage_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.usage_ps_server_1b disk.usage_server_1b_ps_1: - abstract_ps_server_1b - disk.usage_ps_server_1b + forwarder_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - forwarder_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.read.bytes_ps_server_1b @@ -531,10 +534,7 @@ topology_template: - feature feature_ps_server_1b_port_1: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.bytes.rate_ps_server_1b @@ -545,18 +545,18 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - dependency_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - dependency_ps_server_1b_ps_server_1b_port dependency_ps_server_1b_port_1: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_int_network: - packet_int_network - dependency local_storage_server_1b_ps_1: - abstract_ps_server_1b - local_storage_ps_server_1b + dependency_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_ext_network: - packet_ext_network - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml index dc8f67e346..bf477345de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup @@ -100,5 +100,5 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_2} + parent_interface: { get_resource: ps_server_1b_1_port_1} net1: { get_resource: packet_ext_network}
\ 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/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 519a0da24b..e44facaecf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -171,7 +171,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2_test_nested_level2: + - dependency_ps_server_1b_1_port_1_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -213,14 +213,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_1b_ps_1_test_nested_level2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_server_1b_ps_1_test_nested_level2: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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 @@ -253,6 +253,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + 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.requests_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -297,12 +303,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1_test_nested_level2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_pd_server_1b_port_0: 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_ps_server_1b_1_port_1_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -315,6 +331,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_pd_server_1b_port_0: type: tosca.capabilities.Node occurrences: @@ -336,12 +358,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - 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.root.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -387,12 +403,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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.latency_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -497,6 +507,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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.write.bytes.rate_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -555,23 +571,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_port_2_test_nested_level2: - 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 endpoint_server_1b_ps_1_test_nested_level2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -600,11 +605,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -640,6 +640,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1_test_nested_level2: + 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_ps_server_1b_1_port_1_test_nested_level2: + 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.write.requests.rate_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -658,12 +672,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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.requests_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -866,12 +892,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_pd_0: type: tosca.capabilities.OperatingSystem occurrences: @@ -966,14 +986,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_port_2_test_nested_level2: - 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.ephemeral.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1015,6 +1027,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,29 +1123,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: + disk.write.requests_server_1b_pd_0: 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_server_1b_pd_0: + disk.device.allocation_server_1b_ps_1_test_nested_level2: 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 - attachment_ps_server_1b_port_2_test_nested_level2: + attachment_ps_server_1b_1_port_1_test_nested_level2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_1b_ps_1_test_nested_level2: - 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.read.bytes.rate_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1145,12 +1157,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_2_test_nested_level2: type: tosca.capabilities.OperatingSystem occurrences: @@ -1237,12 +1243,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - 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_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1276,6 +1276,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_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 @@ -1284,108 +1292,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1405,14 +1405,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1425,11 +1425,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1449,34 +1444,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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.delta_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: 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.read.requests_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1489,14 +1481,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - 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 cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1509,6 +1493,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1532,7 +1521,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1562,14 +1551,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: 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 - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1585,13 +1575,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1620,12 +1620,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + 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.iops_pd_server_1b: 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_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1649,12 +1660,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_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 instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1666,35 +1671,30 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1718,19 +1718,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1852,7 +1852,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_ps_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1888,14 +1888,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_ps_server_1b_port_2: - 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.latency_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1970,12 +1962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2: - 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.root.size_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2005,12 +1991,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2: - 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_ps_server_1b_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. @@ -2123,23 +2103,18 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2: - type: org.openecomp.capabilities.Forwarder + link_packet_int_network: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2: + instance_server_1b_ps_2: 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 - link_packet_int_network: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED - instance_server_1b_ps_2: + network.outgoing.packets.rate_ps_server_1b_1_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: @@ -2162,7 +2137,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_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: @@ -2192,20 +2167,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2: + network.outpoing.packets_ps_server_1b_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.outpoing.packets_ps_server_1b_port_1: + endpoint_server_1b_ps_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_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 - endpoint_server_1b_ps_1: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_server_1b_1_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 @@ -2246,14 +2227,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_int_network: - type: tosca.capabilities.Node + attachment_ps_server_1b_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_packet_int_network: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2304,6 +2284,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_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 scalable_server_1b_ps_2: type: tosca.capabilities.Scalable occurrences: @@ -2337,6 +2323,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_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 vcpus_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2348,6 +2340,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_1b_1_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_template_subint_Vlan_vmi_1_test_resourceGroup_1: type: tosca.capabilities.Node occurrences: @@ -2401,12 +2399,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2: - 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.latency_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2474,13 +2466,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_port_2: + attachment_packet_ext_network: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_packet_ext_network: - type: tosca.capabilities.Attachment + network.incoming.packets_ps_server_1b_1_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 @@ -2494,20 +2487,27 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_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_test_resourceGroup_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_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.outgoing.bytes_ps_server_1b_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. + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2523,6 +2523,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2557,11 +2562,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2577,32 +2577,22 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2611,72 +2601,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -2698,34 +2698,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_ps_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2767,30 +2767,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_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.latency_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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.iops_ps_server_1b: + disk.device.latency_ps_server_1b: 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 - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_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.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2802,11 +2803,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2856,11 +2852,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2873,7 +2864,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_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: @@ -2891,19 +2882,30 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_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.root.size_ps_server_1b: 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_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -2943,25 +2945,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -2977,6 +2961,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2995,12 +2984,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_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 + binding_ps_server_1b_ps_server_1b_port_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 memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3013,18 +3010,18 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps_server_1b: - type: tosca.capabilities.Endpoint.Admin + network.outpoing.packets_ps_server_1b_ps_server_1b_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.bytes.rate_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps_server_1b: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port: + feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -3035,6 +3032,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_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 cpu.delta_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3047,13 +3050,10 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_port: - 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 + feature_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -3121,4 +3121,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/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml index aade6f5ee0..5d0a28208d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_subint_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,36 +192,33 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate + feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_subint_Vlan_vmi_1 disk.device.read.requests.rate_pd_server_1b: - pd_server_1b - disk.device.read.requests.rate @@ -237,9 +231,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,24 +246,30 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -282,9 +282,15 @@ topology_template: disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -297,32 +303,26 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance binding_pd_server_1b: - pd_server_1b - binding - feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_subint_Vlan_vmi_1 cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,37 +333,37 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate requirements: + subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_subint_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency_template_subint_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_subint_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 1e89da0a89..5bcbd384c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_1_network_role_tag: + type: string + required: true + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,59 +31,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_1b_port_1_network_role: + type: string + required: true + subinterface_nested_vlan_net1: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -113,70 +113,70 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_subint_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port - relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server_1b relationship: tosca.relationships.network.BindsTo + ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_subint_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: ps_server_1b_ps_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_1b capabilities: @@ -198,27 +198,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -243,17 +240,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -261,15 +255,21 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size - feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_subint_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature binding_ps_server_1b: - ps_server_1b - binding @@ -288,17 +288,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -306,6 +297,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -315,55 +309,61 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature + feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature_template_subint_Vlan_vmi_1 vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: + subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - subinterface_link_template_subint_Vlan_vmi_1 + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link - dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency_template_subint_Vlan_vmi_1 - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - subinterface_link_template_subint_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - 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/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml index 3993f75f99..7ee8455f3e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml @@ -101,34 +101,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -138,11 +138,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -174,12 +174,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_ps_1 - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.packets.rate_ps_server_1b_port_2 scalable_server_1b_ps_1_test_nested_level2: - test_nested_level2 - scalable_server_1b_ps_1 + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes.rate_ps_server_1b_1_port_1 end_point_packet_ext_network_test_nested_level2: - test_nested_level2 - end_point_packet_ext_network @@ -195,6 +195,9 @@ topology_template: disk.device.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_2 @@ -215,22 +218,31 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b + forwarder_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - forwarder_ps_server_1b_1_port_1 network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 + feature_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - feature_ps_server_1b_1_port_1 cpu_util_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_ps_2 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outpoing.packets_ps_server_1b_1_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -240,9 +252,6 @@ topology_template: os_server_1b_ps_1_test_nested_level2: - test_nested_level2 - os_server_1b_ps_1 - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes_ps_server_1b_port_2 disk.root.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.root.size_server_1b_ps_1 @@ -267,9 +276,6 @@ topology_template: disk.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests.rate_pd_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes.rate_ps_server_1b_port_2 disk.latency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.latency_server_1b_ps_1 @@ -324,6 +330,9 @@ topology_template: disk.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.read.requests_pd_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.packets.rate_ps_server_1b_1_port_1 disk.device.write.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -354,15 +363,9 @@ topology_template: disk.capacity_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_ps_1 - feature_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - feature_ps_server_1b_port_2 disk.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.allocation_server_1b_ps_1 - network.outgoing.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes_ps_server_1b_port_2 endpoint_server_1b_ps_1_test_nested_level2: - test_nested_level2 - endpoint_server_1b_ps_1 @@ -378,9 +381,6 @@ topology_template: end_point_packet_external_network: - packet_external_network - end_point - forwarder_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - forwarder_ps_server_1b_port_2 disk.write.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -399,6 +399,12 @@ topology_template: disk.device.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.requests_server_1b_ps_2 + binding_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - binding_ps_server_1b_1_port_1 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes_ps_server_1b_1_port_1 disk.device.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b @@ -407,10 +413,16 @@ topology_template: - disk.device.iops_server_1b_ps_2 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets.rate_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 + network.outgoing.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes_ps_server_1b_1_port_1 memory.usage_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory.usage_server_1b_ps_1 @@ -428,7 +440,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -440,7 +452,7 @@ topology_template: - vcpus_server_1b_ps_2 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -512,13 +524,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets_ps_server_1b_port_2 + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -563,13 +572,10 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b - binding_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - binding_ps_server_1b_port_2 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.ephemeral.size_server_1b_ps_1 @@ -591,6 +597,9 @@ topology_template: disk.device.usage_server_1b_pd_0: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes.rate_ps_server_1b_1_port_1 cpu_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_server_1b_ps_2 @@ -626,7 +635,7 @@ topology_template: - disk.write.bytes_server_1b_ps_2 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 host_server_1b_ps_2_test_nested_level2: - test_nested_level2 - host_server_1b_ps_2 @@ -636,18 +645,15 @@ topology_template: link_packet_internal_network: - packet_internal_network - link - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets.rate_ps_server_1b_port_2 disk.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests_pd_server_1b - attachment_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - attachment_ps_server_1b_port_2 disk.device.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.allocation_server_1b_ps_1 + attachment_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - attachment_ps_server_1b_1_port_1 disk.device.read.bytes.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.bytes.rate_server_1b_ps_2 @@ -657,9 +663,6 @@ topology_template: memory_server_1b_ps_2_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_2 - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes.rate_ps_server_1b_port_2 os_server_1b_ps_2_test_nested_level2: - test_nested_level2 - os_server_1b_ps_2 @@ -689,7 +692,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -705,12 +708,9 @@ topology_template: disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outpoing.packets_ps_server_1b_port_2 network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_2 @@ -718,6 +718,9 @@ topology_template: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 requirements: + dependency_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - dependency_ps_server_1b_1_port_1 dependency_server_1b_ps_2_test_nested_level2: - test_nested_level2 - dependency_server_1b_ps_2 @@ -735,10 +738,7 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port - dependency_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - dependency_ps_server_1b_port_2 + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_test_resourceGroup_2_test_nested_level2: - test_nested_level2 - dependency_test_resourceGroup_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 2bba8fd0f1..385411612c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -78,34 +78,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 subinterface_nested_vlan_parent_interface: - ps_server_1b_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -121,11 +121,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -144,34 +144,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 19 - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 1 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 1 subinterface_nested_vlan_parent_interface: - - ps_server_1b_port_2 + - ps_server_1b_1_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -187,11 +187,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -207,7 +207,6 @@ topology_template: subinterface_role: Vlan members: - abstract_ps_server_1b_0 - - abstract_ps_server_1b_1 nested_pattern5_levelTwo_group: type: org.openecomp.groups.heat.HeatStack properties: @@ -221,9 +220,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5_levelTwo capabilities: - binding_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - binding_ps_server_1b_ps_server_1b_port disk.device.latency_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.latency_ps_server_1b @@ -247,7 +243,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b binding_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 disk.read.bytes_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.read.bytes_ps_server_1b @@ -260,15 +256,12 @@ topology_template: disk.root.size_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.root.size_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.read.requests.rate_ps_server_1b @@ -278,12 +271,9 @@ topology_template: feature_test_resourceGroup_1: - test_resourceGroup_1 - feature - network.incoming.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 attachment_packet_int_network: - packet_int_network - attachment @@ -325,7 +315,7 @@ topology_template: - memory_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.capacity_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.capacity_ps_server_1b @@ -337,19 +327,16 @@ topology_template: - instance_ps_server_1b forwarder_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - forwarder_ps_server_1b_ps_server_1b_port - network.outgoing.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_1 link_packet_int_network: - packet_int_network - link instance_server_1b_ps_2: - abstract_ps_server_1b_1 - instance_ps_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.device.capacity_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.capacity_ps_server_1b @@ -359,9 +346,9 @@ topology_template: disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.capacity_ps_server_1b - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: - abstract_ps_server_1b_1 - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.iops_ps_server_1b @@ -370,19 +357,22 @@ topology_template: - disk.device.iops_ps_server_1b network.incoming.packets_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port - network.outpoing.packets_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 network.outpoing.packets_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 endpoint_server_1b_ps_1: - abstract_ps_server_1b_0 - endpoint_ps_server_1b + network.incoming.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 + network.incoming.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.allocation_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.allocation_ps_server_1b @@ -401,12 +391,12 @@ topology_template: host_server_1b_ps_1: - abstract_ps_server_1b_0 - host_ps_server_1b + attachment_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - attachment_ps_server_1b_ps_server_1b_port_1 feature_packet_int_network: - packet_int_network - feature - network.outgoing.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port disk.write.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.write.bytes.rate_ps_server_1b @@ -431,6 +421,9 @@ topology_template: scalable_server_1b_ps_1: - abstract_ps_server_1b_0 - scalable_ps_server_1b + network.outpoing.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 scalable_server_1b_ps_2: - abstract_ps_server_1b_1 - scalable_ps_server_1b @@ -449,12 +442,18 @@ topology_template: vcpus_server_1b_ps_1: - abstract_ps_server_1b_0 - vcpus_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 vcpus_server_1b_ps_2: - abstract_ps_server_1b_1 - vcpus_ps_server_1b feature_template_subint_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 - feature_template_subint_Vlan_vmi_1 + network.incoming.bytes_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 feature_template_subint_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - feature_template_subint_Vlan_vmi_1 @@ -482,9 +481,6 @@ topology_template: disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.write.requests_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.latency_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.latency_ps_server_1b @@ -493,7 +489,7 @@ topology_template: - disk.latency_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 binding_server_1b_ps_1: - abstract_ps_server_1b_0 - binding_ps_server_1b @@ -520,34 +516,40 @@ topology_template: - end_point attachment_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - attachment_ps_server_1b_ps_server_1b_port - attachment_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_1 attachment_packet_ext_network: - packet_ext_network - attachment + network.incoming.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 os_server_1b_ps_2: - abstract_ps_server_1b_1 - os_ps_server_1b os_server_1b_ps_1: - abstract_ps_server_1b_0 - os_ps_server_1b + binding_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - binding_ps_server_1b_ps_server_1b_port_1 feature_test_resourceGroup_2: - test_resourceGroup_2 - feature - network.outgoing.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port network.outgoing.bytes_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 + feature_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - feature_ps_server_1b_ps_server_1b_port_1 disk.usage_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.usage_ps_server_1b disk.usage_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.usage_ps_server_1b + forwarder_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - forwarder_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.read.bytes_ps_server_1b @@ -565,10 +567,7 @@ topology_template: - feature feature_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b_0 - disk.device.read.bytes.rate_ps_server_1b @@ -579,21 +578,21 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - dependency_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - dependency_ps_server_1b_ps_server_1b_port dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency dependency_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_int_network: - packet_int_network - dependency local_storage_server_1b_ps_1: - abstract_ps_server_1b_0 - local_storage_ps_server_1b + dependency_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_ext_network: - packet_ext_network - 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/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 |