diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a')
7 files changed, 639 insertions, 639 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 |