diff options
author | 2018-11-29 20:46:49 +0530 | |
---|---|---|
committer | 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/pattern1b | |
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/pattern1b')
20 files changed, 2141 insertions, 2141 deletions
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 |