diff options
| author |   ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
| commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
| tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel | |
| 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/nestedOtherScenarios/multiLevel')
59 files changed, 8901 insertions, 8901 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml index 8dc7b43734..eedaf27870 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml @@ -119,14 +119,14 @@ resources: ########### PATTERN 1C1 ################# - cmaui_port_01: + cmaui_1c1_main_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_02: + cmaui_1c1_main_2_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} @@ -145,7 +145,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_main_flavor } networks: - - port: { get_resource: cmaui_port_01 } + - port: { get_resource: cmaui_1c1_main_1_mgmt_port_0 } server_main_1c1_cmaui_2: type: OS::Nova::Server @@ -159,7 +159,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_main_flavor } networks: - - port: { get_resource: cmaui_port_02 } + - port: { get_resource: cmaui_1c1_main_2_mgmt_port_0 } ########### PATTERN 4 ################# diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml index d957b399c8..b205ee8189 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml @@ -34,14 +34,14 @@ parameters: type: string resources: - pd_server_pattern4_port_1: + pd_server_pattern4_0_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [pd_server_pattern4_ips, 0]}}] replacement_policy: AUTO - pd_server_pattern4_port_2: + pd_server_pattern4_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: net } @@ -56,8 +56,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_pattern4_flavor } networks: - - port: { get_resource: pd_server_pattern4_port_1 } - - port: { get_resource: pd_server_pattern4_port_2 } + - port: { get_resource: pd_server_pattern4_0_mgmt_port_0 } + - port: { get_resource: pd_server_pattern4_1_mgmt_port_0 } outputs: pattern4_attr_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml index 68c93f53d3..373a967506 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml @@ -34,14 +34,14 @@ parameters: type: string resources: - pd_server_pattern4_port_01: + pd_server_pattern4_1_oam_port_0: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [pd_server_pattern4_ips, 0]}}] replacement_policy: AUTO - pd_server_pattern4_port_02: + pd_server_pattern4_0_oam_port_0: type: OS::Neutron::Port properties: network: { get_param: net } @@ -56,8 +56,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_pattern4_flavor } networks: - - port: { get_resource: pd_server_pattern4_port_01 } - - port: { get_resource: pd_server_pattern4_port_02 } + - port: { get_resource: pd_server_pattern4_1_oam_port_0 } + - port: { get_resource: pd_server_pattern4_0_oam_port_0 } outputs: pattern4_attr_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml index 59312c6bba..af3eab7940 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml @@ -107,14 +107,14 @@ resources: ########### PATTERN 1C1 (same type as main) ################# - cmaui_port_11: + cmaui_1c1_main_11_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_12: + cmaui_1c1_main_21_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} @@ -133,7 +133,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_main_flavor } networks: - - port: { get_resource: cmaui_port_11 } + - port: { get_resource: cmaui_1c1_main_11_mgmt_port_0 } server_main_1c1_cmaui_21: type: OS::Nova::Server @@ -147,7 +147,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_main_flavor } networks: - - port: { get_resource: cmaui_port_12 } + - port: { get_resource: cmaui_1c1_main_21_mgmt_port_0 } ########### PATTERN 4 (same type as main) ################# diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested2.yml index 930b165ed3..16634bcea2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested2.yml @@ -121,14 +121,14 @@ resources: ########### PATTERN 1C1 ################# - cmaui_port_1: + cmaui_1c1_nested2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_1c1_nested2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: contrail_net_name} @@ -148,7 +148,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_nested2_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1c1_nested2_1_mgmt_port_0 } server_nested2_1c1_cmaui_2: type: OS::Nova::Server @@ -163,7 +163,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_nested2_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_1c1_nested2_2_mgmt_port_0 } ########### PATTERN 4 ################# diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 75e2b7f6b6..1a92fb8152 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -652,27 +652,35 @@ node_types: description: UID of OAM network required: true status: SUPPORTED + port_pd_server_pattern4_0_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements p2: type: string description: UID of OAM network required: true status: SUPPORTED - port_pd_server_pattern4_port_2_order: - type: integer + port_pd_server_pattern4_0_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_2_vlan_requirements: - type: list + port_pd_server_pattern4_1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_2_network_role_tag: + port_pd_server_pattern4_1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_pattern4_0_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED availability_zone_0: @@ -680,23 +688,17 @@ node_types: description: availabilityzone name required: true status: SUPPORTED - port_pd_server_pattern4_port_2_ip_requirements: + port_pd_server_pattern4_0_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments net: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_1_network_role_tag: + port_pd_server_pattern4_1_mgmt_port_0_network_role: type: string required: true status: SUPPORTED @@ -705,20 +707,26 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_1_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_pattern4_1_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_1_ip_requirements: + port_pd_server_pattern4_1_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_1_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: type: list description: CMAUI1, CMAUI2 server names @@ -731,8 +739,8 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_pattern4_port_1_order: - type: integer + port_pd_server_pattern4_0_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED pd_server_pattern4_image: @@ -740,36 +748,28 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_1_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_2_related_networks: + port_pd_server_pattern4_1_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_1_network_role: - type: string - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_network_role: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_pattern4_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_1_subnetpoolid: - type: string + port_pd_server_pattern4_0_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_2_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_pattern4_0_mgmt_port_0_order: + type: integer required: true status: SUPPORTED pd_server_pattern4_names: @@ -785,19 +785,6 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_pattern4_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pattern4_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_pd_pattern4_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -812,14 +799,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_2: + - dependency_pd_server_pattern4_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_2: + - link_pd_server_pattern4_1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pd_server_pattern4_0_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pattern4_0_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -832,9 +832,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pattern4_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -849,12 +848,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.capacity_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -873,13 +866,15 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_2: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_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_pattern4_port_1: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_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 @@ -901,16 +896,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pattern4_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED cpu_util_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -928,6 +913,16 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_0_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_pattern4_1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.latency_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -964,6 +959,17 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_0_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_1_mgmt_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.write.bytes_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -983,147 +989,144 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pd_pattern4_1: + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_2: + network.incoming.packets_pd_server_pattern4_0_mgmt_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_server_pd_pattern4_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.write.requests_server_pd_pattern4_1: + disk.write.bytes_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pd_pattern4_1: + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_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.rate_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pd_pattern4_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pd_pattern4_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_1_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_2: + disk.device.write.requests_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_2: + disk.write.requests.rate_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_pd_pattern4_1: + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_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 - forwarder_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.Forwarder + disk.device.read.bytes_server_pd_pattern4_1: + type: org.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_pattern4_port_2: - type: org.openecomp.capabilities.Forwarder + network.incoming.packets_pd_server_pattern4_1_mgmt_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_pd_server_pattern4_port_1: + disk.read.bytes_server_pd_pattern4_1: type: org.openecomp.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_pattern4_port_2: + network.incoming.bytes_pd_server_pattern4_1_mgmt_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 - instance_server_pd_pattern4_1: + network.outpoing.packets_pd_server_pattern4_0_mgmt_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 - vcpus_server_pd_pattern4_1: + network.outpoing.packets_pd_server_pattern4_1_mgmt_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_server_pd_pattern4_1: + instance_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_pd_pattern4_1: - type: tosca.capabilities.network.Bindable + network.incoming.bytes_pd_server_pattern4_0_mgmt_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_server_pd_pattern4_1: + vcpus_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pd_pattern4_1: + cpu.delta_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_pd_pattern4_1: + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_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.allocation_server_pd_pattern4_1: + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_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 - binding_pd_server_pattern4_port_2: + binding_pd_server_pattern4_0_mgmt_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1131,68 +1134,65 @@ node_types: occurrences: - 0 - UNBOUNDED - os_server_pd_pattern4_1: - type: tosca.capabilities.OperatingSystem + binding_server_pd_pattern4_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_2: + disk.device.read.requests_server_pd_pattern4_1: type: org.openecomp.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_server_pd_pattern4_1: + disk.device.write.bytes.rate_server_pd_pattern4_1: type: org.openecomp.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_pattern4_port_1: + disk.usage_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_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 - network.outgoing.packets.rate_pd_server_pattern4_port_1: + disk.device.allocation_server_pd_pattern4_1: type: org.openecomp.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_pattern4_port_1: + os_server_pd_pattern4_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_pd_pattern4_1: + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_pd_pattern4_1: + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_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_pattern4_port_2: + disk.read.requests_server_pd_pattern4_1: type: org.openecomp.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_pattern4_port_2: + disk.root.size_server_pd_pattern4_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1227,66 +1227,68 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_pattern4_port_02_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_network_role_tag: - type: string + port_pd_server_pattern4_0_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_01_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_02_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - availability_zone_0: - type: string - description: availabilityzone name + port_pd_server_pattern4_1_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - net: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_exCP_naming: - type: org.openecomp.datatypes.Naming + availability_zone_0: + type: string + description: availabilityzone name required: true status: SUPPORTED - port_pd_server_pattern4_port_02_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - pd_server_pattern4_flavor: - type: string - description: Flavor for PD server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_01_network_role: + type: org.openecomp.datatypes.network.IpRequirements + net: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_02_network_role: + pd_server_pattern4_flavor: type: string + description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED security_group_name: @@ -1301,44 +1303,42 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_order: - type: integer + port_pd_server_pattern4_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_02_ip_requirements: - type: list + port_pd_server_pattern4_0_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_02_subnetpoolid: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_pattern4_1_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_01_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_02_network_role_tag: + port_pd_server_pattern4_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -1355,14 +1355,14 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_pattern4_port_01: + - dependency_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01: + - link_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1382,14 +1382,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02: + - dependency_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02: + - link_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1408,55 +1408,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - binding_pd_server_pattern4_port_01: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_01: - type: org.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_pattern4_port_02: + feature_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_01: - type: tosca.capabilities.Node + forwarder_pd_server_pattern4_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01: + disk.allocation_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pd_pattern4: + disk.device.usage_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pd_pattern4: + network.incoming.bytes_pd_server_pattern4_0_oam_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: @@ -1486,7 +1460,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02: + binding_pd_server_pattern4_0_oam_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1494,17 +1468,35 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_0_oam_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.latency_server_pd_pattern4: type: org.openecomp.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_pattern4_0_oam_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 endpoint_server_pd_pattern4: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_0_oam_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_server_pd_pattern4: type: tosca.capabilities.Node occurrences: @@ -1516,25 +1508,25 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pd_pattern4: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_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_server_pd_pattern4: + instance_server_pd_pattern4: type: org.openecomp.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_server_pd_pattern4: + cpu_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_01: + disk.device.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1553,25 +1545,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02: + memory.resident_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_pd_pattern4: + disk.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_pd_pattern4: + network.outpoing.packets_pd_server_pattern4_0_oam_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_pd_server_pattern4_port_02: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_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: @@ -1601,7 +1593,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01: + network.incoming.bytes_pd_server_pattern4_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1631,42 +1623,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_pd_pattern4: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02: + network.incoming.packets_pd_server_pattern4_0_oam_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 - binding_server_pd_pattern4: - type: tosca.capabilities.network.Bindable + network.outpoing.packets_pd_server_pattern4_1_oam_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.iops_server_pd_pattern4: + network.outgoing.bytes_pd_server_pattern4_1_oam_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 - forwarder_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.Forwarder + disk.device.iops_server_pd_pattern4: + type: org.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_pattern4_port_02: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_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 @@ -1682,19 +1675,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_pd_pattern4: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_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.read.bytes_server_pd_pattern4: + disk.usage_server_pd_pattern4: type: org.openecomp.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_pattern4_port_01: + disk.read.bytes_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1705,6 +1698,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1722,7 +1720,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01: + feature_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_1_oam_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: @@ -1746,35 +1749,32 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_oam_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - attachment_pd_server_pattern4_port_02: + attachment_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02: + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01: + disk.device.capacity_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pd_pattern4: + network.incoming.packets_pd_server_pattern4_1_oam_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: @@ -1797,66 +1797,68 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_pattern4_port_02_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_network_role_tag: - type: string + port_pd_server_pattern4_0_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_01_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_02_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - availability_zone_0: - type: string - description: availabilityzone name + port_pd_server_pattern4_1_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - net: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_exCP_naming: - type: org.openecomp.datatypes.Naming + availability_zone_0: + type: string + description: availabilityzone name required: true status: SUPPORTED - port_pd_server_pattern4_port_02_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - pd_server_pattern4_flavor: - type: string - description: Flavor for PD server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_01_network_role: + type: org.openecomp.datatypes.network.IpRequirements + net: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_02_network_role: + pd_server_pattern4_flavor: type: string + description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED security_group_name: @@ -1870,44 +1872,42 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_order: - type: integer + port_pd_server_pattern4_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_02_ip_requirements: - type: list + port_pd_server_pattern4_0_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_02_subnetpoolid: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_pattern4_1_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_01_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_02_network_role_tag: + port_pd_server_pattern4_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -1923,14 +1923,14 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_pattern4_port_01: + - dependency_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01: + - link_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1950,14 +1950,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02: + - dependency_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02: + - link_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1976,55 +1976,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - binding_pd_server_pattern4_port_01: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_01: - type: org.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_pattern4_port_02: + feature_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_01: - type: tosca.capabilities.Node + forwarder_pd_server_pattern4_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01: + disk.allocation_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pd_pattern4: + disk.device.usage_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pd_pattern4: + network.incoming.bytes_pd_server_pattern4_0_oam_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: @@ -2054,7 +2028,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02: + binding_pd_server_pattern4_0_oam_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2062,17 +2036,35 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_0_oam_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.latency_server_pd_pattern4: type: org.openecomp.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_pattern4_0_oam_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 endpoint_server_pd_pattern4: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_0_oam_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_server_pd_pattern4: type: tosca.capabilities.Node occurrences: @@ -2084,25 +2076,25 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pd_pattern4: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_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_server_pd_pattern4: + instance_server_pd_pattern4: type: org.openecomp.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_server_pd_pattern4: + cpu_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_01: + disk.device.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2121,25 +2113,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02: + memory.resident_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_pd_pattern4: + disk.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_pd_pattern4: + network.outpoing.packets_pd_server_pattern4_0_oam_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_pd_server_pattern4_port_02: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_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: @@ -2169,7 +2161,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01: + network.incoming.bytes_pd_server_pattern4_1_oam_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: @@ -2199,42 +2191,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_pd_pattern4: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02: + network.incoming.packets_pd_server_pattern4_0_oam_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 - binding_server_pd_pattern4: - type: tosca.capabilities.network.Bindable + network.outpoing.packets_pd_server_pattern4_1_oam_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.iops_server_pd_pattern4: + network.outgoing.bytes_pd_server_pattern4_1_oam_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 - forwarder_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.Forwarder + disk.device.iops_server_pd_pattern4: + type: org.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_pattern4_port_02: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_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 @@ -2250,19 +2243,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_pd_pattern4: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_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.read.bytes_server_pd_pattern4: + disk.usage_server_pd_pattern4: type: org.openecomp.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_pattern4_port_01: + disk.read.bytes_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2273,6 +2266,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2290,7 +2288,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01: + feature_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_1_oam_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: @@ -2314,35 +2317,32 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_oam_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - attachment_pd_server_pattern4_port_02: + attachment_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02: + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01: + disk.device.capacity_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pd_pattern4: + network.incoming.packets_pd_server_pattern4_1_oam_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: @@ -2351,29 +2351,21 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1_main_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_main_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED @@ -2387,72 +2379,67 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_main_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_1c1_main_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_cmaui_1c1_main_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_cmaui_1c1_main_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cmaui_1c1_main_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_cmaui_1c1_main_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_cmaui_1c1_main_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: + port_cmaui_1c1_main_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED requirements: - - dependency_cmaui_1c1_main_cmaui_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_1c1_main_cmaui_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_cmaui_1c1_main: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2467,6 +2454,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: disk.device.iops_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer @@ -2474,6 +2474,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_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.write.bytes.rate_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2503,12 +2509,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_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.read.requests_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2550,8 +2550,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_main_cmaui_port: - type: tosca.capabilities.Attachment + forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -2573,42 +2573,48 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_main_cmaui_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_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 - vcpus_cmaui_1c1_main: + network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_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.read.bytes.rate_cmaui_1c1_main: + vcpus_cmaui_1c1_main: type: org.openecomp.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_cmaui_1c1_main: + disk.read.bytes.rate_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_cmaui_1c1_main: + feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_cmaui_1c1_main: + disk.device.write.requests_cmaui_1c1_main: type: org.openecomp.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_cmaui_1c1_main_cmaui_port: + disk.usage_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2620,19 +2626,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port: + memory.usage_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_cmaui_1c1_main: + network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_1c1_main_cmaui_port: + network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_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: @@ -2662,7 +2668,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_1c1_main_cmaui_port: + network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_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: @@ -2674,12 +2680,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_1c1_main_cmaui_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port: + network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_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: @@ -2698,23 +2699,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_main_cmaui_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.write.bytes.rate_cmaui_1c1_main: type: org.openecomp.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_cmaui_1c1_main_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED memory_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer @@ -2733,21 +2730,24 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_1c1_main_cmaui_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 + disk.device.usage_cmaui_1c1_main: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.usage_cmaui_1c1_main: + network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_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: @@ -2878,6 +2878,19 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_cmaui_1c1_main_11_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_main_11_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_test_nested_pattern_4_main_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2885,14 +2898,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2912,40 +2925,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_cmaui_port_12: + - dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_12: + - link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cmaui_port_11: + - dependency_cmaui_1c1_main_21_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_11: + - link_cmaui_1c1_main_21_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3026,19 +3026,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_2_test_nested2Level: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_2_test_nested2Level: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_nested2_ps_1b_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3088,6 +3075,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_server_nested2_1c1_cmaui_2_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3109,14 +3109,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3136,14 +3136,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3211,26 +3211,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - dependency_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - link_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3245,14 +3245,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3285,19 +3298,6 @@ node_types: occurrences: - 1 - 1 - - dependency_cmaui_port_1_test_nested2Level: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_1_test_nested2Level: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_main_ps_1b_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3330,12 +3330,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_cmaui_1c1_main_21_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED feature_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: tosca.capabilities.Node occurrences: @@ -3347,27 +3361,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2_test_nested2Level: + cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + disk.device.read.requests_server_main_1c1_cmaui_11: type: org.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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.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_server_main_1c1_cmaui_11: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -3377,6 +3390,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.latency_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3394,6 +3412,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_cmaui_1c1_main_11_mgmt_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_util_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3448,6 +3472,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + 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.write.requests_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3465,48 +3497,48 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1: + network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.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_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: type: org.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_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_pd_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_cmaui_1c1_main_21_mgmt_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: @@ -3524,22 +3556,12 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_11: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.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_cmaui_port_12: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_ps_server_main_1b_port_1: type: tosca.capabilities.Node occurrences: @@ -3563,11 +3585,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2_test_nested2Level: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED os_server_pd_pattern4_test_nested_pattern_4_main_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -3591,7 +3608,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_cmaui_1c1_main_11_mgmt_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: @@ -3609,6 +3631,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED instance_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3680,29 +3707,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED binding_server_main_1c1_cmaui_21: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3715,30 +3724,30 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.Attachment + forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_util_server_nested2_ps_1b_test_nested2Level: + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_server_main_ps_1b_1: + cpu_util_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.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_nested2_1b_port_test_nested2Level: + instance_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.packets.rate_ps_server_nested2_1b_port_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3780,6 +3789,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3792,6 +3806,16 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_1c1_main_21_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED endpoint_server_main_1c1_cmaui_21: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3816,7 +3840,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3834,8 +3858,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.Node + network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -3863,12 +3888,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu.delta_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3898,13 +3917,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_main_1c1_cmaui_11: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2_test_nested2Level: + disk.usage_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3922,19 +3941,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_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 - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3960,40 +3966,30 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + feature_cmaui_1c1_main_11_mgmt_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_11: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.read.bytes_server_nested2_pd_1b_test_nested2Level: type: org.openecomp.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_cmaui_port_12: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED os_server_main_ps_1b_1: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_main_11_mgmt_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.read.bytes_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4034,6 +4030,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4046,25 +4047,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED feature_server_nested2_1c1_cmaui_2_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - endpoint_server_main_1c1_cmaui_11: - type: tosca.capabilities.Endpoint.Admin + network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_main_1c1_cmaui_11: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -4126,11 +4129,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4142,51 +4140,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1_test_nested2Level: + disk.device.write.bytes_server_main_pd_1b_1: type: org.openecomp.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_server_main_pd_1b_1: + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - 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.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_main_ps_1b_1: + network.incoming.bytes_cmaui_1c1_main_21_mgmt_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.allocation_server_nested2_1c1_cmaui_1_test_nested2Level: + disk.ephemeral.size_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.allocation_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.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_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4198,23 +4188,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_2_test_nested2Level: - type: org.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_nested2_1b_port_test_nested2Level: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4245,9 +4223,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4257,12 +4234,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.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_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4275,26 +4246,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_port_1_test_nested2Level: - 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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.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_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory.usage_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4313,19 +4270,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: + disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4365,7 +4327,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + network.incoming.packets_cmaui_1c1_main_11_mgmt_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: @@ -4383,6 +4345,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + 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.read.requests_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4401,55 +4371,55 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + disk.iops_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.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_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.outgoing.bytes.rate_pd_server_nested2_1b_port_test_nested2Level: type: org.openecomp.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_server_nested2_1c1_cmaui_1_test_nested2Level: + disk.write.requests_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.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_nested2_1b_port_test_nested2Level: + disk.write.requests_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_nested2_ps_1b_test_nested2Level: + disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_main_pd_1b_1: + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level: + instance_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_server_nested2_1c1_cmaui_2_test_nested2Level: + network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level: + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4461,6 +4431,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED os_server_nested2_pd_1b_test_nested2Level: type: tosca.capabilities.OperatingSystem occurrences: @@ -4478,12 +4454,29 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_nested2_pd_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4520,47 +4513,42 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - type: tosca.capabilities.Node + endpoint_server_main_pd_1b_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_2_test_nested2Level: + disk.allocation_server_main_1c1_cmaui_21: type: org.openecomp.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_cmaui_port_11: + disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_main_pd_1b_1: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.allocation_server_main_1c1_cmaui_21: + vcpus_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.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_cmaui_port_12: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4601,20 +4589,26 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.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_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + attachment_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.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_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Node + network.incoming.bytes.rate_cmaui_1c1_main_11_mgmt_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 @@ -4629,14 +4623,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED network.incoming.packets.rate_pd_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4648,13 +4634,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + disk.device.usage_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_main_1c1_cmaui_11: + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4666,6 +4652,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: tosca.capabilities.network.Bindable occurrences: @@ -4696,6 +4688,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: org.openecomp.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_nested2_1b_port_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4777,12 +4775,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory.resident_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4801,20 +4793,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests_server_main_ps_1b_1: type: org.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_pattern4_port_02_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.Forwarder + attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -4841,7 +4827,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: org.openecomp.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_cmaui_1c1_main_21_mgmt_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: @@ -4871,18 +4863,36 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.allocation_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.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_server_nested2_pd_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4901,14 +4911,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - 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.read.requests_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4921,13 +4923,21 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_nested2_ps_1b_test_nested2Level: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.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_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + binding_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + 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.read.bytes_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4961,12 +4971,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_main_11_mgmt_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.write.requests_server_main_1c1_cmaui_21: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4990,12 +5012,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.Forwarder + disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: + type: org.openecomp.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_server_nested2_1c1_cmaui_2_test_nested2Level: + network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5018,59 +5041,76 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED feature_test_nested3Level_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.incoming.bytes.rate_cmaui_1c1_main_21_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_server_main_pd_1b_1: + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + feature_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_nested2_1c1_cmaui_2_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_main_pd_1b_1: - type: tosca.capabilities.Node + disk.iops_server_main_pd_1b_1: + type: org.openecomp.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_cmaui_port_12: + disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.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_cmaui_port_11: + disk.ephemeral.size_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + feature_server_main_pd_1b_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_1_test_nested2Level: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_cmaui_1c1_main_21_mgmt_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 @@ -5122,7 +5162,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5134,12 +5174,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: org.openecomp.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_server_main_pd_1b_1: type: org.openecomp.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_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5158,13 +5210,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_1_test_nested2Level: + disk.device.latency_server_main_1c1_cmaui_21: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_main_1c1_cmaui_21: + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.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_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5228,25 +5286,33 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + disk.device.write.bytes_server_main_1c1_cmaui_11: type: org.openecomp.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_server_main_1c1_cmaui_11: + binding_pd_server_main_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.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_cmaui_port_2_test_nested2Level: + disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_main_1b_port_1: + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -5254,37 +5320,37 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: + memory.resident_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.incoming.bytes_ps_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_main_pd_1b_1: + vcpus_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.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_main_1b_port_1: + network.outgoing.bytes.rate_cmaui_1c1_main_11_mgmt_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 - vcpus_server_nested2_1c1_cmaui_1_test_nested2Level: + disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5296,29 +5362,30 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level: + network.outpoing.packets_cmaui_1c1_main_11_mgmt_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 - endpoint_server_nested2_1c1_cmaui_1_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level: + type: org.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_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.Attachment + endpoint_server_nested2_1c1_cmaui_1_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1: + network.incoming.packets_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: type: org.openecomp.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_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5330,11 +5397,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5346,6 +5408,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED host_server_main_1c1_cmaui_21: type: tosca.capabilities.Container valid_source_types: @@ -5353,12 +5421,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.ephemeral.size_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5377,12 +5439,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5395,7 +5451,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5413,11 +5469,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5430,12 +5481,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.latency_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5448,21 +5493,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_12: + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_11: + disk.device.read.requests.rate_server_nested2_pd_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_nested2_pd_1b_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -5489,9 +5533,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -5524,51 +5567,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_11: + disk.usage_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outpoing.packets_cmaui_port_12: + network.outpoing.packets_cmaui_1c1_main_21_mgmt_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.usage_server_pd_pattern4_test_nested_pattern_4_main_1: + memory.resident_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_nested2_1c1_cmaui_2_test_nested2Level: + disk.capacity_server_nested2_pd_1b_test_nested2Level: type: org.openecomp.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_server_nested2_pd_1b_test_nested2Level: + disk.ephemeral.size_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_main_1c1_cmaui_11: + cpu_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5634,31 +5669,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.root.size_server_main_1c1_cmaui_21: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_main_1c1_cmaui_21: + disk.usage_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_main_ps_1b_1: + cpu_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_main_pd_1b_1: + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5700,6 +5735,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED host_server_main_1c1_cmaui_11: type: tosca.capabilities.Container valid_source_types: @@ -5707,6 +5748,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.iops_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5743,6 +5790,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5755,6 +5807,30 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_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 + forwarder_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + type: org.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_cmaui_1c1_main_11_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5784,17 +5860,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5901,13 +5966,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5918,12 +5977,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5936,12 +5989,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_cmaui_port_2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5953,28 +6001,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_1_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED feature_server_nested2_ps_1b_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED vcpus_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer @@ -6035,29 +6073,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_main_21_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.packets_cmaui_port_11: + network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level: type: org.openecomp.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_cmaui_port_12: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -6085,12 +6113,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED vcpus_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6127,12 +6149,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: tosca.capabilities.Node occurrences: @@ -6150,6 +6166,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + type: org.openecomp.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_server_main_1c1_cmaui_21: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6174,13 +6196,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6245,20 +6267,27 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.incoming.packets_cmaui_1c1_main_21_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_1_test_nested2Level: - type: tosca.capabilities.Attachment + cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -6309,12 +6338,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.iops_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6344,11 +6367,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6372,14 +6390,14 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_main_1c1_cmaui_11: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_main_11_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2_test_nested2Level: - type: tosca.capabilities.Attachment + disk.read.bytes.rate_server_main_1c1_cmaui_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -6424,28 +6442,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_port_12: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_cmaui_port_11: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_11: - type: org.openecomp.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_cmaui_port_12: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.iops_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6480,14 +6476,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: type: org.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_cmaui_port_2_test_nested2Level: - type: tosca.capabilities.Node + disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -6526,12 +6523,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests_server_main_1c1_cmaui_21: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6568,24 +6559,28 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.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_nested2_1b_port_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_port_2_test_nested2Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED memory_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -6629,18 +6624,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_main_21_mgmt_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 feature_server_pd_pattern4_test_nested_pattern_4_main_1: type: tosca.capabilities.Node occurrences: @@ -6671,12 +6674,7 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_cmaui_1c1_main_11_mgmt_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: @@ -6730,12 +6728,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.usage_server_main_pd_1b_1: type: org.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_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_server_main_1c1_cmaui_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6773,15 +6782,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.device.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_main_21_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -6808,6 +6816,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED memory.resident_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6826,8 +6840,15 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.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_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -6854,94 +6875,77 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.allocation_server_main_ps_1b_1: + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_main_pd_1b_1: + disk.allocation_server_main_ps_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_nested2_1c1_cmaui_1_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: + disk.latency_server_main_pd_1b_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1: + disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_nested2_pd_1b_test_nested2Level: + disk.device.capacity_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level: + disk.device.write.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.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_cmaui_port_12: + disk.device.latency_server_nested2_pd_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_port_12: - 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 + endpoint_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - - 0 + - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_11: + disk.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_port_11: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6963,13 +6967,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_12: - type: tosca.capabilities.Attachment + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11: - type: tosca.capabilities.Attachment + network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -6984,11 +6989,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_port_1_test_nested2Level: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7001,19 +7001,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.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_cmaui_port_1_test_nested2Level: + disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.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_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7549,19 +7549,6 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_cmaui_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_nested2_ps_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -7611,6 +7598,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_1c1_nested2_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_nested2_1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_server_nested2_1c1_cmaui_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -7632,14 +7632,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7659,14 +7659,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7734,26 +7734,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_test_nested_pattern_4_same_type_diff_file: + - dependency_cmaui_1c1_nested2_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - link_cmaui_1c1_nested2_2_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_test_nested_pattern_4_same_type_diff_file: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -7768,14 +7768,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7808,19 +7821,6 @@ node_types: occurrences: - 1 - 1 - - dependency_cmaui_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 capabilities: instance_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -7845,6 +7845,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED os_server_nested2_pd_1b: type: tosca.capabilities.OperatingSystem occurrences: @@ -7862,6 +7868,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED vcpus_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7898,11 +7909,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.iops_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7956,19 +7962,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_nested2_pd_1b: + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.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_cmaui_port_1: + disk.device.allocation_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7980,7 +7985,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7992,12 +7997,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8049,24 +8048,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8096,7 +8077,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8114,12 +8095,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.capacity_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8132,21 +8107,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8164,27 +8131,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.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_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + disk.device.capacity_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_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 + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_cmaui_port_2: + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -8192,27 +8162,14 @@ node_types: occurrences: - 0 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.capacity_server_nested2_ps_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -8222,13 +8179,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_nested2_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + network.incoming.bytes_ps_server_nested2_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8245,12 +8204,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8263,12 +8216,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8292,37 +8239,35 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_nested2_ps_1b: + network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_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.allocation_server_nested2_1c1_cmaui_1: + disk.usage_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + disk.allocation_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_nested2_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2: + disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8334,28 +8279,18 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_cmaui_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED os_server_nested2_ps_1b: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_nested2_ps_1b: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.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_pattern4_port_01_test_nested_pattern_4_nested2: + disk.device.read.requests_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8373,14 +8308,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_jsa_security_group1_test_resourceGroup: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_jsa_security_group1_test_resourceGroup: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -8396,7 +8331,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + feature_cmaui_1c1_nested2_1_mgmt_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -8413,6 +8348,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_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.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8431,6 +8372,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.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_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_server_nested2_1c1_cmaui_2: type: tosca.capabilities.network.Bindable occurrences: @@ -8481,37 +8434,38 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_nested2_1c1_cmaui_2: + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: type: org.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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + disk.read.bytes.rate_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_nested2_1c1_cmaui_1: + cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_nested2_ps_1b: - type: tosca.capabilities.Endpoint.Admin + network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_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_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + disk.read.bytes.rate_server_nested2_1c1_cmaui_1: type: org.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_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder + endpoint_server_nested2_ps_1b: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -8521,11 +8475,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED vcpus_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8574,19 +8523,29 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_nested2_pd_1b: + network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_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.write.bytes_server_nested2_ps_1b: + disk.write.requests_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + attachment_cmaui_1c1_nested2_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8604,12 +8563,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.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_cmaui_1c1_nested2_1_mgmt_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_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: type: org.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_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8627,6 +8603,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: org.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_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8645,6 +8627,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8708,16 +8696,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: tosca.capabilities.Node occurrences: @@ -8729,18 +8707,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: - type: org.openecomp.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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8777,6 +8743,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED feature_server_pd_pattern4_test_nested_pattern_4_nested2: type: tosca.capabilities.Node occurrences: @@ -8799,6 +8773,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + 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.resident_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8830,6 +8812,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8848,6 +8835,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8859,11 +8851,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED network.outgoing.bytes.rate_pd_server_nested2_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8876,14 +8863,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.requests_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8898,67 +8877,70 @@ node_types: occurrences: - 0 - UNBOUNDED - host_server_pd_pattern4_test_nested_pattern_4_nested2: - type: tosca.capabilities.Container + binding_cmaui_1c1_nested2_2_mgmt_port_0: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + network.outpoing.packets_cmaui_1c1_nested2_1_mgmt_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.usage_server_nested2_pd_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_server_pd_pattern4_test_nested_pattern_4_nested2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_nested2_ps_1b: + network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: + disk.usage_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_nested2_1c1_cmaui_1: + disk.device.read.bytes.rate_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: tosca.capabilities.Node + disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: + type: org.openecomp.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_pattern4_port_01_test_nested_pattern_4_nested2: + disk.device.read.requests_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8987,19 +8969,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + disk.device.latency_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_nested2_ps_1b: + disk.capacity_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_nested2_pd_1b: + network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_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: @@ -9011,6 +8993,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_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.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9046,6 +9034,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_nested2_1_mgmt_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 host_server_nested2_1c1_cmaui_2: type: tosca.capabilities.Container valid_source_types: @@ -9064,12 +9060,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.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_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9106,22 +9096,11 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED endpoint_server_nested2_1c1_cmaui_2: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests.rate_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9139,14 +9118,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_jsa_security_group2_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_jsa_security_group2_test_nested3Level: - type: tosca.capabilities.Node + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -9190,13 +9169,12 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_nested2_pd_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + disk.device.write.requests_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9220,12 +9198,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED host_server_nested2_ps_1b: type: tosca.capabilities.Container valid_source_types: @@ -9261,13 +9233,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_nested2_1c1_cmaui_2: + network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_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_pattern4_port_02_test_nested_pattern_4_nested2: + feature_cmaui_1c1_nested2_2_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9285,13 +9262,19 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_server_nested2_1c1_cmaui_1: + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.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_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_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_server_nested2_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9303,6 +9286,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED instance_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9339,7 +9328,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9357,12 +9346,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: - type: org.openecomp.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_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9420,7 +9403,13 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_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 + forwarder_cmaui_1c1_nested2_2_mgmt_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -9431,8 +9420,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_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 @@ -9477,12 +9467,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9501,22 +9485,12 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.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_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9553,36 +9527,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: org.openecomp.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_cmaui_port_1: - type: org.openecomp.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_cmaui_port_2: + disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.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_cmaui_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2: + disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.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_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9600,19 +9557,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_server_nested2_pd_1b: + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_nested2_1c1_cmaui_2: + disk.device.latency_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + disk.write.bytes_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9647,7 +9604,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_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: @@ -9665,14 +9622,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9685,6 +9634,34 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_nested2_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_cmaui_1c1_nested2_2_mgmt_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_cmaui_1c1_nested2_1_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED vcpus_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9702,6 +9679,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED endpoint_server_pd_pattern4_test_nested_pattern_4_nested2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -9719,55 +9702,61 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_nested2_ps_1b: + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.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_server_nested2_1c1_cmaui_2: + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.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_server_nested2_pd_1b: + disk.write.requests.rate_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_nested2_1c1_cmaui_1: + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: type: org.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_server_nested2_1c1_cmaui_1: + cpu_util_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_server_nested2_ps_1b: + disk.device.read.bytes_server_nested2_pd_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + disk.latency_server_nested2_1c1_cmaui_1: type: org.openecomp.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_cmaui_port_1: + cpu_util_server_nested2_1c1_cmaui_1: type: org.openecomp.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_cmaui_port_2: + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + instance_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9800,6 +9789,12 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9858,18 +9853,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + disk.device.allocation_server_nested2_1c1_cmaui_1: type: org.openecomp.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_server_nested2_1c1_cmaui_1: + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: type: org.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_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu.delta_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9885,6 +9885,20 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_main_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_main_1b_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_main_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_main_1b_port_1_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 @@ -9893,87 +9907,86 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_main_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - compute_pd_server_main_1b_availability_zone: + port_pd_server_main_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_main_1b_port_replacement_policy: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_pd_server_main_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_main_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_main_1b_port_related_networks: + port_pd_server_main_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_main_1b_port_network_role: - type: string - required: true - status: SUPPORTED - compute_pd_server_main_1b_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_main_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_main_1b_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_main_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_main_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string + required: true + status: SUPPORTED + compute_pd_server_main_1b_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_main_1b_port_network_role_tag: + type: string + port_pd_server_main_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_main_1b_port_vlan_requirements: - type: list + port_pd_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_1b_port_fixed_ips: + port_pd_server_main_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_1b_port_order: - type: integer - required: true - status: SUPPORTED + type: string requirements: + - dependency_pd_server_main_1b_pd_server_main_1b_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_main_1b_pd_server_main_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_pd_server_main_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -9988,20 +10001,18 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_main_1b_pd_server_main_1b_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn + capabilities: + forwarder_pd_server_main_1b_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED - - link_pd_server_main_1b_pd_server_main_1b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - 1 - capabilities: + - UNBOUNDED disk.write.bytes_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10014,6 +10025,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10043,6 +10060,17 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_main_1b_pd_server_main_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_pd_server_main_1b: type: tosca.capabilities.Scalable occurrences: @@ -10053,11 +10081,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_main_1b_pd_server_main_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED instance_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -10065,13 +10095,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_main_1b_pd_server_main_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED host_pd_server_main_1b: type: tosca.capabilities.Container @@ -10080,31 +10108,31 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_pd_server_main_1b: + network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port: + cpu.delta_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_pd_server_main_1b: + network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server_main_1b: + disk.device.read.bytes_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port: + disk.device.read.bytes.rate_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -10134,8 +10162,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_main_1b_pd_server_main_1b_port: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -10156,12 +10185,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.read.requests_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10174,12 +10197,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.usage_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10227,12 +10244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.read.bytes.rate_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10245,28 +10256,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port: + disk.device.allocation_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_pd_server_main_1b: + network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_main_1b_pd_server_main_1b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.iops_pd_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -10285,9 +10286,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_main_1b_pd_server_main_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -10814,19 +10814,17 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_main_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_main_1b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_ps_server_main_1b_port_ip_requirements: + port_ps_server_main_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_main_1b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_main_1b_port_1_network_role: type: string required: true status: SUPPORTED @@ -10836,10 +10834,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -10848,69 +10842,75 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - vm_flavor_name: - type: string + port_ps_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_main_1b_port_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_main_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_ps_server_main_1b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_ps_server_main_1b_port_related_networks: + port_ps_server_main_1b_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_main_1b_port_vlan_requirements: + port_ps_server_main_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_main_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_main_1b_port_replacement_policy: + port_ps_server_main_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_main_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - port_ps_server_main_1b_port_network: + port_ps_server_main_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_main_1b_port_1_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_ps_server_main_1b_ps_server_main_1b_port: + - dependency_ps_server_main_1b_ps_server_main_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_main_1b_ps_server_main_1b_port: + - link_ps_server_main_1b_ps_server_main_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -10931,32 +10931,38 @@ node_types: - 0 - UNBOUNDED capabilities: - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port: + disk.device.write.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_ps_server_main_1b: + disk.device.capacity_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_ps_server_main_1b: + disk.capacity_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_ps_server_main_1b: + feature_ps_server_main_1b_ps_server_main_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_ps_server_main_1b_ps_server_main_1b_port: - type: tosca.capabilities.Attachment + network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -10966,31 +10972,29 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_ps_server_main_1b: + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port: + network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_ps_server_main_1b: + vcpus_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_ps_server_main_1b_ps_server_main_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + cpu_util_ps_server_main_1b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED disk.device.write.bytes.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -11004,25 +11008,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_ps_server_main_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_server_main_1b_ps_server_main_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu_ps_server_main_1b: + disk.device.write.requests.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_ps_server_main_1b: + cpu_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port: + instance_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11040,25 +11043,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_main_1b_ps_server_main_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_ps_server_main_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_ps_server_main_1b_ps_server_main_1b_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_ps_server_main_1b_ps_server_main_1b_port: - type: org.openecomp.capabilities.Forwarder + memory.usage_ps_server_main_1b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -11068,30 +11066,32 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_ps_server_main_1b: - type: tosca.capabilities.Scalable + binding_ps_server_main_1b_ps_server_main_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_ps_server_main_1b: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port: + disk.usage_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_ps_server_main_1b: + disk.read.bytes_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_ps_server_main_1b: + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11137,24 +11137,18 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_main_1b: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port: + network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_main_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_main_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: + disk.device.read.bytes.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11173,6 +11167,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.requests_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11220,19 +11220,19 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_ps_server_main_1b: + network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_ps_server_main_1b: + memory_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: + disk.root.size_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11247,34 +11247,16 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1_nested2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui_port_network: + port_cmaui_1c1_nested2_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -11283,72 +11265,77 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy: + type: list required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + entry_schema: + type: string + port_cmaui_1c1_nested2_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_cmaui_1c1_nested2_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui_port_network_role: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + vm_image_name: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_cmaui_port_ip_requirements: + entry_schema: + type: string + port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_nested2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_cmaui_1c1_nested2_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_cmaui_1c1_nested2_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_cmaui_1c1_nested2_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED requirements: - - dependency_cmaui_1c1_nested2_cmaui_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_1c1_nested2_cmaui_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_cmaui_1c1_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -11363,11 +11350,27 @@ node_types: occurrences: - 0 - UNBOUNDED - capabilities: - feature_cmaui_1c1_nested2_cmaui_port: - type: tosca.capabilities.Node + - dependency_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 - 1 + capabilities: + binding_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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.write.bytes.rate_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer @@ -11393,13 +11396,12 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_cmaui_1c1_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port: + disk.device.capacity_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11434,7 +11436,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port: + network.incoming.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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: @@ -11445,24 +11447,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED instance_cmaui_1c1_nested2: type: org.openecomp.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_cmaui_1c1_nested2_cmaui_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 endpoint_cmaui_1c1_nested2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -11504,7 +11494,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port: + network.incoming.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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: @@ -11517,13 +11507,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_cmaui_1c1_nested2: + network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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_cmaui_1c1_nested2_cmaui_port: + disk.device.latency_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -11535,6 +11525,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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 binding_cmaui_1c1_nested2: type: tosca.capabilities.network.Bindable occurrences: @@ -11546,11 +11542,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_nested2_cmaui_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.allocation_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11575,7 +11566,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port: + network.outgoing.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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: @@ -11586,9 +11577,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_1c1_nested2_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -11622,6 +11612,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11634,6 +11630,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11646,13 +11647,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_1c1_nested2_cmaui_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 + network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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: - - 0 + - 1 - UNBOUNDED disk.iops_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer @@ -11660,18 +11659,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_nested2_cmaui_port: - type: tosca.capabilities.Attachment + disk.write.requests_cmaui_1c1_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_cmaui_1c1_nested2: + cpu_util_cmaui_1c1_nested2: type: org.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_cmaui_1c1_nested2: + network.outpoing.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_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: @@ -12113,29 +12113,21 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1_main: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_main_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED @@ -12149,72 +12141,67 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_main_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_1c1_main_mgmt_port_0_order: + type: integer required: true status: SUPPORTED + port_cmaui_1c1_main_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cmaui_1c1_main_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cmaui_1c1_main_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_cmaui_1c1_main_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_cmaui_1c1_main_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: + port_cmaui_1c1_main_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED requirements: - - dependency_cmaui_1c1_main_cmaui_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_1c1_main_cmaui_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_cmaui_1c1_main: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -12229,6 +12216,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: disk.device.iops_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer @@ -12236,6 +12236,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_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.write.bytes.rate_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -12265,12 +12271,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_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.read.requests_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -12312,8 +12312,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_main_cmaui_port: - type: tosca.capabilities.Attachment + forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -12335,42 +12335,48 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_main_cmaui_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_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 - vcpus_cmaui_1c1_main: + network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_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.read.bytes.rate_cmaui_1c1_main: + vcpus_cmaui_1c1_main: type: org.openecomp.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_cmaui_1c1_main: + disk.read.bytes.rate_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_cmaui_1c1_main: + feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_cmaui_1c1_main: + disk.device.write.requests_cmaui_1c1_main: type: org.openecomp.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_cmaui_1c1_main_cmaui_port: + disk.usage_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12382,19 +12388,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port: + memory.usage_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_cmaui_1c1_main: + network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_1c1_main_cmaui_port: + network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_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: @@ -12424,7 +12430,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_1c1_main_cmaui_port: + network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_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: @@ -12436,12 +12442,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_1c1_main_cmaui_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port: + network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_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: @@ -12460,23 +12461,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_main_cmaui_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.write.bytes.rate_cmaui_1c1_main: type: org.openecomp.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_cmaui_1c1_main_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED memory_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer @@ -12495,21 +12492,24 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_1c1_main_cmaui_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 + disk.device.usage_cmaui_1c1_main: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.usage_cmaui_1c1_main: + network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_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: @@ -12560,66 +12560,68 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_pattern4_port_02_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_network_role_tag: - type: string + port_pd_server_pattern4_0_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_01_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd_server_pattern4_port_02_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - availability_zone_0: - type: string - description: availabilityzone name + port_pd_server_pattern4_1_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - net: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_exCP_naming: - type: org.openecomp.datatypes.Naming + availability_zone_0: + type: string + description: availabilityzone name required: true status: SUPPORTED - port_pd_server_pattern4_port_02_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - pd_server_pattern4_flavor: - type: string - description: Flavor for PD server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_01_network_role: + type: org.openecomp.datatypes.network.IpRequirements + net: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_02_network_role: + pd_server_pattern4_flavor: type: string + description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED security_group_name: @@ -12633,44 +12635,42 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_pattern4_port_01_order: - type: integer + port_pd_server_pattern4_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_server_pattern4_port_02_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_pattern4_port_02_ip_requirements: - type: list + port_pd_server_pattern4_0_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_02_subnetpoolid: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_pattern4_1_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_pattern4_port_01_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_01_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_02_network_role_tag: + port_pd_server_pattern4_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -12686,14 +12686,14 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_pattern4_port_01: + - dependency_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_01: + - link_pd_server_pattern4_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -12713,14 +12713,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pattern4_port_02: + - dependency_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pattern4_port_02: + - link_pd_server_pattern4_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -12739,55 +12739,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - binding_pd_server_pattern4_port_01: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_01: - type: org.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_pattern4_port_02: + feature_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_pd_server_pattern4_port_01: - type: tosca.capabilities.Node + forwarder_pd_server_pattern4_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_01: + disk.allocation_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pd_pattern4: + disk.device.usage_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pd_pattern4: + network.incoming.bytes_pd_server_pattern4_0_oam_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: @@ -12817,7 +12791,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pattern4_port_02: + binding_pd_server_pattern4_0_oam_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -12825,17 +12799,35 @@ node_types: occurrences: - 0 - UNBOUNDED + network.outgoing.bytes_pd_server_pattern4_0_oam_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.latency_server_pd_pattern4: type: org.openecomp.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_pattern4_0_oam_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 endpoint_server_pd_pattern4: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pattern4_0_oam_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_server_pd_pattern4: type: tosca.capabilities.Node occurrences: @@ -12847,25 +12839,25 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pd_pattern4: + network.incoming.bytes.rate_pd_server_pattern4_1_oam_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_server_pd_pattern4: + instance_server_pd_pattern4: type: org.openecomp.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_server_pd_pattern4: + cpu_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_01: + disk.device.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -12884,25 +12876,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_02: + memory.resident_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_pd_pattern4: + disk.read.requests_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_pd_pattern4: + network.outpoing.packets_pd_server_pattern4_0_oam_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_pd_server_pattern4_port_02: + network.incoming.bytes.rate_pd_server_pattern4_0_oam_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: @@ -12932,7 +12924,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_01: + network.incoming.bytes_pd_server_pattern4_1_oam_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: @@ -12962,42 +12954,43 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_pd_pattern4: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_02: + network.incoming.packets_pd_server_pattern4_0_oam_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 - binding_server_pd_pattern4: - type: tosca.capabilities.network.Bindable + network.outpoing.packets_pd_server_pattern4_1_oam_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.iops_server_pd_pattern4: + network.outgoing.bytes_pd_server_pattern4_1_oam_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 - forwarder_pd_server_pattern4_port_01: - type: org.openecomp.capabilities.Forwarder + disk.device.iops_server_pd_pattern4: + type: org.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_pattern4_port_02: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_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 @@ -13013,19 +13006,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.usage_server_pd_pattern4: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_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.read.bytes_server_pd_pattern4: + disk.usage_server_pd_pattern4: type: org.openecomp.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_pattern4_port_01: + disk.read.bytes_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -13036,6 +13029,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -13053,7 +13051,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_01: + feature_pd_server_pattern4_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pattern4_1_oam_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: @@ -13077,37 +13080,34 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_02: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pattern4_1_oam_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - attachment_pd_server_pattern4_port_02: + attachment_pd_server_pattern4_1_oam_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_02: + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_pattern4_port_01: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_01: + disk.device.capacity_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pd_pattern4: + network.incoming.packets_pd_server_pattern4_1_oam_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
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml index c9b64ed6f0..504b4ca395 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml @@ -339,7 +339,17 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: contrail + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -348,26 +358,16 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - get_input: contrail_net_name - - get_input: contrail_net_name - port_cmaui_port_network_role_tag: contrail vm_flavor_name: get_input: cmaui_1c1_main_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: - - AUTO - - AUTO + port_cmaui_1c1_main_mgmt_port_0_network: + - get_input: contrail_net_name + - get_input: contrail_net_name vm_image_name: get_input: cmaui_1c1_main_image - port_cmaui_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: + - AUTO + - AUTO compute_cmaui_1c1_main_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -391,23 +391,23 @@ topology_template: directives: - substitutable properties: + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + mac_count_required: + is_required: false p1: get_input: jsa_name service_template_filter: substitute_service_template: nested-pattern-4ServiceTemplate.yaml - port_pd_server_pattern4_port_01_mac_requirements: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd_server_pattern4_port_02_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_pattern4_port_02_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml index 55c18354ce..4954b2a32b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml @@ -11,25 +11,18 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: + type: string required: true - port_cmaui_port_network: - type: list + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_main_mgmt_port_0_related_networks: type: list required: true entry_schema: @@ -41,108 +34,118 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - port_cmaui_port_order: - type: integer + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cmaui_port_replacement_policy: + port_cmaui_1c1_main_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_1c1_main_mgmt_port_0_order: + type: integer required: true + port_cmaui_1c1_main_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cmaui_1c1_main_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cmaui_1c1_main_availability_zone: type: list required: true entry_schema: type: string + port_cmaui_1c1_main_mgmt_port_0_network_role: + type: string + required: true compute_cmaui_1c1_main_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: + port_cmaui_1c1_main_mgmt_port_0_subnetpoolid: type: string required: true node_templates: - cmaui_1c1_main_cmaui_port: + cmaui_1c1_main: + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main + properties: + availability_zone: + get_input: + - compute_cmaui_1c1_main_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_cmaui_1c1_main_name + - index_value + cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_main_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_main_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_main_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_main_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_main_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_main_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_main_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_main_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_main_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cmaui_1c1_main relationship: tosca.relationships.network.BindsTo - cmaui_1c1_main: - type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main - properties: - availability_zone: - get_input: - - compute_cmaui_1c1_main_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_cmaui_1c1_main_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main capabilities: disk.device.iops_cmaui_1c1_main: - cmaui_1c1_main - disk.device.iops + network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes.rate @@ -158,9 +161,6 @@ topology_template: disk.latency_cmaui_1c1_main: - cmaui_1c1_main - disk.latency - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.bytes.rate disk.read.requests_cmaui_1c1_main: - cmaui_1c1_main - disk.read.requests @@ -182,9 +182,9 @@ topology_template: disk.device.read.requests_cmaui_1c1_main: - cmaui_1c1_main - disk.device.read.requests - attachment_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - attachment + forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - forwarder instance_cmaui_1c1_main: - cmaui_1c1_main - instance @@ -194,15 +194,21 @@ topology_template: disk.device.write.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes - forwarder_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - forwarder + network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outpoing.packets + network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.packets.rate vcpus_cmaui_1c1_main: - cmaui_1c1_main - vcpus disk.read.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.read.bytes.rate + feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - feature disk.device.capacity_cmaui_1c1_main: - cmaui_1c1_main - disk.device.capacity @@ -212,21 +218,18 @@ topology_template: disk.usage_cmaui_1c1_main: - cmaui_1c1_main - disk.usage - network.incoming.bytes_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.bytes disk.device.read.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.read.bytes - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.bytes.rate memory.usage_cmaui_1c1_main: - cmaui_1c1_main - memory.usage - network.outpoing.packets_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outpoing.packets + network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.bytes.rate + network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.packets memory.resident_cmaui_1c1_main: - cmaui_1c1_main - memory.resident @@ -239,33 +242,27 @@ topology_template: disk.ephemeral.size_cmaui_1c1_main: - cmaui_1c1_main - disk.ephemeral.size - network.incoming.packets_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.packets + network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.write.requests.rate - feature_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - feature - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.packets.rate + network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.bytes disk.root.size_cmaui_1c1_main: - cmaui_1c1_main - disk.root.size host_cmaui_1c1_main: - cmaui_1c1_main - host - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.packets.rate disk.write.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.write.bytes.rate - network.outgoing.bytes_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.bytes + binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - binding memory_cmaui_1c1_main: - cmaui_1c1_main - memory @@ -275,15 +272,18 @@ topology_template: cpu_cmaui_1c1_main: - cmaui_1c1_main - cpu + attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - attachment disk.device.allocation_cmaui_1c1_main: - cmaui_1c1_main - disk.device.allocation - binding_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - binding disk.device.usage_cmaui_1c1_main: - cmaui_1c1_main - disk.device.usage + network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.packets.rate os_cmaui_1c1_main: - cmaui_1c1_main - os @@ -300,15 +300,15 @@ topology_template: - cmaui_1c1_main - disk.allocation requirements: - dependency_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - dependency - link_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port + link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 - link local_storage_cmaui_1c1_main: - cmaui_1c1_main - local_storage + dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - dependency dependency_cmaui_1c1_main: - cmaui_1c1_main - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml index c68dba003a..c4dca48e61 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml @@ -11,25 +11,18 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: + type: string required: true - port_cmaui_port_network: - type: list + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_main_mgmt_port_0_related_networks: type: list required: true entry_schema: @@ -41,108 +34,118 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - port_cmaui_port_order: - type: integer + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cmaui_port_replacement_policy: + port_cmaui_1c1_main_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_1c1_main_mgmt_port_0_order: + type: integer required: true + port_cmaui_1c1_main_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cmaui_1c1_main_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cmaui_1c1_main_availability_zone: type: list required: true entry_schema: type: string + port_cmaui_1c1_main_mgmt_port_0_network_role: + type: string + required: true compute_cmaui_1c1_main_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: + port_cmaui_1c1_main_mgmt_port_0_subnetpoolid: type: string required: true node_templates: - cmaui_1c1_main_cmaui_port: + cmaui_1c1_main: + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main + properties: + availability_zone: + get_input: + - compute_cmaui_1c1_main_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_cmaui_1c1_main_name + - index_value + cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_main_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_main_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_main_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_main_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_main_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_main_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_main_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_main_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_main_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_main_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cmaui_1c1_main relationship: tosca.relationships.network.BindsTo - cmaui_1c1_main: - type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main - properties: - availability_zone: - get_input: - - compute_cmaui_1c1_main_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_cmaui_1c1_main_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main_1 capabilities: disk.device.iops_cmaui_1c1_main: - cmaui_1c1_main - disk.device.iops + network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes.rate @@ -158,9 +161,6 @@ topology_template: disk.latency_cmaui_1c1_main: - cmaui_1c1_main - disk.latency - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.bytes.rate disk.read.requests_cmaui_1c1_main: - cmaui_1c1_main - disk.read.requests @@ -182,9 +182,9 @@ topology_template: disk.device.read.requests_cmaui_1c1_main: - cmaui_1c1_main - disk.device.read.requests - attachment_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - attachment + forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - forwarder instance_cmaui_1c1_main: - cmaui_1c1_main - instance @@ -194,15 +194,21 @@ topology_template: disk.device.write.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes - forwarder_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - forwarder + network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outpoing.packets + network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.packets.rate vcpus_cmaui_1c1_main: - cmaui_1c1_main - vcpus disk.read.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.read.bytes.rate + feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - feature disk.device.capacity_cmaui_1c1_main: - cmaui_1c1_main - disk.device.capacity @@ -212,21 +218,18 @@ topology_template: disk.usage_cmaui_1c1_main: - cmaui_1c1_main - disk.usage - network.incoming.bytes_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.bytes disk.device.read.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.read.bytes - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.bytes.rate memory.usage_cmaui_1c1_main: - cmaui_1c1_main - memory.usage - network.outpoing.packets_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outpoing.packets + network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.bytes.rate + network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.packets memory.resident_cmaui_1c1_main: - cmaui_1c1_main - memory.resident @@ -239,33 +242,27 @@ topology_template: disk.ephemeral.size_cmaui_1c1_main: - cmaui_1c1_main - disk.ephemeral.size - network.incoming.packets_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.packets + network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.write.requests.rate - feature_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - feature - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.packets.rate + network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.incoming.bytes disk.root.size_cmaui_1c1_main: - cmaui_1c1_main - disk.root.size host_cmaui_1c1_main: - cmaui_1c1_main - host - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.incoming.packets.rate disk.write.bytes.rate_cmaui_1c1_main: - cmaui_1c1_main - disk.write.bytes.rate - network.outgoing.bytes_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - network.outgoing.bytes + binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - binding memory_cmaui_1c1_main: - cmaui_1c1_main - memory @@ -275,15 +272,18 @@ topology_template: cpu_cmaui_1c1_main: - cmaui_1c1_main - cpu + attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - attachment disk.device.allocation_cmaui_1c1_main: - cmaui_1c1_main - disk.device.allocation - binding_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - binding disk.device.usage_cmaui_1c1_main: - cmaui_1c1_main - disk.device.usage + network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - network.outgoing.packets.rate os_cmaui_1c1_main: - cmaui_1c1_main - os @@ -300,15 +300,15 @@ topology_template: - cmaui_1c1_main - disk.allocation requirements: - dependency_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port - - dependency - link_cmaui_1c1_main_cmaui_port: - - cmaui_1c1_main_cmaui_port + link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 - link local_storage_cmaui_1c1_main: - cmaui_1c1_main - local_storage + dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0: + - cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + - dependency dependency_cmaui_1c1_main: - cmaui_1c1_main - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml index 5541d71406..adecbf0f02 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml @@ -11,29 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_cmaui_port_network: + port_cmaui_1c1_nested2_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,108 +26,123 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy: + type: list required: true - port_cmaui_port_order: - type: integer + entry_schema: + type: string + port_cmaui_1c1_nested2_mgmt_port_0_subnetpoolid: + type: string required: true vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag: + type: string required: true - port_cmaui_port_replacement_policy: + port_cmaui_1c1_nested2_mgmt_port_0_network_role: + type: string + required: true + port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_cmaui_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_1c1_nested2_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_1c1_nested2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_cmaui_1c1_nested2_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string + port_cmaui_1c1_nested2_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_cmaui_1c1_nested2_availability_zone: type: list required: true entry_schema: type: string + port_cmaui_1c1_nested2_mgmt_port_0_order: + type: integer + required: true node_templates: - cmaui_1c1_nested2_cmaui_port: + cmaui_1c1_nested2: + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_nested2 + properties: + availability_zone: + get_input: + - compute_cmaui_1c1_nested2_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_cmaui_1c1_nested2_name + - index_value + cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_nested2_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_nested2_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_nested2_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_nested2_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_nested2_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_nested2_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_nested2_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cmaui_1c1_nested2 relationship: tosca.relationships.network.BindsTo - cmaui_1c1_nested2: - type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_nested2 - properties: - availability_zone: - get_input: - - compute_cmaui_1c1_nested2_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_cmaui_1c1_nested2_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1_nested2 capabilities: - feature_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - feature + binding_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - binding disk.device.write.bytes.rate_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.write.bytes.rate @@ -155,12 +155,12 @@ topology_template: disk.capacity_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.capacity + attachment_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - attachment disk.device.capacity_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.capacity - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.outgoing.packets.rate vcpus_cmaui_1c1_nested2: - cmaui_1c1_nested2 - vcpus @@ -176,21 +176,15 @@ topology_template: disk.read.bytes_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.read.bytes - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.outpoing.packets + network.incoming.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.incoming.packets scalable_cmaui_1c1_nested2: - cmaui_1c1_nested2 - scalable - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.outgoing.bytes instance_cmaui_1c1_nested2: - cmaui_1c1_nested2 - instance - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.incoming.bytes endpoint_cmaui_1c1_nested2: - cmaui_1c1_nested2 - endpoint @@ -212,30 +206,30 @@ topology_template: disk.device.write.bytes_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.write.bytes - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.incoming.packets.rate + network.incoming.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.incoming.bytes host_cmaui_1c1_nested2: - cmaui_1c1_nested2 - host + network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.outgoing.packets.rate disk.device.latency_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.latency - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.incoming.bytes.rate disk.write.bytes.rate_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.write.bytes.rate + network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.incoming.bytes.rate binding_cmaui_1c1_nested2: - cmaui_1c1_nested2 - binding memory_cmaui_1c1_nested2: - cmaui_1c1_nested2 - memory - forwarder_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - forwarder disk.allocation_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.allocation @@ -248,15 +242,15 @@ topology_template: disk.read.requests_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.read.requests - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.outgoing.bytes.rate + network.outgoing.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.outgoing.bytes os_cmaui_1c1_nested2: - cmaui_1c1_nested2 - os - network.incoming.packets_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - network.incoming.packets + forwarder_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - forwarder disk.write.requests.rate_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.write.requests.rate @@ -272,43 +266,49 @@ topology_template: memory.resident_cmaui_1c1_nested2: - cmaui_1c1_nested2 - memory.resident + network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.outgoing.bytes.rate cpu_cmaui_1c1_nested2: - cmaui_1c1_nested2 - cpu disk.read.bytes.rate_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.read.bytes.rate + feature_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - feature disk.device.allocation_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.device.allocation disk.latency_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.latency - binding_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - binding + network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.incoming.packets.rate disk.iops_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.iops - attachment_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - attachment disk.write.requests_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.write.requests cpu_util_cmaui_1c1_nested2: - cmaui_1c1_nested2 - cpu_util + network.outpoing.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - network.outpoing.packets requirements: - link_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port + link_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 - link + dependency_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0: + - cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + - dependency dependency_cmaui_1c1_nested2: - cmaui_1c1_nested2 - dependency local_storage_cmaui_1c1_nested2: - cmaui_1c1_nested2 - local_storage - dependency_cmaui_1c1_nested2_cmaui_port: - - cmaui_1c1_nested2_cmaui_port - - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml index f8f07113b8..9156d22fb9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml @@ -11,6 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_main_1b_port_1_order: + type: integer + required: true + port_pd_server_main_1b_port_1_network_role: + type: string + required: true + port_pd_server_main_1b_port_1_network: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,134 +29,132 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_main_1b_port_1_network_role_tag: + type: string required: true - compute_pd_server_main_1b_availability_zone: + port_pd_server_main_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_main_1b_port_replacement_policy: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_pd_server_main_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_main_1b_port_subnetpoolid: - type: string - required: true - port_pd_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_pd_server_main_1b_port_related_networks: + port_pd_server_main_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: - type: string - required: true - port_pd_server_main_1b_port_network_role: - type: string - required: true - compute_pd_server_main_1b_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_main_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_pd_server_main_1b_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_main_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd_server_main_1b_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string + required: true + compute_pd_server_main_1b_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_main_1b_port_network_role_tag: + type: string + port_pd_server_main_1b_port_1_subnetpoolid: type: string required: true - port_pd_server_main_1b_port_vlan_requirements: - type: list + port_pd_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_1b_port_fixed_ips: + port_pd_server_main_1b_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_1b_port_order: - type: integer - required: true + type: string node_templates: - pd_server_main_1b: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b - properties: - availability_zone: - get_input: - - compute_pd_server_main_1b_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_main_1b_name - - index_value - pd_server_main_1b_pd_server_main_1b_port: + pd_server_main_1b_pd_server_main_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_main_1b_port_replacement_policy + - port_pd_server_main_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_main_1b_port_mac_requirements + get_input: port_pd_server_main_1b_port_1_mac_requirements order: - get_input: port_pd_server_main_1b_port_order + get_input: port_pd_server_main_1b_port_1_order exCP_naming: - get_input: port_pd_server_main_1b_port_exCP_naming + get_input: port_pd_server_main_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_main_1b_port_vlan_requirements + get_input: port_pd_server_main_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_main_1b_port_ip_requirements + get_input: port_pd_server_main_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_main_1b_port_related_networks + get_input: port_pd_server_main_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_main_1b_port_network_role_tag + get_input: port_pd_server_main_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_main_1b_port_network_role + get_input: port_pd_server_main_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_main_1b_port_fixed_ips + - port_pd_server_main_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_main_1b_port_subnetpoolid + get_input: port_pd_server_main_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_main_1b_port_network + - port_pd_server_main_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_main_1b relationship: tosca.relationships.network.BindsTo + pd_server_main_1b: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b + properties: + availability_zone: + get_input: + - compute_pd_server_main_1b_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_main_1b_name + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_main_1b capabilities: + forwarder_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - forwarder + network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.incoming.packets disk.write.bytes_pd_server_main_1b: - pd_server_main_1b - disk.write.bytes disk.device.capacity_pd_server_main_1b: - pd_server_main_1b - disk.device.capacity + network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.incoming.bytes.rate disk.device.write.requests_pd_server_main_1b: - pd_server_main_1b - disk.device.write.requests @@ -161,39 +170,45 @@ topology_template: disk.read.bytes_pd_server_main_1b: - pd_server_main_1b - disk.read.bytes + feature_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - feature + network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.outgoing.bytes scalable_pd_server_main_1b: - pd_server_main_1b - scalable endpoint_pd_server_main_1b: - pd_server_main_1b - endpoint - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.incoming.packets.rate + binding_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - binding instance_pd_server_main_1b: - pd_server_main_1b - instance - binding_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - binding + network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.incoming.packets.rate host_pd_server_main_1b: - pd_server_main_1b - host + network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.outpoing.packets cpu.delta_pd_server_main_1b: - pd_server_main_1b - cpu.delta - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.incoming.packets + network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.outgoing.packets.rate disk.device.read.bytes_pd_server_main_1b: - pd_server_main_1b - disk.device.read.bytes disk.device.read.bytes.rate_pd_server_main_1b: - pd_server_main_1b - disk.device.read.bytes.rate - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.outgoing.packets.rate disk.device.iops_pd_server_main_1b: - pd_server_main_1b - disk.device.iops @@ -206,9 +221,9 @@ topology_template: disk.device.latency_pd_server_main_1b: - pd_server_main_1b - disk.device.latency - feature_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - feature + network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.incoming.bytes binding_pd_server_main_1b: - pd_server_main_1b - binding @@ -218,18 +233,12 @@ topology_template: disk.ephemeral.size_pd_server_main_1b: - pd_server_main_1b - disk.ephemeral.size - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.outgoing.bytes disk.read.requests_pd_server_main_1b: - pd_server_main_1b - disk.read.requests disk.allocation_pd_server_main_1b: - pd_server_main_1b - disk.allocation - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.incoming.bytes.rate disk.device.usage_pd_server_main_1b: - pd_server_main_1b - disk.device.usage @@ -254,27 +263,18 @@ topology_template: disk.latency_pd_server_main_1b: - pd_server_main_1b - disk.latency - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.outgoing.bytes.rate disk.read.bytes.rate_pd_server_main_1b: - pd_server_main_1b - disk.read.bytes.rate disk.device.read.requests_pd_server_main_1b: - pd_server_main_1b - disk.device.read.requests - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.incoming.bytes disk.device.allocation_pd_server_main_1b: - pd_server_main_1b - disk.device.allocation - forwarder_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - forwarder - attachment_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - attachment + network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - network.outgoing.bytes.rate disk.iops_pd_server_main_1b: - pd_server_main_1b - disk.iops @@ -284,9 +284,9 @@ topology_template: disk.write.requests_pd_server_main_1b: - pd_server_main_1b - disk.write.requests - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - network.outpoing.packets + attachment_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - attachment cpu_util_pd_server_main_1b: - pd_server_main_1b - cpu_util @@ -300,15 +300,15 @@ topology_template: - pd_server_main_1b - disk.device.read.requests.rate requirements: - link_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - link + dependency_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - dependency dependency_pd_server_main_1b: - pd_server_main_1b - dependency + link_pd_server_main_1b_pd_server_main_1b_port_1: + - pd_server_main_1b_pd_server_main_1b_port_1 + - link local_storage_pd_server_main_1b: - pd_server_main_1b - local_storage - dependency_pd_server_main_1b_pd_server_main_1b_port: - - pd_server_main_1b_pd_server_main_1b_port - - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml index 2c92263120..2e4f43992c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml @@ -311,4 +311,4 @@ topology_template: - local_storage dependency_pd_server_main_1b_pd_server_main_1b_port: - pd_server_main_1b_pd_server_main_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml index 5a29af80ad..7d557a9075 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml @@ -311,4 +311,4 @@ topology_template: - dependency link_pd_server_nested2_1b_pd_server_nested2_1b_port: - pd_server_nested2_1b_pd_server_nested2_1b_port - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index 3f68b28f1f..0917b89370 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -11,17 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_main_1b_port_fixed_ips: - type: list + port_ps_server_main_1b_port_1_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_ps_server_main_1b_port_ip_requirements: + port_ps_server_main_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_main_1b_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_main_1b_port_1_network_role: type: string required: true compute_ps_server_main_1b_availability_zone: @@ -29,9 +27,6 @@ topology_template: required: true entry_schema: type: string - port_ps_server_main_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,83 +34,88 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - vm_flavor_name: - type: string + port_ps_server_main_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps_server_main_1b_port_network_role: + vm_flavor_name: type: string required: true - port_ps_server_main_1b_port_order: - type: integer - required: true - port_ps_server_main_1b_port_network_role_tag: - type: string + port_ps_server_main_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_main_1b_port_related_networks: + port_ps_server_main_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_ps_server_main_1b_port_vlan_requirements: + port_ps_server_main_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_main_1b_name: type: list required: true entry_schema: type: string - port_ps_server_main_1b_port_replacement_policy: + port_ps_server_main_1b_port_1_network: type: list required: true entry_schema: type: string - port_ps_server_main_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_main_1b_port_1_network_role_tag: + type: string required: true - port_ps_server_main_1b_port_network: + port_ps_server_main_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string + port_ps_server_main_1b_port_1_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_main_1b_port_1_subnetpoolid: + type: string + required: true node_templates: - ps_server_main_1b_ps_server_main_1b_port: + ps_server_main_1b_ps_server_main_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_main_1b_port_replacement_policy + - port_ps_server_main_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_main_1b_port_mac_requirements + get_input: port_ps_server_main_1b_port_1_mac_requirements order: - get_input: port_ps_server_main_1b_port_order + get_input: port_ps_server_main_1b_port_1_order exCP_naming: - get_input: port_ps_server_main_1b_port_exCP_naming + get_input: port_ps_server_main_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_main_1b_port_vlan_requirements + get_input: port_ps_server_main_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps_server_main_1b_port_ip_requirements + get_input: port_ps_server_main_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_main_1b_port_related_networks + get_input: port_ps_server_main_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_main_1b_port_network_role_tag + get_input: port_ps_server_main_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_main_1b_port_network_role + get_input: port_ps_server_main_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_main_1b_port_fixed_ips + - port_ps_server_main_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_main_1b_port_subnetpoolid + get_input: port_ps_server_main_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_main_1b_port_network + - port_ps_server_main_1b_port_1_network - index_value requirements: - binding: @@ -140,9 +140,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_main_1b capabilities: - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.bytes disk.device.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.write.requests @@ -152,30 +149,39 @@ topology_template: disk.capacity_ps_server_main_1b: - ps_server_main_1b - disk.capacity - attachment_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - attachment + feature_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - feature + network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.packets.rate + network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outpoing.packets disk.device.read.bytes_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes + network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.bytes.rate + network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.packets vcpus_ps_server_main_1b: - ps_server_main_1b - vcpus - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.packets.rate cpu_util_ps_server_main_1b: - ps_server_main_1b - cpu_util - binding_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - binding disk.device.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.write.bytes.rate disk.device.read.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.read.requests.rate + attachment_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.write.requests.rate @@ -185,45 +191,39 @@ topology_template: instance_ps_server_main_1b: - ps_server_main_1b - instance - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outpoing.packets disk.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.read.bytes.rate disk.latency_ps_server_main_1b: - ps_server_main_1b - disk.latency - feature_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - feature disk.device.read.requests_ps_server_main_1b: - ps_server_main_1b - disk.device.read.requests + forwarder_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - forwarder memory.usage_ps_server_main_1b: - ps_server_main_1b - memory.usage - forwarder_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - forwarder disk.write.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.requests.rate + binding_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - binding scalable_ps_server_main_1b: - ps_server_main_1b - scalable - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.bytes - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.packets.rate disk.usage_ps_server_main_1b: - ps_server_main_1b - disk.usage disk.read.bytes_ps_server_main_1b: - ps_server_main_1b - disk.read.bytes + network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.bytes.rate disk.ephemeral.size_ps_server_main_1b: - ps_server_main_1b - disk.ephemeral.size @@ -245,24 +245,24 @@ topology_template: disk.write.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.bytes.rate + network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.bytes binding_ps_server_main_1b: - ps_server_main_1b - binding - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.packets disk.device.read.bytes.rate_ps_server_main_1b: - ps_server_main_1b - disk.device.read.bytes.rate - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.outgoing.bytes.rate host_ps_server_main_1b: - ps_server_main_1b - host disk.device.iops_ps_server_main_1b: - ps_server_main_1b - disk.device.iops + network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.outgoing.bytes disk.write.requests_ps_server_main_1b: - ps_server_main_1b - disk.write.requests @@ -287,28 +287,28 @@ topology_template: disk.device.usage_ps_server_main_1b: - ps_server_main_1b - disk.device.usage + network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - network.incoming.packets.rate memory_ps_server_main_1b: - ps_server_main_1b - memory disk.root.size_ps_server_main_1b: - ps_server_main_1b - disk.root.size - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - network.incoming.bytes.rate disk.allocation_ps_server_main_1b: - ps_server_main_1b - disk.allocation requirements: + link_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - link + dependency_ps_server_main_1b_ps_server_main_1b_port_1: + - ps_server_main_1b_ps_server_main_1b_port_1 + - dependency dependency_ps_server_main_1b: - ps_server_main_1b - dependency - link_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - link - dependency_ps_server_main_1b_ps_server_main_1b_port: - - ps_server_main_1b_ps_server_main_1b_port - - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml index edb49ea4f2..05ce241d6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml @@ -311,4 +311,4 @@ topology_template: - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml index c788016757..9e50a2709e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml @@ -311,4 +311,4 @@ topology_template: - dependency link_ps_server_nested2_1b_ps_server_nested2_1b_port: - ps_server_nested2_1b_ps_server_nested2_1b_port - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml index ba3537795a..42561eb642 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml @@ -20,24 +20,30 @@ topology_template: immutable: false type: string description: UID of OAM network + port_pd_server_pattern4_0_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements p2: hidden: false immutable: false type: string description: UID of OAM network - port_pd_server_pattern4_port_2_order: - type: integer + port_pd_server_pattern4_0_mgmt_port_0_network_role: + type: string required: true - port_pd_server_pattern4_port_2_vlan_requirements: - type: list + port_pd_server_pattern4_1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_2_network_role_tag: + port_pd_server_pattern4_1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_pattern4_0_mgmt_port_0_subnetpoolid: type: string required: true - port_pd_server_pattern4_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_1_mgmt_port_0_subnetpoolid: + type: string required: true availability_zone_0: label: availabilityzone name @@ -45,21 +51,16 @@ topology_template: immutable: false type: string description: availabilityzone name - port_pd_server_pattern4_port_2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_vlan_requirements: + port_pd_server_pattern4_0_mgmt_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments net: hidden: false immutable: false type: string - port_pd_server_pattern4_port_1_network_role_tag: + port_pd_server_pattern4_1_mgmt_port_0_network_role: type: string required: true pd_server_pattern4_flavor: @@ -67,17 +68,22 @@ topology_template: immutable: false type: string description: Flavor for PD server - port_pd_server_pattern4_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_1_mgmt_port_0_order: + type: integer + required: true + port_pd_server_pattern4_1_mgmt_port_0_network_role_tag: + type: string required: true - port_pd_server_pattern4_port_1_ip_requirements: + port_pd_server_pattern4_1_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_1_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: hidden: false immutable: false @@ -90,38 +96,32 @@ topology_template: immutable: false type: string description: Flavor for PS server - port_pd_server_pattern4_port_1_order: - type: integer + port_pd_server_pattern4_0_mgmt_port_0_network_role_tag: + type: string required: true pd_server_pattern4_image: hidden: false immutable: false type: string description: Flavor for PD server - port_pd_server_pattern4_port_1_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_2_related_networks: + port_pd_server_pattern4_1_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_1_network_role: - type: string - required: true - port_pd_server_pattern4_port_2_network_role: - type: string - required: true - port_pd_server_pattern4_port_1_mac_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_mgmt_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_server_pattern4_port_1_subnetpoolid: - type: string + port_pd_server_pattern4_0_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd_server_pattern4_port_2_subnetpoolid: - type: string + port_pd_server_pattern4_0_mgmt_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_pattern4_0_mgmt_port_0_order: + type: integer required: true pd_server_pattern4_names: hidden: false @@ -131,84 +131,84 @@ topology_template: entry_schema: type: string node_templates: - pd_server_pattern4_port_1: + server_pd_pattern4_1: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4 + properties: + flavor: + get_input: pd_server_pattern4_flavor + availability_zone: + get_input: availability_zone_0 + image: + get_input: pd_server_pattern4_image + name: + get_input: + - pd_server_pattern4_names + - 0 + pd_server_pattern4_1_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_pattern4_port_1_subnetpoolid + get_input: port_pd_server_pattern4_1_mgmt_port_0_subnetpoolid related_networks: - get_input: port_pd_server_pattern4_port_1_related_networks + get_input: port_pd_server_pattern4_1_mgmt_port_0_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_pattern4_port_1_ip_requirements + get_input: port_pd_server_pattern4_1_mgmt_port_0_ip_requirements network_role: - get_input: port_pd_server_pattern4_port_1_network_role + get_input: port_pd_server_pattern4_1_mgmt_port_0_network_role fixed_ips: - ip_address: get_input: - pd_server_pattern4_ips - - 0 + - 1 mac_requirements: - get_input: port_pd_server_pattern4_port_1_mac_requirements + get_input: port_pd_server_pattern4_1_mgmt_port_0_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_pattern4_port_1_exCP_naming + get_input: port_pd_server_pattern4_1_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_pattern4_port_1_vlan_requirements + get_input: port_pd_server_pattern4_1_mgmt_port_0_vlan_requirements network_role_tag: - get_input: port_pd_server_pattern4_port_1_network_role_tag + get_input: port_pd_server_pattern4_1_mgmt_port_0_network_role_tag order: - get_input: port_pd_server_pattern4_port_1_order + get_input: port_pd_server_pattern4_1_mgmt_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pd_pattern4_1 relationship: tosca.relationships.network.BindsTo - server_pd_pattern4_1: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4 - properties: - flavor: - get_input: pd_server_pattern4_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: pd_server_pattern4_image - name: - get_input: - - pd_server_pattern4_names - - 0 - pd_server_pattern4_port_2: + pd_server_pattern4_0_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_pattern4_port_2_subnetpoolid + get_input: port_pd_server_pattern4_0_mgmt_port_0_subnetpoolid related_networks: - get_input: port_pd_server_pattern4_port_2_related_networks + get_input: port_pd_server_pattern4_0_mgmt_port_0_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_pattern4_port_2_ip_requirements + get_input: port_pd_server_pattern4_0_mgmt_port_0_ip_requirements network_role: - get_input: port_pd_server_pattern4_port_2_network_role + get_input: port_pd_server_pattern4_0_mgmt_port_0_network_role fixed_ips: - ip_address: get_input: - pd_server_pattern4_ips - - 1 + - 0 mac_requirements: - get_input: port_pd_server_pattern4_port_2_mac_requirements + get_input: port_pd_server_pattern4_0_mgmt_port_0_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_pattern4_port_2_exCP_naming + get_input: port_pd_server_pattern4_0_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_pattern4_port_2_vlan_requirements + get_input: port_pd_server_pattern4_0_mgmt_port_0_vlan_requirements network_role_tag: - get_input: port_pd_server_pattern4_port_2_network_role_tag + get_input: port_pd_server_pattern4_0_mgmt_port_0_network_role_tag order: - get_input: port_pd_server_pattern4_port_2_order + get_input: port_pd_server_pattern4_0_mgmt_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -221,9 +221,9 @@ topology_template: heat_file: ../Artifacts/nested-pattern-4-same-type.yml description: nested1 members: - - pd_server_pattern4_port_1 - server_pd_pattern4_1 - - pd_server_pattern4_port_2 + - pd_server_pattern4_1_mgmt_port_0 + - pd_server_pattern4_0_mgmt_port_0 outputs: pattern4_attr_1: description: pattern4_attr_1_value @@ -234,18 +234,15 @@ topology_template: disk.ephemeral.size_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.ephemeral.size - network.outgoing.bytes_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.outgoing.bytes + forwarder_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - forwarder endpoint_server_pd_pattern4_1: - server_pd_pattern4_1 - endpoint memory.usage_server_pd_pattern4_1: - server_pd_pattern4_1 - memory.usage - network.outgoing.bytes_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.outgoing.bytes disk.device.capacity_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.capacity @@ -255,12 +252,12 @@ topology_template: disk.device.iops_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.iops - feature_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - feature - feature_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - feature + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.latency_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.latency @@ -270,12 +267,6 @@ topology_template: disk.device.read.requests.rate_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.read.requests.rate - attachment_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - attachment - attachment_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - attachment cpu_util_server_pd_pattern4_1: - server_pd_pattern4_1 - cpu_util @@ -285,6 +276,12 @@ topology_template: scalable_server_pd_pattern4_1: - server_pd_pattern4_1 - scalable + feature_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - feature + feature_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - feature disk.latency_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.latency @@ -303,6 +300,12 @@ topology_template: disk.read.bytes.rate_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.read.bytes.rate + forwarder_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - forwarder + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.outgoing.bytes disk.device.write.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.write.bytes @@ -312,63 +315,78 @@ topology_template: host_server_pd_pattern4_1: - server_pd_pattern4_1 - host + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.outgoing.bytes + binding_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - binding + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.incoming.packets disk.write.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.write.bytes - network.outpoing.packets_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.outpoing.packets - network.outpoing.packets_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.outpoing.packets + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.incoming.packets.rate + attachment_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - attachment feature_server_pd_pattern4_1: - server_pd_pattern4_1 - feature + attachment_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - attachment disk.device.write.requests_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.write.requests disk.write.requests.rate_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.write.requests.rate - network.incoming.packets.rate_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 - network.incoming.packets.rate - network.incoming.bytes_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.incoming.bytes disk.device.read.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.read.bytes - network.incoming.packets.rate_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.incoming.packets.rate - network.incoming.bytes_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.incoming.bytes + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.incoming.packets disk.read.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.read.bytes - forwarder_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - forwarder - forwarder_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - forwarder - network.outgoing.bytes.rate_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.outgoing.bytes.rate + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.incoming.bytes + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.outpoing.packets + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.outpoing.packets instance_server_pd_pattern4_1: - server_pd_pattern4_1 - instance + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.incoming.bytes vcpus_server_pd_pattern4_1: - server_pd_pattern4_1 - vcpus cpu.delta_server_pd_pattern4_1: - server_pd_pattern4_1 - cpu.delta + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.incoming.bytes.rate + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - network.incoming.bytes.rate + binding_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - binding binding_server_pd_pattern4_1: - server_pd_pattern4_1 - binding @@ -384,42 +402,24 @@ topology_template: disk.device.allocation_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.device.allocation - binding_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - binding os_server_pd_pattern4_1: - server_pd_pattern4_1 - os - network.incoming.bytes.rate_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.incoming.bytes.rate disk.iops_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.iops - network.incoming.bytes.rate_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.incoming.bytes.rate - binding_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - binding - network.outgoing.packets.rate_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 - network.outgoing.packets.rate - network.incoming.packets_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - network.incoming.packets disk.read.requests_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.read.requests disk.root.size_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.root.size - network.outgoing.packets.rate_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.outgoing.packets.rate - network.incoming.packets_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - network.incoming.packets disk.capacity_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.capacity @@ -430,18 +430,18 @@ topology_template: local_storage_server_pd_pattern4_1: - server_pd_pattern4_1 - local_storage - dependency_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 + dependency_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 - dependency - dependency_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 + dependency_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 - dependency - link_pd_server_pattern4_port_1: - - pd_server_pattern4_port_1 - - link - link_pd_server_pattern4_port_2: - - pd_server_pattern4_port_2 - - link dependency_server_pd_pattern4_1: - server_pd_pattern4_1 - - dependency
\ No newline at end of file + - dependency + link_pd_server_pattern4_0_mgmt_port_0: + - pd_server_pattern4_0_mgmt_port_0 + - link + link_pd_server_pattern4_1_mgmt_port_0: + - pd_server_pattern4_1_mgmt_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml index 640a075c1e..979fb5bead 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -25,57 +25,60 @@ topology_template: immutable: false type: string description: UID of OAM network - port_pd_server_pattern4_port_02_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_pattern4_port_01_network_role_tag: + port_pd_server_pattern4_1_oam_port_0_network_role: type: string required: true - port_pd_server_pattern4_port_01_subnetpoolid: + port_pd_server_pattern4_0_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_0_oam_port_0_network_role_tag: type: string required: true - port_pd_server_pattern4_port_01_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_pattern4_0_oam_port_0_related_networks: + type: list required: true - port_pd_server_pattern4_port_02_order: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_order: type: integer required: true - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_pattern4_1_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true availability_zone_0: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name + port_pd_server_pattern4_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements net: hidden: false immutable: false type: string - port_pd_server_pattern4_port_02_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_pattern4_port_02_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pd_server_pattern4_flavor: hidden: false immutable: false type: string description: Flavor for PD server - port_pd_server_pattern4_port_01_network_role: - type: string - required: true - port_pd_server_pattern4_port_02_network_role: - type: string - required: true - port_pd_server_pattern4_port_01_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true security_group_name: hidden: false @@ -89,38 +92,35 @@ topology_template: immutable: false type: string description: Flavor for PS server - port_pd_server_pattern4_port_01_order: - type: integer + port_pd_server_pattern4_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd_server_pattern4_port_02_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: hidden: false immutable: false type: string description: Flavor for PD server - port_pd_server_pattern4_port_02_ip_requirements: - type: list + port_pd_server_pattern4_0_oam_port_0_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_02_subnetpoolid: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_pattern4_1_oam_port_0_network_role_tag: type: string required: true - port_pd_server_pattern4_port_01_vlan_requirements: + port_pd_server_pattern4_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_01_related_networks: - type: list + port_pd_server_pattern4_1_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_pattern4_port_02_network_role_tag: + port_pd_server_pattern4_0_oam_port_0_subnetpoolid: type: string required: true pd_server_pattern4_names: @@ -131,36 +131,36 @@ topology_template: entry_schema: type: string node_templates: - pd_server_pattern4_port_01: + pd_server_pattern4_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_pattern4_port_01_subnetpoolid + get_input: port_pd_server_pattern4_0_oam_port_0_subnetpoolid related_networks: - get_input: port_pd_server_pattern4_port_01_related_networks + get_input: port_pd_server_pattern4_0_oam_port_0_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_pattern4_port_01_ip_requirements + get_input: port_pd_server_pattern4_0_oam_port_0_ip_requirements network_role: - get_input: port_pd_server_pattern4_port_01_network_role + get_input: port_pd_server_pattern4_0_oam_port_0_network_role fixed_ips: - ip_address: get_input: - pd_server_pattern4_ips - - 0 + - 1 mac_requirements: - get_input: port_pd_server_pattern4_port_01_mac_requirements + get_input: port_pd_server_pattern4_0_oam_port_0_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_pattern4_port_01_exCP_naming + get_input: port_pd_server_pattern4_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_pattern4_port_01_vlan_requirements + get_input: port_pd_server_pattern4_0_oam_port_0_vlan_requirements network_role_tag: - get_input: port_pd_server_pattern4_port_01_network_role_tag + get_input: port_pd_server_pattern4_0_oam_port_0_network_role_tag order: - get_input: port_pd_server_pattern4_port_01_order + get_input: port_pd_server_pattern4_0_oam_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -179,36 +179,36 @@ topology_template: get_input: - pd_server_pattern4_names - 0 - pd_server_pattern4_port_02: + pd_server_pattern4_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_pattern4_port_02_subnetpoolid + get_input: port_pd_server_pattern4_1_oam_port_0_subnetpoolid related_networks: - get_input: port_pd_server_pattern4_port_02_related_networks + get_input: port_pd_server_pattern4_1_oam_port_0_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_pattern4_port_02_ip_requirements + get_input: port_pd_server_pattern4_1_oam_port_0_ip_requirements network_role: - get_input: port_pd_server_pattern4_port_02_network_role + get_input: port_pd_server_pattern4_1_oam_port_0_network_role fixed_ips: - ip_address: get_input: - pd_server_pattern4_ips - - 1 + - 0 mac_requirements: - get_input: port_pd_server_pattern4_port_02_mac_requirements + get_input: port_pd_server_pattern4_1_oam_port_0_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_pattern4_port_02_exCP_naming + get_input: port_pd_server_pattern4_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_pattern4_port_02_vlan_requirements + get_input: port_pd_server_pattern4_1_oam_port_0_vlan_requirements network_role_tag: - get_input: port_pd_server_pattern4_port_02_network_role_tag + get_input: port_pd_server_pattern4_1_oam_port_0_network_role_tag order: - get_input: port_pd_server_pattern4_port_02_order + get_input: port_pd_server_pattern4_1_oam_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -221,9 +221,9 @@ topology_template: heat_file: ../Artifacts/nested-pattern-4.yml description: nested1 members: - - pd_server_pattern4_port_01 + - pd_server_pattern4_0_oam_port_0 - server_pd_pattern4 - - pd_server_pattern4_port_02 + - pd_server_pattern4_1_oam_port_0 outputs: pattern4_attr_1: description: pattern4_attr_1_value @@ -237,33 +237,21 @@ topology_template: disk.device.write.bytes_server_pd_pattern4: - server_pd_pattern4 - disk.device.write.bytes - network.incoming.packets_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.incoming.packets - binding_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - binding - network.incoming.bytes_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.incoming.bytes - network.incoming.bytes_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.incoming.bytes - feature_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - feature - feature_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 + feature_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 - feature - network.incoming.packets_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.incoming.packets + forwarder_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - forwarder disk.allocation_server_pd_pattern4: - server_pd_pattern4 - disk.allocation disk.device.usage_server_pd_pattern4: - server_pd_pattern4 - disk.device.usage + network.incoming.bytes_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.incoming.bytes disk.write.bytes.rate_server_pd_pattern4: - server_pd_pattern4 - disk.write.bytes.rate @@ -276,21 +264,33 @@ topology_template: disk.write.bytes_server_pd_pattern4: - server_pd_pattern4 - disk.write.bytes - binding_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 + binding_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 - binding + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.outgoing.bytes disk.latency_server_pd_pattern4: - server_pd_pattern4 - disk.latency + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.outgoing.bytes.rate endpoint_server_pd_pattern4: - server_pd_pattern4 - endpoint + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.outgoing.packets.rate feature_server_pd_pattern4: - server_pd_pattern4 - feature disk.device.read.requests.rate_server_pd_pattern4: - server_pd_pattern4 - disk.device.read.requests.rate + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.incoming.bytes.rate instance_server_pd_pattern4: - server_pd_pattern4 - instance @@ -300,27 +300,24 @@ topology_template: disk.device.read.requests_server_pd_pattern4: - server_pd_pattern4 - disk.device.read.requests - network.incoming.packets.rate_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.incoming.packets.rate host_server_pd_pattern4: - server_pd_pattern4 - host cpu_util_server_pd_pattern4: - server_pd_pattern4 - cpu_util - network.incoming.packets.rate_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.incoming.packets.rate memory.resident_server_pd_pattern4: - server_pd_pattern4 - memory.resident disk.read.requests_server_pd_pattern4: - server_pd_pattern4 - disk.read.requests - network.outgoing.bytes_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.outgoing.bytes + network.outpoing.packets_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.incoming.bytes.rate disk.read.bytes.rate_server_pd_pattern4: - server_pd_pattern4 - disk.read.bytes.rate @@ -333,9 +330,9 @@ topology_template: disk.write.requests_server_pd_pattern4: - server_pd_pattern4 - disk.write.requests - network.outgoing.bytes_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.outgoing.bytes + network.incoming.bytes_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.incoming.bytes disk.device.write.requests.rate_server_pd_pattern4: - server_pd_pattern4 - disk.device.write.requests.rate @@ -348,45 +345,48 @@ topology_template: disk.capacity_server_pd_pattern4: - server_pd_pattern4 - disk.capacity - network.outgoing.packets.rate_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.outgoing.packets.rate - network.outpoing.packets_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.outpoing.packets - network.outpoing.packets_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.outpoing.packets binding_server_pd_pattern4: - server_pd_pattern4 - binding + attachment_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - attachment + network.incoming.packets_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.outpoing.packets + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.outgoing.bytes disk.device.iops_server_pd_pattern4: - server_pd_pattern4 - disk.device.iops - forwarder_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - forwarder - forwarder_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - forwarder + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_server_pd_pattern4: - server_pd_pattern4 - disk.device.read.bytes.rate disk.device.allocation_server_pd_pattern4: - server_pd_pattern4 - disk.device.allocation + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.outgoing.packets.rate disk.usage_server_pd_pattern4: - server_pd_pattern4 - disk.usage disk.read.bytes_server_pd_pattern4: - server_pd_pattern4 - disk.read.bytes - network.outgoing.packets.rate_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.outgoing.packets.rate os_server_pd_pattern4: - server_pd_pattern4 - os + forwarder_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - forwarder memory_server_pd_pattern4: - server_pd_pattern4 - memory @@ -396,9 +396,12 @@ topology_template: scalable_server_pd_pattern4: - server_pd_pattern4 - scalable - network.outgoing.bytes.rate_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.outgoing.bytes.rate + feature_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - feature + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.incoming.packets.rate disk.write.requests.rate_server_pd_pattern4: - server_pd_pattern4 - disk.write.requests.rate @@ -408,40 +411,37 @@ topology_template: disk.device.write.requests_server_pd_pattern4: - server_pd_pattern4 - disk.device.write.requests - network.outgoing.bytes.rate_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.outgoing.bytes.rate - attachment_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - attachment - network.incoming.bytes.rate_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - network.incoming.bytes.rate - attachment_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 + binding_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - binding + attachment_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 - attachment - network.incoming.bytes.rate_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - network.incoming.bytes.rate + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - network.incoming.packets.rate disk.device.capacity_server_pd_pattern4: - server_pd_pattern4 - disk.device.capacity + network.incoming.packets_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - network.incoming.packets requirements: - dependency_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 + link_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 + - link + dependency_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - dependency + link_pd_server_pattern4_1_oam_port_0: + - pd_server_pattern4_1_oam_port_0 + - link + dependency_pd_server_pattern4_0_oam_port_0: + - pd_server_pattern4_0_oam_port_0 - dependency local_storage_server_pd_pattern4: - server_pd_pattern4 - local_storage - dependency_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - dependency - link_pd_server_pattern4_port_02: - - pd_server_pattern4_port_02 - - link - link_pd_server_pattern4_port_01: - - pd_server_pattern4_port_01 - - link dependency_server_pd_pattern4: - server_pd_pattern4 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml index 7d4ac036a6..128453b89e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml @@ -108,23 +108,23 @@ topology_template: directives: - substitutable properties: + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + mac_count_required: + is_required: false p1: get_input: jsa_name service_template_filter: substitute_service_template: nested-pattern-4ServiceTemplate.yaml - port_pd_server_pattern4_port_01_mac_requirements: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd_server_pattern4_port_02_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_pattern4_port_02_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -135,34 +135,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_main_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_main_1b_ips - - 0 - port_ps_server_main_1b_port_ip_requirements: + compute_ps_server_main_1b_availability_zone: + - get_input: availability_zone_0 + vm_flavor_name: + get_input: ps_server_main_1b_flavor + port_ps_server_main_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_main_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - compute_ps_server_main_1b_availability_zone: - - get_input: availability_zone_0 - vm_flavor_name: - get_input: ps_server_main_1b_flavor vm_image_name: get_input: ps_server_main_1b_image compute_ps_server_main_1b_name: - get_input: - ps_server_main_1b_names - 1 - port_ps_server_main_1b_port_replacement_policy: - - AUTO - port_ps_server_main_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_main_1b_port_network: + port_ps_server_main_1b_port_1_network: - get_input: jsa_name + port_ps_server_main_1b_port_1_replacement_policy: + - AUTO + port_ps_server_main_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_main_1b_ips + - 0 service_template_filter: substitute_service_template: Nested_ps_server_main_1bServiceTemplate.yaml count: 1 @@ -176,7 +176,17 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_main_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cmaui_1c1_main_mgmt_port_0_network_role_tag: contrail + port_cmaui_1c1_main_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_1c1_main_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -185,26 +195,16 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - get_input: contrail_net_name - - get_input: contrail_net_name - port_cmaui_port_network_role_tag: contrail vm_flavor_name: get_input: cmaui_1c1_main_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: - - AUTO - - AUTO + port_cmaui_1c1_main_mgmt_port_0_network: + - get_input: contrail_net_name + - get_input: contrail_net_name vm_image_name: get_input: cmaui_1c1_main_image - port_cmaui_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_cmaui_1c1_main_mgmt_port_0_replacement_policy: + - AUTO + - AUTO compute_cmaui_1c1_main_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -228,34 +228,34 @@ topology_template: directives: - substitutable properties: + port_pd_server_main_1b_port_1_network: + - get_input: jsa_name compute_pd_server_main_1b_availability_zone: - get_input: availability_zone_0 - port_pd_server_main_1b_port_replacement_policy: - - AUTO - port_pd_server_main_1b_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_server_main_1b_flavor - vm_image_name: - get_input: pd_server_main_1b_image - compute_pd_server_main_1b_name: - - get_input: - - pd_server_main_1b_names - - 0 - port_pd_server_main_1b_port_network: - - get_input: jsa_name - port_pd_server_main_1b_port_ip_requirements: + port_pd_server_main_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_main_1b_port_fixed_ips: + port_pd_server_main_1b_port_1_fixed_ips: - ip_address: get_input: - pd_server_main_1b_ips - 0 + vm_image_name: + get_input: pd_server_main_1b_image + compute_pd_server_main_1b_name: + - get_input: + - pd_server_main_1b_names + - 0 + port_pd_server_main_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_main_1b_port_1_replacement_policy: + - AUTO service_template_filter: substitute_service_template: Nested_pd_server_main_1bServiceTemplate.yaml count: 1 @@ -298,30 +298,39 @@ topology_template: disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.ephemeral.size_server_pd_pattern4 + network.outgoing.bytes_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2 + binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file feature_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - feature_test_nested_pattern_4_same_type_diff_file disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2 - network.incoming.packets_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.incoming.packets_cmaui_port_2 - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outpoing.packets_pd_server_pattern4_port_01 cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file disk.device.read.requests_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.read.requests_cmaui_1c1_main + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.read.bytes_server_pd_pattern4 + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - attachment_pd_server_pattern4_0_oam_port_0 disk.latency_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.latency_server_nested2_1c1_cmaui_2 @@ -331,6 +340,9 @@ topology_template: binding_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - binding_cmaui_1c1_main + network.outgoing.packets.rate_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 cpu_util_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - cpu_util_server_pd_pattern4 @@ -358,6 +370,9 @@ topology_template: disk.device.latency_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.latency_pd_server_main_1b + binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.write.requests_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_nested2_ps_1b @@ -367,48 +382,42 @@ topology_template: feature_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - feature_cmaui_1c1_main + network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.allocation_server_pd_pattern4 disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2 - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.bytes_pd_server_pattern4_port_02 - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.device.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_nested2_pd_1b + forwarder_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file network.incoming.bytes_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.bytes.rate_pd_server_pattern4_port_02 + - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port_1 disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.packets.rate_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.read.requests_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.read.requests_server_nested2_ps_1b disk.root.size_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.root.size_server_nested2_ps_1b - forwarder_cmaui_port_11: - - abstract_cmaui_1c1_main - - forwarder_cmaui_1c1_main_cmaui_port disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.read.requests_server_nested2_1c1_cmaui_2 - forwarder_cmaui_port_12: - - abstract_cmaui_1c1_main - - forwarder_cmaui_1c1_main_cmaui_port feature_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - feature_ps_server_main_1b_ps_server_main_1b_port + - feature_ps_server_main_1b_ps_server_main_1b_port_1 vcpus_server_main_pd_1b_1: - abstract_pd_server_main_1b - vcpus_pd_server_main_1b @@ -418,9 +427,6 @@ topology_template: disk.usage_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.usage_server_nested2_ps_1b - forwarder_cmaui_port_2_test_nested2Level: - - test_nested2Level - - forwarder_cmaui_port_2 os_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - os_server_pd_pattern4 @@ -433,15 +439,21 @@ topology_template: memory.resident_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - memory.resident_server_nested2_pd_1b - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.bytes.rate_pd_server_pattern4_port_02 + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + network.outgoing.bytes_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2 disk.device.write.bytes.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.write.bytes.rate_pd_server_main_1b + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - feature_pd_server_pattern4_1_oam_port_0 instance_server_main_pd_1b_1: - abstract_pd_server_main_1b - instance_pd_server_main_1b @@ -465,7 +477,7 @@ topology_template: - disk.write.bytes_server_nested2_ps_1b network.outgoing.bytes.rate_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1 disk.ephemeral.size_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.ephemeral.size_server_nested2_1c1_cmaui_1 @@ -477,28 +489,22 @@ topology_template: - disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 network.outgoing.packets.rate_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1 binding_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - binding_cmaui_1c1_main - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.bytes_pd_server_pattern4_port_02 disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2 disk.read.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.read.bytes.rate_server_nested2_pd_1b - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 cpu_util_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - cpu_util_server_nested2_ps_1b @@ -508,9 +514,6 @@ topology_template: network.outgoing.packets.rate_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_ps_server_nested2_1b_port - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -529,12 +532,21 @@ topology_template: disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + attachment_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - attachment_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file disk.allocation_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.allocation_pd_server_main_1b + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + feature_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 endpoint_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - endpoint_cmaui_1c1_main @@ -547,18 +559,18 @@ topology_template: disk.usage_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.usage_cmaui_1c1_main - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.write.requests_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.write.requests_pd_server_main_1b cpu_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - cpu_server_pd_pattern4 - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: - test_nested2Level - - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -571,9 +583,6 @@ topology_template: memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.incoming.packets.rate_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_cmaui_port_1 cpu.delta_server_main_ps_1b_1: - abstract_ps_server_main_1b - cpu.delta_ps_server_main_1b @@ -589,24 +598,18 @@ topology_template: network.incoming.bytes_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.incoming.bytes_pd_server_nested2_1b_port + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.usage_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.usage_cmaui_1c1_main - network.incoming.packets.rate_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_cmaui_port_2 disk.device.write.bytes.rate_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.write.bytes.rate_ps_server_main_1b cpu_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - cpu_server_nested2_ps_1b - binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - binding_pd_server_pattern4_port_02 - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -615,34 +618,28 @@ topology_template: - disk.root.size_server_nested2_1c1_cmaui_1 forwarder_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - forwarder_ps_server_main_1b_ps_server_main_1b_port + - forwarder_ps_server_main_1b_ps_server_main_1b_port_1 binding_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - binding_ps_server_main_1b_ps_server_main_1b_port - feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - feature_pd_server_pattern4_port_01 - network.outgoing.bytes.rate_cmaui_port_11: + - binding_ps_server_main_1b_ps_server_main_1b_port_1 + feature_cmaui_1c1_main_11_mgmt_port_0: - abstract_cmaui_1c1_main - - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port + - feature_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.read.bytes_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.read.bytes_server_nested2_pd_1b - network.outgoing.bytes.rate_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 os_server_main_ps_1b_1: - abstract_ps_server_main_1b - os_ps_server_main_1b + binding_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.read.bytes_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.read.bytes_pd_server_main_1b attachment_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - attachment_ps_server_main_1b_ps_server_main_1b_port + - attachment_ps_server_main_1b_ps_server_main_1b_port_1 cpu.delta_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - cpu.delta_server_nested2_ps_1b @@ -658,24 +655,27 @@ topology_template: disk.write.requests.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_nested2_pd_1b + feature_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - feature_cmaui_1c1_nested2_1_mgmt_port_0 disk.device.read.bytes.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.read.bytes.rate_pd_server_main_1b network.outgoing.bytes_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outgoing.bytes_ps_server_nested2_1b_port - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - binding_pd_server_pattern4_1_oam_port_0 feature_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - feature_server_nested2_1c1_cmaui_2 + network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0 endpoint_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - endpoint_cmaui_1c1_main - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -690,7 +690,7 @@ topology_template: - feature_ps_server_main_1b network.outpoing.packets_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port + - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port_1 disk.device.read.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_nested2_1c1_cmaui_1 @@ -706,27 +706,24 @@ topology_template: disk.latency_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.latency_cmaui_1c1_main - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.root.size_server_pd_pattern4 binding_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - binding_server_nested2_1c1_cmaui_2 - network.outgoing.packets.rate_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_cmaui_port_1 disk.device.write.bytes_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.write.bytes_pd_server_main_1b - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outpoing.packets_pd_server_pattern4_1_oam_port_0 disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1 + network.incoming.bytes_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.ephemeral.size_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.ephemeral.size_ps_server_main_1b @@ -736,21 +733,12 @@ topology_template: disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.iops_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.iops_cmaui_1c1_main - network.outgoing.bytes_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_cmaui_port_2 forwarder_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - forwarder_pd_server_nested2_1b_port - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.device.read.bytes.rate_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.read.bytes.rate_ps_server_main_1b @@ -766,30 +754,21 @@ topology_template: disk.device.read.bytes.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.read.bytes.rate_cmaui_1c1_main - network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level: + forwarder_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.outgoing.bytes.rate_cmaui_port_2 + - forwarder_cmaui_1c1_nested2_1_mgmt_port_0 disk.device.write.requests.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.write.requests.rate_pd_server_main_1b - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.iops_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.iops_server_pd_pattern4 network.incoming.packets.rate_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port - binding_cmaui_port_1_test_nested2Level: - - test_nested2Level - - binding_cmaui_port_1 + - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port_1 disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file memory.usage_server_main_pd_1b_1: - abstract_pd_server_main_1b - memory.usage_pd_server_main_1b @@ -798,16 +777,19 @@ topology_template: - disk.root.size_ps_server_main_1b network.incoming.packets_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.packets.rate_pd_server_pattern4_port_02 + - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port_1 disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2 disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2 + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - forwarder_pd_server_pattern4_1_oam_port_0 + network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0 scalable_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - scalable_cmaui_1c1_main @@ -826,15 +808,18 @@ topology_template: disk.usage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.usage_server_nested2_1c1_cmaui_1 - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.packets.rate_pd_server_pattern4_port_02 + network.incoming.packets_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.capacity_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.capacity_pd_server_main_1b disk.device.write.requests_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.write.requests_cmaui_1c1_main + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.read.requests_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.read.requests_pd_server_main_1b @@ -844,12 +829,6 @@ topology_template: disk.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.read.bytes_server_nested2_1c1_cmaui_1 - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.bytes_pd_server_pattern4_port_01 - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.iops_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.iops_server_nested2_1c1_cmaui_1 @@ -865,15 +844,24 @@ topology_template: disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_nested2_ps_1b + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 instance_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - instance_server_nested2_1c1_cmaui_2 network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outpoing.packets_pd_server_nested2_1b_port + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets_pd_server_pattern4_0_oam_port_0 disk.latency_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.latency_ps_server_main_1b + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file os_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - os_server_nested2_pd_1b @@ -883,9 +871,18 @@ topology_template: disk.read.bytes_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.read.bytes_pd_server_main_1b + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - forwarder_pd_server_pattern4_0_oam_port_0 + network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0 disk.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.write.requests_server_pd_pattern4 + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes_pd_server_pattern4_1_oam_port_0 disk.device.read.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_nested2_pd_1b @@ -904,15 +901,6 @@ topology_template: network.incoming.bytes_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.incoming.bytes_ps_server_nested2_1b_port - feature_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - feature_pd_server_pattern4_port_02 - network.outgoing.packets.rate_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_cmaui_port_2 - network.outgoing.bytes_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.outgoing.bytes_cmaui_1c1_main_cmaui_port endpoint_server_main_pd_1b_1: - abstract_pd_server_main_1b - endpoint_pd_server_main_1b @@ -922,12 +910,18 @@ topology_template: disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.outgoing.bytes_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.outgoing.bytes_cmaui_1c1_main_cmaui_port vcpus_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - vcpus_server_pd_pattern4_test_nested_pattern_4_nested2 + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0 + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0 + network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0 disk.write.bytes_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.write.bytes_server_nested2_pd_1b @@ -946,39 +940,42 @@ topology_template: cpu.delta_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - cpu.delta_server_pd_pattern4 - disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - disk.write.bytes_server_nested2_1c1_cmaui_1 - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file + attachment_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - attachment_cmaui_1c1_nested2_1_mgmt_port_0 + disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - disk.write.bytes_server_nested2_1c1_cmaui_1 + network.incoming.bytes.rate_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 scalable_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - scalable_server_nested2_pd_1b network.incoming.packets_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port_1 network.incoming.packets.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port + - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1 forwarder_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - forwarder_ps_server_nested2_1b_port - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.device.usage_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.usage_cmaui_1c1_main + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.capacity_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.capacity_server_nested2_ps_1b + network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0 binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -994,6 +991,9 @@ topology_template: memory.usage_server_main_ps_1b_1: - abstract_ps_server_main_1b - memory.usage_ps_server_main_1b + network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0 network.outpoing.packets_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outpoing.packets_ps_server_nested2_1b_port @@ -1036,9 +1036,6 @@ topology_template: binding_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - binding_server_pd_pattern4_test_nested_pattern_4_nested2 - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.bytes_pd_server_pattern4_port_01 memory.resident_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - memory.resident_server_nested2_1c1_cmaui_1 @@ -1048,15 +1045,12 @@ topology_template: disk.device.iops_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.iops_server_nested2_1c1_cmaui_2 - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.write.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.write.requests_ps_server_main_1b - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - forwarder_pd_server_pattern4_port_02 + attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -1069,9 +1063,12 @@ topology_template: disk.device.read.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.read.requests_ps_server_main_1b - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets_pd_server_pattern4_1_oam_port_0 + network.outgoing.packets.rate_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -1084,12 +1081,21 @@ topology_template: disk.write.requests.rate_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.write.requests.rate_cmaui_1c1_main + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.allocation_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.allocation_cmaui_1c1_main + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.read.bytes_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_nested2_pd_1b @@ -1099,21 +1105,21 @@ topology_template: disk.capacity_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.capacity_ps_server_main_1b - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.read.requests_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.read.requests_server_nested2_ps_1b cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0 + binding_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - binding_cmaui_1c1_nested2_1_mgmt_port_0 disk.read.bytes_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.read.bytes_server_nested2_ps_1b - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 scalable_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - scalable_server_pd_pattern4 @@ -1129,9 +1135,15 @@ topology_template: disk.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.read.bytes.rate_server_nested2_1c1_cmaui_2 + network.incoming.bytes_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.bytes_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.write.requests_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.write.requests_cmaui_1c1_main + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.device.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_nested2_1c1_cmaui_1 @@ -1144,12 +1156,12 @@ topology_template: feature_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - feature_cmaui_1c1_main - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - forwarder_pd_server_pattern4_port_01 disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_nested2_1c1_cmaui_2 + network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0 disk.device.capacity_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.capacity_cmaui_1c1_main @@ -1159,12 +1171,27 @@ topology_template: disk.write.bytes.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.write.bytes.rate_pd_server_main_1b + feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file feature_test_nested3Level_test_nested2Level: - test_nested2Level - feature_test_nested3Level + network.incoming.bytes.rate_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes_pd_server_pattern4_0_oam_port_0 + feature_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - feature_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.iops_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.iops_pd_server_main_1b @@ -1177,18 +1204,12 @@ topology_template: feature_server_main_pd_1b_1: - abstract_pd_server_main_1b - feature_pd_server_main_1b - network.incoming.bytes_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.incoming.bytes_cmaui_1c1_main_cmaui_port - network.incoming.bytes_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.incoming.bytes_cmaui_1c1_main_cmaui_port scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - forwarder_cmaui_port_1_test_nested2Level: - - test_nested2Level - - forwarder_cmaui_port_1 + network.outgoing.bytes.rate_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.latency_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.latency_server_nested2_pd_1b @@ -1213,15 +1234,21 @@ topology_template: cpu_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - cpu_server_nested2_pd_1b - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.packets.rate_pd_server_pattern4_port_01 + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.device.allocation_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.allocation_server_nested2_1c1_cmaui_2 + network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0 disk.device.allocation_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.allocation_pd_server_main_1b + network.outpoing.packets_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_cmaui_1c1_nested2_1_mgmt_port_0 disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.read.bytes_server_pd_pattern4 @@ -1231,12 +1258,15 @@ topology_template: disk.device.usage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.usage_server_nested2_1c1_cmaui_1 - network.incoming.bytes_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_cmaui_port_1 disk.device.latency_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.latency_cmaui_1c1_main + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 disk.device.allocation_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.allocation_server_nested2_1c1_cmaui_1 @@ -1267,72 +1297,72 @@ topology_template: disk.device.capacity_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.capacity_ps_server_main_1b - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.packets.rate_pd_server_pattern4_port_01 disk.device.write.bytes_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.write.bytes_cmaui_1c1_main - network.incoming.bytes_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_cmaui_port_2 binding_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - binding_pd_server_main_1b_pd_server_main_1b_port + - binding_pd_server_main_1b_pd_server_main_1b_port_1 disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.write.bytes_server_pd_pattern4 disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2 + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 memory.resident_server_main_pd_1b_1: - abstract_pd_server_main_1b - memory.resident_pd_server_main_1b network.incoming.bytes_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port + - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port_1 vcpus_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - vcpus_server_nested2_1c1_cmaui_1 + network.outgoing.bytes.rate_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_nested2_1c1_cmaui_1 + network.outpoing.packets_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.read.bytes.rate_server_nested2_ps_1b endpoint_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - endpoint_server_nested2_1c1_cmaui_1 - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: - test_nested2Level - - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_cmaui_1c1_nested2_1_mgmt_port_0 disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.device.iops_server_pd_pattern4 - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.device.read.requests_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.read.requests_server_nested2_pd_1b - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - attachment_pd_server_pattern4_port_02 memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - memory.resident_server_pd_pattern4 feature_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - feature_pd_server_main_1b_pd_server_main_1b_port + - feature_pd_server_main_1b_pd_server_main_1b_port_1 + network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0 host_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - host_cmaui_1c1_main - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.ephemeral.size_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.ephemeral.size_server_nested2_ps_1b @@ -1342,51 +1372,42 @@ topology_template: network.outgoing.bytes_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outgoing.bytes_pd_server_nested2_1b_port - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.device.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_nested2_ps_1b disk.device.usage_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.usage_ps_server_main_1b - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + - network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.capacity_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.capacity_server_nested2_1c1_cmaui_2 disk.device.write.requests_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_nested2_pd_1b - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.usage_server_nested2_1c1_cmaui_2 disk.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_nested2_1c1_cmaui_1 - network.incoming.bytes.rate_cmaui_port_2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes.rate_cmaui_port_2 disk.device.latency_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.latency_cmaui_1c1_main disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 - network.incoming.packets.rate_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port - network.incoming.packets.rate_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.device.read.requests.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_nested2_pd_1b + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - attachment_pd_server_pattern4_1_oam_port_0 disk.device.allocation_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.allocation_ps_server_main_1b @@ -1395,13 +1416,13 @@ topology_template: - vcpus_cmaui_1c1_main attachment_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - attachment_pd_server_main_1b_pd_server_main_1b_port + - attachment_pd_server_main_1b_pd_server_main_1b_port_1 disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.incoming.bytes.rate_cmaui_port_1_test_nested2Level: + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - network.incoming.bytes.rate_cmaui_port_1 + - forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 os_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - os_server_nested2_1c1_cmaui_2 @@ -1417,18 +1438,12 @@ topology_template: disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - network.outpoing.packets_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.outpoing.packets_cmaui_1c1_main_cmaui_port - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file - network.outpoing.packets_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.outpoing.packets_cmaui_1c1_main_cmaui_port disk.usage_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.usage_server_pd_pattern4 + network.outpoing.packets_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.outpoing.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 memory.resident_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - memory.resident_server_nested2_1c1_cmaui_2 @@ -1441,6 +1456,9 @@ topology_template: cpu_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - cpu_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file binding_server_main_pd_1b_1: - abstract_pd_server_main_1b - binding_pd_server_main_1b @@ -1471,9 +1489,6 @@ topology_template: cpu_util_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - cpu_util_server_nested2_1c1_cmaui_1 - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -1486,6 +1501,9 @@ topology_template: cpu_server_main_pd_1b_1: - abstract_pd_server_main_1b - cpu_pd_server_main_1b + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 disk.read.requests_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.read.requests_cmaui_1c1_main @@ -1504,9 +1522,15 @@ topology_template: disk.ephemeral.size_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.ephemeral.size_cmaui_1c1_main + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 host_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - host_cmaui_1c1_main + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0 disk.device.iops_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.iops_cmaui_1c1_main @@ -1525,18 +1549,33 @@ topology_template: memory_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - memory_server_nested2_1c1_cmaui_2 + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 disk.device.read.requests.rate_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.read.requests.rate_ps_server_main_1b disk.device.read.requests.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.read.requests.rate_cmaui_1c1_main + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - binding_pd_server_pattern4_0_oam_port_0 + forwarder_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_1c1_nested2_2_mgmt_port_0 + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0 + forwarder_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.read.bytes_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.read.bytes_cmaui_1c1_main network.outpoing.packets_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port + - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port_1 disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_nested2_pd_1b @@ -1546,12 +1585,6 @@ topology_template: endpoint_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - endpoint_server_nested2_ps_1b - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.packets_pd_server_pattern4_port_01 disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2 @@ -1596,55 +1629,40 @@ topology_template: - disk.device.write.requests.rate_cmaui_1c1_main network.outgoing.bytes.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1 instance_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - instance_cmaui_1c1_main network.outgoing.packets.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port_1 disk.device.iops_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.iops_cmaui_1c1_main - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.bytes.rate_pd_server_pattern4_port_01 - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_port_0 forwarder_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - forwarder_pd_server_main_1b_pd_server_main_1b_port - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.incoming.packets_pd_server_pattern4_port_02 + - forwarder_pd_server_main_1b_pd_server_main_1b_port_1 disk.write.requests.rate_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.write.requests.rate_ps_server_main_1b disk.allocation_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.allocation_server_nested2_ps_1b - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 - network.outpoing.packets_cmaui_port_2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - network.outpoing.packets_cmaui_port_2 + - network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file cpu.delta_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - cpu.delta_cmaui_1c1_main - network.outgoing.bytes_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes_cmaui_port_1 feature_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - feature_server_nested2_ps_1b - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outgoing.bytes.rate_pd_server_pattern4_port_01 - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + binding_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: - test_nested2Level - - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - binding_cmaui_1c1_nested2_2_mgmt_port_0 vcpus_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - vcpus_server_nested2_1c1_cmaui_2 @@ -1675,21 +1693,18 @@ topology_template: disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 + attachment_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_ps_server_nested2_1b_port - binding_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - - binding_pd_server_pattern4_port_01 - network.incoming.packets_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.incoming.packets_cmaui_1c1_main_cmaui_port - network.incoming.packets_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.incoming.packets_cmaui_1c1_main_cmaui_port + - feature_pd_server_pattern4_0_oam_port_0 network.incoming.bytes.rate_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port + - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port_1 disk.device.latency_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.latency_server_nested2_1c1_cmaui_1 @@ -1699,9 +1714,6 @@ topology_template: disk.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_nested2_1c1_cmaui_2 - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - network.outpoing.packets_pd_server_pattern4_port_02 vcpus_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - vcpus_server_pd_pattern4 @@ -1720,9 +1732,6 @@ topology_template: endpoint_server_main_ps_1b_1: - abstract_ps_server_main_1b - endpoint_ps_server_main_1b - network.outpoing.packets_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_cmaui_port_1 feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -1732,6 +1741,9 @@ topology_template: disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.read.bytes.rate_server_pd_pattern4 + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0 disk.capacity_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.capacity_cmaui_1c1_main @@ -1744,15 +1756,15 @@ topology_template: disk.read.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.read.requests_ps_server_main_1b - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outpoing.packets_pd_server_pattern4_0_oam_port_0 network.outgoing.bytes_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port + - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port_1 disk.device.iops_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.iops_server_nested2_ps_1b @@ -1767,7 +1779,7 @@ topology_template: - disk.capacity_server_pd_pattern4 network.outgoing.bytes_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port + - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port_1 instance_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - instance_server_nested2_1c1_cmaui_1 @@ -1780,15 +1792,18 @@ topology_template: disk.write.bytes_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.write.bytes_ps_server_main_1b + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.write.requests.rate_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.write.requests.rate_pd_server_main_1b + network.incoming.packets_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.packets_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2 - attachment_cmaui_port_1_test_nested2Level: - - test_nested2Level - - attachment_cmaui_port_1 binding_server_main_ps_1b_1: - abstract_ps_server_main_1b - binding_ps_server_main_1b @@ -1813,9 +1828,6 @@ topology_template: disk.device.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_nested2_1c1_cmaui_1 - network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes.rate_cmaui_port_1 disk.device.iops_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.iops_ps_server_main_1b @@ -1831,9 +1843,6 @@ topology_template: memory_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - memory_cmaui_1c1_main - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - attachment_pd_server_pattern4_port_01 disk.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_nested2_ps_1b @@ -1846,12 +1855,12 @@ topology_template: disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2 + attachment_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - attachment_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.read.bytes.rate_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.read.bytes.rate_cmaui_1c1_main - attachment_cmaui_port_2_test_nested2Level: - - test_nested2Level - - attachment_cmaui_port_2 disk.device.write.bytes.rate_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.device.write.bytes.rate_cmaui_1c1_main @@ -1863,7 +1872,7 @@ topology_template: - memory_pd_server_main_1b network.incoming.bytes.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port + - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port_1 disk.device.read.requests_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.read.requests_pd_server_main_1b @@ -1873,18 +1882,6 @@ topology_template: disk.device.capacity_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.capacity_server_nested2_pd_1b - feature_cmaui_port_12: - - abstract_cmaui_1c1_main - - feature_cmaui_1c1_main_cmaui_port - feature_cmaui_port_11: - - abstract_cmaui_1c1_main - - feature_cmaui_1c1_main_cmaui_port - network.incoming.bytes.rate_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port - network.incoming.bytes.rate_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port disk.device.iops_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.device.iops_pd_server_main_1b @@ -1903,12 +1900,12 @@ topology_template: attachment_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - attachment_pd_server_nested2_1b_port + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes_pd_server_pattern4_1_oam_port_0 disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - feature_cmaui_port_2_test_nested2Level: - - test_nested2Level - - feature_cmaui_port_2 disk.device.write.bytes_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.write.bytes_server_nested2_ps_1b @@ -1927,9 +1924,6 @@ topology_template: disk.read.bytes.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.read.bytes.rate_cmaui_1c1_main - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.write.requests_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.write.requests_cmaui_1c1_main @@ -1948,15 +1942,18 @@ topology_template: disk.device.write.bytes.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.device.write.bytes.rate_cmaui_1c1_main + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 feature_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - feature_pd_server_nested2_1b_port - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 - binding_cmaui_port_2_test_nested2Level: + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0 + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - binding_cmaui_port_2 + - network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file memory_server_main_ps_1b_1: - abstract_ps_server_main_1b - memory_ps_server_main_1b @@ -1978,12 +1975,15 @@ topology_template: disk.write.bytes.rate_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - disk.write.bytes.rate_cmaui_1c1_main - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + binding_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - binding_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 feature_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - feature_server_pd_pattern4 @@ -1999,12 +1999,9 @@ topology_template: binding_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - binding_pd_server_nested2_1b_port - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + network.incoming.packets.rate_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - network.incoming.packets.rate_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 disk.device.write.bytes_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.write.bytes_ps_server_main_1b @@ -2029,9 +2026,15 @@ topology_template: disk.device.write.requests.rate_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_nested2_pd_1b + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.usage_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.usage_pd_server_main_1b + attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.write.bytes.rate_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.write.bytes.rate_cmaui_1c1_main @@ -2050,12 +2053,12 @@ topology_template: memory_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - memory_server_nested2_1c1_cmaui_1 - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.device.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_nested2_1c1_cmaui_2 + forwarder_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - forwarder_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 scalable_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - scalable_server_nested2_1c1_cmaui_1 @@ -2068,6 +2071,9 @@ topology_template: disk.iops_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.iops_server_nested2_ps_1b + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file memory.resident_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - memory.resident_server_nested2_ps_1b @@ -2077,9 +2083,12 @@ topology_template: memory.usage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - memory.usage_server_nested2_1c1_cmaui_1 - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + - network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 disk.device.allocation_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.allocation_server_nested2_ps_1b @@ -2092,9 +2101,18 @@ topology_template: disk.device.write.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.device.write.requests_ps_server_main_1b + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0 disk.allocation_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.allocation_ps_server_main_1b + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.latency_server_main_pd_1b_1: - abstract_pd_server_main_1b - disk.latency_pd_server_main_1b @@ -2122,21 +2140,6 @@ topology_template: disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 - network.outgoing.packets.rate_cmaui_port_12: - - abstract_cmaui_1c1_main - - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port - binding_cmaui_port_12: - - abstract_cmaui_1c1_main - - binding_cmaui_1c1_main_cmaui_port - network.outgoing.packets.rate_cmaui_port_11: - - abstract_cmaui_1c1_main - - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port - binding_cmaui_port_11: - - abstract_cmaui_1c1_main - - binding_cmaui_1c1_main_cmaui_port - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file os_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - os_server_nested2_1c1_cmaui_1 @@ -2146,79 +2149,64 @@ topology_template: disk.write.requests.rate_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_nested2_ps_1b - attachment_cmaui_port_12: - - abstract_cmaui_1c1_main - - attachment_cmaui_1c1_main_cmaui_port - attachment_cmaui_port_11: - - abstract_cmaui_1c1_main - - attachment_cmaui_1c1_main_cmaui_port + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0 feature_test_resourceGroup_test_nested2Level: - test_nested2Level - feature_test_resourceGroup disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2 - feature_cmaui_port_1_test_nested2Level: - - test_nested2Level - - feature_cmaui_port_1 disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file cpu.delta_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - cpu.delta_server_nested2_1c1_cmaui_1 - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 - network.incoming.packets_cmaui_port_1_test_nested2Level: + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - - network.incoming.packets_cmaui_port_1 + - network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2 + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes_pd_server_pattern4_0_oam_port_0 requirements: dependency_jsa_security_group2_test_resourceGroup_test_nested2Level: - test_nested2Level - dependency_jsa_security_group2_test_resourceGroup - link_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - link_pd_server_pattern4_port_01 - dependency_cmaui_port_2_test_nested2Level: + dependency_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: - test_nested2Level - - dependency_cmaui_port_2 + - dependency_cmaui_1c1_nested2_2_mgmt_port_0 dependency_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - dependency_server_nested2_1c1_cmaui_1 port_jsa_security_group1_test_nested3Level_test_nested2Level: - test_nested2Level - port_jsa_security_group1_test_nested3Level - link_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - link_pd_server_pattern4_port_02 dependency_test_nested2Level: - test_nested2Level - dependency - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file + dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - - dependency_pd_server_pattern4_port_02 + - dependency_pd_server_pattern4_0_oam_port_0 local_storage_server_main_ps_1b_1: - abstract_ps_server_main_1b - local_storage_ps_server_main_1b - dependency_cmaui_port_11: - - abstract_cmaui_1c1_main - - dependency_cmaui_1c1_main_cmaui_port dependency_server_main_pd_1b_1: - abstract_pd_server_main_1b - dependency_pd_server_main_1b dependency_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - dependency_cmaui_1c1_main - dependency_cmaui_port_12: - - abstract_cmaui_1c1_main - - dependency_cmaui_1c1_main_cmaui_port - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: - - test_nested_pattern_4_main_1 - - dependency_pd_server_pattern4_port_01 local_storage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2 @@ -2228,45 +2216,57 @@ topology_template: local_storage_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - local_storage_server_nested2_pd_1b + link_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 local_storage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - local_storage_server_nested2_1c1_cmaui_1 + link_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - link_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 local_storage_server_main_pd_1b_1: - abstract_pd_server_main_1b - local_storage_pd_server_main_1b dependency_test_resourceGroup_test_nested2Level: - test_nested2Level - dependency_test_resourceGroup - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + dependency_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - dependency_cmaui_1c1_nested2_1_mgmt_port_0 + dependency_cmaui_1c1_main_11_mgmt_port_0: + - abstract_cmaui_1c1_main + - dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 + dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + - dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 + dependency_cmaui_1c1_main_21_mgmt_port_0: + - abstract_cmaui_1c1_main + - dependency_cmaui_1c1_main_cmaui_1c1_main_mgmt_port_0 dependency_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - dependency_pd_server_nested2_1b_port + link_cmaui_1c1_nested2_1_mgmt_port_0_test_nested2Level: + - test_nested2Level + - link_cmaui_1c1_nested2_1_mgmt_port_0 dependency_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - dependency_server_nested2_1c1_cmaui_2 link_pd_server_nested2_1b_port_test_nested2Level: - test_nested2Level - link_pd_server_nested2_1b_port - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - dependency_pd_server_pattern4_1_oam_port_0 dependency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - dependency_server_pd_pattern4_test_nested_pattern_4_nested2 - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 - dependency_cmaui_port_1_test_nested2Level: - - test_nested2Level - - dependency_cmaui_port_1 local_storage_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - local_storage_server_pd_pattern4 @@ -2276,54 +2276,48 @@ topology_template: dependency_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - dependency_server_nested2_pd_1b + link_cmaui_1c1_nested2_2_mgmt_port_0_test_nested2Level: + - test_nested2Level + - link_cmaui_1c1_nested2_2_mgmt_port_0 dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file dependency_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - dependency_server_nested2_ps_1b + dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file dependency_jsa_security_group1_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_jsa_security_group1_test_nested3Level - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file local_storage_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - local_storage_cmaui_1c1_main dependency_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - dependency_pd_server_main_1b_pd_server_main_1b_port - link_cmaui_port_11: - - abstract_cmaui_1c1_main - - link_cmaui_1c1_main_cmaui_port - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - - test_nested2Level - - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + - dependency_pd_server_main_1b_pd_server_main_1b_port_1 link_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - link_ps_server_main_1b_ps_server_main_1b_port + - link_ps_server_main_1b_ps_server_main_1b_port_1 dependency_jsa_security_group1_test_resourceGroup_test_nested2Level: - test_nested2Level - dependency_jsa_security_group1_test_resourceGroup - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 - link_cmaui_port_2_test_nested2Level: + - dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2 + link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - - link_cmaui_port_2 - link_cmaui_port_12: - - abstract_cmaui_1c1_main - - link_cmaui_1c1_main_cmaui_port + - link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2 dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - dependency_test_nested_pattern_4_same_type_diff_file link_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - - link_pd_server_main_1b_pd_server_main_1b_port - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - - test_nested2Level - - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + - link_pd_server_main_1b_pd_server_main_1b_port_1 + link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - link_pd_server_pattern4_1_oam_port_0 port_jsa_security_group2_test_resourceGroup_test_nested2Level: - test_nested2Level - port_jsa_security_group2_test_resourceGroup @@ -2339,9 +2333,6 @@ topology_template: dependency_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - dependency_server_pd_pattern4 - link_cmaui_port_1_test_nested2Level: - - test_nested2Level - - link_cmaui_port_1 local_storage_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - local_storage_cmaui_1c1_main @@ -2354,18 +2345,27 @@ topology_template: link_ps_server_nested2_1b_port_test_nested2Level: - test_nested2Level - link_ps_server_nested2_1b_port + link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file + dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file dependency_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - dependency_cmaui_1c1_main dependency_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - - dependency_ps_server_main_1b_ps_server_main_1b_port + - dependency_ps_server_main_1b_ps_server_main_1b_port_1 port_jsa_security_group1_test_resourceGroup_test_nested2Level: - test_nested2Level - port_jsa_security_group1_test_resourceGroup dependency_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - dependency_test_nested_pattern_4_nested2 + link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - link_pd_server_pattern4_0_oam_port_0 dependency_test_nested3Level_test_nested2Level: - test_nested2Level - - dependency_test_nested3Level
\ No newline at end of file + - dependency_test_nested3Level diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml index 8e569f47cd..e4f5c1efed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml @@ -149,23 +149,23 @@ topology_template: directives: - substitutable properties: + port_pd_server_pattern4_0_oam_port_0_mac_requirements: + mac_count_required: + is_required: false p1: get_input: jsa_name service_template_filter: substitute_service_template: nested-pattern-4ServiceTemplate.yaml - port_pd_server_pattern4_port_01_mac_requirements: + port_pd_server_pattern4_1_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd_server_pattern4_port_02_ip_requirements: + port_pd_server_pattern4_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_pattern4_port_02_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_01_ip_requirements: + port_pd_server_pattern4_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -189,24 +189,24 @@ topology_template: get_input: jsa_name service_template_filter: substitute_service_template: nested-pattern-4-same-typeServiceTemplate.yaml - port_pd_server_pattern4_port_1_ip_requirements: + port_pd_server_pattern4_0_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_0_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_pattern4_port_2_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_1_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_pattern4_port_2_ip_requirements: + port_pd_server_pattern4_1_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pd_server_pattern4_1_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false abstract_ps_server_nested2_1b: type: org.openecomp.resource.abstract.nodes.ps_server_nested2_1b directives: @@ -269,7 +269,16 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_nested2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_1c1_nested2_mgmt_port_0_replacement_policy: + - AUTO + - AUTO + vm_flavor_name: + get_input: cmaui_1c1_nested2_flavor + port_cmaui_1c1_nested2_mgmt_port_0_network_role_tag: contrail + port_cmaui_1c1_nested2_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -278,21 +287,12 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - get_input: contrail_net_name - - get_input: contrail_net_name - port_cmaui_port_network_role_tag: contrail - vm_flavor_name: - get_input: cmaui_1c1_nested2_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: - - AUTO - - AUTO vm_image_name: get_input: cmaui_1c1_nested2_image - port_cmaui_port_ip_requirements: + port_cmaui_1c1_nested2_mgmt_port_0_network: + - get_input: contrail_net_name + - get_input: contrail_net_name + port_cmaui_1c1_nested2_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -346,6 +346,9 @@ topology_template: network.incoming.packets.rate_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port + network.incoming.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes_pd_server_pattern4_1_oam_port_0 os_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - os_pd_server_nested2_1b @@ -355,6 +358,9 @@ topology_template: disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.write.bytes_server_pd_pattern4 + feature_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - feature_pd_server_pattern4_1_oam_port_0 vcpus_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - vcpus_pd_server_nested2_1b @@ -373,9 +379,6 @@ topology_template: disk.device.latency_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.latency_cmaui_1c1_nested2 - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - forwarder_pd_server_pattern4_port_2 disk.iops_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.iops_ps_server_nested2_1b @@ -403,27 +406,24 @@ topology_template: cpu_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - cpu_server_pd_pattern4 - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port + feature_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - feature_pd_server_pattern4_1_mgmt_port_0 + network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.packets.rate_pd_server_pattern4_0_mgmt_port_0 disk.device.allocation_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.allocation_pd_server_nested2_1b - network.outgoing.bytes_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.read.requests_server_pd_pattern4 - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.bytes.rate_pd_server_pattern4_port_1 + network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes.rate_pd_server_pattern4_1_oam_port_0 disk.write.bytes.rate_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.write.bytes.rate_ps_server_nested2_1b - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.packets.rate_pd_server_pattern4_port_2 disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.write.requests_server_pd_pattern4_1 @@ -451,15 +451,6 @@ topology_template: attachment_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - attachment_ps_server_nested2_1b_ps_server_nested2_1b_port - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - binding_pd_server_pattern4_port_1 - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - forwarder_pd_server_pattern4_port_01 - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - attachment_pd_server_pattern4_port_02 disk.device.iops_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.iops_ps_server_nested2_1b @@ -475,90 +466,75 @@ topology_template: cpu_util_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - cpu_util_pd_server_nested2_1b - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.packets_pd_server_pattern4_port_01 + network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets.rate_pd_server_pattern4_1_mgmt_port_0 network.incoming.packets_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.incoming.packets_pd_server_nested2_1b_pd_server_nested2_1b_port disk.write.bytes.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.write.bytes.rate_pd_server_nested2_1b - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.packets.rate_pd_server_pattern4_port_02 disk.device.capacity_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.capacity_cmaui_1c1_nested2 disk.device.capacity_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.capacity_cmaui_1c1_nested2 - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - binding_pd_server_pattern4_port_02 - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outpoing.packets_pd_server_pattern4_port_1 disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.write.requests.rate_server_pd_pattern4_1 + network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes.rate_pd_server_pattern4_1_mgmt_port_0 disk.write.bytes_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.write.bytes_ps_server_nested2_1b disk.latency_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.latency_pd_server_nested2_1b - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + feature_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - network.incoming.packets_pd_server_pattern4_port_1 - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.packets_pd_server_pattern4_port_2 - binding_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - binding_cmaui_1c1_nested2_cmaui_port - binding_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - binding_cmaui_1c1_nested2_cmaui_port - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - feature_pd_server_pattern4_0_mgmt_port_0 + network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - network.outgoing.packets.rate_pd_server_pattern4_port_1 + - network.incoming.bytes_pd_server_pattern4_1_mgmt_port_0 disk.device.capacity_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.capacity_ps_server_nested2_1b - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - network.outgoing.bytes.rate_pd_server_pattern4_port_1 - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - network.outgoing.packets.rate_pd_server_pattern4_1_mgmt_port_0 + binding_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - binding_pd_server_pattern4_1_oam_port_0 + network.incoming.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets_pd_server_pattern4_0_oam_port_0 + attachment_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - network.outpoing.packets_pd_server_pattern4_port_2 + - attachment_pd_server_pattern4_1_mgmt_port_0 disk.read.requests_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.read.requests_ps_server_nested2_1b + binding_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - binding_pd_server_pattern4_0_mgmt_port_0 network.incoming.bytes_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.bytes.rate_pd_server_pattern4_port_02 feature_test_resourceGroup: - test_resourceGroup - feature disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.read.bytes_server_pd_pattern4_1 - network.incoming.bytes_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.write.requests.rate_server_pd_pattern4 disk.device.read.bytes.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.read.bytes.rate_pd_server_nested2_1b - network.incoming.bytes_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port disk.write.requests.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.write.requests.rate_pd_server_nested2_1b @@ -571,69 +547,66 @@ topology_template: disk.allocation_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.allocation_cmaui_1c1_nested2 + network.incoming.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.usage_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.usage_ps_server_nested2_1b disk.allocation_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.allocation_cmaui_1c1_nested2 - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + attachment_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - network.incoming.packets.rate_pd_server_pattern4_port_01 + - attachment_pd_server_pattern4_0_oam_port_0 + forwarder_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - forwarder_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.write.bytes.rate_cmaui_1c1_nested2 - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.write.bytes.rate_cmaui_1c1_nested2 - feature_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - feature_cmaui_1c1_nested2_cmaui_port - feature_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - feature_cmaui_1c1_nested2_cmaui_port os_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - os_ps_server_nested2_1b + network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes.rate_pd_server_pattern4_1_oam_port_0 disk.device.read.requests_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.read.requests_ps_server_nested2_1b - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.packets.rate_pd_server_pattern4_port_01 disk.ephemeral.size_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.ephemeral.size_ps_server_nested2_1b disk.device.iops_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.iops_pd_server_nested2_1b - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.packets.rate_pd_server_pattern4_port_1 feature_jsa_security_group1_test_resourceGroup: - test_resourceGroup - feature_jsa_security_group1 + network.incoming.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_pd_server_pattern4_0_mgmt_port_0 disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.write.requests.rate_server_pd_pattern4_1 disk.device.usage_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.usage_ps_server_nested2_1b - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - feature_pd_server_pattern4_port_2 + feature_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - feature_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.write.requests.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.write.requests.rate_cmaui_1c1_nested2 disk.device.write.requests.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.write.requests.rate_cmaui_1c1_nested2 + network.incoming.bytes_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - memory.usage_server_pd_pattern4_1 @@ -643,6 +616,12 @@ topology_template: cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - cpu_util_server_pd_pattern4 + network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets.rate_pd_server_pattern4_0_oam_port_0 + network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes.rate_pd_server_pattern4_1_mgmt_port_0 binding_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - binding_cmaui_1c1_nested2 @@ -670,30 +649,27 @@ topology_template: memory.usage_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - memory.usage_ps_server_nested2_1b + network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes.rate_pd_server_pattern4_0_oam_port_0 disk.read.bytes.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.read.bytes.rate_cmaui_1c1_nested2 cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - cpu_util_server_pd_pattern4_1 + network.outgoing.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.read.bytes.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.read.bytes.rate_cmaui_1c1_nested2 endpoint_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - endpoint_ps_server_nested2_1b - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.bytes_pd_server_pattern4_port_02 - forwarder_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - forwarder_cmaui_1c1_nested2_cmaui_port network.incoming.bytes_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port - forwarder_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - forwarder_cmaui_1c1_nested2_cmaui_port vcpus_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - vcpus_cmaui_1c1_nested2 @@ -718,24 +694,39 @@ topology_template: network.outgoing.bytes_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port + network.incoming.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.write.requests_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.write.requests_pd_server_nested2_1b + attachment_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - attachment_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + forwarder_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - forwarder_pd_server_pattern4_1_oam_port_0 disk.device.write.bytes_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.write.bytes_ps_server_nested2_1b - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.bytes_pd_server_pattern4_port_02 disk.latency_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.latency_ps_server_nested2_1b memory.resident_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - memory.resident_cmaui_1c1_nested2 - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes.rate_pd_server_pattern4_0_mgmt_port_0 + network.incoming.packets_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + network.outgoing.bytes_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes_pd_server_pattern4_1_oam_port_0 + feature_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - network.incoming.bytes.rate_pd_server_pattern4_port_02 + - feature_pd_server_pattern4_0_oam_port_0 disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.allocation_server_pd_pattern4 @@ -745,6 +736,9 @@ topology_template: feature_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - feature_pd_server_nested2_1b_pd_server_nested2_1b_port + network.outpoing.packets_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outpoing.packets_pd_server_pattern4_0_oam_port_0 cpu_util_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - cpu_util_ps_server_nested2_1b @@ -754,6 +748,9 @@ topology_template: disk.read.requests_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.read.requests_pd_server_nested2_1b + network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.packets.rate_pd_server_pattern4_1_oam_port_0 disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.requests.rate_server_pd_pattern4_1 @@ -787,24 +784,12 @@ topology_template: attachment_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - attachment_pd_server_nested2_1b_pd_server_nested2_1b_port - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - attachment_pd_server_pattern4_port_01 - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - feature_pd_server_pattern4_port_02 feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - feature_server_pd_pattern4_1 disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.allocation_server_pd_pattern4 - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.iops_server_pd_pattern4_1 @@ -823,6 +808,9 @@ topology_template: disk.device.usage_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.usage_cmaui_1c1_nested2 + binding_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - binding_pd_server_pattern4_0_oam_port_0 feature_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - feature_server_pd_pattern4 @@ -835,6 +823,9 @@ topology_template: feature_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - feature_ps_server_nested2_1b + binding_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - binding_pd_server_pattern4_1_mgmt_port_0 memory.resident_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - memory.resident_cmaui_1c1_nested2 @@ -850,6 +841,9 @@ topology_template: disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.latency_server_pd_pattern4_1 + forwarder_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - forwarder_pd_server_pattern4_1_mgmt_port_0 disk.device.iops_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.iops_cmaui_1c1_nested2 @@ -859,33 +853,42 @@ topology_template: disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.usage_server_pd_pattern4 + forwarder_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - forwarder_pd_server_pattern4_0_oam_port_0 disk.device.write.bytes.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.write.bytes.rate_pd_server_nested2_1b forwarder_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - attachment_pd_server_pattern4_port_2 network.outgoing.bytes.rate_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port network.incoming.packets.rate_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - binding_pd_server_pattern4_port_01 disk.device.read.requests_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.read.requests_cmaui_1c1_nested2 binding_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - binding_ps_server_nested2_1b_ps_server_nested2_1b_port + binding_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - binding_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.packets.rate_pd_server_pattern4_0_oam_port_0 + network.outpoing.packets_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outpoing.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 host_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - host_server_pd_pattern4 + network.outpoing.packets_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outpoing.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.requests_server_pd_pattern4 @@ -898,24 +901,12 @@ topology_template: disk.device.read.bytes.rate_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.read.bytes.rate_ps_server_nested2_1b - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outgoing.bytes.rate_pd_server_pattern4_port_2 - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.bytes_pd_server_pattern4_port_01 disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.write.bytes_server_pd_pattern4 disk.device.read.requests_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.read.requests_cmaui_1c1_nested2 - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - feature_pd_server_pattern4_port_1 - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.bytes.rate_pd_server_pattern4_port_01 scalable_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - scalable_cmaui_1c1_nested2 @@ -928,18 +919,21 @@ topology_template: cpu_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - cpu_pd_server_nested2_1b - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outpoing.packets_pd_server_pattern4_port_01 disk.device.latency_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.latency_ps_server_nested2_1b disk.capacity_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.capacity_pd_server_nested2_1b + network.outgoing.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 memory.usage_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - memory.usage_pd_server_nested2_1b + network.outgoing.bytes.rate_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.write.bytes_server_pd_pattern4_1 @@ -958,6 +952,9 @@ topology_template: host_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - host_cmaui_1c1_nested2 + binding_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - binding_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 host_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - host_cmaui_1c1_nested2 @@ -967,9 +964,6 @@ topology_template: feature_jsa_security_group1_test_nested3Level: - test_nested3Level - feature_jsa_security_group1 - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outgoing.bytes_pd_server_pattern4_port_2 disk.capacity_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.capacity_cmaui_1c1_nested2 @@ -988,15 +982,9 @@ topology_template: disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.write.requests_server_pd_pattern4 - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - feature_pd_server_pattern4_port_01 endpoint_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - endpoint_cmaui_1c1_nested2 - network.incoming.packets_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.incoming.packets_cmaui_1c1_nested2_cmaui_port disk.device.write.requests.rate_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.write.requests.rate_ps_server_nested2_1b @@ -1006,12 +994,12 @@ topology_template: binding_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - binding_pd_server_nested2_1b - network.incoming.packets_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.incoming.packets_cmaui_1c1_nested2_cmaui_port feature_jsa_security_group2_test_nested3Level: - test_nested3Level - feature_jsa_security_group2 + network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outpoing.packets_pd_server_pattern4_0_mgmt_port_0 feature_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - feature @@ -1033,12 +1021,12 @@ topology_template: disk.usage_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.usage_cmaui_1c1_nested2 + forwarder_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - forwarder_pd_server_pattern4_0_mgmt_port_0 disk.device.write.requests_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.write.requests_pd_server_nested2_1b - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.bytes_pd_server_pattern4_port_2 disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.root.size_server_pd_pattern4_1 @@ -1048,9 +1036,6 @@ topology_template: disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.write.requests_server_pd_pattern4_1 - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.bytes_pd_server_pattern4_port_1 host_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - host_ps_server_nested2_1b @@ -1069,27 +1054,36 @@ topology_template: disk.read.requests_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.read.requests_cmaui_1c1_nested2 + network.outgoing.bytes_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + feature_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - feature_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.read.requests.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.read.requests.rate_cmaui_1c1_nested2 - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.packets_pd_server_pattern4_port_02 disk.read.requests_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.read.requests_cmaui_1c1_nested2 disk.device.read.requests.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.read.requests.rate_cmaui_1c1_nested2 + network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes_pd_server_pattern4_1_mgmt_port_0 + network.outgoing.bytes_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 cpu_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - cpu_cmaui_1c1_nested2 - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outgoing.packets.rate_pd_server_pattern4_port_2 cpu_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - cpu_cmaui_1c1_nested2 + network.outpoing.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outpoing.packets_pd_server_pattern4_1_oam_port_0 instance_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - instance_pd_server_nested2_1b @@ -1108,18 +1102,15 @@ topology_template: disk.device.write.requests_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.write.requests_cmaui_1c1_nested2 - network.outgoing.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port + network.outgoing.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes_pd_server_pattern4_0_oam_port_0 disk.write.requests_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.write.requests_ps_server_nested2_1b disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.requests.rate_server_pd_pattern4 - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port disk.device.write.bytes_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.write.bytes_cmaui_1c1_nested2 @@ -1150,15 +1141,18 @@ topology_template: os_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - os_server_pd_pattern4 - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - forwarder_pd_server_pattern4_port_1 + network.incoming.bytes_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + forwarder_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - forwarder_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.requests_server_pd_pattern4_1 - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - attachment_pd_server_pattern4_port_1 + network.incoming.packets.rate_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.write.requests_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.write.requests_cmaui_1c1_nested2 @@ -1180,9 +1174,6 @@ topology_template: disk.ephemeral.size_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.ephemeral.size_cmaui_1c1_nested2 - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outpoing.packets_pd_server_pattern4_port_02 disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.capacity_server_pd_pattern4 @@ -1192,15 +1183,9 @@ topology_template: disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.bytes.rate_server_pd_pattern4 - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - forwarder_pd_server_pattern4_port_02 disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.capacity_server_pd_pattern4 - attachment_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - attachment_cmaui_1c1_nested2_cmaui_port disk.allocation_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.allocation_pd_server_nested2_1b @@ -1219,39 +1204,30 @@ topology_template: disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.bytes_server_pd_pattern4 - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.incoming.bytes.rate_pd_server_pattern4_port_2 - network.outgoing.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port - attachment_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - attachment_cmaui_1c1_nested2_cmaui_port disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.iops_server_pd_pattern4 disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.bytes_server_pd_pattern4_1 + network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets.rate_pd_server_pattern4_1_oam_port_0 disk.root.size_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.root.size_cmaui_1c1_nested2 disk.root.size_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.root.size_cmaui_1c1_nested2 + network.incoming.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_pd_server_pattern4_1_mgmt_port_0 disk.device.latency_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.latency_pd_server_nested2_1b disk.write.bytes_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.write.bytes_cmaui_1c1_nested2 - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - network.outgoing.bytes_pd_server_pattern4_port_1 disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.usage_server_pd_pattern4_1 @@ -1267,24 +1243,36 @@ topology_template: disk.iops_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.iops_cmaui_1c1_nested2 - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.bytes_pd_server_pattern4_port_01 + network.outgoing.packets.rate_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 disk.iops_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.iops_pd_server_nested2_1b disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.read.bytes.rate_cmaui_1c1_nested2 - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - binding_pd_server_pattern4_port_2 disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.device.read.bytes.rate_cmaui_1c1_nested2 disk.latency_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - disk.latency_cmaui_1c1_nested2 + attachment_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - attachment_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + network.incoming.packets_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + network.incoming.bytes.rate_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + attachment_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - attachment_pd_server_pattern4_0_mgmt_port_0 + network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes.rate_pd_server_pattern4_0_oam_port_0 vcpus_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - vcpus_server_pd_pattern4 @@ -1294,6 +1282,9 @@ topology_template: disk.device.write.requests_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.device.write.requests_ps_server_nested2_1b + network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes_pd_server_pattern4_0_mgmt_port_0 endpoint_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - endpoint_server_pd_pattern4 @@ -1303,9 +1294,18 @@ topology_template: memory_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - memory_pd_server_nested2_1b + network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes.rate_pd_server_pattern4_0_mgmt_port_0 + network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes_pd_server_pattern4_0_mgmt_port_0 disk.write.requests.rate_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.write.requests.rate_ps_server_nested2_1b + network.incoming.bytes_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes_pd_server_pattern4_0_oam_port_0 cpu_util_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - cpu_util_cmaui_1c1_nested2 @@ -1318,18 +1318,12 @@ topology_template: cpu_util_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - cpu_util_cmaui_1c1_nested2 + network.incoming.packets_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets_pd_server_pattern4_1_oam_port_0 instance_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - instance_ps_server_nested2_1b - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.incoming.bytes.rate_pd_server_pattern4_port_01 - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port host_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - host_pd_server_nested2_1b @@ -1342,6 +1336,9 @@ topology_template: binding_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - binding_pd_server_nested2_1b_pd_server_nested2_1b_port + network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets.rate_pd_server_pattern4_0_mgmt_port_0 disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.root.size_server_pd_pattern4 @@ -1372,12 +1369,15 @@ topology_template: network.outgoing.bytes_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - network.outgoing.packets.rate_pd_server_pattern4_port_02 disk.device.allocation_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.allocation_cmaui_1c1_nested2 + network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outpoing.packets_pd_server_pattern4_1_mgmt_port_0 + attachment_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - attachment_pd_server_pattern4_1_oam_port_0 cpu.delta_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - cpu.delta_ps_server_nested2_1b @@ -1415,42 +1415,30 @@ topology_template: dependency_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - dependency_cmaui_1c1_nested2 - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + dependency_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency_pd_server_pattern4_port_01 + - dependency_pd_server_pattern4_0_oam_port_0 port_jsa_security_group2_test_nested3Level: - test_nested3Level - port_jsa_security_group2 dependency_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - dependency_pd_server_nested2_1b - link_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - link_cmaui_1c1_nested2_cmaui_port - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - link_pd_server_pattern4_port_02 - link_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - link_cmaui_1c1_nested2_cmaui_port local_storage_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - local_storage_ps_server_nested2_1b dependency_test_resourceGroup: - test_resourceGroup - dependency + dependency_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - dependency_pd_server_pattern4_1_oam_port_0 local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - local_storage_server_pd_pattern4_1 - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - - test_nested_pattern_4_nested2 - - dependency_pd_server_pattern4_port_02 - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + dependency_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - dependency_pd_server_pattern4_port_1 - dependency_cmaui_port_1: - - abstract_cmaui_1c1_nested2 - - dependency_cmaui_1c1_nested2_cmaui_port + - dependency_pd_server_pattern4_0_mgmt_port_0 link_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - link_pd_server_nested2_1b_pd_server_nested2_1b_port @@ -1460,36 +1448,36 @@ topology_template: dependency_test_nested3Level: - test_nested3Level - dependency - dependency_cmaui_port_2: - - abstract_cmaui_1c1_nested2 - - dependency_cmaui_1c1_nested2_cmaui_port dependency_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - dependency_pd_server_nested2_1b_pd_server_nested2_1b_port + link_pd_server_pattern4_0_oam_port_0_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - link_pd_server_pattern4_0_oam_port_0 port_jsa_security_group1_test_nested3Level: - test_nested3Level - port_jsa_security_group1 dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - dependency_server_pd_pattern4_1 - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + link_pd_server_pattern4_1_oam_port_0_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - link_pd_server_pattern4_port_01 + - link_pd_server_pattern4_1_oam_port_0 dependency_ps_server_nested2_1b_port: - abstract_ps_server_nested2_1b - dependency_ps_server_nested2_1b_ps_server_nested2_1b_port - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - - test_nested_pattern_4_same_type_diff_file - - dependency_pd_server_pattern4_port_2 - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + dependency_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - dependency_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + dependency_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - link_pd_server_pattern4_port_2 + - dependency_pd_server_pattern4_1_mgmt_port_0 dependency_jsa_security_group1_test_nested3Level: - test_nested3Level - dependency_jsa_security_group1 - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + link_pd_server_pattern4_1_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - - link_pd_server_pattern4_port_1 + - link_pd_server_pattern4_1_mgmt_port_0 local_storage_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - local_storage_cmaui_1c1_nested2 @@ -1504,4 +1492,16 @@ topology_template: - local_storage_cmaui_1c1_nested2 dependency_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency
\ No newline at end of file + - dependency + dependency_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - dependency_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + link_pd_server_pattern4_0_mgmt_port_0_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - link_pd_server_pattern4_0_mgmt_port_0 + link_cmaui_1c1_nested2_2_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - link_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 + link_cmaui_1c1_nested2_1_mgmt_port_0: + - abstract_cmaui_1c1_nested2 + - link_cmaui_1c1_nested2_cmaui_1c1_nested2_mgmt_port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index e00b9d0529..e7bcdefd3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/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_pd02_port_0_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,68 +34,62 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -105,20 +105,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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: @@ -159,6 +167,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd02_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_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. @@ -189,15 +203,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + network.outpoing.packets_pd_server_pd02_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: @@ -221,29 +227,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pd02_port: + feature_pd_server_pd02_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd02_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -267,11 +255,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - 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. @@ -290,12 +273,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_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 binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -318,7 +295,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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: @@ -330,6 +307,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pd02_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_pd_server_pd02_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.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. @@ -354,6 +343,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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. @@ -373,36 +368,42 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_pd_server_pd02_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.write.requests.rate_pd_server: + network.incoming.bytes.rate_pd_server_pd02_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.ephemeral.size_pd_server: + disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: + disk.ephemeral.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.device.latency_pd_server: + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -426,15 +427,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.ps_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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 @@ -443,17 +455,11 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_replacement_policy: - type: list - required: true - 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 @@ -463,16 +469,24 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd01_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_pd01_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED vm_image_name: type: string required: true @@ -483,52 +497,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: - type: list + type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + compute_ps_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_ps_name: + port_pd01_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + 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 requirements: - dependency_ps: capability: tosca.capabilities.Node @@ -544,14 +544,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_pd01_port: + - dependency_ps_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_pd01_port: + - link_ps_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -570,12 +570,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_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 scalable_ps: type: tosca.capabilities.Scalable occurrences: @@ -618,14 +612,14 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_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_ps_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. + endpoint_ps: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -641,23 +635,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes_ps: type: org.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_ps_pd01_port: - type: org.openecomp.capabilities.Forwarder + cpu.delta_ps: + type: org.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: + network.incoming.packets_ps_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: @@ -680,54 +670,65 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_pd01_port: + disk.device.write.requests.rate_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_ps: + network.outgoing.bytes_ps_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_ps_pd01_port: - type: tosca.capabilities.Node + cpu_util_ps: + type: org.openecomp.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_pd01_port: + disk.read.bytes.rate_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_ps: + disk.device.read.bytes.rate_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_ps: + forwarder_ps_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps: + vcpus_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_ps: + network.incoming.packets.rate_ps_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 - vcpus_ps: + attachment_ps_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_ps_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: @@ -745,31 +746,28 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_pd01_port: + disk.device.read.bytes_ps: type: org.openecomp.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_ps: + memory.usage_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_ps: + network.outgoing.bytes.rate_ps_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 - binding_ps_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 + feature_ps_pd01_port_1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED feature_ps: type: tosca.capabilities.Node @@ -782,12 +780,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_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.ephemeral.size_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -817,12 +809,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_pd01_port: + network.outgoing.packets.rate_ps_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 + binding_ps_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 disk.iops_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -853,7 +853,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_pd01_port: + network.outpoing.packets_ps_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: @@ -874,82 +874,82 @@ 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 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: 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_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: 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 @@ -971,20 +971,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - 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: @@ -1014,12 +1022,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: @@ -1031,12 +1033,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. @@ -1067,7 +1063,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: @@ -1091,7 +1087,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: @@ -1109,6 +1117,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. @@ -1120,17 +1133,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. @@ -1154,6 +1167,12 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -1165,27 +1184,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: @@ -1215,6 +1226,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. @@ -1234,14 +1251,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 @@ -1263,11 +1274,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. @@ -1286,12 +1292,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. @@ -1301,22 +1301,12 @@ node_types: org.openecomp.resource.abstract.nodes.oam: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam02_port_network: + port_oam02_port_2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam02_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam02_port_network_role: - type: string - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1325,90 +1315,87 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam02_port_fixed_ips: + port_oam02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: json vm_flavor_name: type: string required: true status: SUPPORTED - port_oam02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam02_port_security_groups: + port_oam02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: json - port_oam02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_oam02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_oam02_port_2_fixed_ips: + type: list required: true status: SUPPORTED - port_oam02_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_oam02_port_network_role_tag: + port_oam02_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_oam02_port_replacement_policy: + port_oam02_port_2_order: + type: integer + required: true + status: SUPPORTED + port_oam02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam02_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements + port_oam02_port_2_network_role: + type: string + required: true + status: SUPPORTED + port_oam02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED compute_oam_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam02_port_vlan_requirements: - type: list + port_oam02_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_oam02_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_oam_oam02_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_oam_oam02_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_oam: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1423,14 +1410,21 @@ node_types: occurrences: - 0 - UNBOUNDED - capabilities: - cpu_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - dependency_oam_oam02_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_oam_oam02_port: + - link_oam_oam02_port_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + cpu_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1448,49 +1442,35 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_oam: + network.incoming.bytes.rate_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_oam02_port: + disk.device.write.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_oam: + network.outgoing.bytes.rate_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam02_port: + disk.read.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_oam_oam02_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 scalable_oam: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED feature_oam: type: tosca.capabilities.Node occurrences: @@ -1502,6 +1482,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_oam_oam02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.usage_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1519,6 +1505,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_oam02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1549,7 +1541,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_oam02_port: + forwarder_oam_oam02_port_2: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -1560,13 +1552,21 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_oam: + network.outgoing.packets.rate_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_oam02_port: + binding_oam_oam02_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + instance_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1578,7 +1578,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam02_port: + attachment_oam_oam02_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_oam02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_oam_oam02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1602,6 +1613,17 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_oam02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_oam_oam02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1674,23 +1696,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_oam02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_oam: type: org.openecomp.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_oam_oam02_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_oam: type: tosca.capabilities.OperatingSystem occurrences: @@ -1708,17 +1719,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam02_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 - attachment_oam_oam02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1740,36 +1740,16 @@ node_types: org.openecomp.resource.abstract.nodes.oam_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_oam01_port_subnetpoolid: + port_oam01_port_1_network_role: type: string required: true status: SUPPORTED - port_oam01_port_order: - type: integer - required: true - status: SUPPORTED - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam01_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_oam01_port_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 @@ -1778,7 +1758,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam01_port_replacement_policy: + port_oam01_port_1_network: type: list required: true status: SUPPORTED @@ -1788,61 +1768,81 @@ node_types: type: string required: true status: SUPPORTED - port_oam01_port_related_networks: + port_oam01_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_oam01_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: + port_oam01_port_1_order: + type: integer + required: true + status: SUPPORTED + port_oam01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_oam01_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_oam01_port_1_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_oam_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam01_port_network_role_tag: + port_oam01_port_1_network_role_tag: type: string required: true status: SUPPORTED - compute_oam_name: + port_oam01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam01_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_oam_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string requirements: - - dependency_oam_oam01_port: + - dependency_oam_oam01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam01_port: + - link_oam_oam01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1869,39 +1869,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam01_port: + disk.usage_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_oam_oam01_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 - network.outgoing.bytes.rate_oam_oam01_port: + memory.resident_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_oam: + network.outgoing.bytes.rate_oam_oam01_port_1: type: org.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_oam: + disk.device.write.bytes_oam: type: org.openecomp.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_oam: + network.incoming.bytes.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1918,17 +1910,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_oam_oam01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED feature_oam: type: tosca.capabilities.Node occurrences: @@ -1946,12 +1927,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam01_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 binding_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -1987,11 +1962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_oam01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.write.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2010,7 +1980,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam01_port: + attachment_oam_oam01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2022,6 +1997,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_oam_oam01_port_1: + type: org.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_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2040,13 +2021,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_oam: + feature_oam_oam01_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_oam_oam01_port_1: type: org.openecomp.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_oam_oam01_port: + disk.device.read.requests.rate_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2082,11 +2068,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_oam01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2105,13 +2086,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam01_port: + disk.device.read.requests_oam: type: org.openecomp.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_oam: + network.incoming.packets.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2129,6 +2110,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_oam01_port_1: + type: org.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_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2152,25 +2139,38 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_oam: + forwarder_oam_oam01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_oam_oam01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_oam: + disk.write.bytes_oam: type: org.openecomp.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_oam: + binding_oam_oam01_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.read.requests_oam: type: org.openecomp.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_oam_oam01_port: + disk.device.capacity_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2179,34 +2179,36 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui02_port_related_networks: + port_cmaui02_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_cmaui02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui02_port_2_network: + type: list required: true status: SUPPORTED - port_cmaui02_port_fixed_ips: + entry_schema: + type: string + port_cmaui02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_cmaui02_port_2_subnetpoolid: + type: string required: true status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 vm_flavor_name: type: string required: true @@ -2217,71 +2219,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui02_port_vlan_requirements: + port_cmaui02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui02_port_2_network_role: + type: string + required: true + status: SUPPORTED + port_cmaui02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: + port_cmaui02_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cmaui02_port_order: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui02_port_2_order: type: integer required: true status: SUPPORTED - port_cmaui02_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui02_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_cmaui02_port_security_groups: + port_cmaui02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cmaui02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_cmaui02_port_network: + port_cmaui02_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui02_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED requirements: - - dependency_cmaui_cmaui02_port: + - dependency_cmaui_cmaui02_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui02_port: + - link_cmaui_cmaui02_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2302,7 +2302,7 @@ node_types: - 0 - UNBOUNDED capabilities: - network.incoming.bytes_cmaui_cmaui02_port: + network.incoming.bytes_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2326,11 +2326,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_cmaui02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.iops_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2362,11 +2357,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_cmaui02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.read.bytes_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2402,6 +2392,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED memory.usage_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2413,26 +2409,17 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_cmaui02_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_cmaui02_port: + disk.device.read.bytes.rate_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_cmaui02_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.usage_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2451,25 +2438,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests_cmaui: + network.incoming.bytes.rate_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_cmaui: + disk.device.read.requests_cmaui: type: org.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_cmaui: + disk.capacity_cmaui: type: org.openecomp.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_cmaui_cmaui02_port: + cpu_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2487,12 +2474,42 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_cmaui: type: org.openecomp.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_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_cmaui02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_cmaui02_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets.rate_cmaui_cmaui02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED vcpus_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2504,7 +2521,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_cmaui02_port: + network.outgoing.packets.rate_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2515,11 +2532,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_cmaui02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED endpoint_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -2549,25 +2561,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_cmaui02_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.usage_cmaui: type: org.openecomp.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_cmaui: + network.outgoing.bytes.rate_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_cmaui02_port: + disk.latency_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2585,7 +2591,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui02_port: + network.outgoing.bytes_cmaui_cmaui02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2603,12 +2609,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui02_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.write.requests.rate_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2618,20 +2618,6 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui01_port_network_role: - type: string - required: true - status: SUPPORTED - port_cmaui01_port_order: - type: integer - required: true - status: SUPPORTED - port_cmaui01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2640,12 +2626,6 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui01_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -2656,71 +2636,91 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui01_port_vlan_requirements: + port_cmaui01_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui01_port_1_order: + type: integer + required: true + status: SUPPORTED compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui01_port_subnetpoolid: - type: string + port_cmaui01_port_1_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_image_name: type: string required: true status: SUPPORTED - port_cmaui01_port_network_role_tag: + port_cmaui01_port_1_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_cmaui01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_cmaui01_port_related_networks: + port_cmaui01_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cmaui01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui01_port_1_security_groups: + type: list required: true status: SUPPORTED - port_cmaui01_port_mac_requirements: + entry_schema: + type: json + port_cmaui01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui01_port_fixed_ips: - type: list + port_cmaui01_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui01_port_network: + port_cmaui01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cmaui01_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cmaui01_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cmaui01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_cmaui_cmaui01_port: + - dependency_cmaui_cmaui01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui01_port: + - link_cmaui_cmaui01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2759,13 +2759,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_cmaui01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_cmaui_cmaui01_port: + network.incoming.bytes_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2808,19 +2802,20 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_cmaui: + network.outpoing.packets_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_cmaui: - type: tosca.capabilities.Scalable + disk.write.requests_cmaui: + type: org.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_cmaui_cmaui01_port: - type: tosca.capabilities.Node + scalable_cmaui: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -2853,7 +2848,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_cmaui01_port: + network.outgoing.packets.rate_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2865,36 +2860,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_cmaui01_port: + network.outgoing.bytes.rate_cmaui_cmaui01_port_1: type: org.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_cmaui_cmaui01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_cmaui01_port: + disk.device.usage_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_cmaui: + disk.iops_cmaui: type: org.openecomp.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_cmaui: + disk.device.latency_cmaui: type: org.openecomp.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_cmaui: + network.outgoing.bytes_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2918,42 +2908,49 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui01_port: + disk.read.requests_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_cmaui: + disk.device.read.bytes_cmaui: type: org.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_cmaui_cmaui01_port: - type: tosca.capabilities.Attachment + feature_cmaui_cmaui01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_cmaui: + network.incoming.packets_cmaui_cmaui01_port_1: type: org.openecomp.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_cmaui_cmaui01_port: + disk.device.write.requests_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_cmaui01_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui01_port: + binding_cmaui_cmaui01_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 + network.incoming.packets.rate_cmaui_cmaui01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2965,14 +2962,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_cmaui01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED feature_cmaui: type: tosca.capabilities.Node occurrences: @@ -2983,6 +2972,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_cmaui01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED endpoint_cmaui: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3006,6 +3001,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_cmaui01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6597,12 +6597,20 @@ node_types: org.openecomp.resource.abstract.nodes.ps: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_pd02_port_2_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_2_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -6611,86 +6619,78 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_2_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: - type: string + entry_schema: + type: string + port_pd02_port_2_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd02_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_2_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd02_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_security_groups: + port_pd02_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_ps_availability_zone: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_replacement_policy: + type: json + port_pd02_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_network_role: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_image_name: type: string required: true status: SUPPORTED - compute_ps_name: + compute_ps_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: - type: list + port_pd02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + compute_ps_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: - type: list + port_pd02_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_ps: capability: tosca.capabilities.Node @@ -6706,14 +6706,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_pd02_port: + - dependency_ps_pd02_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_pd02_port: + - link_ps_pd02_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6774,12 +6774,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_ps_pd02_port: + network.incoming.bytes.rate_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6790,31 +6785,39 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_ps: + network.outgoing.bytes.rate_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_ps: + disk.device.capacity_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_pd02_port: + cpu_ps: type: org.openecomp.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_ps: + network.outgoing.packets.rate_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_pd02_port: + binding_ps_pd02_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6843,13 +6846,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_pd02_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 + network.outpoing.packets_ps_pd02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + feature_ps_pd02_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 - UNBOUNDED disk.device.write.requests.rate_ps: type: org.openecomp.capabilities.metric.Ceilometer @@ -6857,7 +6863,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_pd02_port: + network.outgoing.bytes_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6869,19 +6875,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_ps_pd02_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_pd02_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_pd02_port: + network.incoming.bytes_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6917,6 +6921,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_pd02_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.latency_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6958,11 +6968,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.usage_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6992,11 +6997,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_pd02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7015,7 +7015,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_pd02_port: + network.incoming.packets_ps_pd02_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7764,4 +7764,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml index 8fdf0c1e04..d5a5f4c9b5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml @@ -133,28 +133,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_0_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: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_0_network: + - get_input: oam_net_name + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: oam_net_name + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -170,6 +170,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: @@ -178,20 +190,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - 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 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml index b7f6826e85..fe904e5a1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml @@ -11,11 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui02_port_related_networks: + port_cmaui02_port_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui02_port_2_network: + type: list + required: true + entry_schema: + type: string + port_cmaui02_port_2_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_cmaui02_port_2_subnetpoolid: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,17 +36,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui02_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true vm_flavor_name: type: string required: true @@ -42,89 +44,87 @@ topology_template: required: true entry_schema: type: string - port_cmaui02_port_vlan_requirements: + port_cmaui02_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui02_port_2_network_role: + type: string + required: true + port_cmaui02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - vm_image_name: + port_cmaui02_port_2_network_role_tag: type: string required: true - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cmaui02_port_order: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui02_port_2_order: type: integer required: true - port_cmaui02_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_cmaui02_port_network_role: + vm_image_name: type: string required: true - port_cmaui02_port_security_groups: + port_cmaui02_port_2_security_groups: type: list required: true entry_schema: type: json - port_cmaui02_port_subnetpoolid: - type: string - required: true - port_cmaui02_port_network: + port_cmaui02_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_cmaui02_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - cmaui_cmaui02_port: + cmaui_cmaui02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui02_port_replacement_policy + - port_cmaui02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_cmaui02_port_mac_requirements + get_input: port_cmaui02_port_2_mac_requirements order: - get_input: port_cmaui02_port_order + get_input: port_cmaui02_port_2_order security_groups: get_input: - - port_cmaui02_port_security_groups + - port_cmaui02_port_2_security_groups - index_value exCP_naming: - get_input: port_cmaui02_port_exCP_naming + get_input: port_cmaui02_port_2_exCP_naming vlan_requirements: - get_input: port_cmaui02_port_vlan_requirements + get_input: port_cmaui02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cmaui02_port_related_networks + get_input: port_cmaui02_port_2_related_networks ip_requirements: - get_input: port_cmaui02_port_ip_requirements + get_input: port_cmaui02_port_2_ip_requirements network_role_tag: - get_input: port_cmaui02_port_network_role_tag + get_input: port_cmaui02_port_2_network_role_tag network_role: - get_input: port_cmaui02_port_network_role + get_input: port_cmaui02_port_2_network_role fixed_ips: get_input: - - port_cmaui02_port_fixed_ips + - port_cmaui02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui02_port_subnetpoolid + get_input: port_cmaui02_port_2_subnetpoolid network: get_input: - - port_cmaui02_port_network + - port_cmaui02_port_2_network - index_value requirements: - binding: @@ -149,8 +149,8 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui capabilities: - network.incoming.bytes_cmaui_cmaui02_port: - - cmaui_cmaui02_port + network.incoming.bytes_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 - network.incoming.bytes disk.read.bytes.rate_cmaui: - cmaui @@ -161,9 +161,6 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes - forwarder_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - forwarder disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -179,9 +176,6 @@ topology_template: disk.device.allocation_cmaui: - cmaui - disk.device.allocation - feature_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - feature disk.read.bytes_cmaui: - cmaui - disk.read.bytes @@ -200,21 +194,21 @@ topology_template: disk.root.size_cmaui: - cmaui - disk.root.size + network.outpoing.packets_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outpoing.packets memory.usage_cmaui: - cmaui - memory.usage os_cmaui: - cmaui - os + attachment_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - attachment disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - network.incoming.packets.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.packets.rate - binding_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - binding disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -224,6 +218,9 @@ topology_template: disk.device.latency_cmaui: - cmaui - disk.device.latency + network.incoming.bytes.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.bytes.rate disk.device.read.requests_cmaui: - cmaui - disk.device.read.requests @@ -233,33 +230,42 @@ topology_template: cpu_cmaui: - cmaui - cpu - network.outgoing.packets.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.packets.rate disk.read.requests_cmaui: - cmaui - disk.read.requests disk.device.read.bytes_cmaui: - cmaui - disk.device.read.bytes + forwarder_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - forwarder disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests + network.incoming.packets_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.packets + feature_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - feature + binding_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - binding + network.incoming.packets.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.incoming.packets.rate vcpus_cmaui: - cmaui - vcpus feature_cmaui: - cmaui - feature - network.incoming.packets_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.packets + network.outgoing.packets.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.packets.rate binding_cmaui: - cmaui - binding - attachment_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - attachment endpoint_cmaui: - cmaui - endpoint @@ -275,49 +281,43 @@ topology_template: disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate - network.outgoing.bytes_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.bytes disk.usage_cmaui: - cmaui - disk.usage + network.outgoing.bytes.rate_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.bytes.rate disk.latency_cmaui: - cmaui - disk.latency - network.outgoing.bytes.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outgoing.bytes.rate instance_cmaui: - cmaui - instance disk.allocation_cmaui: - cmaui - disk.allocation - network.incoming.bytes.rate_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.incoming.bytes.rate + network.outgoing.bytes_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - network.outgoing.bytes disk.write.bytes_cmaui: - cmaui - disk.write.bytes cpu_util_cmaui: - cmaui - cpu_util - network.outpoing.packets_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - network.outpoing.packets disk.device.write.requests.rate_cmaui: - cmaui - disk.device.write.requests.rate requirements: - dependency_cmaui_cmaui02_port: - - cmaui_cmaui02_port - - dependency - link_cmaui_cmaui02_port: - - cmaui_cmaui02_port + link_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 - link + dependency_cmaui_cmaui02_port_2: + - cmaui_cmaui02_port_2 + - dependency dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml index 72ebfec0cd..4ca46a5ce1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml @@ -11,17 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui01_port_network_role: - type: string - required: true - port_cmaui01_port_order: - type: integer - required: true - port_cmaui01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -29,11 +18,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui01_port_security_groups: - type: list - required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -42,89 +26,105 @@ topology_template: required: true entry_schema: type: string - port_cmaui01_port_vlan_requirements: + port_cmaui01_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui01_port_1_order: + type: integer + required: true compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - port_cmaui01_port_subnetpoolid: - type: string + port_cmaui01_port_1_network: + type: list required: true + entry_schema: + type: string vm_image_name: type: string required: true - port_cmaui01_port_network_role_tag: + port_cmaui01_port_1_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_cmaui01_port_1_network_role_tag: type: string required: true - port_cmaui01_port_related_networks: + port_cmaui01_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cmaui01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cmaui01_port_1_security_groups: + type: list required: true - port_cmaui01_port_mac_requirements: + entry_schema: + type: json + port_cmaui01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cmaui01_port_fixed_ips: - type: list + port_cmaui01_port_1_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui01_port_network: + port_cmaui01_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_cmaui01_port_ip_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_cmaui01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cmaui01_port_1_subnetpoolid: + type: string + required: true + port_cmaui01_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements node_templates: - cmaui_cmaui01_port: + cmaui_cmaui01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui01_port_replacement_policy + - port_cmaui01_port_1_replacement_policy - index_value mac_requirements: - get_input: port_cmaui01_port_mac_requirements + get_input: port_cmaui01_port_1_mac_requirements order: - get_input: port_cmaui01_port_order + get_input: port_cmaui01_port_1_order security_groups: get_input: - - port_cmaui01_port_security_groups + - port_cmaui01_port_1_security_groups - index_value exCP_naming: - get_input: port_cmaui01_port_exCP_naming + get_input: port_cmaui01_port_1_exCP_naming vlan_requirements: - get_input: port_cmaui01_port_vlan_requirements + get_input: port_cmaui01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cmaui01_port_related_networks + get_input: port_cmaui01_port_1_related_networks ip_requirements: - get_input: port_cmaui01_port_ip_requirements + get_input: port_cmaui01_port_1_ip_requirements network_role_tag: - get_input: port_cmaui01_port_network_role_tag + get_input: port_cmaui01_port_1_network_role_tag network_role: - get_input: port_cmaui01_port_network_role + get_input: port_cmaui01_port_1_network_role fixed_ips: get_input: - - port_cmaui01_port_fixed_ips + - port_cmaui01_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui01_port_subnetpoolid + get_input: port_cmaui01_port_1_subnetpoolid network: get_input: - - port_cmaui01_port_network + - port_cmaui01_port_1_network - index_value requirements: - binding: @@ -158,12 +158,9 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes - network.outgoing.bytes_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.bytes - network.incoming.packets.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.packets.rate + network.incoming.bytes_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.bytes disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -182,15 +179,15 @@ topology_template: disk.read.bytes_cmaui: - cmaui - disk.read.bytes + network.outpoing.packets_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outpoing.packets disk.write.requests_cmaui: - cmaui - disk.write.requests scalable_cmaui: - cmaui - scalable - feature_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - feature disk.device.write.bytes.rate_cmaui: - cmaui - disk.device.write.bytes.rate @@ -206,21 +203,15 @@ topology_template: os_cmaui: - cmaui - os - network.outgoing.bytes.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.packets.rate disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - network.incoming.bytes_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.bytes - forwarder_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - forwarder - network.outgoing.packets.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.bytes.rate disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -230,6 +221,9 @@ topology_template: disk.device.latency_cmaui: - cmaui - disk.device.latency + network.outgoing.bytes_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.outgoing.bytes disk.device.read.requests_cmaui: - cmaui - disk.device.read.requests @@ -239,39 +233,42 @@ topology_template: cpu_cmaui: - cmaui - cpu - network.outpoing.packets_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.outpoing.packets disk.read.requests_cmaui: - cmaui - disk.read.requests - attachment_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - attachment disk.device.read.bytes_cmaui: - cmaui - disk.device.read.bytes - network.incoming.packets_cmaui_cmaui01_port: - - cmaui_cmaui01_port + feature_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - feature + network.incoming.packets_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 - network.incoming.packets disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests - network.incoming.bytes.rate_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - network.incoming.bytes.rate + forwarder_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - forwarder + binding_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - binding + network.incoming.packets.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.packets.rate vcpus_cmaui: - cmaui - vcpus - binding_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - binding feature_cmaui: - cmaui - feature binding_cmaui: - cmaui - binding + network.incoming.bytes.rate_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - network.incoming.bytes.rate endpoint_cmaui: - cmaui - endpoint @@ -284,6 +281,9 @@ topology_template: memory_cmaui: - cmaui - memory + attachment_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - attachment disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate @@ -309,15 +309,15 @@ topology_template: - cmaui - disk.device.write.requests.rate requirements: - dependency_cmaui_cmaui01_port: - - cmaui_cmaui01_port - - dependency - link_cmaui_cmaui01_port: - - cmaui_cmaui01_port + link_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 - link dependency_cmaui: - cmaui - dependency local_storage_cmaui: - cmaui - - local_storage
\ No newline at end of file + - local_storage + dependency_cmaui_cmaui01_port_1: + - cmaui_cmaui01_port_1 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml index 87232dd290..545037b77b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml @@ -11,19 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam02_port_network: + port_oam02_port_2_network: type: list required: true entry_schema: type: string - port_oam02_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam02_port_network_role: - type: string - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -31,163 +23,165 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam02_port_fixed_ips: + port_oam02_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: json vm_flavor_name: type: string required: true - port_oam02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam02_port_security_groups: + port_oam02_port_2_replacement_policy: type: list required: true entry_schema: - type: json - port_oam02_port_subnetpoolid: - type: string - required: true - port_oam02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_oam02_port_2_fixed_ips: + type: list required: true - port_oam02_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_image_name: type: string required: true - port_oam02_port_network_role_tag: + port_oam02_port_2_network_role_tag: type: string required: true - port_oam02_port_replacement_policy: + port_oam02_port_2_order: + type: integer + required: true + port_oam02_port_2_related_networks: type: list required: true entry_schema: - type: string - port_oam02_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam02_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements + port_oam02_port_2_network_role: + type: string + required: true + port_oam02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_oam_availability_zone: type: list required: true entry_schema: type: string - port_oam02_port_vlan_requirements: - type: list + port_oam02_port_2_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_name: type: list required: true entry_schema: type: string + port_oam02_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: - oam_oam02_port: + oam: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam + properties: + availability_zone: + get_input: + - compute_oam_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_name + - index_value + oam_oam02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam02_port_replacement_policy + - port_oam02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_oam02_port_mac_requirements + get_input: port_oam02_port_2_mac_requirements order: - get_input: port_oam02_port_order + get_input: port_oam02_port_2_order security_groups: get_input: - - port_oam02_port_security_groups + - port_oam02_port_2_security_groups - index_value exCP_naming: - get_input: port_oam02_port_exCP_naming + get_input: port_oam02_port_2_exCP_naming vlan_requirements: - get_input: port_oam02_port_vlan_requirements + get_input: port_oam02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam02_port_related_networks + get_input: port_oam02_port_2_related_networks ip_requirements: - get_input: port_oam02_port_ip_requirements + get_input: port_oam02_port_2_ip_requirements network_role_tag: - get_input: port_oam02_port_network_role_tag + get_input: port_oam02_port_2_network_role_tag network_role: - get_input: port_oam02_port_network_role + get_input: port_oam02_port_2_network_role fixed_ips: get_input: - - port_oam02_port_fixed_ips + - port_oam02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_oam02_port_subnetpoolid + get_input: port_oam02_port_2_subnetpoolid network: get_input: - - port_oam02_port_network + - port_oam02_port_2_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam relationship: tosca.relationships.network.BindsTo - oam: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam - properties: - availability_zone: - get_input: - - compute_oam_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_name - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam capabilities: cpu_oam: - oam - cpu - network.incoming.bytes.rate_oam_oam02_port: - - oam_oam02_port - - network.incoming.bytes.rate disk.usage_oam: - oam - disk.usage memory.resident_oam: - oam - memory.resident + network.incoming.bytes.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.bytes.rate disk.device.write.bytes_oam: - oam - disk.device.write.bytes - network.incoming.packets_oam_oam02_port: - - oam_oam02_port - - network.incoming.packets + network.outgoing.bytes.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.bytes.rate disk.read.bytes_oam: - oam - disk.read.bytes - network.outgoing.packets.rate_oam_oam02_port: - - oam_oam02_port - - network.outgoing.packets.rate - binding_oam_oam02_port: - - oam_oam02_port - - binding scalable_oam: - oam - scalable - network.outgoing.bytes.rate_oam_oam02_port: - - oam_oam02_port - - network.outgoing.bytes.rate feature_oam: - oam - feature disk.allocation_oam: - oam - disk.allocation + network.incoming.packets.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.packets.rate disk.device.usage_oam: - oam - disk.device.usage @@ -197,6 +191,9 @@ topology_template: disk.device.read.bytes.rate_oam: - oam - disk.device.read.bytes.rate + network.incoming.bytes_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.bytes disk.write.bytes.rate_oam: - oam - disk.write.bytes.rate @@ -212,24 +209,33 @@ topology_template: disk.write.requests_oam: - oam - disk.write.requests - forwarder_oam_oam02_port: - - oam_oam02_port + forwarder_oam_oam02_port_2: + - oam_oam02_port_2 - forwarder disk.capacity_oam: - oam - disk.capacity + network.outgoing.packets.rate_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.packets.rate + binding_oam_oam02_port_2: + - oam_oam02_port_2 + - binding instance_oam: - oam - instance - network.outgoing.bytes_oam_oam02_port: - - oam_oam02_port - - network.outgoing.bytes disk.root.size_oam: - oam - disk.root.size - network.incoming.packets.rate_oam_oam02_port: - - oam_oam02_port - - network.incoming.packets.rate + attachment_oam_oam02_port_2: + - oam_oam02_port_2 + - attachment + network.incoming.packets_oam_oam02_port_2: + - oam_oam02_port_2 + - network.incoming.packets + network.outgoing.bytes_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outgoing.bytes memory_oam: - oam - memory @@ -239,6 +245,12 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests + feature_oam_oam02_port_2: + - oam_oam02_port_2 + - feature + network.outpoing.packets_oam_oam02_port_2: + - oam_oam02_port_2 + - network.outpoing.packets disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate @@ -275,15 +287,9 @@ topology_template: disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - feature_oam_oam02_port: - - oam_oam02_port - - feature cpu_util_oam: - oam - cpu_util - network.outpoing.packets_oam_oam02_port: - - oam_oam02_port - - network.outpoing.packets os_oam: - oam - os @@ -293,12 +299,6 @@ topology_template: disk.latency_oam: - oam - disk.latency - network.incoming.bytes_oam_oam02_port: - - oam_oam02_port - - network.incoming.bytes - attachment_oam_oam02_port: - - oam_oam02_port - - attachment disk.write.bytes_oam: - oam - disk.write.bytes @@ -309,15 +309,15 @@ topology_template: - oam - disk.device.capacity requirements: - link_oam_oam02_port: - - oam_oam02_port - - link + dependency_oam_oam02_port_2: + - oam_oam02_port_2 + - dependency local_storage_oam: - oam - local_storage - dependency_oam_oam02_port: - - oam_oam02_port - - dependency + link_oam_oam02_port_2: + - oam_oam02_port_2 + - link dependency_oam: - oam - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml index f6f3d190cd..07bc854756 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml @@ -11,30 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_oam01_port_subnetpoolid: + port_oam01_port_1_network_role: type: string required: true - port_oam01_port_order: - type: integer - required: true - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam01_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_oam01_port_network: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -42,7 +26,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam01_port_replacement_policy: + port_oam01_port_1_network: type: list required: true entry_schema: @@ -50,81 +34,97 @@ topology_template: vm_flavor_name: type: string required: true - port_oam01_port_related_networks: + port_oam01_port_1_security_groups: + type: list + required: true + entry_schema: + type: json + port_oam01_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_image_name: + port_oam01_port_1_order: + type: integer + required: true + port_oam01_port_1_subnetpoolid: type: string required: true - port_oam01_port_network_role: + vm_image_name: type: string required: true - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_oam01_port_1_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_oam_availability_zone: type: list required: true entry_schema: type: string - port_oam01_port_network_role_tag: + port_oam01_port_1_network_role_tag: type: string required: true - compute_oam_name: + port_oam01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_oam01_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_oam_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string node_templates: - oam_oam01_port: + oam_oam01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam01_port_replacement_policy + - port_oam01_port_1_replacement_policy - index_value mac_requirements: - get_input: port_oam01_port_mac_requirements + get_input: port_oam01_port_1_mac_requirements order: - get_input: port_oam01_port_order + get_input: port_oam01_port_1_order security_groups: get_input: - - port_oam01_port_security_groups + - port_oam01_port_1_security_groups - index_value exCP_naming: - get_input: port_oam01_port_exCP_naming + get_input: port_oam01_port_1_exCP_naming vlan_requirements: - get_input: port_oam01_port_vlan_requirements + get_input: port_oam01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam01_port_related_networks + get_input: port_oam01_port_1_related_networks ip_requirements: - get_input: port_oam01_port_ip_requirements + get_input: port_oam01_port_1_ip_requirements network_role_tag: - get_input: port_oam01_port_network_role_tag + get_input: port_oam01_port_1_network_role_tag network_role: - get_input: port_oam01_port_network_role + get_input: port_oam01_port_1_network_role fixed_ips: get_input: - - port_oam01_port_fixed_ips + - port_oam01_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_oam01_port_subnetpoolid + get_input: port_oam01_port_1_subnetpoolid network: get_input: - - port_oam01_port_network + - port_oam01_port_1_network - index_value requirements: - binding: @@ -152,36 +152,27 @@ topology_template: cpu_oam: - oam - cpu - network.outgoing.packets.rate_oam_oam01_port: - - oam_oam01_port - - network.outgoing.packets.rate - binding_oam_oam01_port: - - oam_oam01_port - - binding - network.outgoing.bytes.rate_oam_oam01_port: - - oam_oam01_port - - network.outgoing.bytes.rate disk.usage_oam: - oam - disk.usage memory.resident_oam: - oam - memory.resident + network.outgoing.bytes.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.bytes.rate disk.device.write.bytes_oam: - oam - disk.device.write.bytes + network.incoming.bytes.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.bytes.rate disk.read.bytes_oam: - oam - disk.read.bytes scalable_oam: - oam - scalable - attachment_oam_oam01_port: - - oam_oam01_port - - attachment - network.incoming.bytes_oam_oam01_port: - - oam_oam01_port - - network.incoming.bytes feature_oam: - oam - feature @@ -191,9 +182,6 @@ topology_template: disk.device.usage_oam: - oam - disk.device.usage - network.incoming.packets.rate_oam_oam01_port: - - oam_oam01_port - - network.incoming.packets.rate binding_oam: - oam - binding @@ -212,9 +200,6 @@ topology_template: disk.ephemeral.size_oam: - oam - disk.ephemeral.size - feature_oam_oam01_port: - - oam_oam01_port - - feature disk.write.requests_oam: - oam - disk.write.requests @@ -224,12 +209,18 @@ topology_template: instance_oam: - oam - instance - network.outpoing.packets_oam_oam01_port: - - oam_oam01_port - - network.outpoing.packets + attachment_oam_oam01_port_1: + - oam_oam01_port_1 + - attachment + network.incoming.packets_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.packets disk.root.size_oam: - oam - disk.root.size + network.outgoing.bytes_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.bytes memory_oam: - oam - memory @@ -239,12 +230,15 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests + feature_oam_oam01_port_1: + - oam_oam01_port_1 + - feature + network.outpoing.packets_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outpoing.packets disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate - network.outgoing.bytes_oam_oam01_port: - - oam_oam01_port - - network.outgoing.bytes disk.write.requests.rate_oam: - oam - disk.write.requests.rate @@ -260,9 +254,6 @@ topology_template: disk.device.write.requests.rate_oam: - oam - disk.device.write.requests.rate - forwarder_oam_oam01_port: - - oam_oam01_port - - forwarder disk.device.read.bytes_oam: - oam - disk.device.read.bytes @@ -272,18 +263,21 @@ topology_template: endpoint_oam: - oam - endpoint - network.incoming.bytes.rate_oam_oam01_port: - - oam_oam01_port - - network.incoming.bytes.rate disk.device.read.requests_oam: - oam - disk.device.read.requests + network.incoming.packets.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.packets.rate disk.iops_oam: - oam - disk.iops disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate + network.incoming.bytes_oam_oam01_port_1: + - oam_oam01_port_1 + - network.incoming.bytes cpu_util_oam: - oam - cpu_util @@ -296,28 +290,34 @@ topology_template: disk.latency_oam: - oam - disk.latency + forwarder_oam_oam01_port_1: + - oam_oam01_port_1 + - forwarder + network.outgoing.packets.rate_oam_oam01_port_1: + - oam_oam01_port_1 + - network.outgoing.packets.rate disk.write.bytes_oam: - oam - disk.write.bytes + binding_oam_oam01_port_1: + - oam_oam01_port_1 + - binding disk.read.requests_oam: - oam - disk.read.requests disk.device.capacity_oam: - oam - disk.device.capacity - network.incoming.packets_oam_oam01_port: - - oam_oam01_port - - network.incoming.packets requirements: local_storage_oam: - oam - local_storage - dependency_oam_oam01_port: - - oam_oam01_port + dependency_oam_oam01_port_1: + - oam_oam01_port_1 - dependency - link_oam_oam01_port: - - oam_oam01_port + link_oam_oam01_port_1: + - oam_oam01_port_1 - link dependency_oam: - oam - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 9d8385b905..d2a3d40128 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/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_pd02_port_0_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,55 +33,50 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string + required: true + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -152,6 +155,9 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -167,12 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +185,9 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -206,9 +200,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,9 +209,6 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding @@ -233,12 +221,18 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -251,6 +245,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -260,24 +257,27 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +287,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index 34e182d166..0b507de50e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: 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 @@ -97,31 +97,31 @@ topology_template: 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: false 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: @@ -131,6 +131,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 @@ -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,9 +170,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 @@ -185,27 +182,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 @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + 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 @@ -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_0: + - pd_server_pd01_port_0 + - 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_0: + - pd_server_pd01_port_0 + - 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 dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml index 1ef6099449..83f47e734a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml @@ -11,11 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_pd02_port_2_order: + type: integer + required: true + port_pd02_port_2_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,70 +29,64 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_flavor_name: - type: string - required: true - port_pd02_port_order: - type: integer + port_pd02_port_2_network: + type: list required: true - port_pd02_port_subnetpoolid: - type: string + entry_schema: + type: string + port_pd02_port_2_vlan_requirements: + type: list required: true - port_pd02_port_network_role_tag: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_2_subnetpoolid: type: string required: true - port_pd02_port_vlan_requirements: + port_pd02_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_flavor_name: type: string required: true - port_pd02_port_security_groups: + port_pd02_port_2_ip_requirements: type: list required: true entry_schema: - type: json - compute_ps_availability_zone: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_2_security_groups: type: list required: true entry_schema: - type: string - port_pd02_port_replacement_policy: + type: json + port_pd02_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_pd02_port_network_role: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd02_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_image_name: type: string required: true - compute_ps_name: + compute_ps_availability_zone: type: list required: true entry_schema: type: string - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: - type: list + port_pd02_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + compute_ps_name: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list + port_pd02_port_2_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: ps: type: org.openecomp.resource.vfc.compute.nodes.heat.ps @@ -103,43 +103,43 @@ topology_template: get_input: - compute_ps_name - index_value - ps_pd02_port: + ps_pd02_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd02_port_replacement_policy + - port_pd02_port_2_replacement_policy - index_value mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_2_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_2_order security_groups: get_input: - - port_pd02_port_security_groups + - port_pd02_port_2_security_groups - index_value exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_2_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_2_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_2_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_2_network_role_tag network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_2_network_role fixed_ips: get_input: - - port_pd02_port_fixed_ips + - port_pd02_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_2_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_2_network - index_value requirements: - binding: @@ -176,30 +176,30 @@ topology_template: disk.device.usage_ps: - ps - disk.device.usage - forwarder_ps_pd02_port: - - ps_pd02_port - - forwarder - network.outgoing.bytes.rate_ps_pd02_port: - - ps_pd02_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.bytes.rate endpoint_ps: - ps - endpoint + network.outgoing.bytes.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outgoing.bytes.rate disk.device.capacity_ps: - ps - disk.device.capacity cpu_ps: - ps - cpu - network.incoming.packets_ps_pd02_port: - - ps_pd02_port - - network.incoming.packets + network.outgoing.packets.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outgoing.packets.rate + binding_ps_pd02_port_2: + - ps_pd02_port_2 + - binding disk.device.write.bytes_ps: - ps - disk.device.write.bytes - network.outgoing.packets.rate_ps_pd02_port: - - ps_pd02_port - - network.outgoing.packets.rate cpu.delta_ps: - ps - cpu.delta @@ -212,26 +212,29 @@ topology_template: binding_ps: - ps - binding - binding_ps_pd02_port: - - ps_pd02_port - - binding + network.outpoing.packets_ps_pd02_port_2: + - ps_pd02_port_2 + - network.outpoing.packets + feature_ps_pd02_port_2: + - ps_pd02_port_2 + - feature disk.device.write.requests.rate_ps: - ps - disk.device.write.requests.rate - network.outgoing.bytes_ps_pd02_port: - - ps_pd02_port + network.outgoing.bytes_ps_pd02_port_2: + - ps_pd02_port_2 - network.outgoing.bytes cpu_util_ps: - ps - cpu_util - network.outpoing.packets_ps_pd02_port: - - ps_pd02_port - - network.outpoing.packets - network.incoming.packets.rate_ps_pd02_port: - - ps_pd02_port - - network.incoming.packets.rate - network.incoming.bytes_ps_pd02_port: - - ps_pd02_port + forwarder_ps_pd02_port_2: + - ps_pd02_port_2 + - forwarder + attachment_ps_pd02_port_2: + - ps_pd02_port_2 + - attachment + network.incoming.bytes_ps_pd02_port_2: + - ps_pd02_port_2 - network.incoming.bytes disk.read.bytes.rate_ps: - ps @@ -248,6 +251,9 @@ topology_template: instance_ps: - ps - instance + network.incoming.packets.rate_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.packets.rate disk.latency_ps: - ps - disk.latency @@ -269,9 +275,6 @@ topology_template: memory_ps: - ps - memory - feature_ps_pd02_port: - - ps_pd02_port - - feature disk.usage_ps: - ps - disk.usage @@ -287,9 +290,6 @@ topology_template: disk.allocation_ps: - ps - disk.allocation - attachment_ps_pd02_port: - - ps_pd02_port - - attachment disk.device.read.requests_ps: - ps - disk.device.read.requests @@ -299,9 +299,9 @@ topology_template: disk.device.latency_ps: - ps - disk.device.latency - network.incoming.bytes.rate_ps_pd02_port: - - ps_pd02_port - - network.incoming.bytes.rate + network.incoming.packets_ps_pd02_port_2: + - ps_pd02_port_2 + - network.incoming.packets disk.device.write.requests_ps: - ps - disk.device.write.requests @@ -309,15 +309,15 @@ topology_template: - ps - disk.write.bytes requirements: - dependency_ps_pd02_port: - - ps_pd02_port - - dependency - link_ps_pd02_port: - - ps_pd02_port + link_ps_pd02_port_2: + - ps_pd02_port_2 - link dependency_ps: - ps - dependency local_storage_ps: - ps - - local_storage
\ No newline at end of file + - local_storage + dependency_ps_pd02_port_2: + - ps_pd02_port_2 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml index 7c142e6996..b8458d6726 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml @@ -11,6 +11,16 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_security_groups: + type: list + required: true + entry_schema: + type: json + 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 @@ -18,15 +28,10 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_replacement_policy: - type: list - 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: @@ -34,14 +39,20 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd01_port_1_network_role: + type: string + required: true + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_pd01_port_1_subnetpoolid: + type: string + required: true vm_image_name: type: string required: true @@ -50,43 +61,32 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: - type: list + type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + compute_ps_name: type: list required: true entry_schema: type: string - compute_ps_name: + port_pd01_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + 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 node_templates: ps: type: org.openecomp.resource.vfc.compute.nodes.heat.ps @@ -103,43 +103,43 @@ topology_template: get_input: - compute_ps_name - index_value - ps_pd01_port: + ps_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd01_port_1_replacement_policy - index_value 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 security_groups: get_input: - - port_pd01_port_security_groups + - port_pd01_port_1_security_groups - index_value 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 network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role fixed_ips: get_input: - - port_pd01_port_fixed_ips + - port_pd01_port_1_fixed_ips - index_value 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: @@ -155,9 +155,6 @@ topology_template: disk.device.iops_ps: - ps - disk.device.iops - network.incoming.packets_ps_pd01_port: - - ps_pd01_port - - network.incoming.packets scalable_ps: - ps - scalable @@ -179,30 +176,27 @@ topology_template: disk.device.usage_ps: - ps - disk.device.usage + network.incoming.bytes.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.bytes.rate endpoint_ps: - ps - endpoint - network.incoming.bytes.rate_ps_pd01_port: - - ps_pd01_port - - network.incoming.bytes.rate disk.device.capacity_ps: - ps - disk.device.capacity cpu_ps: - ps - cpu - attachment_ps_pd01_port: - - ps_pd01_port - - attachment disk.device.write.bytes_ps: - ps - disk.device.write.bytes - forwarder_ps_pd01_port: - - ps_pd01_port - - forwarder cpu.delta_ps: - ps - cpu.delta + network.incoming.packets_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.packets disk.root.size_ps: - ps - disk.root.size @@ -212,18 +206,12 @@ topology_template: binding_ps: - ps - binding - network.incoming.packets.rate_ps_pd01_port: - - ps_pd01_port - - network.incoming.packets.rate disk.device.write.requests.rate_ps: - ps - disk.device.write.requests.rate - feature_ps_pd01_port: - - ps_pd01_port - - feature - network.incoming.bytes_ps_pd01_port: - - ps_pd01_port - - network.incoming.bytes + network.outgoing.bytes_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outgoing.bytes cpu_util_ps: - ps - cpu_util @@ -233,39 +221,48 @@ topology_template: disk.device.read.bytes.rate_ps: - ps - disk.device.read.bytes.rate + forwarder_ps_pd01_port_1: + - ps_pd01_port_1 + - forwarder disk.read.requests_ps: - ps - disk.read.requests vcpus_ps: - ps - vcpus + network.incoming.packets.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.packets.rate + attachment_ps_pd01_port_1: + - ps_pd01_port_1 + - attachment + network.incoming.bytes_ps_pd01_port_1: + - ps_pd01_port_1 + - network.incoming.bytes instance_ps: - ps - instance disk.latency_ps: - ps - disk.latency - network.outpoing.packets_ps_pd01_port: - - ps_pd01_port - - network.outpoing.packets disk.device.read.bytes_ps: - ps - disk.device.read.bytes memory.usage_ps: - ps - memory.usage - binding_ps_pd01_port: - - ps_pd01_port - - binding + network.outgoing.bytes.rate_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outgoing.bytes.rate + feature_ps_pd01_port_1: + - ps_pd01_port_1 + - feature feature_ps: - ps - feature disk.device.write.bytes.rate_ps: - ps - disk.device.write.bytes.rate - network.outgoing.bytes_ps_pd01_port: - - ps_pd01_port - - network.outgoing.bytes disk.ephemeral.size_ps: - ps - disk.ephemeral.size @@ -281,9 +278,12 @@ topology_template: os_ps: - ps - os - network.outgoing.packets.rate_ps_pd01_port: - - ps_pd01_port + network.outgoing.packets.rate_ps_pd01_port_1: + - ps_pd01_port_1 - network.outgoing.packets.rate + binding_ps_pd01_port_1: + - ps_pd01_port_1 + - binding disk.iops_ps: - ps - disk.iops @@ -299,9 +299,9 @@ topology_template: disk.device.latency_ps: - ps - disk.device.latency - network.outgoing.bytes.rate_ps_pd01_port: - - ps_pd01_port - - network.outgoing.bytes.rate + network.outpoing.packets_ps_pd01_port_1: + - ps_pd01_port_1 + - network.outpoing.packets disk.device.write.requests_ps: - ps - disk.device.write.requests @@ -309,15 +309,15 @@ topology_template: - ps - disk.write.bytes requirements: + link_ps_pd01_port_1: + - ps_pd01_port_1 + - link + dependency_ps_pd01_port_1: + - ps_pd01_port_1 + - dependency dependency_ps: - ps - dependency local_storage_ps: - ps - local_storage - dependency_ps_pd01_port: - - ps_pd01_port - - dependency - link_ps_pd01_port: - - ps_pd01_port - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml index aa2ed981f2..118eee3b23 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -62,36 +62,36 @@ topology_template: directives: - substitutable properties: - port_cmaui02_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui02_port_mac_requirements: - mac_count_required: - is_required: false + port_cmaui02_port_2_network: + - get_input: net + port_cmaui02_port_2_replacement_policy: + - AUTO vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 1 - compute_cmaui_availability_zone: - - get_input: availability_zone_0 - vm_image_name: - get_input: cmaui_image - port_cmaui02_port_ip_requirements: + port_cmaui02_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cmaui02_port_replacement_policy: - - AUTO - port_cmaui02_port_security_groups: + compute_cmaui_availability_zone: + - get_input: availability_zone_0 + vm_image_name: + get_input: cmaui_image + port_cmaui02_port_2_security_groups: - - get_input: p2 - port_cmaui02_port_network: - - get_input: net + port_cmaui02_port_2_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui02_port_2_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -105,32 +105,32 @@ topology_template: directives: - substitutable properties: - port_cmaui01_port_replacement_policy: - - AUTO - port_cmaui01_port_security_groups: - - - get_input: p1 - - get_input: p2 vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 0 + port_cmaui01_port_1_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 compute_cmaui_availability_zone: - get_input: availability_zone_0 + port_cmaui01_port_1_network: + - get_input: net vm_image_name: get_input: cmaui_image - port_cmaui01_port_mac_requirements: + port_cmaui01_port_1_replacement_policy: + - AUTO + port_cmaui01_port_1_security_groups: + - - get_input: p1 + - get_input: p2 + port_cmaui01_port_1_mac_requirements: mac_count_required: is_required: false - port_cmaui01_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui01_port_network: - - get_input: net - port_cmaui01_port_ip_requirements: + port_cmaui01_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -179,16 +179,16 @@ topology_template: - feature_pd01_port_1_test_nested3Level network.outgoing.packets.rate_cmaui02_port_2: - abstract_cmaui - - network.outgoing.packets.rate_cmaui_cmaui02_port + - network.outgoing.packets.rate_cmaui_cmaui02_port_2 binding_cmaui02_port_2: - abstract_cmaui - - binding_cmaui_cmaui02_port + - binding_cmaui_cmaui02_port_2 disk.device.latency_server_cmaui_1: - abstract_cmaui_1 - disk.device.latency_cmaui network.outgoing.bytes.rate_cmaui02_port_2: - abstract_cmaui - - network.outgoing.bytes.rate_cmaui_cmaui02_port + - network.outgoing.bytes.rate_cmaui_cmaui02_port_2 disk.device.latency_server_cmaui_2: - abstract_cmaui - disk.device.latency_cmaui @@ -209,13 +209,13 @@ topology_template: - disk.device.latency_server_ps_1_test_nested3Level attachment_cmaui01_port_1: - abstract_cmaui_1 - - attachment_cmaui_cmaui01_port + - attachment_cmaui_cmaui01_port_1 disk.write.bytes_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.bytes_server_ps_1_test_nested3Level network.incoming.bytes.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.bytes.rate_cmaui_cmaui01_port + - network.incoming.bytes.rate_cmaui_cmaui01_port_1 disk.capacity_server_oam_1_test_nested2Level: - test_nested2Level - disk.capacity_server_oam_1 @@ -248,7 +248,7 @@ topology_template: - disk.device.read.bytes.rate_cmaui feature_cmaui02_port_2: - abstract_cmaui - - feature_cmaui_cmaui02_port + - feature_cmaui_cmaui02_port_2 disk.device.read.bytes.rate_server_cmaui_1: - abstract_cmaui_1 - disk.device.read.bytes.rate_cmaui @@ -287,7 +287,7 @@ topology_template: - disk.iops_server_oam_2 network.outpoing.packets_cmaui02_port_2: - abstract_cmaui - - network.outpoing.packets_cmaui_cmaui02_port + - network.outpoing.packets_cmaui_cmaui02_port_2 attachment_pd01_port_1_test_nested3Level_test_nested2Level: - test_nested2Level - attachment_pd01_port_1_test_nested3Level @@ -314,7 +314,7 @@ topology_template: - cpu_util_server_ps_2_test_nested3Level network.outgoing.bytes_cmaui02_port_2: - abstract_cmaui - - network.outgoing.bytes_cmaui_cmaui02_port + - network.outgoing.bytes_cmaui_cmaui02_port_2 feature_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - feature_server_ps_1_test_nested3Level @@ -344,7 +344,7 @@ topology_template: - disk.device.write.bytes.rate_server_ps_2_test_nested3Level forwarder_cmaui01_port_1: - abstract_cmaui_1 - - forwarder_cmaui_cmaui01_port + - forwarder_cmaui_cmaui01_port_1 network.outgoing.bytes.rate_oam02_port_2_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_oam02_port_2 @@ -419,7 +419,7 @@ topology_template: - cpu_util_cmaui network.incoming.packets_cmaui02_port_2: - abstract_cmaui - - network.incoming.packets_cmaui_cmaui02_port + - network.incoming.packets_cmaui_cmaui02_port_2 disk.device.write.bytes.rate_server_cmaui_2: - abstract_cmaui - disk.device.write.bytes.rate_cmaui @@ -482,7 +482,7 @@ topology_template: - disk.device.usage_server_ps_2_test_nested3Level network.incoming.bytes_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.bytes_cmaui_cmaui01_port + - network.incoming.bytes_cmaui_cmaui01_port_1 instance_server_oam_2_test_nested2Level: - test_nested2Level - instance_server_oam_2 @@ -590,7 +590,7 @@ topology_template: - feature_oam01_port_1 network.outgoing.bytes_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.bytes_cmaui_cmaui01_port + - network.outgoing.bytes_cmaui_cmaui01_port_1 instance_server_cmaui_2: - abstract_cmaui - instance_cmaui @@ -602,7 +602,7 @@ topology_template: - memory.resident_server_ps_2_test_nested3Level network.incoming.packets.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.packets.rate_cmaui_cmaui01_port + - network.incoming.packets.rate_cmaui_cmaui01_port_1 disk.read.requests_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.read.requests_server_ps_1_test_nested3Level @@ -677,10 +677,10 @@ topology_template: - disk.device.usage_cmaui network.outgoing.packets.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.packets.rate_cmaui_cmaui01_port + - network.outgoing.packets.rate_cmaui_cmaui01_port_1 binding_cmaui01_port_1: - abstract_cmaui_1 - - binding_cmaui_cmaui01_port + - binding_cmaui_cmaui01_port_1 scalable_server_oam_2_test_nested2Level: - test_nested2Level - scalable_server_oam_2 @@ -695,7 +695,7 @@ topology_template: - disk.device.write.requests.rate_server_ps_2_test_nested3Level network.outgoing.bytes.rate_cmaui01_port_1: - abstract_cmaui_1 - - network.outgoing.bytes.rate_cmaui_cmaui01_port + - network.outgoing.bytes.rate_cmaui_cmaui01_port_1 memory_server_ps_2_test_nested3Level_test_nested2Level: - test_nested2Level - memory_server_ps_2_test_nested3Level @@ -719,7 +719,7 @@ topology_template: - disk.device.allocation_server_oam_1 network.incoming.bytes.rate_cmaui02_port_2: - abstract_cmaui - - network.incoming.bytes.rate_cmaui_cmaui02_port + - network.incoming.bytes.rate_cmaui_cmaui02_port_2 endpoint_server_oam_2_test_nested2Level: - test_nested2Level - endpoint_server_oam_2 @@ -734,7 +734,7 @@ topology_template: - disk.iops_server_ps_2_test_nested3Level attachment_cmaui02_port_2: - abstract_cmaui - - attachment_cmaui_cmaui02_port + - attachment_cmaui_cmaui02_port_2 disk.write.bytes.rate_server_oam_2_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_oam_2 @@ -809,7 +809,7 @@ topology_template: - host_server_oam_2 forwarder_cmaui02_port_2: - abstract_cmaui - - forwarder_cmaui_cmaui02_port + - forwarder_cmaui_cmaui02_port_2 feature_server_oam_2_test_nested2Level: - test_nested2Level - feature_server_oam_2 @@ -839,7 +839,7 @@ topology_template: - disk.device.capacity_server_ps_1_test_nested3Level feature_cmaui01_port_1: - abstract_cmaui_1 - - feature_cmaui_cmaui01_port + - feature_cmaui_cmaui01_port_1 disk.device.read.requests.rate_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.read.requests.rate_server_ps_1_test_nested3Level @@ -911,7 +911,7 @@ topology_template: - memory.usage_server_ps_2_test_nested3Level network.incoming.bytes_cmaui02_port_2: - abstract_cmaui - - network.incoming.bytes_cmaui_cmaui02_port + - network.incoming.bytes_cmaui_cmaui02_port_2 disk.write.requests_server_cmaui_2: - abstract_cmaui - disk.write.requests_cmaui @@ -989,7 +989,7 @@ topology_template: - network.outgoing.packets.rate_pd02_port_2_test_nested3Level network.incoming.packets_cmaui01_port_1: - abstract_cmaui_1 - - network.incoming.packets_cmaui_cmaui01_port + - network.incoming.packets_cmaui_cmaui01_port_1 disk.read.bytes_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.read.bytes_server_ps_1_test_nested3Level @@ -1040,7 +1040,7 @@ topology_template: - network.outgoing.bytes_oam01_port_1 network.incoming.packets.rate_cmaui02_port_2: - abstract_cmaui - - network.incoming.packets.rate_cmaui_cmaui02_port + - network.incoming.packets.rate_cmaui_cmaui02_port_2 disk.device.write.requests_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_ps_1_test_nested3Level @@ -1127,17 +1127,17 @@ topology_template: - memory.usage_cmaui network.outpoing.packets_cmaui01_port_1: - abstract_cmaui_1 - - network.outpoing.packets_cmaui_cmaui01_port + - network.outpoing.packets_cmaui_cmaui01_port_1 requirements: link_cmaui01_port_1: - abstract_cmaui_1 - - link_cmaui_cmaui01_port + - link_cmaui_cmaui01_port_1 local_storage_server_oam_2_test_nested2Level: - test_nested2Level - local_storage_server_oam_2 link_cmaui02_port_2: - abstract_cmaui - - link_cmaui_cmaui02_port + - link_cmaui_cmaui02_port_2 dependency_test_nested2Level: - test_nested2Level - dependency @@ -1155,10 +1155,10 @@ topology_template: - dependency_oam01_port_1 dependency_cmaui01_port_1: - abstract_cmaui_1 - - dependency_cmaui_cmaui01_port + - dependency_cmaui_cmaui01_port_1 dependency_cmaui02_port_2: - abstract_cmaui - - dependency_cmaui_cmaui02_port + - dependency_cmaui_cmaui02_port_2 dependency_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_server_ps_1_test_nested3Level diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml index 07c709079f..7e6940549d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -62,33 +62,33 @@ topology_template: directives: - substitutable properties: - port_oam01_port_mac_requirements: - mac_count_required: - is_required: false - port_oam01_port_ip_requirements: + port_oam01_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam01_port_security_groups: - - - get_input: p2 - - get_input: p1 - port_oam01_port_network: + port_oam01_port_1_network: - get_input: net - port_oam01_port_replacement_policy: - - AUTO vm_flavor_name: get_input: cmaui_flavor + port_oam01_port_1_security_groups: + - - get_input: p2 + - get_input: p1 vm_image_name: get_input: cmaui_image - port_oam01_port_fixed_ips: + port_oam01_port_1_replacement_policy: + - AUTO + port_oam01_port_1_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 compute_oam_availability_zone: - get_input: availability_zone_0 + port_oam01_port_1_mac_requirements: + mac_count_required: + is_required: false compute_oam_name: - get_input: - oam_names @@ -106,30 +106,30 @@ topology_template: directives: - substitutable properties: - port_oam02_port_network: + port_oam02_port_2_network: - get_input: net - port_oam02_port_ip_requirements: + port_oam02_port_2_security_groups: + - - get_input: p1 + vm_flavor_name: + get_input: cmaui_flavor + port_oam02_port_2_replacement_policy: + - AUTO + port_oam02_port_2_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 + vm_image_name: + get_input: cmaui_image + port_oam02_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam02_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - vm_flavor_name: - get_input: cmaui_flavor - port_oam02_port_security_groups: - - - get_input: p1 - port_oam02_port_mac_requirements: + port_oam02_port_2_mac_requirements: mac_count_required: is_required: false - vm_image_name: - get_input: cmaui_image - port_oam02_port_replacement_policy: - - AUTO compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_name: @@ -168,7 +168,7 @@ topology_template: capabilities: network.incoming.packets.rate_oam02_port_2: - abstract_oam - - network.incoming.packets.rate_oam_oam02_port + - network.incoming.packets.rate_oam_oam02_port_2 disk.latency_server_oam_2: - abstract_oam - disk.latency_oam @@ -186,7 +186,7 @@ topology_template: - disk.latency_oam network.incoming.bytes_oam02_port_2: - abstract_oam - - network.incoming.bytes_oam_oam02_port + - network.incoming.bytes_oam_oam02_port_2 endpoint_server_oam_1: - abstract_oam_1 - endpoint_oam @@ -210,7 +210,7 @@ topology_template: - disk.device.read.bytes_oam forwarder_oam01_port_1: - abstract_oam_1 - - forwarder_oam_oam01_port + - forwarder_oam_oam01_port_1 disk.device.read.bytes_server_oam_2: - abstract_oam - disk.device.read.bytes_oam @@ -219,7 +219,7 @@ topology_template: - cpu.delta_oam attachment_oam01_port_1: - abstract_oam_1 - - attachment_oam_oam01_port + - attachment_oam_oam01_port_1 disk.write.bytes_server_ps_1_test_nested3Level: - test_nested3Level - disk.write.bytes_server_ps_1 @@ -285,7 +285,7 @@ topology_template: - disk.capacity_oam network.incoming.packets_oam01_port_1: - abstract_oam_1 - - network.incoming.packets_oam_oam01_port + - network.incoming.packets_oam_oam01_port_1 disk.device.read.requests.rate_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_ps_1 @@ -300,7 +300,7 @@ topology_template: - disk.capacity_server_ps_2 network.outgoing.bytes.rate_oam01_port_1: - abstract_oam_1 - - network.outgoing.bytes.rate_oam_oam01_port + - network.outgoing.bytes.rate_oam_oam01_port_1 disk.iops_server_ps_2_test_nested3Level: - test_nested3Level - disk.iops_server_ps_2 @@ -396,7 +396,7 @@ topology_template: - disk.allocation_server_ps_2 binding_oam02_port_2: - abstract_oam - - binding_oam_oam02_port + - binding_oam_oam02_port_2 binding_server_oam_1: - abstract_oam_1 - binding_oam @@ -408,10 +408,10 @@ topology_template: - endpoint_server_ps_2 network.outgoing.bytes_oam02_port_2: - abstract_oam - - network.outgoing.bytes_oam_oam02_port + - network.outgoing.bytes_oam_oam02_port_2 network.outpoing.packets_oam01_port_1: - abstract_oam_1 - - network.outpoing.packets_oam_oam01_port + - network.outpoing.packets_oam_oam01_port_1 disk.device.read.bytes.rate_server_oam_1: - abstract_oam_1 - disk.device.read.bytes.rate_oam @@ -438,7 +438,7 @@ topology_template: - instance_oam network.incoming.packets_oam02_port_2: - abstract_oam - - network.incoming.packets_oam_oam02_port + - network.incoming.packets_oam_oam02_port_2 disk.read.bytes_server_ps_2_test_nested3Level: - test_nested3Level - disk.read.bytes_server_ps_2 @@ -465,7 +465,7 @@ topology_template: - host_server_ps_1 attachment_oam02_port_2: - abstract_oam - - attachment_oam_oam02_port + - attachment_oam_oam02_port_2 disk.device.iops_server_oam_2: - abstract_oam - disk.device.iops_oam @@ -489,7 +489,7 @@ topology_template: - disk.device.capacity_server_ps_1 network.incoming.bytes.rate_oam02_port_2: - abstract_oam - - network.incoming.bytes.rate_oam_oam02_port + - network.incoming.bytes.rate_oam_oam02_port_2 disk.write.requests.rate_server_ps_2_test_nested3Level: - test_nested3Level - disk.write.requests.rate_server_ps_2 @@ -498,7 +498,7 @@ topology_template: - disk.latency_server_ps_2 network.incoming.packets.rate_oam01_port_1: - abstract_oam_1 - - network.incoming.packets.rate_oam_oam01_port + - network.incoming.packets.rate_oam_oam01_port_1 disk.device.latency_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.latency_server_ps_1 @@ -519,13 +519,13 @@ topology_template: - attachment_pd02_port_2 network.incoming.bytes_oam01_port_1: - abstract_oam_1 - - network.incoming.bytes_oam_oam01_port + - network.incoming.bytes_oam_oam01_port_1 cpu_server_ps_2_test_nested3Level: - test_nested3Level - cpu_server_ps_2 forwarder_oam02_port_2: - abstract_oam - - forwarder_oam_oam02_port + - forwarder_oam_oam02_port_2 network.incoming.packets.rate_pd01_port_1_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_pd01_port_1 @@ -537,13 +537,13 @@ topology_template: - os_oam network.outgoing.packets.rate_oam02_port_2: - abstract_oam - - network.outgoing.packets.rate_oam_oam02_port + - network.outgoing.packets.rate_oam_oam02_port_2 disk.device.latency_server_ps_2_test_nested3Level: - test_nested3Level - disk.device.latency_server_ps_2 feature_oam01_port_1: - abstract_oam_1 - - feature_oam_oam01_port + - feature_oam_oam01_port_1 disk.device.allocation_server_oam_2: - abstract_oam - disk.device.allocation_oam @@ -558,7 +558,7 @@ topology_template: - cpu_util_server_ps_2 network.incoming.bytes.rate_oam01_port_1: - abstract_oam_1 - - network.incoming.bytes.rate_oam_oam01_port + - network.incoming.bytes.rate_oam_oam01_port_1 vcpus_server_oam_2: - abstract_oam - vcpus_oam @@ -588,7 +588,7 @@ topology_template: - network.incoming.bytes.rate_pd02_port_2 network.outgoing.bytes.rate_oam02_port_2: - abstract_oam - - network.outgoing.bytes.rate_oam_oam02_port + - network.outgoing.bytes.rate_oam_oam02_port_2 vcpus_server_oam_1: - abstract_oam_1 - vcpus_oam @@ -612,7 +612,7 @@ topology_template: - cpu_oam binding_oam01_port_1: - abstract_oam_1 - - binding_oam_oam01_port + - binding_oam_oam01_port_1 disk.device.write.requests_server_ps_2_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_ps_2 @@ -756,7 +756,7 @@ topology_template: - disk.device.capacity_oam network.outgoing.packets.rate_oam01_port_1: - abstract_oam_1 - - network.outgoing.packets.rate_oam_oam01_port + - network.outgoing.packets.rate_oam_oam01_port_1 disk.device.read.requests_server_ps_1_test_nested3Level: - test_nested3Level - disk.device.read.requests_server_ps_1 @@ -765,13 +765,13 @@ topology_template: - disk.read.bytes.rate_server_ps_2 feature_oam02_port_2: - abstract_oam - - feature_oam_oam02_port + - feature_oam_oam02_port_2 network.outgoing.bytes_oam01_port_1: - abstract_oam_1 - - network.outgoing.bytes_oam_oam01_port + - network.outgoing.bytes_oam_oam01_port_1 network.outpoing.packets_oam02_port_2: - abstract_oam - - network.outpoing.packets_oam_oam02_port + - network.outpoing.packets_oam_oam02_port_2 network.incoming.packets_pd01_port_1_test_nested3Level: - test_nested3Level - network.incoming.packets_pd01_port_1 @@ -808,13 +808,13 @@ topology_template: requirements: link_oam02_port_2: - abstract_oam - - link_oam_oam02_port + - link_oam_oam02_port_2 dependency_pd01_port_1_test_nested3Level: - test_nested3Level - dependency_pd01_port_1 link_oam01_port_1: - abstract_oam_1 - - link_oam_oam01_port + - link_oam_oam01_port_1 dependency_server_oam_1: - abstract_oam_1 - dependency_oam @@ -841,10 +841,10 @@ topology_template: - link_pd01_port_1 dependency_oam01_port_1: - abstract_oam_1 - - dependency_oam_oam01_port + - dependency_oam_oam01_port_1 dependency_oam02_port_2: - abstract_oam - - dependency_oam_oam02_port + - dependency_oam_oam02_port_2 dependency_test_nested3Level: - test_nested3Level - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml index 1a19d76b8c..82b9147bb8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -62,36 +62,36 @@ topology_template: directives: - substitutable properties: - port_pd02_port_fixed_ips: + port_pd02_port_2_replacement_policy: + - AUTO + port_pd02_port_2_network: + - get_input: net + vm_flavor_name: + get_input: cmaui_flavor + port_pd02_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pd02_port_2_security_groups: + - - get_input: p1 + port_pd02_port_2_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - vm_flavor_name: - get_input: cmaui_flavor vm_image_name: get_input: cmaui_image - port_pd02_port_security_groups: - - - get_input: p1 compute_ps_availability_zone: - get_input: availability_zone_0 - port_pd02_port_replacement_policy: - - AUTO + port_pd02_port_2_mac_requirements: + mac_count_required: + is_required: false compute_ps_name: - get_input: - ps_names - 0 - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: net service_template_filter: substitute_service_template: Nested_psServiceTemplate.yaml count: 1 @@ -105,37 +105,37 @@ topology_template: directives: - substitutable properties: - port_pd01_port_replacement_policy: - - AUTO - vm_flavor_name: - get_input: cmaui_flavor - port_pd01_port_security_groups: + port_pd01_port_1_security_groups: - - get_input: p2 - get_input: p1 - port_pd01_port_mac_requirements: + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + vm_flavor_name: + get_input: cmaui_flavor + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: cmaui_image compute_ps_availability_zone: - get_input: availability_zone_0 - port_pd01_port_fixed_ips: + port_pd01_port_1_replacement_policy: + - AUTO + compute_ps_name: + - get_input: + - ps_names + - 0 + port_pd01_port_1_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 0 - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network: - get_input: net - compute_ps_name: - - get_input: - - ps_names - - 0 service_template_filter: substitute_service_template: Nested_ps_1ServiceTemplate.yaml count: 1 @@ -179,13 +179,13 @@ topology_template: - disk.capacity_ps network.outgoing.bytes_pd02_port_2: - abstract_ps - - network.outgoing.bytes_ps_pd02_port + - network.outgoing.bytes_ps_pd02_port_2 disk.capacity_server_ps_2: - abstract_ps - disk.capacity_ps network.outgoing.bytes_pd01_port_1: - abstract_ps_1 - - network.outgoing.bytes_ps_pd01_port + - network.outgoing.bytes_ps_pd01_port_1 memory.usage_server_ps_1: - abstract_ps_1 - memory.usage_ps @@ -248,13 +248,13 @@ topology_template: - endpoint_ps binding_pd01_port_1: - abstract_ps_1 - - binding_ps_pd01_port + - binding_ps_pd01_port_1 disk.device.read.requests.rate_server_ps_1: - abstract_ps_1 - disk.device.read.requests.rate_ps network.outgoing.bytes.rate_pd02_port_2: - abstract_ps - - network.outgoing.bytes.rate_ps_pd02_port + - network.outgoing.bytes.rate_ps_pd02_port_2 host_server_ps_2: - abstract_ps - host_ps @@ -275,13 +275,13 @@ topology_template: - scalable_ps network.incoming.packets.rate_pd02_port_2: - abstract_ps - - network.incoming.packets.rate_ps_pd02_port + - network.incoming.packets.rate_ps_pd02_port_2 scalable_server_ps_2: - abstract_ps - scalable_ps network.outgoing.packets.rate_pd01_port_1: - abstract_ps_1 - - network.outgoing.packets.rate_ps_pd01_port + - network.outgoing.packets.rate_ps_pd01_port_1 disk.write.bytes.rate_server_ps_2: - abstract_ps - disk.write.bytes.rate_ps @@ -302,7 +302,7 @@ topology_template: - disk.ephemeral.size_ps feature_pd02_port_2: - abstract_ps - - feature_ps_pd02_port + - feature_ps_pd02_port_2 disk.ephemeral.size_server_ps_2: - abstract_ps - disk.ephemeral.size_ps @@ -320,7 +320,7 @@ topology_template: - disk.allocation_ps attachment_pd01_port_1: - abstract_ps_1 - - attachment_ps_pd01_port + - attachment_ps_pd01_port_1 memory.resident_server_ps_1: - abstract_ps_1 - memory.resident_ps @@ -341,7 +341,7 @@ topology_template: - disk.device.read.requests_ps network.incoming.bytes.rate_pd01_port_1: - abstract_ps_1 - - network.incoming.bytes.rate_ps_pd01_port + - network.incoming.bytes.rate_ps_pd01_port_1 disk.read.bytes.rate_server_ps_1: - abstract_ps_1 - disk.read.bytes.rate_ps @@ -353,7 +353,7 @@ topology_template: - disk.device.iops_ps feature_pd01_port_1: - abstract_ps_1 - - feature_ps_pd01_port + - feature_ps_pd01_port_1 disk.device.iops_server_ps_2: - abstract_ps - disk.device.iops_ps @@ -383,40 +383,40 @@ topology_template: - disk.root.size_ps attachment_pd02_port_2: - abstract_ps - - attachment_ps_pd02_port + - attachment_ps_pd02_port_2 disk.root.size_server_ps_2: - abstract_ps - disk.root.size_ps network.outgoing.bytes.rate_pd01_port_1: - abstract_ps_1 - - network.outgoing.bytes.rate_ps_pd01_port + - network.outgoing.bytes.rate_ps_pd01_port_1 binding_pd02_port_2: - abstract_ps - - binding_ps_pd02_port + - binding_ps_pd02_port_2 network.incoming.packets.rate_pd01_port_1: - abstract_ps_1 - - network.incoming.packets.rate_ps_pd01_port + - network.incoming.packets.rate_ps_pd01_port_1 disk.usage_server_ps_1: - abstract_ps_1 - disk.usage_ps network.outpoing.packets_pd01_port_1: - abstract_ps_1 - - network.outpoing.packets_ps_pd01_port + - network.outpoing.packets_ps_pd01_port_1 disk.usage_server_ps_2: - abstract_ps - disk.usage_ps network.outpoing.packets_pd02_port_2: - abstract_ps - - network.outpoing.packets_ps_pd02_port + - network.outpoing.packets_ps_pd02_port_2 network.incoming.bytes_pd01_port_1: - abstract_ps_1 - - network.incoming.bytes_ps_pd01_port + - network.incoming.bytes_ps_pd01_port_1 network.incoming.bytes_pd02_port_2: - abstract_ps - - network.incoming.bytes_ps_pd02_port + - network.incoming.bytes_ps_pd02_port_2 network.outgoing.packets.rate_pd02_port_2: - abstract_ps - - network.outgoing.packets.rate_ps_pd02_port + - network.outgoing.packets.rate_ps_pd02_port_2 vcpus_server_ps_1: - abstract_ps_1 - vcpus_ps @@ -425,22 +425,22 @@ topology_template: - vcpus_ps forwarder_pd01_port_1: - abstract_ps_1 - - forwarder_ps_pd01_port + - forwarder_ps_pd01_port_1 forwarder_pd02_port_2: - abstract_ps - - forwarder_ps_pd02_port + - forwarder_ps_pd02_port_2 network.incoming.packets_pd01_port_1: - abstract_ps_1 - - network.incoming.packets_ps_pd01_port + - network.incoming.packets_ps_pd01_port_1 network.incoming.packets_pd02_port_2: - abstract_ps - - network.incoming.packets_ps_pd02_port + - network.incoming.packets_ps_pd02_port_2 disk.device.write.bytes.rate_server_ps_1: - abstract_ps_1 - disk.device.write.bytes.rate_ps network.incoming.bytes.rate_pd02_port_2: - abstract_ps - - network.incoming.bytes.rate_ps_pd02_port + - network.incoming.bytes.rate_ps_pd02_port_2 disk.write.requests_server_ps_1: - abstract_ps_1 - disk.write.requests_ps @@ -477,16 +477,16 @@ topology_template: requirements: dependency_pd02_port_2: - abstract_ps - - dependency_ps_pd02_port + - dependency_ps_pd02_port_2 local_storage_server_ps_2: - abstract_ps - local_storage_ps link_pd01_port_1: - abstract_ps_1 - - link_ps_pd01_port + - link_ps_pd01_port_1 link_pd02_port_2: - abstract_ps - - link_ps_pd02_port + - link_ps_pd02_port_2 local_storage_server_ps_1: - abstract_ps_1 - local_storage_ps @@ -498,4 +498,4 @@ topology_template: - dependency_ps dependency_pd01_port_1: - abstract_ps_1 - - dependency_ps_pd01_port + - dependency_ps_pd01_port_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1481bf653e..e776376302 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_4: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_01_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_01_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_01_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,57 +48,37 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_01_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_01_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: + port_pd01_port_01_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role: + port_pd01_port_01_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_01_vlan_requirements: type: list required: true status: SUPPORTED @@ -105,20 +105,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_01: 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_01: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.outgoing.bytes_pd_server_pd01_port_01: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -148,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd01_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -165,12 +171,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,12 +201,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -225,12 +219,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -254,8 +242,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd01_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -277,6 +265,20 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd01_port_01: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd01_port_01: + 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 binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -288,6 +290,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_port_01: + type: org.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,13 +307,10 @@ 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 + attachment_pd_server_pd01_port_01: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED disk.write.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -313,13 +318,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_01: type: org.openecomp.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.rate_pd_server_pd01_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -368,24 +373,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: + forwarder_pd_server_pd01_port_01: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pd_server: + disk.ephemeral.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.ephemeral.size_pd_server: + network.outgoing.packets.rate_pd_server_pd01_port_01: 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,11 +402,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,13 +420,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.device.iops_pd_server: + network.incoming.packets_pd_server_pd01_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -435,6 +435,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_5: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_ps02_port_01_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 @@ -443,12 +449,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps02_port_ip_requirements: + port_ps02_port_01_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_ps02_port_01_order: + type: integer + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -461,90 +471,80 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps02_port_01_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_ps02_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_ps02_port_network_role: + port_ps02_port_01_network_role: type: string required: true status: SUPPORTED - port_ps02_port_vlan_requirements: - type: list + port_ps02_port_01_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps02_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: - type: string + port_ps02_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps02_port_related_networks: + port_ps02_port_01_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps02_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_ps02_port_order: - type: integer - required: true - status: SUPPORTED + type: string compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps02_port_network: - type: list + port_ps02_port_01_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string requirements: - - dependency_pd_server: + - dependency_pd_server_ps02_port_01: 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 + - link_pd_server_ps02_port_01: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_ps02_port: + - 1 + - 1 + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_ps02_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: scalable_pd_server: type: tosca.capabilities.Scalable @@ -557,14 +557,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_ps02_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 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. @@ -583,7 +575,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_ps02_port: + network.outgoing.packets.rate_pd_server_ps02_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -630,13 +622,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.incoming.packets.rate_pd_server_ps02_port_01: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pd_server_ps02_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_ps02_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: @@ -648,6 +646,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_ps02_port_01: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED 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. @@ -672,6 +675,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_ps02_port_01: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED endpoint_pd_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -683,21 +692,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_ps02_port: + 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. occurrences: - 1 - UNBOUNDED - disk.device.allocation_pd_server: + disk.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. occurrences: - 1 - UNBOUNDED - disk.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. + feature_pd_server_ps02_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -712,11 +720,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_ps02_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -734,17 +737,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_ps02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_ps02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.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. @@ -769,12 +761,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_ps02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -794,60 +780,74 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_ps02_port: + network.incoming.bytes.rate_pd_server_ps02_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pd_server: + network.outgoing.bytes_pd_server_ps02_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_pd_server: + forwarder_pd_server_ps02_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_pd_server_ps02_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_ps02_port: + disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: + disk.ephemeral.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.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 - forwarder_pd_server_ps02_port: - type: org.openecomp.capabilities.Forwarder + 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.latency_pd_server: + network.incoming.packets_pd_server_ps02_port_01: type: org.openecomp.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: + binding_pd_server_ps02_port_01: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.latency_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_ps02_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: @@ -862,6 +862,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_6: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_0_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 @@ -882,68 +888,62 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_user_data_format: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -959,20 +959,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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: @@ -1013,6 +1021,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd02_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_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. @@ -1043,15 +1057,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + network.outpoing.packets_pd_server_pd02_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: @@ -1075,29 +1081,11 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pd02_port: + feature_pd_server_pd02_port_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd02_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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1121,11 +1109,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - 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. @@ -1144,12 +1127,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_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 binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -1172,7 +1149,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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: @@ -1184,6 +1161,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pd02_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_pd_server_pd02_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.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. @@ -1208,6 +1197,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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. @@ -1227,36 +1222,42 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_pd_server_pd02_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.write.requests.rate_pd_server: + network.incoming.bytes.rate_pd_server_pd02_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.ephemeral.size_pd_server: + disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: + disk.ephemeral.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.device.latency_pd_server: + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -1280,15 +1281,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_03_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1309,11 +1321,13 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_03_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_03_related_networks: type: list required: true status: SUPPORTED @@ -1323,48 +1337,34 @@ 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: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: + port_pd01_port_03_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_03_order: + type: integer required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_03_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd01_port_03_network_role_tag: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -1372,6 +1372,19 @@ node_types: entry_schema: type: string requirements: + - dependency_pd_server_pd01_port_03: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pd_server_pd01_port_03: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1386,20 +1399,13 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pd01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + capabilities: + network.outgoing.bytes_pd_server_pd01_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - 1 - capabilities: + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -1429,7 +1435,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd01_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1446,12 +1452,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. @@ -1482,9 +1482,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd01_port_03: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1506,12 +1505,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1535,8 +1528,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + network.incoming.bytes_pd_server_pd01_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1563,12 +1557,31 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_03: + 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.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 + network.incoming.bytes.rate_pd_server_pd01_port_03: + type: org.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_pd01_port_03: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -1580,27 +1593,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.rate_pd_server_pd01_port_03: type: org.openecomp.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.packets.rate_pd_server_pd01_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1649,17 +1654,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd01_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1672,14 +1672,20 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd01_port_03: + type: org.openecomp.capabilities.Forwarder + 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: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd01_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1701,12 +1707,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. @@ -1716,82 +1716,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_7: 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 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: 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_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_0_order: + type: integer + required: true + status: SUPPORTED + vm_image_name: 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 @@ -1813,20 +1813,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - 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: @@ -1856,12 +1864,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: @@ -1873,12 +1875,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. @@ -1909,7 +1905,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: @@ -1933,7 +1929,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: @@ -1951,6 +1959,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. @@ -1962,17 +1975,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. @@ -1996,6 +2009,12 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -2007,27 +2026,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: @@ -2057,6 +2068,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. @@ -2076,14 +2093,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 @@ -2105,11 +2116,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. @@ -2128,12 +2134,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. @@ -2143,6 +2143,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_03_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd02_port_03_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2163,68 +2173,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd02_port_order: + port_pd02_port_03_order: type: integer required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_03_network_role: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_network_role: + port_pd02_port_03_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_03_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: string + port_pd02_port_03_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: + port_pd02_port_03_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -2240,20 +2240,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_03: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_03: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -2265,6 +2271,20 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd02_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd02_port_03: + 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. @@ -2294,104 +2314,90 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_pd_server: + network.incoming.packets.rate_pd_server_pd02_port_03: type: org.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. + attachment_pd_server_pd02_port_03: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + 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 - disk.read.bytes_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 - disk.device.read.bytes.rate_pd_server: + disk.device.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + disk.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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd02_port_03: type: org.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: + 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 - 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.bytes_pd_server_pd02_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_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: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd02_port: + vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_pd_server: + disk.device.write.bytes.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_pd_server: + 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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_pd02_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2402,11 +2408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - 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. @@ -2425,12 +2426,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_port: + network.outgoing.bytes_pd_server_pd02_port_03: type: org.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_pd02_port_03: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -2442,18 +2448,24 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd02_port_03: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_pd_server: + network.outpoing.packets_pd_server_pd02_port_03: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + feature_pd_server: + type: tosca.capabilities.Node + 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. occurrences: @@ -2508,8 +2520,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd02_port_03: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2537,12 +2549,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd02_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.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. @@ -2561,15 +2567,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd02_port_02_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2578,6 +2582,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd02_port_02_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -2590,51 +2600,47 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_02_network_role: + type: string required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_02_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + port_pd02_port_02_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_02_related_networks: + type: list required: true status: SUPPORTED - port_pd02_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_02_network_role_tag: + type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: - type: list + port_pd02_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + port_pd02_port_02_network: type: list required: true status: SUPPORTED @@ -2646,12 +2652,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -2667,20 +2667,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd02_port_02: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_02: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -2692,12 +2698,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd02_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_pd_server_pd02_port_02: + 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_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. @@ -2721,104 +2741,90 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_pd_server: + network.incoming.packets.rate_pd_server_pd02_port_02: type: org.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: + 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 - disk.device.write.requests.rate_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd02_port_02: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.read.bytes_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 - disk.device.read.bytes.rate_pd_server: + disk.device.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.packets.rate_pd_server_pd02_port: + disk.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.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd02_port_02: type: org.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: + 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 - 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.bytes_pd_server_pd02_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_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: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd02_port: + vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_pd_server: + disk.device.write.bytes.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_pd_server: + 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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2829,17 +2835,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - 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_pd02_port_02: + 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. @@ -2852,7 +2858,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_port: + network.outgoing.bytes_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2869,18 +2875,24 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.packets_pd_server_pd02_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_pd_server: + network.outpoing.packets_pd_server_pd02_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + feature_pd_server: + type: tosca.capabilities.Node + 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. occurrences: @@ -2935,8 +2947,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + feature_pd_server_pd02_port_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2964,12 +2976,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd02_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.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. @@ -2988,15 +2994,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server_3: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_02_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3017,62 +3027,52 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_02_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd01_port_02_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: 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_02_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_02_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + port_pd01_port_02_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_02_ip_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_02_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pd_server_user_data_format: type: list required: true @@ -3094,20 +3094,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_02: 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_02: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + network.outgoing.bytes_pd_server_pd01_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -3137,24 +3143,18 @@ 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: - 1 - UNBOUNDED - disk.write.bytes.rate_pd_server: + network.outpoing.packets_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + 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. occurrences: @@ -3190,15 +3190,14 @@ 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: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd01_port_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3214,12 +3213,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.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 vcpus_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3243,11 +3236,6 @@ 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. @@ -3266,17 +3254,37 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd01_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_port_02: + 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.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 + network.incoming.bytes.rate_pd_server_pd01_port_02: + type: org.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: @@ -3288,13 +3296,10 @@ 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 + attachment_pd_server_pd01_port_02: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED disk.write.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -3302,13 +3307,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_02: type: org.openecomp.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.rate_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3357,24 +3362,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_pd_server: + disk.ephemeral.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.ephemeral.size_pd_server: + network.outgoing.packets.rate_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3386,8 +3386,8 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + forwarder_pd_server_pd01_port_02: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3409,13 +3409,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.device.iops_pd_server: + network.incoming.packets_pd_server_pd01_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7692,4 +7692,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml index 9914f9b938..22342cabed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml @@ -133,28 +133,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_0_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: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_0_network: + - get_input: oam_net_name + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd02_port_network: - - get_input: oam_net_name + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -170,6 +170,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: @@ -178,20 +190,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - 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 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..5548e79a3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,15 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_03_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +37,12 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_03_vlan_requirements: + type: list required: true - port_pd01_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_03_related_networks: type: list required: true entry_schema: @@ -39,98 +50,90 @@ 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: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd01_port_03_subnetpoolid: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_03_order: + type: integer required: true - port_pd01_port_vlan_requirements: + port_pd01_port_03_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd01_port_03_network_role_tag: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string node_templates: - 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_03: 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_03_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_03_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_03_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_03_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_03_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_03_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_03_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_03_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_03_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_03_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: + network.outgoing.bytes_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,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 + network.outpoing.packets_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outpoing.packets 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,9 +173,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 + feature_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - feature disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +185,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +197,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment + network.incoming.bytes_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.bytes disk.capacity_pd_server: - pd_server - disk.capacity @@ -215,27 +212,33 @@ topology_template: binding_pd_server: - pd_server - binding + binding_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.bytes.rate + attachment_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - attachment 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.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.packets.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,24 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.packets.rate_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - 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 + forwarder_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - forwarder disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.incoming.packets_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - network.incoming.packets 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_03: + - pd_server_pd01_port_03 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_03: + - pd_server_pd01_port_03 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index c46b8e7c0f..8dd1090b25 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_03_network_role_tag: + type: string + required: true + port_pd02_port_03_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,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_flavor_name: - type: string - required: true - port_pd02_port_order: + port_pd02_port_03_order: type: integer required: true - port_pd02_port_subnetpoolid: + port_pd02_port_03_network_role: type: string required: true - port_pd02_port_network_role_tag: + vm_flavor_name: type: string required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_03_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + port_pd02_port_03_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_network_role: + port_pd02_port_03_subnetpoolid: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_03_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: string + port_pd02_port_03_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: + port_pd02_port_03_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_03: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_03_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_03_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_03_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_03_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_03_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_03_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_03_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_03_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_03_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_03_network - index_value requirements: - binding: @@ -131,12 +131,21 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.bytes.rate scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.incoming.bytes_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.bytes + binding_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -152,6 +161,12 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.incoming.packets.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.packets.rate + attachment_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - attachment cpu_pd_server: - pd_server - cpu @@ -164,15 +179,12 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + network.outgoing.bytes.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +194,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port - - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -203,12 +203,12 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,24 +218,30 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outgoing.bytes + forwarder_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.packets_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.incoming.packets + network.outpoing.packets_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - network.outpoing.packets feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets disk.write.bytes_pd_server: - pd_server - disk.write.bytes @@ -260,9 +266,9 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + feature_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -275,9 +281,6 @@ topology_template: disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +290,16 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link + dependency_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_03: + - pd_server_pd02_port_03 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml index 7ecfd2d3ca..cf7af8017b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,6 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_02_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +21,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd02_port_02_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -28,41 +36,38 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_02_network_role: + type: string required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: + port_pd02_port_02_subnetpoolid: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_vlan_requirements: + port_pd02_port_02_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd02_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_02_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + port_pd02_port_02_network: type: list required: true entry_schema: @@ -72,11 +77,6 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_02_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_02_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_02_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_02_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_02_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_02_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_02_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_02_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_02_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_02_network - index_value requirements: - binding: @@ -131,15 +131,24 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_2 capabilities: + network.incoming.bytes.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.bytes.rate scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.incoming.bytes_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.bytes memory.usage_pd_server: - pd_server - memory.usage + binding_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - binding memory_pd_server: - pd_server - memory @@ -152,9 +161,15 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.incoming.packets.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.packets.rate cpu_pd_server: - pd_server - cpu + attachment_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - attachment cpu_util_pd_server: - pd_server - cpu_util @@ -164,15 +179,12 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + network.outgoing.bytes.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.bytes.rate disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +194,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port - - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -203,39 +203,45 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outgoing.bytes binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.packets_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.incoming.packets + network.outpoing.packets_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - network.outpoing.packets feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets disk.write.bytes_pd_server: - pd_server - disk.write.bytes @@ -260,9 +266,9 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + feature_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -275,9 +281,6 @@ topology_template: disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +290,16 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link + dependency_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_02: + - pd_server_pd02_port_02 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml index a802e130ad..e2187dccf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_02_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,50 +36,42 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_02_network_role: + type: string required: true - port_pd01_port_related_networks: - type: list + port_pd01_port_02_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments 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_02_network_role_tag: 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_02_network: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd01_port_02_subnetpoolid: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_02_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments 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_02: 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_02_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_02_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_02_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_02_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_02_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_02_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_02_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_02_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_02_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_02_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_3 capabilities: + network.outgoing.bytes_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,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 + network.outpoing.packets_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outpoing.packets 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 +173,18 @@ 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 + feature_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - feature 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 vcpus_pd_server: - pd_server - vcpus @@ -200,9 +197,6 @@ 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 @@ -212,30 +206,39 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.bytes binding_pd_server: - pd_server - binding + binding_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.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 + attachment_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - attachment 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.incoming.packets.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.packets.rate + network.outgoing.bytes.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,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 disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.outgoing.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + forwarder_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - forwarder disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,22 +284,22 @@ 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 + network.incoming.packets_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - network.incoming.packets requirements: 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_02: + - pd_server_pd01_port_02 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_02: + - pd_server_pd01_port_02 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml index 752fc03a07..ad592f067c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_01_network_role_tag: + type: string + required: true + port_pd01_port_01_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_01_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,46 +44,30 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_01_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_01_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: + port_pd01_port_01_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: - 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: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string + port_pd01_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_network_role: + port_pd01_port_01_subnetpoolid: type: string required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_01_vlan_requirements: type: list required: true entry_schema: @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_01: 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_01_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_01_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_01_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_01_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_01_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_01_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_01_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_01_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_01_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_01_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_4 capabilities: + network.outgoing.bytes_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.bytes scalable_pd_server: - pd_server - scalable @@ -146,18 +149,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 + network.outpoing.packets_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outpoing.packets 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,9 +173,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +182,6 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,9 +194,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment + feature_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - feature disk.capacity_pd_server: - pd_server - disk.capacity @@ -212,30 +206,39 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + network.incoming.bytes_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.bytes + binding_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - binding binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.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 + attachment_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - attachment 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.incoming.packets.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.packets.rate + network.outgoing.bytes.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,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 disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate + forwarder_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - forwarder disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.outgoing.packets.rate 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,22 +284,22 @@ 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 + network.incoming.packets_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - network.incoming.packets requirements: 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_01: + - pd_server_pd01_port_01 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_01: + - pd_server_pd01_port_01 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml index 6e87a88d97..5e1e46fd42 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_ps02_port_01_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 @@ -18,11 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps02_port_ip_requirements: + port_ps02_port_01_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_ps02_port_01_order: + type: integer + required: true compute_pd_server_availability_zone: type: list required: true @@ -33,101 +41,93 @@ topology_template: required: true entry_schema: type: string - port_ps02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps02_port_01_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_ps02_port_network_role_tag: + vm_image_name: type: string required: true - port_ps02_port_network_role: + port_ps02_port_01_network_role: type: string required: true - port_ps02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - vm_image_name: + port_ps02_port_01_network_role_tag: type: string required: true - port_ps02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps02_port_subnetpoolid: - type: string + port_ps02_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps02_port_order: - type: integer + port_ps02_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - compute_pd_server_user_data_format: + port_ps02_port_01_network: type: list required: true entry_schema: type: string - port_ps02_port_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_ps02_port_01_subnetpoolid: + type: string + required: true node_templates: - 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_ps02_port: + pd_server_ps02_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps02_port_exCP_naming + get_input: port_ps02_port_01_exCP_naming vlan_requirements: - get_input: port_ps02_port_vlan_requirements + get_input: port_ps02_port_01_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_ps02_port_related_networks + get_input: port_ps02_port_01_related_networks ip_requirements: - get_input: port_ps02_port_ip_requirements + get_input: port_ps02_port_01_ip_requirements network_role_tag: - get_input: port_ps02_port_network_role_tag + get_input: port_ps02_port_01_network_role_tag mac_requirements: - get_input: port_ps02_port_mac_requirements + get_input: port_ps02_port_01_mac_requirements order: - get_input: port_ps02_port_order + get_input: port_ps02_port_01_order network_role: - get_input: port_ps02_port_network_role + get_input: port_ps02_port_01_network_role subnetpoolid: - get_input: port_ps02_port_subnetpoolid + get_input: port_ps02_port_01_subnetpoolid network: get_input: - - port_ps02_port_network + - port_ps02_port_01_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_5 capabilities: @@ -137,9 +137,6 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_ps02_port: - - pd_server_ps02_port - - binding memory.usage_pd_server: - pd_server - memory.usage @@ -149,9 +146,9 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.incoming.bytes.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.packets.rate os_pd_server: - pd_server - os @@ -173,15 +170,21 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.incoming.packets.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.packets.rate memory.resident_pd_server: - pd_server - memory.resident + attachment_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - attachment cpu.delta_pd_server: - pd_server - cpu.delta @@ -194,30 +197,30 @@ topology_template: disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.incoming.bytes_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.bytes endpoint_pd_server: - pd_server - endpoint disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.bytes_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.bytes disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation + feature_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - feature binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests - attachment_pd_server_ps02_port: - - pd_server_ps02_port - - attachment feature_pd_server: - pd_server - feature @@ -227,12 +230,6 @@ topology_template: disk.write.bytes_pd_server: - pd_server - disk.write.bytes - feature_pd_server_ps02_port: - - pd_server_ps02_port - - feature - network.outgoing.bytes.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -245,9 +242,6 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outgoing.packets.rate_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.packets.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,36 +251,42 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_ps02_port: - - pd_server_ps02_port - - network.outpoing.packets + network.incoming.bytes.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.bytes.rate + network.outgoing.bytes_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.bytes + forwarder_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - forwarder + network.outgoing.bytes.rate_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.outgoing.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size - network.outgoing.bytes_pd_server_ps02_port: - - pd_server_ps02_port - - network.outgoing.bytes disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - forwarder_pd_server_ps02_port: - - pd_server_ps02_port - - forwarder + network.incoming.packets_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - network.incoming.packets + binding_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - binding disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.incoming.packets_pd_server_ps02_port: - - pd_server_ps02_port - - network.incoming.packets 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_ps02_port: - - pd_server_ps02_port + link_pd_server_ps02_port_01: + - pd_server_ps02_port_01 - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_ps02_port: - - pd_server_ps02_port - - dependency
\ No newline at end of file + dependency_pd_server_ps02_port_01: + - pd_server_ps02_port_01 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml index 1289e6e812..fddf5efbed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd02_port_0_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,55 +33,50 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd02_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer + port_pd02_port_0_network: + type: list required: true - port_pd02_port_subnetpoolid: + entry_schema: + type: string + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd02_port_network_role: + port_pd02_port_0_network_role_tag: type: string required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: + type: string + required: true + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd02_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd02_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_6 capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -152,6 +155,9 @@ topology_template: disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -167,12 +173,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets disk.iops_pd_server: - pd_server - disk.iops @@ -182,18 +185,9 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate vcpus_pd_server: - pd_server - vcpus @@ -206,9 +200,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity @@ -218,9 +209,6 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding @@ -233,12 +221,18 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -251,6 +245,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -260,24 +257,27 @@ topology_template: host_pd_server: - pd_server - host - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency @@ -287,19 +287,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml index 4c81d47d18..7e40cdd1bb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: 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 @@ -97,31 +97,31 @@ topology_template: 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: false 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: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_7 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -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,9 +170,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 @@ -185,27 +182,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 @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + 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 @@ -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_0: + - pd_server_pd01_port_0 + - 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_0: + - pd_server_pd01_port_0 + - 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 dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml index c51dcc3d09..db8d29c093 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -62,28 +62,28 @@ topology_template: directives: - substitutable properties: + port_pd01_port_01_network_role_tag: oam + port_pd01_port_01_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: - get_input: - pd_server_names - 0 + port_pd01_port_01_network: + - get_input: oam_net_name vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_01_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 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -99,7 +99,7 @@ topology_template: directives: - substitutable properties: - port_ps02_port_ip_requirements: + port_ps02_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -111,18 +111,18 @@ topology_template: - get_input: - pd_server_names - 1 - port_ps02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_ps02_port_network_role_tag: oam vm_image_name: get_input: pd_image_name + port_ps02_port_01_network_role_tag: oam + port_ps02_port_01_mac_requirements: + mac_count_required: + is_required: false + port_ps02_port_01_network: + - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_ps02_port_network: - - get_input: oam_net_name service_template_filter: substitute_service_template: Nested_pd_server_5ServiceTemplate.yaml count: 1 @@ -194,16 +194,16 @@ topology_template: - disk.device.write.bytes_server_pd_32_test_nested3Level feature_ps02_port_01: - abstract_pd_server_5 - - feature_pd_server_ps02_port + - feature_pd_server_ps02_port_01 disk.usage_server_pd_21_test_nested2Level: - test_nested2Level - disk.usage_server_pd_21 network.incoming.packets.rate_ps02_port_01: - abstract_pd_server_5 - - network.incoming.packets.rate_pd_server_ps02_port + - network.incoming.packets.rate_pd_server_ps02_port_01 network.outgoing.bytes_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_01 disk.device.read.bytes.rate_server_pd_11: - abstract_pd_server_4 - disk.device.read.bytes.rate_pd_server @@ -218,7 +218,7 @@ topology_template: - disk.device.write.bytes_server_pd_31_test_nested3Level network.incoming.bytes.rate_ps02_port_01: - abstract_pd_server_5 - - network.incoming.bytes.rate_pd_server_ps02_port + - network.incoming.bytes.rate_pd_server_ps02_port_01 disk.device.read.requests_server_pd_11: - abstract_pd_server_4 - disk.device.read.requests_pd_server @@ -251,7 +251,7 @@ topology_template: - attachment_pd01_port_02 network.incoming.bytes_ps02_port_01: - abstract_pd_server_5 - - network.incoming.bytes_pd_server_ps02_port + - network.incoming.bytes_pd_server_ps02_port_01 feature_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - feature_server_pd_32_test_nested3Level @@ -263,7 +263,7 @@ topology_template: - disk.read.requests_server_pd_31_test_nested3Level attachment_pd01_port_01: - abstract_pd_server_4 - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_01 disk.write.bytes.rate_server_pd_21_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_pd_21 @@ -299,13 +299,13 @@ topology_template: - disk.usage_server_pd_32_test_nested3Level binding_pd01_port_01: - abstract_pd_server_4 - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_01 disk.latency_server_pd_22_test_nested2Level: - test_nested2Level - disk.latency_server_pd_22 binding_ps02_port_01: - abstract_pd_server_5 - - binding_pd_server_ps02_port + - binding_pd_server_ps02_port_01 disk.read.requests_server_pd_21_test_nested2Level: - test_nested2Level - disk.read.requests_server_pd_21 @@ -374,7 +374,7 @@ topology_template: - disk.device.read.bytes_pd_server network.incoming.bytes.rate_pd01_port_01: - abstract_pd_server_4 - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_01 endpoint_server_pd_12: - abstract_pd_server_5 - endpoint_pd_server @@ -413,7 +413,7 @@ topology_template: - disk.latency_pd_server network.outgoing.bytes_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.bytes_pd_server_ps02_port + - network.outgoing.bytes_pd_server_ps02_port_01 disk.device.write.requests.rate_server_pd_21_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_pd_21 @@ -446,7 +446,7 @@ topology_template: - endpoint_server_pd_31_test_nested3Level network.outgoing.bytes.rate_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_01 disk.write.requests_server_pd_21_test_nested2Level: - test_nested2Level - disk.write.requests_server_pd_21 @@ -476,7 +476,7 @@ topology_template: - disk.device.allocation_pd_server network.outgoing.packets.rate_pd01_port_01: - abstract_pd_server_4 - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_01 disk.device.latency_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.latency_server_pd_32_test_nested3Level @@ -524,7 +524,7 @@ topology_template: - feature_pd01_port_03_test_nested3Level network.outgoing.packets.rate_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.packets.rate_pd_server_ps02_port + - network.outgoing.packets.rate_pd_server_ps02_port_01 network.outgoing.bytes_pd01_port_03_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_pd01_port_03_test_nested3Level @@ -581,7 +581,7 @@ topology_template: - network.outgoing.bytes_pd02_port_02 network.outpoing.packets_pd01_port_01: - abstract_pd_server_4 - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_01 disk.allocation_server_pd_31_test_nested3Level_test_nested2Level: - test_nested2Level - disk.allocation_server_pd_31_test_nested3Level @@ -611,7 +611,7 @@ topology_template: - network.outpoing.packets_pd01_port_03_test_nested3Level attachment_ps02_port_01: - abstract_pd_server_5 - - attachment_pd_server_ps02_port + - attachment_pd_server_ps02_port_01 network.incoming.bytes.rate_pd02_port_03_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_pd02_port_03_test_nested3Level @@ -731,7 +731,7 @@ topology_template: - network.incoming.packets.rate_pd01_port_02 network.incoming.packets_ps02_port_01: - abstract_pd_server_5 - - network.incoming.packets_pd_server_ps02_port + - network.incoming.packets_pd_server_ps02_port_01 disk.device.iops_server_pd_31_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.iops_server_pd_31_test_nested3Level @@ -761,13 +761,13 @@ topology_template: - disk.root.size_server_pd_31_test_nested3Level network.outgoing.bytes.rate_ps02_port_01: - abstract_pd_server_5 - - network.outgoing.bytes.rate_pd_server_ps02_port + - network.outgoing.bytes.rate_pd_server_ps02_port_01 disk.iops_server_pd_22_test_nested2Level: - test_nested2Level - disk.iops_server_pd_22 feature_pd01_port_01: - abstract_pd_server_4 - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_01 disk.device.write.bytes.rate_server_pd_12: - abstract_pd_server_5 - disk.device.write.bytes.rate_pd_server @@ -803,10 +803,10 @@ topology_template: - binding_server_pd_21 network.incoming.packets_pd01_port_01: - abstract_pd_server_4 - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_01 network.incoming.packets.rate_pd01_port_01: - abstract_pd_server_4 - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_01 cpu_util_server_pd_12: - abstract_pd_server_5 - cpu_util_pd_server @@ -926,10 +926,10 @@ topology_template: - scalable_server_pd_31_test_nested3Level network.incoming.bytes_pd01_port_01: - abstract_pd_server_4 - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_01 network.outpoing.packets_ps02_port_01: - abstract_pd_server_5 - - network.outpoing.packets_pd_server_ps02_port + - network.outpoing.packets_pd_server_ps02_port_01 disk.device.write.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_pd_32_test_nested3Level @@ -1076,13 +1076,13 @@ topology_template: - vcpus_pd_server forwarder_ps02_port_01: - abstract_pd_server_5 - - forwarder_pd_server_ps02_port + - forwarder_pd_server_ps02_port_01 disk.device.write.bytes_server_pd_11: - abstract_pd_server_4 - disk.device.write.bytes_pd_server forwarder_pd01_port_01: - abstract_pd_server_4 - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_01 disk.allocation_server_pd_11: - abstract_pd_server_4 - disk.allocation_pd_server @@ -1143,10 +1143,10 @@ topology_template: - dependency_server_pd_22 dependency_ps02_port_01: - abstract_pd_server_5 - - dependency_pd_server_ps02_port + - dependency_pd_server_ps02_port_01 dependency_pd01_port_01: - abstract_pd_server_4 - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_01 local_storage_server_pd_11: - abstract_pd_server_4 - local_storage_pd_server @@ -1164,7 +1164,7 @@ topology_template: - dependency_pd02_port_03_test_nested3Level link_pd01_port_01: - abstract_pd_server_4 - - link_pd_server_pd01_port + - link_pd_server_pd01_port_01 local_storage_server_pd_12: - abstract_pd_server_5 - local_storage_pd_server @@ -1179,7 +1179,7 @@ topology_template: - dependency_pd01_port_02 link_ps02_port_01: - abstract_pd_server_5 - - link_pd_server_ps02_port + - link_pd_server_ps02_port_01 dependency_server_pd_12: - abstract_pd_server_5 - dependency_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml index 64678af2fe..568252d1f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -71,27 +71,27 @@ topology_template: directives: - substitutable properties: + port_pd02_port_02_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: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_pd02_port_02_network_role_tag: oam + port_pd02_port_02_mac_requirements: + mac_count_required: is_required: false - port_pd02_port_network: + port_pd02_port_02_network: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW @@ -116,20 +116,20 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_02_network_role_tag: oam + port_pd01_port_02_network: + - get_input: oam_net_name + port_pd01_port_02_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_02_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 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -206,7 +206,7 @@ topology_template: - memory.usage_pd_server network.outgoing.bytes_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_02 disk.device.read.bytes.rate_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.bytes.rate_server_pd_31 @@ -218,7 +218,7 @@ topology_template: - disk.read.requests_server_pd_32 network.incoming.packets.rate_pd02_port_02: - abstract_pd_server_2 - - network.incoming.packets.rate_pd_server_pd02_port + - network.incoming.packets.rate_pd_server_pd02_port_02 network.outpoing.packets_pd02_port_03_test_nested3Level: - test_nested3Level - network.outpoing.packets_pd02_port_03 @@ -227,7 +227,7 @@ topology_template: - disk.read.bytes.rate_server_pd_31 feature_pd02_port_02: - abstract_pd_server_2 - - feature_pd_server_pd02_port + - feature_pd_server_pd02_port_02 disk.read.bytes.rate_server_pd_32_test_nested3Level: - test_nested3Level - disk.read.bytes.rate_server_pd_32 @@ -236,10 +236,10 @@ topology_template: - disk.write.requests.rate_server_pd_31 attachment_pd01_port_02: - abstract_pd_server_3 - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_02 binding_pd01_port_02: - abstract_pd_server_3 - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_02 disk.allocation_server_pd_32_test_nested3Level: - test_nested3Level - disk.allocation_server_pd_32 @@ -257,13 +257,13 @@ topology_template: - disk.device.iops_server_pd_32 network.outpoing.packets_pd02_port_02: - abstract_pd_server_2 - - network.outpoing.packets_pd_server_pd02_port + - network.outpoing.packets_pd_server_pd02_port_02 network.incoming.bytes_pd01_port_03_test_nested3Level: - test_nested3Level - network.incoming.bytes_pd01_port_03 network.incoming.bytes.rate_pd02_port_02: - abstract_pd_server_2 - - network.incoming.bytes.rate_pd_server_pd02_port + - network.incoming.bytes.rate_pd_server_pd02_port_02 host_server_pd_31_test_nested3Level: - test_nested3Level - host_server_pd_31 @@ -296,10 +296,10 @@ topology_template: - memory_server_pd_32 network.incoming.bytes.rate_pd01_port_02: - abstract_pd_server_3 - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_02 binding_pd02_port_02: - abstract_pd_server_2 - - binding_pd_server_pd02_port + - binding_pd_server_pd02_port_02 memory.resident_server_pd_21: - abstract_pd_server_3 - memory.resident_pd_server @@ -338,7 +338,7 @@ topology_template: - disk.device.read.bytes_server_pd_32 network.incoming.packets_pd02_port_02: - abstract_pd_server_2 - - network.incoming.packets_pd_server_pd02_port + - network.incoming.packets_pd_server_pd02_port_02 disk.device.read.bytes_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.bytes_server_pd_31 @@ -353,7 +353,7 @@ topology_template: - forwarder_pd02_port_03 network.outgoing.bytes.rate_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_02 disk.device.write.requests.rate_server_pd_21: - abstract_pd_server_3 - disk.device.write.requests.rate_pd_server @@ -392,10 +392,10 @@ topology_template: - os_server_pd_32 network.outgoing.packets.rate_pd01_port_02: - abstract_pd_server_3 - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_02 network.incoming.bytes_pd02_port_02: - abstract_pd_server_2 - - network.incoming.bytes_pd_server_pd02_port + - network.incoming.bytes_pd_server_pd02_port_02 endpoint_server_pd_22: - abstract_pd_server_2 - endpoint_pd_server @@ -455,16 +455,16 @@ topology_template: - memory_pd_server network.outgoing.packets.rate_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.packets.rate_pd_server_pd02_port + - network.outgoing.packets.rate_pd_server_pd02_port_02 disk.device.write.requests_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_pd_31 attachment_pd02_port_02: - abstract_pd_server_2 - - attachment_pd_server_pd02_port + - attachment_pd_server_pd02_port_02 network.outpoing.packets_pd01_port_02: - abstract_pd_server_3 - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_02 network.incoming.packets_pd02_port_03_test_nested3Level: - test_nested3Level - network.incoming.packets_pd02_port_03 @@ -524,7 +524,7 @@ topology_template: - disk.write.requests.rate_pd_server forwarder_pd02_port_02: - abstract_pd_server_2 - - forwarder_pd_server_pd02_port + - forwarder_pd_server_pd02_port_02 disk.device.latency_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.latency_server_pd_31 @@ -560,7 +560,7 @@ topology_template: - disk.device.write.requests_pd_server feature_pd01_port_02: - abstract_pd_server_3 - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_02 memory.usage_server_pd_31_test_nested3Level: - test_nested3Level - memory.usage_server_pd_31 @@ -569,7 +569,7 @@ topology_template: - disk.read.bytes_server_pd_32 network.outgoing.bytes_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.bytes_pd_server_pd02_port + - network.outgoing.bytes_pd_server_pd02_port_02 disk.device.read.requests.rate_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_pd_31 @@ -590,10 +590,10 @@ topology_template: - disk.latency_server_pd_31 network.incoming.packets.rate_pd01_port_02: - abstract_pd_server_3 - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_02 network.incoming.packets_pd01_port_02: - abstract_pd_server_3 - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_02 disk.iops_server_pd_22: - abstract_pd_server_2 - disk.iops_pd_server @@ -671,7 +671,7 @@ topology_template: - cpu_server_pd_32 network.incoming.bytes_pd01_port_02: - abstract_pd_server_3 - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_02 cpu_util_server_pd_32_test_nested3Level: - test_nested3Level - cpu_util_server_pd_32 @@ -782,10 +782,10 @@ topology_template: - network.outgoing.bytes.rate_pd02_port_03 forwarder_pd01_port_02: - abstract_pd_server_3 - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_02 network.outgoing.bytes.rate_pd02_port_02: - abstract_pd_server_2 - - network.outgoing.bytes.rate_pd_server_pd02_port + - network.outgoing.bytes.rate_pd_server_pd02_port_02 disk.device.allocation_server_pd_31_test_nested3Level: - test_nested3Level - disk.device.allocation_server_pd_31 @@ -804,7 +804,7 @@ topology_template: - link_pd01_port_03 link_pd02_port_02: - abstract_pd_server_2 - - link_pd_server_pd02_port + - link_pd_server_pd02_port_02 dependency_pd02_port_03_test_nested3Level: - test_nested3Level - dependency_pd02_port_03 @@ -813,7 +813,7 @@ topology_template: - dependency_server_pd_31 link_pd01_port_02: - abstract_pd_server_3 - - link_pd_server_pd01_port + - link_pd_server_pd01_port_02 dependency_server_pd_22: - abstract_pd_server_2 - dependency_pd_server @@ -825,7 +825,7 @@ topology_template: - link_pd02_port_03 dependency_pd02_port_02: - abstract_pd_server_2 - - dependency_pd_server_pd02_port + - dependency_pd_server_pd02_port_02 dependency_server_pd_21: - abstract_pd_server_3 - dependency_pd_server @@ -843,4 +843,4 @@ topology_template: - dependency dependency_pd01_port_02: - abstract_pd_server_3 - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_02 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml index 6a84a53e6e..f8357e678b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -62,6 +62,9 @@ topology_template: directives: - substitutable properties: + port_pd01_port_03_mac_requirements: + mac_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -70,20 +73,17 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_03_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + vm_image_name: + get_input: pd_image_name + port_pd01_port_03_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam + port_pd01_port_03_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -99,28 +99,28 @@ topology_template: directives: - substitutable properties: + port_pd02_port_03_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 1 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_03_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd02_port_ip_requirements: + port_pd02_port_03_network: + - get_input: oam_net_name + port_pd02_port_03_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd02_port_network: - - get_input: oam_net_name compute_pd_server_user_data_format: - RAW service_template_filter: @@ -145,7 +145,7 @@ topology_template: capabilities: attachment_pd02_port_03: - abstract_pd_server_1 - - attachment_pd_server_pd02_port + - attachment_pd_server_pd02_port_03 disk.root.size_server_pd_31: - abstract_pd_server - disk.root.size_pd_server @@ -154,7 +154,7 @@ topology_template: - disk.root.size_pd_server network.outgoing.packets.rate_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.packets.rate_pd_server_pd02_port + - network.outgoing.packets.rate_pd_server_pd02_port_03 disk.iops_server_pd_32: - abstract_pd_server_1 - disk.iops_pd_server @@ -163,7 +163,7 @@ topology_template: - disk.iops_pd_server network.outpoing.packets_pd01_port_03: - abstract_pd_server - - network.outpoing.packets_pd_server_pd01_port + - network.outpoing.packets_pd_server_pd01_port_03 disk.device.write.bytes.rate_server_pd_32: - abstract_pd_server_1 - disk.device.write.bytes.rate_pd_server @@ -172,7 +172,7 @@ topology_template: - disk.device.write.bytes.rate_pd_server network.outgoing.bytes_pd01_port_03: - abstract_pd_server - - network.outgoing.bytes_pd_server_pd01_port + - network.outgoing.bytes_pd_server_pd01_port_03 disk.write.requests_server_pd_32: - abstract_pd_server_1 - disk.write.requests_pd_server @@ -187,7 +187,7 @@ topology_template: - disk.read.bytes_pd_server network.incoming.packets.rate_pd02_port_03: - abstract_pd_server_1 - - network.incoming.packets.rate_pd_server_pd02_port + - network.incoming.packets.rate_pd_server_pd02_port_03 cpu_util_server_pd_31: - abstract_pd_server - cpu_util_pd_server @@ -205,7 +205,7 @@ topology_template: - disk.device.write.bytes_pd_server feature_pd02_port_03: - abstract_pd_server_1 - - feature_pd_server_pd02_port + - feature_pd_server_pd02_port_03 disk.device.write.bytes_server_pd_31: - abstract_pd_server - disk.device.write.bytes_pd_server @@ -217,7 +217,7 @@ topology_template: - memory.usage_pd_server forwarder_pd02_port_03: - abstract_pd_server_1 - - forwarder_pd_server_pd02_port + - forwarder_pd_server_pd02_port_03 disk.read.bytes.rate_server_pd_31: - abstract_pd_server - disk.read.bytes.rate_pd_server @@ -226,10 +226,10 @@ topology_template: - disk.read.bytes.rate_pd_server binding_pd01_port_03: - abstract_pd_server - - binding_pd_server_pd01_port + - binding_pd_server_pd01_port_03 attachment_pd01_port_03: - abstract_pd_server - - attachment_pd_server_pd01_port + - attachment_pd_server_pd01_port_03 disk.device.read.bytes_server_pd_32: - abstract_pd_server_1 - disk.device.read.bytes_pd_server @@ -265,10 +265,10 @@ topology_template: - disk.read.requests_pd_server network.outgoing.bytes_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.bytes_pd_server_pd02_port + - network.outgoing.bytes_pd_server_pd02_port_03 network.outpoing.packets_pd02_port_03: - abstract_pd_server_1 - - network.outpoing.packets_pd_server_pd02_port + - network.outpoing.packets_pd_server_pd02_port_03 disk.device.write.requests.rate_server_pd_31: - abstract_pd_server - disk.device.write.requests.rate_pd_server @@ -277,7 +277,7 @@ topology_template: - disk.device.write.requests.rate_pd_server network.incoming.bytes.rate_pd02_port_03: - abstract_pd_server_1 - - network.incoming.bytes.rate_pd_server_pd02_port + - network.incoming.bytes.rate_pd_server_pd02_port_03 scalable_server_pd_32: - abstract_pd_server_1 - scalable_pd_server @@ -289,7 +289,7 @@ topology_template: - disk.device.write.requests_pd_server network.incoming.packets.rate_pd01_port_03: - abstract_pd_server - - network.incoming.packets.rate_pd_server_pd01_port + - network.incoming.packets.rate_pd_server_pd01_port_03 disk.device.write.requests_server_pd_31: - abstract_pd_server - disk.device.write.requests_pd_server @@ -298,7 +298,7 @@ topology_template: - disk.device.latency_pd_server network.incoming.packets_pd01_port_03: - abstract_pd_server - - network.incoming.packets_pd_server_pd01_port + - network.incoming.packets_pd_server_pd01_port_03 disk.device.usage_server_pd_31: - abstract_pd_server - disk.device.usage_pd_server @@ -307,7 +307,7 @@ topology_template: - disk.device.usage_pd_server feature_pd01_port_03: - abstract_pd_server - - feature_pd_server_pd01_port + - feature_pd_server_pd01_port_03 disk.device.read.requests_server_pd_32: - abstract_pd_server_1 - disk.device.read.requests_pd_server @@ -322,10 +322,10 @@ topology_template: - disk.device.read.requests_pd_server network.incoming.bytes.rate_pd01_port_03: - abstract_pd_server - - network.incoming.bytes.rate_pd_server_pd01_port + - network.incoming.bytes.rate_pd_server_pd01_port_03 binding_pd02_port_03: - abstract_pd_server_1 - - binding_pd_server_pd02_port + - binding_pd_server_pd02_port_03 disk.capacity_server_pd_32: - abstract_pd_server_1 - disk.capacity_pd_server @@ -334,13 +334,13 @@ topology_template: - disk.capacity_pd_server network.incoming.bytes_pd01_port_03: - abstract_pd_server - - network.incoming.bytes_pd_server_pd01_port + - network.incoming.bytes_pd_server_pd01_port_03 vcpus_server_pd_31: - abstract_pd_server - vcpus_pd_server network.incoming.packets_pd02_port_03: - abstract_pd_server_1 - - network.incoming.packets_pd_server_pd02_port + - network.incoming.packets_pd_server_pd02_port_03 disk.usage_server_pd_32: - abstract_pd_server_1 - disk.usage_pd_server @@ -358,7 +358,7 @@ topology_template: - memory.resident_pd_server network.outgoing.bytes.rate_pd01_port_03: - abstract_pd_server - - network.outgoing.bytes.rate_pd_server_pd01_port + - network.outgoing.bytes.rate_pd_server_pd01_port_03 cpu_server_pd_32: - abstract_pd_server_1 - cpu_pd_server @@ -400,13 +400,13 @@ topology_template: - disk.write.requests.rate_pd_server network.outgoing.packets.rate_pd01_port_03: - abstract_pd_server - - network.outgoing.packets.rate_pd_server_pd01_port + - network.outgoing.packets.rate_pd_server_pd01_port_03 memory_server_pd_32: - abstract_pd_server_1 - memory_pd_server network.incoming.bytes_pd02_port_03: - abstract_pd_server_1 - - network.incoming.bytes_pd_server_pd02_port + - network.incoming.bytes_pd_server_pd02_port_03 memory_server_pd_31: - abstract_pd_server - memory_pd_server @@ -430,7 +430,7 @@ topology_template: - instance_pd_server forwarder_pd01_port_03: - abstract_pd_server - - forwarder_pd_server_pd01_port + - forwarder_pd_server_pd01_port_03 disk.device.allocation_server_pd_31: - abstract_pd_server - disk.device.allocation_pd_server @@ -451,7 +451,7 @@ topology_template: - binding_pd_server network.outgoing.bytes.rate_pd02_port_03: - abstract_pd_server_1 - - network.outgoing.bytes.rate_pd_server_pd02_port + - network.outgoing.bytes.rate_pd_server_pd02_port_03 disk.write.bytes.rate_server_pd_32: - abstract_pd_server_1 - disk.write.bytes.rate_pd_server @@ -476,13 +476,13 @@ topology_template: - local_storage_pd_server link_pd02_port_03: - abstract_pd_server_1 - - link_pd_server_pd02_port + - link_pd_server_pd02_port_03 dependency_pd02_port_03: - abstract_pd_server_1 - - dependency_pd_server_pd02_port + - dependency_pd_server_pd02_port_03 link_pd01_port_03: - abstract_pd_server - - link_pd_server_pd01_port + - link_pd_server_pd01_port_03 dependency_pd01_port_03: - abstract_pd_server - - dependency_pd_server_pd01_port + - dependency_pd_server_pd01_port_03 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml index bbaa6a2636..6266dff927 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml @@ -34,14 +34,14 @@ parameters: type: string resources: - pd_server_port_1: + pd_server_1_port: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [pd_server_ips, 0]}}] replacement_policy: AUTO - pd_server_port_2: + pd_server_2_port: type: OS::Neutron::Port properties: network: { get_param: net } @@ -56,8 +56,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_flavor } networks: - - port: { get_resource: pd_server_port_1 } - - port: { get_resource: pd_server_port_2 } + - port: { get_resource: pd_server_1_port } + - port: { get_resource: pd_server_2_port } outputs: pattern4_attr_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml index 65ef047317..8b93801e10 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml @@ -100,14 +100,14 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - cmaui_port_1: + cmaui_1c1_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_1c1_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} @@ -122,7 +122,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1c1_1_mgmt_port_0 } server_1c1_cmaui_2: type: OS::Nova::Server @@ -132,16 +132,16 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_1c1_2_mgmt_port_0 } - oam_port_1: + oam_server_1c2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}] replacement_policy: AUTO - oam_port_2: + oam_server_1c2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} @@ -156,7 +156,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_1 } + - port: { get_resource: oam_server_1c2_1_mgmt_port_0 } server_1c2_oam_2: type: OS::Nova::Server @@ -166,7 +166,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_2 } + - port: { get_resource: oam_server_1c2_2_mgmt_port_0 } metadata: { connectivity_to_pd_server_1b: {get_attr: [server_1b_pd_1, accessIPv4]}, connectivity_to_server_1c1_cmaui_1: {get_attr: [server_1c1_cmaui_1, accessIPv4]}, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml index 33a64f5cc1..63a0573263 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml @@ -100,14 +100,14 @@ resources: networks: - port: { get_resource: ps_server_1b_port } - BE_port_1: + BE_1c1_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 0]}}] replacement_policy: AUTO - BE_port_2: + BE_1c1_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} @@ -122,7 +122,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: BE_1c1_flavor } networks: - - port: { get_resource: BE_port_1 } + - port: { get_resource: BE_1c1_1_mgmt_port_0 } server_1c1_BE_2: type: OS::Nova::Server @@ -132,16 +132,16 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: BE_1c1_flavor } networks: - - port: { get_resource: BE_port_2 } + - port: { get_resource: BE_1c1_2_mgmt_port_0 } - osm_port_1: + osm_server_1c2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 1]}}] replacement_policy: AUTO - osm_port_2: + osm_server_1c2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_2} @@ -156,7 +156,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: osm_server_1c2_flavor } networks: - - port: { get_resource: osm_port_1 } + - port: { get_resource: osm_server_1c2_1_mgmt_port_0 } server_1c2_osm_2: type: OS::Nova::Server @@ -166,7 +166,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: osm_server_1c2_flavor } networks: - - port: { get_resource: osm_port_2 } + - port: { get_resource: osm_server_1c2_2_mgmt_port_0 } metadata: { connectivity_to_rd_server_1b: {get_attr: [server_1b_rd_1, accessIPv4]}, connectivity_to_server_1c1_BE_1: {get_attr: [server_1c1_BE_1, accessIPv4]}, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 23264fd584..7bef7a1fce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,85 +14,85 @@ node_types: status: SUPPORTED entry_schema: 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 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: - type: list + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: + port_pd_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_1b_port_1_related_networks: + type: list required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_fixed_ips: - type: list + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + vm_image_name: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED @@ -115,14 +115,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -135,11 +135,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -159,28 +154,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -199,14 +191,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -230,6 +214,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -242,7 +232,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -272,14 +262,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -301,7 +292,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -324,6 +315,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.root.size_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -336,6 +333,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -359,12 +366,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED instance_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -382,9 +383,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -394,7 +394,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -418,25 +418,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_pd_server_1b: + disk.usage_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_pd_server_1b: + disk.write.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -445,20 +445,10 @@ node_types: org.openecomp.resource.abstract.nodes.osm_server_1c2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_osm_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_osm_port_exCP_naming: + port_osm_server_1c2_mgmt_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_osm_port_subnetpoolid: - type: string - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -467,7 +457,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_osm_port_network: + port_osm_server_1c2_mgmt_port_0_network: type: list required: true status: SUPPORTED @@ -479,79 +469,89 @@ node_types: status: SUPPORTED entry_schema: type: string - port_osm_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_osm_port_ip_requirements: + port_osm_server_1c2_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_osm_port_fixed_ips: + type: string + port_osm_server_1c2_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_osm_port_network_role_tag: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_osm_server_1c2_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_osm_port_network_role: - type: string + port_osm_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_osm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_osm_server_1c2_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_osm_port_order: + port_osm_server_1c2_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_osm_server_1c2_mgmt_port_0_order: type: integer required: true status: SUPPORTED - port_osm_port_related_networks: + port_osm_server_1c2_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_osm_server_1c2_metadata: type: list required: true status: SUPPORTED entry_schema: type: json + port_osm_server_1c2_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_osm_server_1c2_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_osm_server_1c2_mgmt_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements attributes: osm_server_1c2_accessIPv4: type: string status: SUPPORTED requirements: - - dependency_osm_server_1c2_osm_port: + - dependency_osm_server_1c2_osm_server_1c2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_osm_server_1c2_osm_port: + - link_osm_server_1c2_osm_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -577,13 +577,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_osm_server_1c2_osm_port: - type: tosca.capabilities.Node + os_osm_server_1c2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - os_osm_server_1c2: - type: tosca.capabilities.OperatingSystem + feature_osm_server_1c2_osm_server_1c2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -630,6 +630,17 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_osm_server_1c2_osm_server_1c2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_osm_server_1c2_osm_server_1c2_mgmt_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_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -672,8 +683,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_osm_server_1c2_osm_port: - type: tosca.capabilities.Attachment + forwarder_osm_server_1c2_osm_server_1c2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_osm_server_1c2_osm_server_1c2_mgmt_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 @@ -694,12 +711,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_osm_server_1c2_osm_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.ephemeral.size_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -712,14 +723,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_osm_server_1c2_osm_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_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -732,12 +735,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_osm_server_1c2_osm_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.write.requests_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -755,7 +752,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_osm_server_1c2_osm_port: + network.outgoing.packets.rate_osm_server_1c2_osm_server_1c2_mgmt_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_osm_server_1c2_osm_server_1c2_mgmt_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: @@ -784,25 +787,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_osm_server_1c2: + network.outgoing.bytes.rate_osm_server_1c2_osm_server_1c2_mgmt_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.usage_osm_server_1c2: + disk.root.size_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_osm_server_1c2: + disk.usage_osm_server_1c2: type: org.openecomp.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_osm_server_1c2_osm_port: + memory.usage_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -826,60 +829,57 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_osm_server_1c2_osm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_osm_server_1c2_osm_server_1c2_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.device.read.bytes_osm_server_1c2: + network.incoming.packets_osm_server_1c2_osm_server_1c2_mgmt_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 - forwarder_osm_server_1c2_osm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.device.capacity_osm_server_1c2: + network.incoming.packets.rate_osm_server_1c2_osm_server_1c2_mgmt_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_osm_server_1c2_osm_port: + disk.device.read.bytes_osm_server_1c2: type: org.openecomp.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_osm_server_1c2: + network.outpoing.packets_osm_server_1c2_osm_server_1c2_mgmt_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.write.requests.rate_osm_server_1c2: + disk.device.capacity_osm_server_1c2: type: org.openecomp.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_osm_server_1c2_osm_port: + disk.device.write.bytes_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_osm_server_1c2: + disk.device.write.requests.rate_osm_server_1c2: type: org.openecomp.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_osm_server_1c2_osm_port: + instance_osm_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -888,16 +888,24 @@ node_types: org.openecomp.resource.abstract.nodes.oam_server_1c2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_1c2_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_oam_server_1c2_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -906,46 +914,36 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_oam_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam_port_order: - type: integer + port_oam_server_1c2_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_oam_port_subnetpoolid: - type: string + port_oam_server_1c2_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_oam_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_server_1c2_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true status: SUPPORTED - compute_oam_server_1c2_availability_zone: - type: list + port_oam_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_oam_port_fixed_ips: + compute_oam_server_1c2_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string vm_image_name: type: string required: true @@ -956,29 +954,31 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_port_vlan_requirements: + port_oam_server_1c2_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_port_ip_requirements: - type: list + type: string + port_oam_server_1c2_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_port_replacement_policy: - type: list + port_oam_server_1c2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_oam_port_network_role_tag: + port_oam_server_1c2_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_oam_port_network_role: + port_oam_server_1c2_mgmt_port_0_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_oam_server_1c2_mgmt_port_0_network_role: type: string required: true status: SUPPORTED @@ -987,33 +987,33 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_oam_server_1c2: + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_oam_server_1c2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_oam_server_1c2_oam_port: + - 1 + - 1 + - dependency_oam_server_1c2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_server_1c2_oam_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_oam_server_1c2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.usage_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer @@ -1050,18 +1050,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_server_1c2_oam_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_oam_server_1c2_oam_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_util_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1074,18 +1062,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_oam_server_1c2: - type: org.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_oam_server_1c2_oam_port: - type: tosca.capabilities.Attachment + binding_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_oam_server_1c2_oam_port: + disk.device.allocation_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1109,7 +1094,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_server_1c2_oam_port: + network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_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: @@ -1127,13 +1112,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_server_1c2_oam_port: + network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_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_oam_server_1c2_oam_port: + network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_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: @@ -1151,13 +1136,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_server_1c2_oam_port: + cpu_oam_server_1c2: type: org.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_oam_server_1c2: + network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_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: @@ -1199,17 +1184,17 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_server_1c2_oam_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.ephemeral.size_oam_server_1c2: type: org.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_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED memory.resident_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1234,31 +1219,33 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_server_1c2_oam_port: + network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_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 - binding_oam_server_1c2_oam_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 os_oam_server_1c2: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1271,8 +1258,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_server_1c2_oam_port: - type: tosca.capabilities.Node + network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_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 @@ -1310,6 +1298,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_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.capacity_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1328,6 +1322,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1341,10 +1341,6 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_port_1_order: - type: integer - required: true - status: SUPPORTED pd_server_names: type: list description: PD server names @@ -1352,16 +1348,18 @@ node_types: status: SUPPORTED entry_schema: &id001 type: string - port_pd_server_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1_port_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_network_role: - type: string + port_pd_server_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED pd_server_flavor: @@ -1369,14 +1367,18 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_2_ip_requirements: + port_pd_server_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_network_role: + type: string required: true status: SUPPORTED availability_zone_0: @@ -1388,34 +1390,36 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_subnetpoolid: + pd_server_ips: type: string required: true status: SUPPORTED - pd_server_ips: + port_pd_server_1_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_port_1_subnetpoolid: - type: string + port_pd_server_2_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_related_networks: + port_pd_server_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_1_network_role_tag: + port_pd_server_1_port_network_role_tag: type: string required: true status: SUPPORTED + port_pd_server_2_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED security_group_name: type: list description: CMAUI1, CMAUI2 server names @@ -1428,23 +1432,29 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_port_1_vlan_requirements: + port_pd_server_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_2_port_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_2_network_role_tag: + port_pd_server_2_port_network_role: type: string required: true status: SUPPORTED @@ -1453,18 +1463,8 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED attributes: @@ -1473,27 +1473,27 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_port_1: + - dependency_pd_server_2_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_1: + - link_pd_server_2_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_port_2: + - dependency_pd_server_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_2: + - link_pd_server_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1514,6 +1514,17 @@ node_types: - 0 - UNBOUNDED capabilities: + feature_pd_server_2_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1526,43 +1537,61 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_server_pd: + network.outgoing.bytes_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_pd: + network.outgoing.packets.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_1: + memory.resident_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_2: + binding_pd_server_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + cpu_util_server_pd: type: org.openecomp.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_server_pd: + attachment_pd_server_2_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_port_1: + disk.device.read.requests_server_pd: type: org.openecomp.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_port_2: + forwarder_pd_server_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1597,23 +1626,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_2: + network.outpoing.packets_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_1: + network.incoming.bytes_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1655,35 +1674,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_1: - type: tosca.capabilities.Node + network.outpoing.packets_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pd_server_port_2: - type: tosca.capabilities.Node + binding_pd_server_2_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.read.bytes_server_pd: + network.incoming.packets.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pd: + disk.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_2_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_1: + feature_pd_server_1_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1695,21 +1722,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pd_server_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 + network.incoming.bytes.rate_pd_server_2_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED cpu.delta_server_pd: type: org.openecomp.capabilities.metric.Ceilometer @@ -1724,7 +1741,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_1: + network.incoming.bytes.rate_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1742,37 +1759,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.latency_server_pd: type: org.openecomp.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_port_1: + disk.device.write.bytes.rate_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pd: + disk.write.requests.rate_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pd: + network.outgoing.bytes.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1784,19 +1789,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_2: + disk.device.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pd: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_1: + network.incoming.packets_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1819,30 +1823,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_pd: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - scalable_server_pd: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_2: + network.outgoing.bytes_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_1: - type: org.openecomp.capabilities.Forwarder + binding_server_pd: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_pd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -1858,13 +1851,14 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_2: - type: org.openecomp.capabilities.Forwarder + feature_server_pd: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_server_pd: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1886,6 +1880,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1901,32 +1901,22 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1935,88 +1925,98 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_pd_server_1b: + - dependency_pd_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pd_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_ps_server_1b_port: + - 1 + - 1 + - dependency_pd_server_1b: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_ps_server_1b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.read.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -2031,7 +2031,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2043,40 +2043,23 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port: + disk.allocation_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu.delta_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2094,12 +2077,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2141,7 +2118,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_ps_server_1b_port: + network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2189,14 +2166,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_ps_server_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED scalable_pd_server_1b: type: tosca.capabilities.Scalable occurrences: @@ -2208,6 +2177,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2220,12 +2195,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.iops_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2238,6 +2231,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED os_pd_server_1b: type: tosca.capabilities.OperatingSystem occurrences: @@ -2255,12 +2253,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED binding_pd_server_1b: type: tosca.capabilities.network.Bindable occurrences: @@ -2278,30 +2270,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + feature_pd_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_1b_ps_server_1b_port: + disk.device.write.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server_1b: + disk.device.capacity_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2325,6 +2311,20 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.write.requests.rate_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2334,14 +2334,16 @@ node_types: org.openecomp.resource.abstract.nodes.BE_1c1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_BE_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_BE_1c1_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_BE_port_network_role: - type: string + port_BE_1c1_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2350,73 +2352,71 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_BE_port_order: + port_BE_1c1_mgmt_port_0_order: type: integer required: true status: SUPPORTED - port_BE_port_subnetpoolid: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_BE_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_BE_port_fixed_ips: + port_BE_1c1_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_BE_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + compute_BE_1c1_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_BE_1c1_availability_zone: + type: string + port_BE_1c1_mgmt_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_BE_1c1_mgmt_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_BE_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_BE_1c1_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_BE_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_BE_1c1_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_BE_port_network_role_tag: + type: string + port_BE_1c1_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_BE_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - compute_BE_1c1_name: + port_BE_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_BE_1c1_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_BE_port_replacement_policy: + port_BE_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + compute_BE_1c1_name: type: list required: true status: SUPPORTED @@ -2427,19 +2427,6 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_BE_1c1_BE_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_BE_1c1_BE_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_BE_1c1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2454,6 +2441,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_BE_1c1_BE_1c1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_BE_1c1_BE_1c1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: disk.ephemeral.size_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer @@ -2477,12 +2477,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_BE_1c1_BE_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.write.requests_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2501,18 +2495,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_BE_1c1_BE_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 - attachment_BE_1c1_BE_port: - type: tosca.capabilities.Attachment + feature_BE_1c1_BE_1c1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_BE_1c1_BE_port: + network.incoming.packets_BE_1c1_BE_1c1_mgmt_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: @@ -2549,20 +2537,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_BE_1c1_BE_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 - binding_BE_1c1_BE_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.usage_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2575,14 +2549,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_BE_1c1_BE_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_BE_1c1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_BE_1c1: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_BE_1c1_BE_1c1_mgmt_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 @@ -2610,24 +2584,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_BE_1c1_BE_port: + network.outgoing.bytes_BE_1c1_BE_1c1_mgmt_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 - forwarder_BE_1c1_BE_port: - type: org.openecomp.capabilities.Forwarder + disk.device.latency_BE_1c1: + type: org.openecomp.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_BE_1c1: + disk.device.read.requests_BE_1c1: type: org.openecomp.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_BE_1c1: + network.incoming.packets.rate_BE_1c1_BE_1c1_mgmt_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: @@ -2669,6 +2644,19 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_BE_1c1_BE_1c1_mgmt_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 + forwarder_BE_1c1_BE_1c1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2681,12 +2669,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_BE_1c1_BE_port: + network.outgoing.packets.rate_BE_1c1_BE_1c1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + attachment_BE_1c1_BE_1c1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2699,6 +2692,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_BE_1c1_BE_1c1_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_BE_1c1_BE_1c1_mgmt_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.write.requests.rate_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2715,42 +2720,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_BE_1c1: + network.incoming.bytes_BE_1c1_BE_1c1_mgmt_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.write.requests_BE_1c1: + disk.write.bytes.rate_BE_1c1: type: org.openecomp.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_BE_1c1: + disk.write.requests_BE_1c1: type: org.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_BE_1c1_BE_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.read.bytes.rate_BE_1c1: + disk.device.read.bytes_BE_1c1: type: org.openecomp.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_BE_1c1: + disk.device.read.bytes.rate_BE_1c1: type: org.openecomp.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_BE_1c1_BE_port: + disk.device.capacity_BE_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2891,7 +2891,14 @@ node_types: description: all_pattern_attr_1 status: SUPPORTED requirements: - - dependency_cmaui_port_2: + - dependency_oam_server_1c2_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_oam_server_1c2_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -2905,27 +2912,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_port_1_nested1_pattern_4: + - dependency_pd_server_2_port_nested1_pattern_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_1_nested1_pattern_4: + - link_pd_server_2_port_nested1_pattern_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_port_2_nested1_pattern_4: + - dependency_pd_server_1_port_nested1_pattern_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_2_nested1_pattern_4: + - link_pd_server_1_port_nested1_pattern_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2973,48 +2980,48 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_server_1b_pd_2: + - dependency_cmaui_1c1_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_1b_pd_2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_cmaui_port_1: + - dependency_cmaui_1c1_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_server_1b_pd_1: + - dependency_server_1b_pd_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_1b_pd_1: + - local_storage_server_1b_pd_2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_oam_port_1: + - dependency_server_1b_pd_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED + - local_storage_server_1b_pd_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_packet_internal_network_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3076,13 +3083,6 @@ node_types: occurrences: - 1 - 1 - - dependency_oam_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_packet_external_network_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3105,6 +3105,11 @@ node_types: occurrences: - 0 - UNBOUNDED + feature_cmaui_1c1_1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.capacity_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3129,26 +3134,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pd_nested1_pattern_4: + network.outpoing.packets_pd_server_1_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_port_1: - type: tosca.capabilities.Node + disk.device.read.requests.rate_server_pd_nested1_pattern_4: + type: org.openecomp.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_oam_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_1c1_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3204,17 +3208,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_1_nested1_pattern_4: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_pd_server_port_1_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3257,34 +3250,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_port_1: - type: org.openecomp.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_oam_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - binding_cmaui_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 - binding_cmaui_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED end_point_packet_internal_network_1: type: tosca.capabilities.Endpoint occurrences: @@ -3314,30 +3279,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_port_2_nested1_pattern_4: - type: org.openecomp.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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_cmaui_port_1: - type: org.openecomp.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_port_2_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED os_server_1c2_oam_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -3384,32 +3325,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pd_nested1_pattern_4: + network.outgoing.bytes_pd_server_2_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_1c2_oam_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1: + disk.device.write.bytes.rate_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_1c2_oam_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_1_port_nested1_pattern_4: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3418,13 +3352,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_port_1: + disk.device.capacity_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_1c1_cmaui_2: + network.outgoing.packets.rate_cmaui_1c1_1_mgmt_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: @@ -3437,11 +3371,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3459,7 +3388,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_port_1: + attachment_oam_server_1c2_1_mgmt_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -3524,12 +3453,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_oam_server_1c2_1_mgmt_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_util_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.bytes_oam_server_1c2_1_mgmt_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.allocation_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3574,12 +3515,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_2_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.read.bytes_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3592,21 +3527,10 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_oam_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 + forwarder_oam_server_1c2_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.read.bytes.rate_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer @@ -3646,13 +3570,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_server_1c2_oam_1: + network.incoming.packets.rate_pd_server_2_port_nested1_pattern_4: type: org.openecomp.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_port_1_nested1_pattern_4: + disk.latency_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3664,6 +3588,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_1_port_nested1_pattern_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3700,19 +3630,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_port_1: - type: org.openecomp.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_port_1_nested1_pattern_4: + network.outgoing.bytes.rate_cmaui_1c1_1_mgmt_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_oam_port_2: + network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_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: @@ -3757,22 +3681,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_2_nested1_pattern_4: - type: org.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_oam_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_oam_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED binding_server_1c2_oam_2: type: tosca.capabilities.network.Bindable occurrences: @@ -3783,6 +3691,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3813,9 +3726,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_port_2_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_2_port_nested1_pattern_4: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -3843,12 +3755,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3873,7 +3779,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_1c1_2_mgmt_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: @@ -3937,18 +3843,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_oam_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.iops_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3979,32 +3873,26 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_1c1_cmaui_2: + network.outgoing.packets.rate_pd_server_2_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_1c1_cmaui_1: + disk.write.requests_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - link_packet_external_network_1: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: + disk.write.requests_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_1_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + link_packet_external_network_1: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED @@ -4014,12 +3902,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4050,6 +3932,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1c1_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4078,12 +3965,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1_port_nested1_pattern_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_1c2_oam_1: type: org.openecomp.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_cmaui_1c1_2_mgmt_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_2_port_nested1_pattern_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4118,37 +4023,42 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_server_1c2_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED instance_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_1c1_cmaui_1: + network.outgoing.bytes.rate_pd_server_2_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_1b_pd_2: + disk.latency_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_1c1_cmaui_2: + memory_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_1b_pd_1: + disk.latency_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_port_1_nested1_pattern_4: + memory_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4159,51 +4069,49 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_server_1b_pd_2: + network.outgoing.bytes_oam_server_1c2_2_mgmt_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.latency_server_1b_pd_1: + disk.device.latency_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_pd_nested1_pattern_4: + disk.device.latency_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pd_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_server_1c2_1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_port_1: + disk.read.bytes_server_pd_nested1_pattern_4: type: org.openecomp.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_oam_port_2: + network.outpoing.packets_oam_server_1c2_2_mgmt_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_cmaui_port_1: + disk.device.iops_server_pd_nested1_pattern_4: type: org.openecomp.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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_oam_server_1c2_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4231,18 +4139,19 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_2_nested1_pattern_4: - type: org.openecomp.capabilities.Forwarder + disk.device.write.bytes_server_1c2_oam_1: + type: org.openecomp.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_server_1c2_oam_1: + disk.device.write.bytes_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_1c2_oam_2: + network.incoming.packets_pd_server_1_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4254,8 +4163,17 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_2_nested1_pattern_4: - type: tosca.capabilities.Node + binding_pd_server_1_port_nested1_pattern_4: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets_oam_server_1c2_1_mgmt_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 @@ -4283,6 +4201,17 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1_port_nested1_pattern_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_server_1c2_2_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.iops_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4300,53 +4229,52 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_server_1c1_cmaui_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.usage_server_1c2_oam_1: + network.outgoing.bytes_cmaui_1c1_1_mgmt_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_server_1c1_cmaui_2: - type: tosca.capabilities.Node + attachment_pd_server_1_port_nested1_pattern_4: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_port_1: + network.outgoing.bytes_cmaui_1c1_2_mgmt_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_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_1c1_cmaui_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pd_nested1_pattern_4: + disk.usage_server_1c2_oam_1: type: org.openecomp.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_server_1c2_oam_1: + feature_server_1c1_cmaui_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_1: + disk.device.capacity_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_1_nested1_pattern_4: + disk.iops_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4415,13 +4343,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_2_nested1_pattern_4: + vcpus_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_pd_nested1_pattern_4: + network.outgoing.packets.rate_oam_server_1c2_2_mgmt_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: @@ -4438,19 +4366,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_1b_pd_2: + network.incoming.packets.rate_oam_server_1c2_1_mgmt_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.usage_server_1c2_oam_2: + disk.write.bytes_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_2_nested1_pattern_4: + disk.device.usage_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4468,11 +4396,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_1_nested1_pattern_4: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.latency_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4496,6 +4419,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_2_port_nested1_pattern_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED os_server_pd_nested1_pattern_4: type: tosca.capabilities.OperatingSystem occurrences: @@ -4525,14 +4453,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_port_1: + network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_1_nested1_pattern_4: - type: tosca.capabilities.Attachment + network.outgoing.bytes_pd_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -4548,6 +4477,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_server_1c2_1_mgmt_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.allocation_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4560,29 +4495,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_server_pd_nested1_pattern_4: + network.incoming.bytes_cmaui_1c1_1_mgmt_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 - vcpus_server_1c1_cmaui_1: + disk.root.size_server_pd_nested1_pattern_4: type: org.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_cmaui_port_1: - type: tosca.capabilities.Node + vcpus_server_1c1_cmaui_1: + type: org.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_cmaui_port_2: - type: tosca.capabilities.Node + instance_server_1c1_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_server_1c1_cmaui_2: + network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_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: @@ -4600,7 +4537,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_2_nested1_pattern_4: + attachment_cmaui_1c1_1_mgmt_port_0: type: tosca.capabilities.Attachment occurrences: - 1 @@ -4622,11 +4559,25 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_1c2_2_mgmt_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 os_server_1b_pd_2: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_server_1c2_1_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.root.size_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4675,13 +4626,15 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder + network.incoming.packets_cmaui_1c1_2_mgmt_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 - forwarder_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pd_server_2_port_nested1_pattern_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -4691,6 +4644,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_1c1_2_mgmt_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.allocation_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4714,49 +4675,42 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_1c1_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_server_1c1_cmaui_2: + network.incoming.packets_pd_server_2_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_pd_nested1_pattern_4: + disk.write.bytes.rate_server_1c1_cmaui_1: type: org.openecomp.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_port_2_nested1_pattern_4: + disk.write.bytes.rate_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_server_1c2_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pd_nested1_pattern_4: + memory.resident_server_pd_nested1_pattern_4: type: org.openecomp.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_cmaui_port_1: + network.outgoing.bytes_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_2: + disk.device.allocation_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4828,6 +4782,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED memory.resident_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4839,6 +4799,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_1_mgmt_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 os_server_1c1_cmaui_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -4856,6 +4822,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cmaui_1c1_1_mgmt_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 instance_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4868,6 +4840,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_2_port_nested1_pattern_4: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED network.incoming.bytes.rate_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4904,6 +4884,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4916,6 +4901,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_oam_server_1c2_2_mgmt_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.allocation_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4964,6 +4955,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_cmaui_1c1_1_mgmt_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.read.requests_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5018,6 +5015,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1_port_nested1_pattern_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED host_server_1c2_oam_2: type: tosca.capabilities.Container valid_source_types: @@ -5053,140 +5056,133 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_2_nested1_pattern_4: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - disk.device.read.bytes.rate_server_1c1_cmaui_1: + network.outpoing.packets_cmaui_1c1_2_mgmt_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.bytes.rate_server_1c1_cmaui_2: + network.outpoing.packets_cmaui_1c1_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_port_1: - type: tosca.capabilities.Attachment + forwarder_pd_server_2_port_nested1_pattern_4: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu.delta_server_1c2_oam_2: + disk.device.read.bytes.rate_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_1b_pd_1: + disk.device.read.bytes.rate_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_1b_pd_2: + network.outpoing.packets_pd_server_2_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_1c1_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.usage_server_1c1_cmaui_1: + network.outgoing.packets.rate_pd_server_1_port_nested1_pattern_4: type: org.openecomp.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_oam_port_2: + cpu.delta_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_port_1: + network.outgoing.bytes.rate_oam_server_1c2_1_mgmt_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.write.bytes.rate_server_pd_nested1_pattern_4: + disk.ephemeral.size_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment + disk.ephemeral.size_server_1b_pd_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_port_1: + network.incoming.bytes_cmaui_1c1_2_mgmt_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 - instance_server_1b_pd_1: + disk.usage_server_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_1b_pd_1: + disk.usage_server_1c1_cmaui_1: type: org.openecomp.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_oam_port_2: + disk.write.bytes.rate_server_pd_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_server_1b_pd_2: + network.incoming.bytes_pd_server_1_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_1b_pd_2: + instance_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_1c1_cmaui_1: + disk.device.capacity_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: + instance_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_2: + disk.device.capacity_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + disk.capacity_server_1c1_cmaui_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -5208,6 +5204,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_1c2_1_mgmt_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.read.requests.rate_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5238,31 +5242,37 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_server_1c2_oam_1: + network.incoming.packets_cmaui_1c1_1_mgmt_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.bytes.rate_server_1c2_oam_1: + network.outgoing.bytes_pd_server_1_port_nested1_pattern_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_1b_pd_1: + cpu.delta_server_1c2_oam_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_1b_pd_2: + disk.device.read.bytes.rate_server_1c2_oam_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_1_nested1_pattern_4: + disk.device.usage_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5286,13 +5296,17 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_port_2: - type: tosca.capabilities.Node + binding_cmaui_1c1_1_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - feature_oam_port_1: - type: tosca.capabilities.Node + network.incoming.bytes_oam_server_1c2_2_mgmt_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 @@ -5301,12 +5315,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_port_1_nested1_pattern_4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.latency_server_1c1_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5369,14 +5377,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_1_nested1_pattern_4: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED network.incoming.bytes.rate_pd_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6568,26 +6568,24 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_port_1_order: - type: integer - required: true - status: SUPPORTED pd_server_names: type: list description: PD server names required: true status: SUPPORTED entry_schema: *id001 - port_pd_server_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1_port_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_network_role: - type: string + port_pd_server_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED pd_server_flavor: @@ -6595,14 +6593,18 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_2_ip_requirements: + port_pd_server_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_network_role: + type: string required: true status: SUPPORTED availability_zone_0: @@ -6614,34 +6616,36 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_subnetpoolid: + pd_server_ips: type: string required: true status: SUPPORTED - pd_server_ips: + port_pd_server_1_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_port_1_subnetpoolid: - type: string + port_pd_server_2_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_related_networks: + port_pd_server_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_1_network_role_tag: + port_pd_server_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_2_port_subnetpoolid: type: string required: true status: SUPPORTED + port_pd_server_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED security_group_name: type: list description: CMAUI1, CMAUI2 server names @@ -6653,23 +6657,29 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_port_1_vlan_requirements: + port_pd_server_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_port_2_related_networks: + port_pd_server_2_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_2_network_role_tag: + port_pd_server_2_port_network_role: type: string required: true status: SUPPORTED @@ -6678,18 +6688,8 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED attributes: @@ -6698,27 +6698,27 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_port_1: + - dependency_pd_server_2_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_1: + - link_pd_server_2_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_port_2: + - dependency_pd_server_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_2: + - link_pd_server_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6739,6 +6739,17 @@ node_types: - 0 - UNBOUNDED capabilities: + feature_pd_server_2_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6751,43 +6762,61 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_server_pd: + network.outgoing.bytes_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_pd: + network.outgoing.packets.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_1: + memory.resident_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_2: + binding_pd_server_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + cpu_util_server_pd: type: org.openecomp.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_server_pd: + attachment_pd_server_2_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_port_1: + disk.device.read.requests_server_pd: type: org.openecomp.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_port_2: + forwarder_pd_server_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6822,23 +6851,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_2: + network.outpoing.packets_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_1: + network.incoming.bytes_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6880,35 +6899,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_1: - type: tosca.capabilities.Node + network.outpoing.packets_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pd_server_port_2: - type: tosca.capabilities.Node + binding_pd_server_2_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.read.bytes_server_pd: + network.incoming.packets.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pd: + disk.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_1: + disk.device.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6920,21 +6947,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pd_server_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 + network.incoming.bytes.rate_pd_server_2_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED cpu.delta_server_pd: type: org.openecomp.capabilities.metric.Ceilometer @@ -6949,7 +6966,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_1: + network.incoming.bytes.rate_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6967,37 +6984,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.latency_server_pd: type: org.openecomp.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_port_1: + disk.device.write.bytes.rate_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pd: + disk.write.requests.rate_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pd: + network.outgoing.bytes.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7009,19 +7014,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_2: + disk.device.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pd: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_1: + network.incoming.packets_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7044,30 +7048,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_pd: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - scalable_server_pd: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_2: + network.outgoing.bytes_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_1: - type: org.openecomp.capabilities.Forwarder + binding_server_pd: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_pd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -7083,13 +7076,14 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_2: - type: org.openecomp.capabilities.Forwarder + feature_server_pd: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_server_pd: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -7111,6 +7105,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7136,26 +7136,24 @@ node_types: description: UID of OAM network required: true status: SUPPORTED - port_pd_server_port_1_order: - type: integer - required: true - status: SUPPORTED pd_server_names: type: list description: PD server names required: true status: SUPPORTED entry_schema: *id001 - port_pd_server_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1_port_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_server_port_2_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_network_role: - type: string + port_pd_server_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED pd_server_flavor: @@ -7163,14 +7161,18 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_2_ip_requirements: + port_pd_server_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_network_role: + type: string required: true status: SUPPORTED availability_zone_0: @@ -7182,34 +7184,36 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_port_2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_subnetpoolid: + pd_server_ips: type: string required: true status: SUPPORTED - pd_server_ips: + port_pd_server_1_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_server_port_1_subnetpoolid: - type: string + port_pd_server_2_port_order: + type: integer required: true status: SUPPORTED - port_pd_server_port_1_related_networks: + port_pd_server_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_1_network_role_tag: + port_pd_server_1_port_network_role_tag: type: string required: true status: SUPPORTED + port_pd_server_2_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED security_group_name: type: list description: CMAUI1, CMAUI2 server names @@ -7221,23 +7225,29 @@ node_types: description: Flavor for PS server required: true status: SUPPORTED - port_pd_server_port_1_vlan_requirements: + port_pd_server_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_port_2_related_networks: + port_pd_server_2_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_2_network_role_tag: + port_pd_server_2_port_network_role: type: string required: true status: SUPPORTED @@ -7246,18 +7256,8 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED - port_pd_server_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED attributes: @@ -7266,27 +7266,27 @@ node_types: description: pattern4_attr_1_value status: SUPPORTED requirements: - - dependency_pd_server_port_1: + - dependency_pd_server_2_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_1: + - link_pd_server_2_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_port_2: + - dependency_pd_server_1_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_port_2: + - link_pd_server_1_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7307,6 +7307,17 @@ node_types: - 0 - UNBOUNDED capabilities: + feature_pd_server_2_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7319,43 +7330,61 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_server_pd: + network.outgoing.bytes_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_pd: + network.outgoing.packets.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_1: + memory.resident_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_port_2: + binding_pd_server_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + cpu_util_server_pd: type: org.openecomp.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_server_pd: + attachment_pd_server_2_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_port_1: + disk.device.read.requests_server_pd: type: org.openecomp.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_port_2: + forwarder_pd_server_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7390,23 +7419,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_2: + network.outpoing.packets_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_port_1: + network.incoming.bytes_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7448,35 +7467,43 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_port_1: - type: tosca.capabilities.Node + network.outpoing.packets_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pd_server_port_2: - type: tosca.capabilities.Node + binding_pd_server_2_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.read.bytes_server_pd: + network.incoming.packets.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pd: + disk.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_2_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_port_1: + feature_pd_server_1_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7488,21 +7515,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pd_server_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 + network.incoming.bytes.rate_pd_server_2_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED cpu.delta_server_pd: type: org.openecomp.capabilities.metric.Ceilometer @@ -7517,7 +7534,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_1: + network.incoming.bytes.rate_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7535,37 +7552,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.latency_server_pd: type: org.openecomp.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_port_1: + disk.device.write.bytes.rate_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pd: + disk.write.requests.rate_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pd: + network.outgoing.bytes.rate_pd_server_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7577,19 +7582,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_2: + disk.device.iops_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pd: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_port_1: + network.incoming.packets_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7612,30 +7616,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_pd: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - scalable_server_pd: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_2: + network.outgoing.bytes_pd_server_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_1: - type: org.openecomp.capabilities.Forwarder + binding_server_pd: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_pd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -7651,13 +7644,14 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_port_2: - type: org.openecomp.capabilities.Forwarder + feature_server_pd: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_server_pd: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -7679,6 +7673,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7694,71 +7694,73 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui_1c1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - port_cmaui_port_network: + constraints: + - greater_or_equal: 0 + port_cmaui_1c1_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_related_networks: + port_cmaui_1c1_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 + type: org.openecomp.datatypes.network.VlanRequirements compute_cmaui_1c1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_mgmt_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_1c1_mgmt_port_0_network_role: + type: string required: true status: SUPPORTED - port_cmaui_port_replacement_policy: + port_cmaui_1c1_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: + port_cmaui_1c1_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui_1c1_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -7766,35 +7768,33 @@ node_types: type: string required: true status: SUPPORTED - port_cmaui_port_ip_requirements: - type: list + port_cmaui_1c1_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_cmaui_1c1_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_cmaui_1c1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string - required: true - status: SUPPORTED attributes: cmaui_1c1_accessIPv4: type: string status: SUPPORTED requirements: - - dependency_cmaui_1c1_cmaui_port: + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_1c1_cmaui_port: + - link_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -7815,14 +7815,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_cmaui_1c1_cmaui_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.iops_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7846,49 +7838,50 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_1c1_cmaui_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.packets_cmaui_1c1_cmaui_port: + network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_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_cmaui_1c1_cmaui_port: + network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_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_cmaui_1c1_cmaui_port: + memory_cmaui_1c1: type: org.openecomp.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_cmaui_1c1_cmaui_port: + disk.latency_cmaui_1c1: type: org.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_cmaui_1c1: + disk.read.bytes.rate_cmaui_1c1: type: org.openecomp.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_cmaui_1c1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_cmaui_1c1: + network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_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: @@ -7924,25 +7917,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_1c1_cmaui_port: + disk.device.read.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_cmaui_1c1: + disk.ephemeral.size_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_cmaui_1c1: + instance_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_cmaui_1c1: + network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_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: @@ -7954,6 +7947,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7997,12 +7995,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_1c1_cmaui_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.write.bytes.rate_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8043,20 +8035,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_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_cmaui_1c1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_1c1_cmaui_port: + disk.allocation_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_cmaui_1c1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -8072,8 +8069,9 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_1c1_cmaui_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_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 @@ -8089,12 +8087,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_1c1_cmaui_port: - type: tosca.capabilities.Attachment + disk.usage_cmaui_1c1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_cmaui_1c1: + network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_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: @@ -8117,8 +8116,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_1c1_cmaui_port: - type: tosca.capabilities.Node + network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_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 @@ -8127,4 +8127,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index e8dbc5af26..ea071289d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -411,24 +411,24 @@ topology_template: get_attribute: - test_nested_no_compute - no_compute_attr_1 - port_pd_server_port_2_ip_requirements: + port_pd_server_2_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_2_mac_requirements: + port_pd_server_1_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_port_1_ip_requirements: + port_pd_server_2_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_1_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_1_mac_requirements: - mac_count_required: - is_required: false test_nested_no_compute: type: org.openecomp.resource.abstract.nodes.heat.nested-no-compute directives: @@ -449,32 +449,30 @@ topology_template: substitute_service_template: nested-pattern-4ServiceTemplate.yaml p2: get_input: p2 - port_pd_server_port_2_ip_requirements: + port_pd_server_2_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_2_mac_requirements: + port_pd_server_1_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_port_1_ip_requirements: + port_pd_server_2_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_1_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_1_mac_requirements: - mac_count_required: - is_required: false abstract_osm_server_1c2_0: type: org.openecomp.resource.abstract.nodes.osm_server_1c2 directives: - substitutable properties: - port_osm_port_replacement_policy: - - AUTO - port_osm_port_network: + port_osm_server_1c2_mgmt_port_0_network: - packet_internal_network_2 compute_osm_server_1c2_name: - get_input: @@ -482,24 +480,26 @@ topology_template: - 0 vm_flavor_name: get_input: osm_server_1c2_flavor - port_osm_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_osm_server_1c2_mgmt_port_0_replacement_policy: + - AUTO + port_osm_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: is_required: false - port_osm_port_fixed_ips: + vm_image_name: + get_input: osm_server_1c2_image + port_osm_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - BE_osm_ips - 1 - vm_image_name: - get_input: osm_server_1c2_image - port_osm_port_mac_requirements: - mac_count_required: - is_required: false compute_osm_server_1c2_availability_zone: - get_input: availability_zone_0 + port_osm_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_osm_server_1c2ServiceTemplate.yaml count: 1 @@ -509,7 +509,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_osm_server_1c2_osm_port: + - link_osm_server_1c2_osm_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network_2 relationship: tosca.relationships.network.LinksTo @@ -518,9 +518,7 @@ topology_template: directives: - substitutable properties: - port_osm_port_replacement_policy: - - AUTO - port_osm_port_network: + port_osm_server_1c2_mgmt_port_0_network: - packet_external_network_2 compute_osm_server_1c2_name: - get_input: @@ -528,22 +526,18 @@ topology_template: - 1 vm_flavor_name: get_input: osm_server_1c2_flavor - port_osm_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_osm_server_1c2_mgmt_port_0_replacement_policy: + - AUTO + port_osm_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: is_required: false - port_osm_port_fixed_ips: + vm_image_name: + get_input: osm_server_1c2_image + port_osm_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - BE_osm_ips - 1 - vm_image_name: - get_input: osm_server_1c2_image - port_osm_port_mac_requirements: - mac_count_required: - is_required: false compute_osm_server_1c2_metadata: - connectivity_to_server_1c1_BE_1: get_attribute: @@ -563,6 +557,12 @@ topology_template: - rd_server_1b_accessIPv4 compute_osm_server_1c2_availability_zone: - get_input: availability_zone_0 + port_osm_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_osm_server_1c2ServiceTemplate.yaml count: 1 @@ -572,7 +572,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_osm_server_1c2_osm_port: + - link_osm_server_1c2_osm_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network_2 relationship: tosca.relationships.network.LinksTo @@ -593,10 +593,16 @@ topology_template: properties: vm_flavor_name: get_input: BE_1c1_flavor - port_BE_port_mac_requirements: - mac_count_required: + port_BE_1c1_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_BE_port_fixed_ips: + compute_BE_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_BE_1c1_mgmt_port_0_fixed_ips: - - ip_address: get_input: - BE_osm_ips @@ -605,20 +611,17 @@ topology_template: get_input: - BE_osm_ips - 0 - compute_BE_1c1_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_BE_port_network: + port_BE_1c1_mgmt_port_0_network: - packet_internal_network_2 - packet_internal_network_2 - port_BE_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false vm_image_name: get_input: BE_1c1_image + port_BE_1c1_mgmt_port_0_replacement_policy: + - AUTO + - AUTO + port_BE_1c1_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false compute_BE_1c1_name: - get_input: - BE_1c1_names @@ -626,9 +629,6 @@ topology_template: - get_input: - BE_1c1_names - 0 - port_BE_port_replacement_policy: - - AUTO - - AUTO service_template_filter: substitute_service_template: Nested_BE_1c1ServiceTemplate.yaml count: 2 @@ -638,7 +638,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_BE_1c1_BE_port: + - link_BE_1c1_BE_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network_2 relationship: tosca.relationships.network.LinksTo @@ -689,4 +689,4 @@ topology_template: value: get_attribute: - abstract_osm_server_1c2_1 - - osm_server_1c2_accessIPv4
\ No newline at end of file + - osm_server_1c2_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml index 5833cce311..b6584b992e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml @@ -11,12 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_BE_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_BE_port_network_role: + port_BE_1c1_mgmt_port_0_network_role: type: string required: true + port_BE_1c1_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -24,119 +26,117 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_BE_port_order: + port_BE_1c1_mgmt_port_0_order: type: integer required: true - port_BE_port_subnetpoolid: - type: string - required: true vm_flavor_name: type: string required: true - port_BE_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_BE_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_BE_port_vlan_requirements: + port_BE_1c1_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_BE_1c1_availability_zone: type: list required: true entry_schema: type: string - port_BE_port_network: + port_BE_1c1_mgmt_port_0_subnetpoolid: + type: string + required: true + port_BE_1c1_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_BE_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_BE_1c1_mgmt_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_BE_port_network_role_tag: - type: string - required: true - port_BE_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_BE_1c1_mgmt_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string + port_BE_1c1_mgmt_port_0_network_role_tag: + type: string + required: true vm_image_name: type: string required: true - compute_BE_1c1_name: + port_BE_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_BE_1c1_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_BE_port_replacement_policy: + port_BE_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + compute_BE_1c1_name: type: list required: true entry_schema: type: string node_templates: - BE_1c1_BE_port: + BE_1c1: + type: org.openecomp.resource.vfc.compute.nodes.heat.BE_1c1 + properties: + availability_zone: + get_input: + - compute_BE_1c1_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_BE_1c1_name + - index_value + BE_1c1_BE_1c1_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_BE_port_replacement_policy + - port_BE_1c1_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_BE_port_mac_requirements + get_input: port_BE_1c1_mgmt_port_0_mac_requirements order: - get_input: port_BE_port_order + get_input: port_BE_1c1_mgmt_port_0_order exCP_naming: - get_input: port_BE_port_exCP_naming + get_input: port_BE_1c1_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_BE_port_vlan_requirements + get_input: port_BE_1c1_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_BE_port_ip_requirements + get_input: port_BE_1c1_mgmt_port_0_ip_requirements related_networks: - get_input: port_BE_port_related_networks + get_input: port_BE_1c1_mgmt_port_0_related_networks network_role_tag: - get_input: port_BE_port_network_role_tag + get_input: port_BE_1c1_mgmt_port_0_network_role_tag network_role: - get_input: port_BE_port_network_role + get_input: port_BE_1c1_mgmt_port_0_network_role fixed_ips: get_input: - - port_BE_port_fixed_ips + - port_BE_1c1_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_BE_port_subnetpoolid + get_input: port_BE_1c1_mgmt_port_0_subnetpoolid network: get_input: - - port_BE_port_network + - port_BE_1c1_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: BE_1c1 relationship: tosca.relationships.network.BindsTo - BE_1c1: - type: org.openecomp.resource.vfc.compute.nodes.heat.BE_1c1 - properties: - availability_zone: - get_input: - - compute_BE_1c1_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_BE_1c1_name - - index_value outputs: BE_1c1_accessIPv4: type: string @@ -159,9 +159,6 @@ topology_template: endpoint_BE_1c1: - BE_1c1 - endpoint - network.outpoing.packets_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.outpoing.packets disk.device.write.requests_BE_1c1: - BE_1c1 - disk.device.write.requests @@ -171,15 +168,12 @@ topology_template: vcpus_BE_1c1: - BE_1c1 - vcpus - network.incoming.packets.rate_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.incoming.packets.rate - attachment_BE_1c1_BE_port: - - BE_1c1_BE_port - - attachment - network.incoming.bytes_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.incoming.bytes + feature_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - feature + network.incoming.packets_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.incoming.packets disk.capacity_BE_1c1: - BE_1c1 - disk.capacity @@ -195,24 +189,18 @@ topology_template: disk.write.bytes_BE_1c1: - BE_1c1 - disk.write.bytes - network.outgoing.packets.rate_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.outgoing.packets.rate - binding_BE_1c1_BE_port: - - BE_1c1_BE_port - - binding disk.device.usage_BE_1c1: - BE_1c1 - disk.device.usage disk.device.read.requests.rate_BE_1c1: - BE_1c1 - disk.device.read.requests.rate - network.outgoing.bytes.rate_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.outgoing.bytes.rate scalable_BE_1c1: - BE_1c1 - scalable + network.outgoing.bytes.rate_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.outgoing.bytes.rate disk.read.requests_BE_1c1: - BE_1c1 - disk.read.requests @@ -225,18 +213,18 @@ topology_template: memory.usage_BE_1c1: - BE_1c1 - memory.usage - network.incoming.packets_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.incoming.packets - forwarder_BE_1c1_BE_port: - - BE_1c1_BE_port - - forwarder + network.outgoing.bytes_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.outgoing.bytes disk.device.latency_BE_1c1: - BE_1c1 - disk.device.latency disk.device.read.requests_BE_1c1: - BE_1c1 - disk.device.read.requests + network.incoming.packets.rate_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.incoming.packets.rate memory.resident_BE_1c1: - BE_1c1 - memory.resident @@ -255,21 +243,36 @@ topology_template: disk.read.bytes.rate_BE_1c1: - BE_1c1 - disk.read.bytes.rate + binding_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - binding + forwarder_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - forwarder disk.device.iops_BE_1c1: - BE_1c1 - disk.device.iops disk.root.size_BE_1c1: - BE_1c1 - disk.root.size - network.incoming.bytes.rate_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.incoming.bytes.rate + network.outgoing.packets.rate_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.outgoing.packets.rate + attachment_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - attachment cpu_BE_1c1: - BE_1c1 - cpu cpu.delta_BE_1c1: - BE_1c1 - cpu.delta + network.incoming.bytes.rate_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.incoming.bytes.rate + network.outpoing.packets_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_BE_1c1: - BE_1c1 - disk.write.requests.rate @@ -279,6 +282,9 @@ topology_template: feature_BE_1c1: - BE_1c1 - feature + network.incoming.bytes_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - network.incoming.bytes disk.write.bytes.rate_BE_1c1: - BE_1c1 - disk.write.bytes.rate @@ -288,18 +294,12 @@ topology_template: disk.device.read.bytes_BE_1c1: - BE_1c1 - disk.device.read.bytes - feature_BE_1c1_BE_port: - - BE_1c1_BE_port - - feature disk.device.read.bytes.rate_BE_1c1: - BE_1c1 - disk.device.read.bytes.rate disk.device.capacity_BE_1c1: - BE_1c1 - disk.device.capacity - network.outgoing.bytes_BE_1c1_BE_port: - - BE_1c1_BE_port - - network.outgoing.bytes disk.latency_BE_1c1: - BE_1c1 - disk.latency @@ -307,15 +307,15 @@ topology_template: - BE_1c1 - cpu_util requirements: - link_BE_1c1_BE_port: - - BE_1c1_BE_port - - link local_storage_BE_1c1: - BE_1c1 - local_storage - dependency_BE_1c1_BE_port: - - BE_1c1_BE_port - - dependency dependency_BE_1c1: - BE_1c1 - - dependency
\ No newline at end of file + - dependency + dependency_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - dependency + link_BE_1c1_BE_1c1_mgmt_port_0: + - BE_1c1_BE_1c1_mgmt_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml index 334e680cc5..b7135a12b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -11,29 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cmaui_port_vlan_requirements: + port_cmaui_1c1_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cmaui_port_network: - type: list - required: true - entry_schema: - type: string - port_cmaui_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,81 +23,99 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_cmaui_1c1_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_cmaui_1c1_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cmaui_1c1_availability_zone: type: list required: true entry_schema: type: string - port_cmaui_port_network_role_tag: - type: string + port_cmaui_1c1_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_cmaui_port_order: - type: integer + port_cmaui_1c1_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_flavor_name: type: string required: true - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_1c1_mgmt_port_0_fixed_ips: + type: list required: true - port_cmaui_port_replacement_policy: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_1c1_mgmt_port_0_network_role: + type: string + required: true + port_cmaui_1c1_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: + port_cmaui_1c1_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cmaui_1c1_mgmt_port_0_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: - type: list + port_cmaui_1c1_mgmt_port_0_order: + type: integer + required: true + port_cmaui_1c1_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_cmaui_1c1_name: type: list required: true entry_schema: type: string - port_cmaui_port_subnetpoolid: - type: string - required: true node_templates: - cmaui_1c1_cmaui_port: + cmaui_1c1_cmaui_1c1_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_cmaui_port_replacement_policy + - port_cmaui_1c1_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_1c1_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_1c1_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_1c1_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_1c1_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_1c1_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_1c1_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_1c1_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_1c1_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_1c1_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_1c1_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_1c1_mgmt_port_0_network - index_value requirements: - binding: @@ -147,9 +147,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cmaui_1c1 capabilities: - binding_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - binding disk.iops_cmaui_1c1: - cmaui_1c1 - disk.iops @@ -162,21 +159,15 @@ topology_template: endpoint_cmaui_1c1: - cmaui_1c1 - endpoint - network.incoming.bytes.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.bytes.rate - network.incoming.packets_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.packets - network.outgoing.bytes_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outgoing.bytes - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port + binding_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - binding + network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 - network.outgoing.bytes.rate - network.outpoing.packets_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outpoing.packets + network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outgoing.bytes memory_cmaui_1c1: - cmaui_1c1 - memory @@ -186,6 +177,12 @@ topology_template: disk.read.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.read.bytes.rate + attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - attachment + network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.packets disk.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.write.requests.rate @@ -201,9 +198,6 @@ topology_template: cpu_util_cmaui_1c1: - cmaui_1c1 - cpu_util - network.outgoing.packets.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.outgoing.packets.rate disk.device.read.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.device.read.bytes.rate @@ -213,9 +207,15 @@ topology_template: instance_cmaui_1c1: - cmaui_1c1 - instance + network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.packets.rate disk.device.read.requests_cmaui_1c1: - cmaui_1c1 - disk.device.read.requests + feature_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - feature disk.device.write.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes.rate @@ -237,9 +237,6 @@ topology_template: disk.device.latency_cmaui_1c1: - cmaui_1c1 - disk.device.latency - network.incoming.bytes_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.bytes disk.write.bytes.rate_cmaui_1c1: - cmaui_1c1 - disk.write.bytes.rate @@ -261,36 +258,39 @@ topology_template: disk.device.read.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.read.requests.rate + network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.bytes feature_cmaui_1c1: - cmaui_1c1 - feature - network.incoming.packets.rate_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - network.incoming.packets.rate disk.allocation_cmaui_1c1: - cmaui_1c1 - disk.allocation + forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - forwarder disk.device.allocation_cmaui_1c1: - cmaui_1c1 - disk.device.allocation disk.device.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.requests.rate - forwarder_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - forwarder + network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes memory.resident_cmaui_1c1: - cmaui_1c1 - memory.resident - attachment_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - attachment disk.usage_cmaui_1c1: - cmaui_1c1 - disk.usage + network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.incoming.bytes.rate disk.read.requests_cmaui_1c1: - cmaui_1c1 - disk.read.requests @@ -300,22 +300,22 @@ topology_template: vcpus_cmaui_1c1: - cmaui_1c1 - vcpus - feature_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - feature + network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - network.outpoing.packets cpu.delta_cmaui_1c1: - cmaui_1c1 - cpu.delta requirements: - dependency_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - dependency + link_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - link dependency_cmaui_1c1: - cmaui_1c1 - dependency - link_cmaui_1c1_cmaui_port: - - cmaui_1c1_cmaui_port - - link + dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0: + - cmaui_1c1_cmaui_1c1_mgmt_port_0 + - dependency local_storage_cmaui_1c1: - cmaui_1c1 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml index 5ad7f5d029..0b256d91f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -11,14 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_1c2_mgmt_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_1c2_name: type: list required: true entry_schema: type: string + port_oam_server_1c2_mgmt_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 @@ -26,38 +33,30 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_port_network: + port_oam_server_1c2_mgmt_port_0_network_role_tag: + type: string + required: true + port_oam_server_1c2_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_oam_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam_port_order: - type: integer - required: true - port_oam_port_subnetpoolid: - type: string - required: true - port_oam_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_server_1c2_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_flavor_name: type: string required: true + port_oam_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_oam_server_1c2_availability_zone: type: list required: true entry_schema: type: string - port_oam_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true @@ -66,86 +65,87 @@ topology_template: required: true entry_schema: type: json - port_oam_port_vlan_requirements: + port_oam_server_1c2_mgmt_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_port_ip_requirements: - type: list + type: string + port_oam_server_1c2_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_server_1c2_mgmt_port_0_subnetpoolid: + type: string + required: true + port_oam_server_1c2_mgmt_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_oam_port_network_role_tag: - type: string - required: true - port_oam_port_network_role: + port_oam_server_1c2_mgmt_port_0_network_role: type: string required: true node_templates: - oam_server_1c2: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2 - properties: - availability_zone: - get_input: - - compute_oam_server_1c2_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - metadata: - get_input: - - compute_oam_server_1c2_metadata - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_server_1c2_name - - index_value - oam_server_1c2_oam_port: + oam_server_1c2_oam_server_1c2_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_oam_port_replacement_policy + - port_oam_server_1c2_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_oam_port_mac_requirements + get_input: port_oam_server_1c2_mgmt_port_0_mac_requirements order: - get_input: port_oam_port_order + get_input: port_oam_server_1c2_mgmt_port_0_order exCP_naming: - get_input: port_oam_port_exCP_naming + get_input: port_oam_server_1c2_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_oam_port_vlan_requirements + get_input: port_oam_server_1c2_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_oam_port_ip_requirements + get_input: port_oam_server_1c2_mgmt_port_0_ip_requirements related_networks: - get_input: port_oam_port_related_networks + get_input: port_oam_server_1c2_mgmt_port_0_related_networks network_role_tag: - get_input: port_oam_port_network_role_tag + get_input: port_oam_server_1c2_mgmt_port_0_network_role_tag network_role: - get_input: port_oam_port_network_role + get_input: port_oam_server_1c2_mgmt_port_0_network_role fixed_ips: get_input: - - port_oam_port_fixed_ips + - port_oam_server_1c2_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_oam_port_subnetpoolid + get_input: port_oam_server_1c2_mgmt_port_0_subnetpoolid network: get_input: - - port_oam_port_network + - port_oam_server_1c2_mgmt_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam_server_1c2 relationship: tosca.relationships.network.BindsTo + oam_server_1c2: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam_server_1c2 + properties: + availability_zone: + get_input: + - compute_oam_server_1c2_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_oam_server_1c2_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_server_1c2_name + - index_value outputs: oam_server_1c2_accessIPv4: type: string @@ -174,27 +174,18 @@ topology_template: disk.device.write.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.device.write.bytes.rate - network.outgoing.packets.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.packets.rate - network.outpoing.packets_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outpoing.packets cpu_util_oam_server_1c2: - oam_server_1c2 - cpu_util disk.device.write.bytes_oam_server_1c2: - oam_server_1c2 - disk.device.write.bytes + binding_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - binding disk.device.allocation_oam_server_1c2: - oam_server_1c2 - disk.device.allocation - attachment_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - attachment - network.incoming.bytes.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.bytes.rate disk.root.size_oam_server_1c2: - oam_server_1c2 - disk.root.size @@ -204,33 +195,33 @@ topology_template: disk.read.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.read.bytes.rate - network.outgoing.bytes_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.bytes + network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.bytes.rate disk.allocation_oam_server_1c2: - oam_server_1c2 - disk.allocation disk.read.bytes_oam_server_1c2: - oam_server_1c2 - disk.read.bytes - network.incoming.bytes_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.bytes - network.outgoing.bytes.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.outgoing.bytes.rate + network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.packets + network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.packets.rate vcpus_oam_server_1c2: - oam_server_1c2 - vcpus disk.device.read.bytes.rate_oam_server_1c2: - oam_server_1c2 - disk.device.read.bytes.rate - network.incoming.packets_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.packets cpu_oam_server_1c2: - oam_server_1c2 - cpu + network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_oam_server_1c2: - oam_server_1c2 - disk.write.requests.rate @@ -249,12 +240,12 @@ topology_template: endpoint_oam_server_1c2: - oam_server_1c2 - endpoint - forwarder_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - forwarder disk.ephemeral.size_oam_server_1c2: - oam_server_1c2 - disk.ephemeral.size + feature_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - feature memory.resident_oam_server_1c2: - oam_server_1c2 - memory.resident @@ -267,27 +258,30 @@ topology_template: memory.usage_oam_server_1c2: - oam_server_1c2 - memory.usage + attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - attachment disk.usage_oam_server_1c2: - oam_server_1c2 - disk.usage - network.incoming.packets.rate_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - network.incoming.packets.rate - binding_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - binding + network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.bytes os_oam_server_1c2: - oam_server_1c2 - os + forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - forwarder disk.device.read.requests_oam_server_1c2: - oam_server_1c2 - disk.device.read.requests disk.latency_oam_server_1c2: - oam_server_1c2 - disk.latency - feature_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - feature + network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.bytes disk.write.requests_oam_server_1c2: - oam_server_1c2 - disk.write.requests @@ -306,6 +300,9 @@ topology_template: disk.write.bytes_oam_server_1c2: - oam_server_1c2 - disk.write.bytes + network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.outgoing.packets.rate disk.capacity_oam_server_1c2: - oam_server_1c2 - disk.capacity @@ -315,16 +312,19 @@ topology_template: disk.iops_oam_server_1c2: - oam_server_1c2 - disk.iops + network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - network.incoming.bytes.rate requirements: local_storage_oam_server_1c2: - oam_server_1c2 - local_storage + dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 + - dependency dependency_oam_server_1c2: - oam_server_1c2 - dependency - link_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port + link_oam_server_1c2_oam_server_1c2_mgmt_port_0: + - oam_server_1c2_oam_server_1c2_mgmt_port_0 - link - dependency_oam_server_1c2_oam_port: - - oam_server_1c2_oam_port - - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml index 867f972c34..f00f07985c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml @@ -11,17 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_osm_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_osm_port_exCP_naming: + port_osm_server_1c2_mgmt_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_osm_port_subnetpoolid: - type: string - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -29,7 +21,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_osm_port_network: + port_osm_server_1c2_mgmt_port_0_network: type: list required: true entry_schema: @@ -39,88 +31,96 @@ topology_template: required: true entry_schema: type: string - port_osm_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true - port_osm_port_ip_requirements: + port_osm_server_1c2_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_osm_port_fixed_ips: + type: string + port_osm_server_1c2_mgmt_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_osm_port_network_role_tag: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_osm_server_1c2_mgmt_port_0_subnetpoolid: type: string required: true - port_osm_port_network_role: - type: string + port_osm_server_1c2_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true vm_image_name: type: string required: true - port_osm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_osm_server_1c2_mgmt_port_0_network_role_tag: + type: string required: true - port_osm_port_order: + port_osm_server_1c2_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_osm_server_1c2_mgmt_port_0_order: type: integer required: true - port_osm_port_related_networks: + port_osm_server_1c2_mgmt_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_osm_server_1c2_metadata: type: list required: true entry_schema: type: json + port_osm_server_1c2_mgmt_port_0_network_role: + type: string + required: true compute_osm_server_1c2_availability_zone: type: list required: true entry_schema: type: string + port_osm_server_1c2_mgmt_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: - osm_server_1c2_osm_port: + osm_server_1c2_osm_server_1c2_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_osm_port_replacement_policy + - port_osm_server_1c2_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_osm_port_mac_requirements + get_input: port_osm_server_1c2_mgmt_port_0_mac_requirements order: - get_input: port_osm_port_order + get_input: port_osm_server_1c2_mgmt_port_0_order exCP_naming: - get_input: port_osm_port_exCP_naming + get_input: port_osm_server_1c2_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_osm_port_vlan_requirements + get_input: port_osm_server_1c2_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_osm_port_ip_requirements + get_input: port_osm_server_1c2_mgmt_port_0_ip_requirements related_networks: - get_input: port_osm_port_related_networks + get_input: port_osm_server_1c2_mgmt_port_0_related_networks network_role_tag: - get_input: port_osm_port_network_role_tag + get_input: port_osm_server_1c2_mgmt_port_0_network_role_tag network_role: - get_input: port_osm_port_network_role + get_input: port_osm_server_1c2_mgmt_port_0_network_role fixed_ips: get_input: - - port_osm_port_fixed_ips + - port_osm_server_1c2_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_osm_port_subnetpoolid + get_input: port_osm_server_1c2_mgmt_port_0_subnetpoolid network: get_input: - - port_osm_port_network + - port_osm_server_1c2_mgmt_port_0_network - index_value requirements: - binding: @@ -159,12 +159,12 @@ topology_template: endpoint_osm_server_1c2: - osm_server_1c2 - endpoint - feature_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - feature os_osm_server_1c2: - osm_server_1c2 - os + feature_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - feature disk.device.read.bytes.rate_osm_server_1c2: - osm_server_1c2 - disk.device.read.bytes.rate @@ -186,6 +186,12 @@ topology_template: host_osm_server_1c2: - osm_server_1c2 - host + attachment_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - attachment + network.outgoing.bytes_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.outgoing.bytes memory_osm_server_1c2: - osm_server_1c2 - memory @@ -207,9 +213,12 @@ topology_template: memory.resident_osm_server_1c2: - osm_server_1c2 - memory.resident - attachment_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - attachment + forwarder_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - forwarder + network.incoming.bytes_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.incoming.bytes feature_osm_server_1c2: - osm_server_1c2 - feature @@ -219,27 +228,18 @@ topology_template: disk.device.write.requests_osm_server_1c2: - osm_server_1c2 - disk.device.write.requests - network.outgoing.bytes_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.outgoing.bytes disk.ephemeral.size_osm_server_1c2: - osm_server_1c2 - disk.ephemeral.size disk.allocation_osm_server_1c2: - osm_server_1c2 - disk.allocation - binding_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - binding disk.write.bytes_osm_server_1c2: - osm_server_1c2 - disk.write.bytes disk.capacity_osm_server_1c2: - osm_server_1c2 - disk.capacity - network.incoming.bytes_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.incoming.bytes disk.write.requests_osm_server_1c2: - osm_server_1c2 - disk.write.requests @@ -249,9 +249,12 @@ topology_template: binding_osm_server_1c2: - osm_server_1c2 - binding - network.incoming.packets.rate_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.incoming.packets.rate + network.outgoing.packets.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.incoming.bytes.rate scalable_osm_server_1c2: - osm_server_1c2 - scalable @@ -264,6 +267,9 @@ topology_template: disk.read.bytes_osm_server_1c2: - osm_server_1c2 - disk.read.bytes + network.outgoing.bytes.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.outgoing.bytes.rate disk.root.size_osm_server_1c2: - osm_server_1c2 - disk.root.size @@ -273,9 +279,6 @@ topology_template: memory.usage_osm_server_1c2: - osm_server_1c2 - memory.usage - network.outpoing.packets_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.outpoing.packets disk.write.bytes.rate_osm_server_1c2: - osm_server_1c2 - disk.write.bytes.rate @@ -285,46 +288,43 @@ topology_template: disk.device.usage_osm_server_1c2: - osm_server_1c2 - disk.device.usage - network.outgoing.packets.rate_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.outgoing.packets.rate + binding_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - binding + network.incoming.packets_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.incoming.packets + network.incoming.packets.rate_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.incoming.packets.rate disk.device.read.bytes_osm_server_1c2: - osm_server_1c2 - disk.device.read.bytes - forwarder_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - forwarder + network.outpoing.packets_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - network.outpoing.packets disk.device.capacity_osm_server_1c2: - osm_server_1c2 - disk.device.capacity - network.outgoing.bytes.rate_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.outgoing.bytes.rate disk.device.write.bytes_osm_server_1c2: - osm_server_1c2 - disk.device.write.bytes disk.device.write.requests.rate_osm_server_1c2: - osm_server_1c2 - disk.device.write.requests.rate - network.incoming.bytes.rate_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.incoming.bytes.rate instance_osm_server_1c2: - osm_server_1c2 - instance - network.incoming.packets_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - network.incoming.packets requirements: - link_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port - - link - dependency_osm_server_1c2_osm_port: - - osm_server_1c2_osm_port + dependency_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 - dependency local_storage_osm_server_1c2: - osm_server_1c2 - local_storage dependency_osm_server_1c2: - osm_server_1c2 - - dependency
\ No newline at end of file + - dependency + link_osm_server_1c2_osm_server_1c2_mgmt_port_0: + - osm_server_1c2_osm_server_1c2_mgmt_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml index 4c8a635991..e44613e5cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: - type: list + port_ps_server_1b_port_1_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_1b_name: type: list required: true entry_schema: type: string - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,104 +31,112 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: - pd_server_1b: - type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b - properties: - availability_zone: - get_input: - - compute_pd_server_1b_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_pd_server_1b_name - - index_value - pd_server_1b_ps_server_1b_port: + pd_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b: + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b + properties: + availability_zone: + get_input: + - compute_pd_server_1b_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_pd_server_1b_name + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b capabilities: @@ -146,30 +146,21 @@ topology_template: host_pd_server_1b: - pd_server_1b - host - network.outpoing.packets_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes.rate disk.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.read.bytes.rate + forwarder_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - forwarder disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - feature cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - network.incoming.packets_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.incoming.packets - forwarder_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - forwarder disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -179,9 +170,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.outgoing.bytes.rate cpu_pd_server_1b: - pd_server_1b - cpu @@ -203,9 +191,9 @@ topology_template: memory_pd_server_1b: - pd_server_1b - memory - network.outgoing.bytes_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.outgoing.bytes + network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.read.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.read.bytes.rate @@ -227,30 +215,42 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - binding_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - binding scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests + network.incoming.bytes_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.incoming.bytes disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.incoming.packets.rate_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + network.incoming.packets_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.incoming.packets + network.outgoing.bytes_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes disk.device.write.bytes_pd_server_1b: - pd_server_1b - disk.device.write.bytes + attachment_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - attachment os_pd_server_1b: - pd_server_1b - os @@ -260,9 +260,6 @@ topology_template: instance_pd_server_1b: - pd_server_1b - instance - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.outgoing.packets.rate binding_pd_server_1b: - pd_server_1b - binding @@ -272,21 +269,18 @@ topology_template: memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.incoming.packets.rate - attachment_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - attachment - network.incoming.bytes_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - network.incoming.bytes + feature_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - feature disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate disk.device.capacity_pd_server_1b: - pd_server_1b - disk.device.capacity + network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests @@ -296,19 +290,25 @@ topology_template: disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outpoing.packets_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - network.outpoing.packets + binding_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - binding disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate requirements: + dependency_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - dependency + link_pd_server_1b_ps_server_1b_port_1: + - pd_server_1b_ps_server_1b_port_1 + - link dependency_pd_server_1b: - pd_server_1b - dependency local_storage_pd_server_1b: - pd_server_1b - local_storage - dependency_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - dependency - link_pd_server_1b_ps_server_1b_port: - - pd_server_1b_ps_server_1b_port - - 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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml index 798ca5a3de..287608b58e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -16,6 +16,25 @@ topology_template: required: true entry_schema: type: string + port_pd_server_1b_port_1_network_role_tag: + type: string + required: true + port_pd_server_1b_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,63 +42,44 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - vm_flavor_name: - type: string - required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: + vm_flavor_name: type: string required: true + port_pd_server_1b_port_1_order: + type: integer + required: true vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: @@ -98,39 +98,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: @@ -150,9 +150,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -162,18 +159,15 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -183,9 +177,6 @@ topology_template: disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -198,15 +189,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -219,12 +213,12 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -234,9 +228,9 @@ topology_template: disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -246,12 +240,21 @@ topology_template: disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -264,9 +267,6 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance @@ -276,14 +276,14 @@ topology_template: cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -294,9 +294,6 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity @@ -306,6 +303,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -313,9 +313,9 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + link_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml index 17cbb4ac54..a22e09cd2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml @@ -21,9 +21,6 @@ topology_template: immutable: false type: string description: UID of OAM network - port_pd_server_port_1_order: - type: integer - required: true pd_server_names: hidden: false immutable: false @@ -31,27 +28,32 @@ topology_template: description: PD server names entry_schema: type: string - port_pd_server_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1_port_ip_requirements: + type: list required: true - port_pd_server_port_2_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_port_order: + type: integer required: true - port_pd_server_port_1_network_role: - type: string + port_pd_server_2_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true pd_server_flavor: hidden: false immutable: false type: string description: Flavor for PD server - port_pd_server_port_2_ip_requirements: + port_pd_server_1_port_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_network_role_tag: + type: string + required: true + port_pd_server_1_port_network_role: + type: string required: true availability_zone_0: label: availabilityzone name @@ -63,29 +65,30 @@ topology_template: hidden: false immutable: false type: string - port_pd_server_port_2_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_subnetpoolid: - type: string - required: true pd_server_ips: hidden: false immutable: false type: string - port_pd_server_port_1_subnetpoolid: + port_pd_server_1_port_subnetpoolid: type: string required: true - port_pd_server_port_1_related_networks: + port_pd_server_2_port_order: + type: integer + required: true + port_pd_server_1_port_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_1_network_role_tag: + port_pd_server_1_port_network_role_tag: + type: string + required: true + port_pd_server_2_port_subnetpoolid: type: string required: true + port_pd_server_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true security_group_name: hidden: false immutable: false @@ -98,20 +101,25 @@ topology_template: immutable: false type: string description: Flavor for PS server - port_pd_server_port_1_vlan_requirements: + port_pd_server_2_port_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_port_2_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_server_port_2_related_networks: + port_pd_server_2_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_port_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_port_2_network_role_tag: + port_pd_server_2_port_network_role: type: string required: true pd_server_image: @@ -119,83 +127,75 @@ topology_template: immutable: false type: string description: Flavor for PD server - port_pd_server_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - pd_server_port_1: + pd_server_2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_port_1_subnetpoolid + get_input: port_pd_server_2_port_subnetpoolid related_networks: - get_input: port_pd_server_port_1_related_networks + get_input: port_pd_server_2_port_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_port_1_ip_requirements + get_input: port_pd_server_2_port_ip_requirements network_role: - get_input: port_pd_server_port_1_network_role + get_input: port_pd_server_2_port_network_role fixed_ips: - ip_address: get_input: - pd_server_ips - - 0 + - 1 mac_requirements: - get_input: port_pd_server_port_1_mac_requirements + get_input: port_pd_server_2_port_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_port_1_exCP_naming + get_input: port_pd_server_2_port_exCP_naming vlan_requirements: - get_input: port_pd_server_port_1_vlan_requirements + get_input: port_pd_server_2_port_vlan_requirements network_role_tag: - get_input: port_pd_server_port_1_network_role_tag + get_input: port_pd_server_2_port_network_role_tag order: - get_input: port_pd_server_port_1_order + get_input: port_pd_server_2_port_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pd relationship: tosca.relationships.network.BindsTo - pd_server_port_2: + pd_server_1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: - get_input: port_pd_server_port_2_subnetpoolid + get_input: port_pd_server_1_port_subnetpoolid related_networks: - get_input: port_pd_server_port_2_related_networks + get_input: port_pd_server_1_port_related_networks network: get_input: net replacement_policy: AUTO ip_requirements: - get_input: port_pd_server_port_2_ip_requirements + get_input: port_pd_server_1_port_ip_requirements network_role: - get_input: port_pd_server_port_2_network_role + get_input: port_pd_server_1_port_network_role fixed_ips: - ip_address: get_input: - pd_server_ips - - 1 + - 0 mac_requirements: - get_input: port_pd_server_port_2_mac_requirements + get_input: port_pd_server_1_port_mac_requirements subinterface_indicator: false exCP_naming: - get_input: port_pd_server_port_2_exCP_naming + get_input: port_pd_server_1_port_exCP_naming vlan_requirements: - get_input: port_pd_server_port_2_vlan_requirements + get_input: port_pd_server_1_port_vlan_requirements network_role_tag: - get_input: port_pd_server_port_2_network_role_tag + get_input: port_pd_server_1_port_network_role_tag order: - get_input: port_pd_server_port_2_order + get_input: port_pd_server_1_port_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -221,8 +221,8 @@ topology_template: heat_file: ../Artifacts/nested-pattern-4.yml description: nested1 members: - - pd_server_port_1 - - pd_server_port_2 + - pd_server_2_port + - pd_server_1_port - server_pd outputs: pattern4_attr_1: @@ -231,33 +231,48 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.pd_server capabilities: + feature_pd_server_2_port: + - pd_server_2_port + - feature + network.incoming.packets.rate_pd_server_1_port: + - pd_server_1_port + - network.incoming.packets.rate disk.iops_server_pd: - server_pd - disk.iops disk.device.read.bytes.rate_server_pd: - server_pd - disk.device.read.bytes.rate + network.outgoing.bytes_pd_server_2_port: + - pd_server_2_port + - network.outgoing.bytes + network.outgoing.packets.rate_pd_server_2_port: + - pd_server_2_port + - network.outgoing.packets.rate memory.resident_server_pd: - server_pd - memory.resident + binding_pd_server_1_port: + - pd_server_1_port + - binding cpu_util_server_pd: - server_pd - cpu_util - network.incoming.bytes_pd_server_port_1: - - pd_server_port_1 - - network.incoming.bytes - network.incoming.bytes_pd_server_port_2: - - pd_server_port_2 - - network.incoming.bytes + attachment_pd_server_2_port: + - pd_server_2_port + - attachment + network.incoming.packets_pd_server_2_port: + - pd_server_2_port + - network.incoming.packets disk.device.read.requests_server_pd: - server_pd - disk.device.read.requests - network.incoming.bytes.rate_pd_server_port_1: - - pd_server_port_1 - - network.incoming.bytes.rate - network.incoming.bytes.rate_pd_server_port_2: - - pd_server_port_2 - - network.incoming.bytes.rate + forwarder_pd_server_1_port: + - pd_server_1_port + - forwarder + network.outgoing.packets.rate_pd_server_1_port: + - pd_server_1_port + - network.outgoing.packets.rate disk.device.allocation_server_pd: - server_pd - disk.device.allocation @@ -273,18 +288,12 @@ topology_template: disk.device.capacity_server_pd: - server_pd - disk.device.capacity - attachment_pd_server_port_2: - - pd_server_port_2 - - attachment - network.incoming.packets_pd_server_port_2: - - pd_server_port_2 - - network.incoming.packets - attachment_pd_server_port_1: - - pd_server_port_1 - - attachment - network.incoming.packets_pd_server_port_1: - - pd_server_port_1 - - network.incoming.packets + network.outpoing.packets_pd_server_2_port: + - pd_server_2_port + - network.outpoing.packets + network.incoming.bytes_pd_server_2_port: + - pd_server_2_port + - network.incoming.bytes memory.usage_server_pd: - server_pd - memory.usage @@ -303,78 +312,72 @@ topology_template: disk.device.usage_server_pd: - server_pd - disk.device.usage - feature_pd_server_port_1: - - pd_server_port_1 - - feature - feature_pd_server_port_2: - - pd_server_port_2 - - feature + network.outpoing.packets_pd_server_1_port: + - pd_server_1_port + - network.outpoing.packets + binding_pd_server_2_port: + - pd_server_2_port + - binding + network.incoming.packets.rate_pd_server_2_port: + - pd_server_2_port + - network.incoming.packets.rate disk.read.bytes_server_pd: - server_pd - disk.read.bytes + forwarder_pd_server_2_port: + - pd_server_2_port + - forwarder + feature_pd_server_1_port: + - pd_server_1_port + - feature disk.device.read.bytes_server_pd: - server_pd - disk.device.read.bytes - network.incoming.packets.rate_pd_server_port_2: - - pd_server_port_2 - - network.incoming.packets.rate - network.incoming.packets.rate_pd_server_port_1: - - pd_server_port_1 - - network.incoming.packets.rate instance_server_pd: - server_pd - instance - binding_pd_server_port_2: - - pd_server_port_2 - - binding - binding_pd_server_port_1: - - pd_server_port_1 - - binding + network.incoming.bytes.rate_pd_server_2_port: + - pd_server_2_port + - network.incoming.bytes.rate cpu.delta_server_pd: - server_pd - cpu.delta host_server_pd: - server_pd - host - network.outpoing.packets_pd_server_port_1: - - pd_server_port_1 - - network.outpoing.packets + network.incoming.bytes.rate_pd_server_1_port: + - pd_server_1_port + - network.incoming.bytes.rate vcpus_server_pd: - server_pd - vcpus disk.ephemeral.size_server_pd: - server_pd - disk.ephemeral.size - network.outpoing.packets_pd_server_port_2: - - pd_server_port_2 - - network.outpoing.packets - network.outgoing.packets.rate_pd_server_port_2: - - pd_server_port_2 - - network.outgoing.packets.rate disk.latency_server_pd: - server_pd - disk.latency - network.outgoing.packets.rate_pd_server_port_1: - - pd_server_port_1 - - network.outgoing.packets.rate disk.device.write.bytes.rate_server_pd: - server_pd - disk.device.write.bytes.rate disk.write.requests.rate_server_pd: - server_pd - disk.write.requests.rate + network.outgoing.bytes.rate_pd_server_2_port: + - pd_server_2_port + - network.outgoing.bytes.rate disk.write.requests_server_pd: - server_pd - disk.write.requests - network.outgoing.bytes_pd_server_port_2: - - pd_server_port_2 - - network.outgoing.bytes disk.device.iops_server_pd: - server_pd - disk.device.iops - network.outgoing.bytes_pd_server_port_1: - - pd_server_port_1 - - network.outgoing.bytes + attachment_pd_server_1_port: + - pd_server_1_port + - attachment + network.incoming.packets_pd_server_1_port: + - pd_server_1_port + - network.incoming.packets disk.read.requests_server_pd: - server_pd - disk.read.requests @@ -384,33 +387,27 @@ topology_template: disk.device.latency_server_pd: - server_pd - disk.device.latency + network.outgoing.bytes_pd_server_1_port: + - pd_server_1_port + - network.outgoing.bytes binding_server_pd: - server_pd - binding scalable_server_pd: - server_pd - scalable - network.outgoing.bytes.rate_pd_server_port_2: - - pd_server_port_2 - - network.outgoing.bytes.rate - forwarder_pd_server_port_1: - - pd_server_port_1 - - forwarder - network.outgoing.bytes.rate_pd_server_port_1: - - pd_server_port_1 - - network.outgoing.bytes.rate disk.write.bytes_server_pd: - server_pd - disk.write.bytes disk.write.bytes.rate_server_pd: - server_pd - disk.write.bytes.rate - forwarder_pd_server_port_2: - - pd_server_port_2 - - forwarder feature_server_pd: - server_pd - feature + network.outgoing.bytes.rate_pd_server_1_port: + - pd_server_1_port + - network.outgoing.bytes.rate disk.root.size_server_pd: - server_pd - disk.root.size @@ -420,6 +417,9 @@ topology_template: disk.device.write.requests.rate_server_pd: - server_pd - disk.device.write.requests.rate + network.incoming.bytes_pd_server_1_port: + - pd_server_1_port + - network.incoming.bytes disk.device.write.bytes_server_pd: - server_pd - disk.device.write.bytes @@ -433,15 +433,15 @@ topology_template: dependency_server_pd: - server_pd - dependency - link_pd_server_port_2: - - pd_server_port_2 - - link - link_pd_server_port_1: - - pd_server_port_1 + dependency_pd_server_2_port: + - pd_server_2_port + - dependency + link_pd_server_2_port: + - pd_server_2_port - link - dependency_pd_server_port_1: - - pd_server_port_1 + dependency_pd_server_1_port: + - pd_server_1_port - dependency - dependency_pd_server_port_2: - - pd_server_port_2 - - dependency
\ No newline at end of file + link_pd_server_1_port: + - pd_server_1_port + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml index 327ade922e..5d62a6c5a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml @@ -133,30 +133,30 @@ topology_template: - get_input: - pd_server_1b_names - 0 - vm_flavor_name: - get_input: pd_server_1b_flavor - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - get_input: net - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_1_replacement_policy: + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml count: 1 @@ -170,7 +170,24 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: + port_cmaui_1c1_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cmaui_1c1_mgmt_port_0_network: + - packet_external_network_1 + - packet_external_network_1 + compute_cmaui_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_cmaui_1c1_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: cmaui_1c1_flavor + port_cmaui_1c1_mgmt_port_0_fixed_ips: - - ip_address: get_input: - cmaui_oam_ips @@ -179,28 +196,11 @@ topology_template: get_input: - cmaui_oam_ips - 0 - port_cmaui_port_network: - - packet_external_network_1 - - packet_external_network_1 - compute_cmaui_1c1_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - vm_flavor_name: - get_input: cmaui_1c1_flavor - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false - port_cmaui_port_replacement_policy: + port_cmaui_1c1_mgmt_port_0_replacement_policy: - AUTO - AUTO vm_image_name: get_input: cmaui_1c1_image - port_cmaui_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false compute_cmaui_1c1_name: - get_input: - cmaui_1c1_names @@ -217,7 +217,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_cmaui_1c1_cmaui_port: + - link_cmaui_1c1_cmaui_1c1_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network_1 relationship: tosca.relationships.network.LinksTo @@ -230,24 +230,24 @@ topology_template: substitute_service_template: nested-pattern-4ServiceTemplate.yaml p2: get_input: p2 - port_pd_server_port_2_ip_requirements: + port_pd_server_2_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_2_mac_requirements: + port_pd_server_1_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_2_port_mac_requirements: mac_count_required: is_required: false - port_pd_server_port_1_ip_requirements: + port_pd_server_1_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pd_server_port_1_mac_requirements: - mac_count_required: - is_required: false abstract_pd_server_1b: type: org.openecomp.resource.abstract.nodes.pd_server_1b directives: @@ -257,28 +257,28 @@ topology_template: - get_input: - pd_server_1b_names - 1 - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - vm_flavor_name: - get_input: pd_server_1b_flavor - port_ps_server_1b_port_network: - - get_input: net - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 + port_ps_server_1b_port_1_network: + - get_input: net compute_pd_server_1b_availability_zone: - get_input: availability_zone_0 service_template_filter: @@ -299,24 +299,28 @@ topology_template: directives: - substitutable properties: - port_oam_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_server_1c2_name: - get_input: - oam_server_1c2_names - 1 - port_oam_port_network: - - packet_external_network_1 - vm_flavor_name: - get_input: oam_server_1c2_flavor - compute_oam_server_1c2_availability_zone: - - get_input: availability_zone_0 - port_oam_port_fixed_ips: + port_oam_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + port_oam_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 vm_image_name: get_input: oam_server_1c2_image compute_oam_server_1c2_metadata: @@ -336,13 +340,9 @@ topology_template: get_attribute: - abstract_cmaui_1c1 - cmaui_1c1_accessIPv4 - port_oam_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_network: + - packet_external_network_1 + port_oam_server_1c2_mgmt_port_0_replacement_policy: - AUTO service_template_filter: substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml @@ -353,7 +353,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_server_1c2_oam_port: + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network_1 relationship: tosca.relationships.network.LinksTo @@ -362,33 +362,33 @@ topology_template: directives: - substitutable properties: - port_oam_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_server_1c2_name: - get_input: - oam_server_1c2_names - 0 - port_oam_port_network: - - packet_internal_network_1 - vm_flavor_name: - get_input: oam_server_1c2_flavor - compute_oam_server_1c2_availability_zone: - - get_input: availability_zone_0 - port_oam_port_fixed_ips: + port_oam_server_1c2_mgmt_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_server_1c2_mgmt_port_0_fixed_ips: - ip_address: get_input: - cmaui_oam_ips - 1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + port_oam_server_1c2_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 vm_image_name: get_input: oam_server_1c2_image - port_oam_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_oam_port_replacement_policy: + port_oam_server_1c2_mgmt_port_0_network: + - packet_internal_network_1 + port_oam_server_1c2_mgmt_port_0_replacement_policy: - AUTO service_template_filter: substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml @@ -399,7 +399,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_server_1c2_oam_port: + - link_oam_server_1c2_oam_server_1c2_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network_1 relationship: tosca.relationships.network.LinksTo @@ -438,7 +438,10 @@ topology_template: - memory_server_pd binding_ps_server_1b_port_1: - abstract_pd_server_1b - - binding_pd_server_1b_ps_server_1b_port + - binding_pd_server_1b_ps_server_1b_port_1 + feature_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.capacity_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.capacity_pd_server_1b @@ -451,18 +454,18 @@ topology_template: disk.read.requests_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.read.requests_cmaui_1c1 + network.outpoing.packets_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outpoing.packets_pd_server_1_port disk.device.read.requests.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.read.requests.rate_server_pd + feature_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - feature_pd_server_1b_pd_server_1b_port - network.outgoing.packets.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.packets.rate_oam_server_1c2_oam_port - network.outgoing.packets.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.packets.rate_oam_server_1c2_oam_port + - feature_pd_server_1b_pd_server_1b_port_1 disk.device.iops_server_1b_pd_2: - abstract_pd_server_1b - disk.device.iops_pd_server_1b @@ -486,16 +489,10 @@ topology_template: - scalable_oam_server_1c2 network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port_1 disk.device.read.requests_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.read.requests_server_pd - feature_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - feature_pd_server_port_1 - network.outpoing.packets_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.outpoing.packets_pd_server_port_1 disk.device.write.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.requests_cmaui_1c1 @@ -517,18 +514,6 @@ topology_template: disk.device.capacity_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.capacity_oam_server_1c2 - network.outpoing.packets_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outpoing.packets_oam_server_1c2_oam_port - network.outpoing.packets_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outpoing.packets_oam_server_1c2_oam_port - binding_cmaui_port_1: - - abstract_cmaui_1c1 - - binding_cmaui_1c1_cmaui_port - binding_cmaui_port_2: - - abstract_cmaui_1c1 - - binding_cmaui_1c1_cmaui_port end_point_packet_internal_network_1: - packet_internal_network_1 - end_point @@ -544,18 +529,6 @@ topology_template: disk.write.bytes_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.write.bytes_oam_server_1c2 - network.incoming.bytes.rate_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.bytes.rate_pd_server_port_2 - network.incoming.bytes_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.bytes_cmaui_1c1_cmaui_port - network.incoming.bytes_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.bytes_cmaui_1c1_cmaui_port - network.incoming.packets_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.packets_pd_server_port_2 os_server_1c2_oam_1: - abstract_oam_server_1c2_0 - os_oam_server_1c2 @@ -567,7 +540,7 @@ topology_template: - disk.device.iops_cmaui_1c1 network.outgoing.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1 memory.resident_server_1b_pd_2: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -580,36 +553,30 @@ topology_template: memory.resident_server_1b_pd_1: - abstract_pd_server_1b_1 - memory.resident_pd_server_1b + network.outgoing.bytes_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes_pd_server_2_port disk.device.write.bytes.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.write.bytes.rate_server_pd feature_server_1c2_oam_2: - abstract_oam_server_1c2_1 - feature_oam_server_1c2 - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.packets.rate_cmaui_1c1_cmaui_port - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.packets.rate_cmaui_1c1_cmaui_port - network.outgoing.bytes_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.bytes_oam_server_1c2_oam_port + feature_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - feature_pd_server_1_port feature_server_1c2_oam_1: - abstract_oam_server_1c2_0 - feature_oam_server_1c2 - network.outgoing.bytes_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.bytes_oam_server_1c2_oam_port disk.device.capacity_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.capacity_cmaui_1c1 + network.outgoing.packets.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 host_server_pd_nested1_pattern_4: - nested1_pattern_4 - host_server_pd - attachment_oam_port_2: - - abstract_oam_server_1c2_1 - - attachment_oam_server_1c2_oam_port disk.capacity_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.capacity_oam_server_1c2 @@ -619,9 +586,9 @@ topology_template: endpoint_server_pd_nested1_pattern_4: - nested1_pattern_4 - endpoint_server_pd - attachment_oam_port_1: + attachment_oam_server_1c2_1_mgmt_port_0: - abstract_oam_server_1c2_0 - - attachment_oam_server_1c2_oam_port + - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.read.bytes.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.read.bytes.rate_server_pd @@ -652,9 +619,15 @@ topology_template: disk.write.requests.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.write.requests.rate_cmaui_1c1 + network.outgoing.bytes_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 cpu_util_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_util_cmaui_1c1 + network.incoming.bytes_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.allocation_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.allocation_oam_server_1c2 @@ -666,7 +639,7 @@ topology_template: - cpu_util_cmaui_1c1 binding_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_1 disk.device.latency_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.latency_server_pd @@ -676,21 +649,15 @@ topology_template: disk.read.bytes_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.read.bytes_oam_server_1c2 - network.outpoing.packets_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.outpoing.packets_pd_server_port_2 disk.read.bytes_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.read.bytes_oam_server_1c2 disk.write.requests_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.write.requests_pd_server_1b - binding_oam_port_2: - - abstract_oam_server_1c2_1 - - binding_oam_server_1c2_oam_port - binding_oam_port_1: + forwarder_oam_server_1c2_1_mgmt_port_0: - abstract_oam_server_1c2_0 - - binding_oam_server_1c2_oam_port + - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.read.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.read.bytes.rate_cmaui_1c1 @@ -709,15 +676,18 @@ topology_template: vcpus_server_1b_pd_2: - abstract_pd_server_1b - vcpus_pd_server_1b + network.incoming.packets.rate_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets.rate_pd_server_2_port disk.latency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.latency_oam_server_1c2 - network.incoming.bytes.rate_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.bytes.rate_pd_server_port_1 disk.latency_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.latency_oam_server_1c2 + network.incoming.bytes.rate_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes.rate_pd_server_1_port disk.device.usage_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.usage_server_pd @@ -736,15 +706,12 @@ topology_template: disk.device.write.requests_server_1b_pd_2: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b - network.incoming.bytes.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.bytes.rate_oam_server_1c2_oam_port - network.outgoing.bytes.rate_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.bytes.rate_pd_server_port_1 - network.incoming.bytes.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.bytes.rate_oam_server_1c2_oam_port + network.outgoing.bytes.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 memory.usage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - memory.usage_cmaui_1c1 @@ -766,21 +733,15 @@ topology_template: disk.device.iops_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.iops_oam_server_1c2 - network.incoming.bytes_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.bytes_pd_server_port_2 - forwarder_oam_port_1: - - abstract_oam_server_1c2_0 - - forwarder_oam_server_1c2_oam_port - forwarder_oam_port_2: - - abstract_oam_server_1c2_1 - - forwarder_oam_server_1c2_oam_port binding_server_1c2_oam_2: - abstract_oam_server_1c2_1 - binding_oam_server_1c2 binding_server_1c2_oam_1: - abstract_oam_server_1c2_0 - binding_oam_server_1c2 + forwarder_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.read.bytes.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.bytes.rate_pd_server_1b @@ -795,10 +756,10 @@ topology_template: - disk.device.read.bytes.rate_pd_server_1b network.incoming.bytes_ps_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_ps_server_1b_port - network.outgoing.packets.rate_pd_server_port_2_nested1_pattern_4: + - network.incoming.bytes_pd_server_1b_ps_server_1b_port_1 + attachment_pd_server_2_port_nested1_pattern_4: - nested1_pattern_4 - - network.outgoing.packets.rate_pd_server_port_2 + - attachment_pd_server_2_port disk.usage_server_1b_pd_2: - abstract_pd_server_1b - disk.usage_pd_server_1b @@ -811,9 +772,6 @@ topology_template: disk.usage_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.usage_pd_server_1b - network.incoming.packets_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.packets_cmaui_1c1_cmaui_port disk.device.write.requests_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.requests_oam_server_1c2 @@ -826,9 +784,9 @@ topology_template: disk.device.write.bytes.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.write.bytes.rate_pd_server_1b - network.incoming.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - network.incoming.packets_cmaui_1c1_cmaui_port + - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_server_1b_pd_1: - abstract_pd_server_1b_1 - feature_pd_server_1b @@ -859,12 +817,6 @@ topology_template: disk.device.read.bytes_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.read.bytes_server_pd - network.incoming.packets.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.packets.rate_oam_server_1c2_oam_port - network.incoming.packets.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.packets.rate_oam_server_1c2_oam_port disk.iops_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.iops_pd_server_1b @@ -880,6 +832,9 @@ topology_template: disk.device.allocation_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.allocation_oam_server_1c2 + network.outgoing.packets.rate_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.packets.rate_pd_server_2_port disk.write.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.requests_cmaui_1c1 @@ -889,24 +844,15 @@ topology_template: link_packet_external_network_1: - packet_external_network_1 - link - network.outgoing.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port - network.incoming.bytes_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.bytes_pd_server_port_1 cpu_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_cmaui_1c1 - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port cpu_server_1c1_cmaui_1: - abstract_cmaui_1c1 - cpu_cmaui_1c1 network.outpoing.packets_ps_server_1b_port_1: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_ps_server_1b_port + - network.outpoing.packets_pd_server_1b_ps_server_1b_port_1 cpu_server_1c2_oam_1: - abstract_oam_server_1c2_0 - cpu_oam_server_1c2 @@ -916,6 +862,9 @@ topology_template: disk.write.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.write.requests.rate_oam_server_1c2 + attachment_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.read.bytes_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.bytes_pd_server_1b @@ -931,9 +880,18 @@ topology_template: disk.iops_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.iops_server_pd + network.incoming.packets.rate_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets.rate_pd_server_1_port disk.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.write.requests.rate_oam_server_1c2 + network.outgoing.packets.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.incoming.bytes.rate_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes.rate_pd_server_2_port disk.read.bytes_server_1b_pd_2: - abstract_pd_server_1b - disk.read.bytes_pd_server_1b @@ -951,10 +909,16 @@ topology_template: - endpoint_pd_server_1b network.incoming.bytes_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1 + attachment_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - attachment_oam_server_1c2_oam_server_1c2_mgmt_port_0 instance_server_pd_nested1_pattern_4: - nested1_pattern_4 - instance_server_pd + network.outgoing.bytes.rate_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes.rate_pd_server_2_port disk.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.latency_cmaui_1c1 @@ -967,36 +931,33 @@ topology_template: memory_server_1b_pd_1: - abstract_pd_server_1b_1 - memory_pd_server_1b - network.outgoing.packets.rate_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.packets.rate_pd_server_port_1 feature_packet_external_network_1: - packet_external_network_1 - feature + network.outgoing.bytes_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.latency_server_1b_pd_2: - abstract_pd_server_1b - disk.device.latency_pd_server_1b disk.device.latency_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.latency_pd_server_1b + feature_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.read.bytes_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.read.bytes_server_pd + network.outpoing.packets_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.iops_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.iops_server_pd - network.incoming.packets_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.packets_oam_server_1c2_oam_port - network.incoming.packets_oam_port_2: + forwarder_oam_server_1c2_2_mgmt_port_0: - abstract_oam_server_1c2_1 - - network.incoming.packets_oam_server_1c2_oam_port - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.incoming.bytes.rate_cmaui_1c1_cmaui_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + - forwarder_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.iops_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.iops_cmaui_1c1 @@ -1009,21 +970,24 @@ topology_template: disk.device.read.requests_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.requests_pd_server_1b - forwarder_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - forwarder_pd_server_port_2 disk.device.write.bytes_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.bytes_oam_server_1c2 disk.device.write.bytes_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.bytes_oam_server_1c2 + network.incoming.packets_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets_pd_server_1_port disk.write.bytes_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.bytes_server_pd - feature_pd_server_port_2_nested1_pattern_4: + binding_pd_server_1_port_nested1_pattern_4: - nested1_pattern_4 - - feature_pd_server_port_2 + - binding_pd_server_1_port + network.incoming.packets_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.write.bytes.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.bytes.rate_oam_server_1c2 @@ -1036,15 +1000,30 @@ topology_template: disk.read.bytes_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.read.bytes_cmaui_1c1 + forwarder_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - forwarder_pd_server_1_port + network.incoming.packets_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.iops_oam_server_1c2 forwarder_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_1 disk.usage_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.usage_oam_server_1c2 + network.outgoing.bytes_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 + attachment_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - attachment_pd_server_1_port + network.outgoing.bytes_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 feature_server_1c1_cmaui_1: - abstract_cmaui_1c1 - feature_cmaui_1c1 @@ -1056,22 +1035,13 @@ topology_template: - feature_cmaui_1c1 network.outpoing.packets_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.bytes_cmaui_1c1_cmaui_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1 disk.device.capacity_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.capacity_server_pd disk.iops_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.iops_oam_server_1c2 - network.outgoing.bytes_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.bytes_cmaui_1c1_cmaui_port - network.outgoing.bytes_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.bytes_pd_server_port_1 binding_server_pd_nested1_pattern_4: - nested1_pattern_4 - binding_server_pd @@ -1105,36 +1075,33 @@ topology_template: disk.usage_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.usage_server_pd - network.outgoing.bytes_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.bytes_pd_server_port_2 vcpus_server_pd_nested1_pattern_4: - nested1_pattern_4 - vcpus_server_pd + network.outgoing.packets.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 link_packet_internal_network_1: - packet_internal_network_1 - link disk.write.bytes_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.write.bytes_pd_server_1b + network.incoming.packets.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.write.bytes_server_1b_pd_2: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b disk.device.usage_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.usage_oam_server_1c2 - network.incoming.packets.rate_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.packets.rate_pd_server_port_2 disk.device.write.requests.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b disk.device.usage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.usage_oam_server_1c2 - forwarder_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - forwarder_pd_server_port_1 disk.latency_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.latency_server_pd @@ -1147,6 +1114,9 @@ topology_template: disk.write.requests.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.requests.rate_server_pd + feature_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - feature_pd_server_2_port os_server_pd_nested1_pattern_4: - nested1_pattern_4 - os_server_pd @@ -1158,52 +1128,55 @@ topology_template: - cpu_util_oam_server_1c2 network.incoming.packets_ps_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_ps_server_1b_port + - network.incoming.packets_pd_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port_1 + network.incoming.packets.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 network.outgoing.bytes_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port - attachment_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - attachment_pd_server_port_1 + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1 memory.resident_server_1c2_oam_2: - abstract_oam_server_1c2_1 - memory.resident_oam_server_1c2 memory.resident_server_1c2_oam_1: - abstract_oam_server_1c2_0 - memory.resident_oam_server_1c2 + network.outgoing.packets.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.packets.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.allocation_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.allocation_cmaui_1c1 disk.device.allocation_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.allocation_cmaui_1c1 + network.incoming.bytes_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.root.size_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.root.size_server_pd vcpus_server_1c1_cmaui_1: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 - feature_cmaui_port_1: - - abstract_cmaui_1c1 - - feature_cmaui_1c1_cmaui_port - feature_cmaui_port_2: - - abstract_cmaui_1c1 - - feature_cmaui_1c1_cmaui_port instance_server_1c1_cmaui_2: - abstract_cmaui_1c1 - instance_cmaui_1c1 + network.outgoing.bytes.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 instance_server_1c1_cmaui_1: - abstract_cmaui_1c1 - instance_cmaui_1c1 network.outgoing.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port - attachment_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - attachment_pd_server_port_2 + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1 + attachment_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.device.read.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.read.requests.rate_oam_server_1c2 @@ -1213,9 +1186,15 @@ topology_template: os_server_1b_pd_1: - abstract_pd_server_1b_1 - os_pd_server_1b + binding_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0 os_server_1b_pd_2: - abstract_pd_server_1b - os_pd_server_1b + network.outpoing.packets_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outpoing.packets_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.root.size_server_1b_pd_2: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -1224,7 +1203,7 @@ topology_template: - endpoint_cmaui_1c1 network.incoming.packets.rate_ps_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port + - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port_1 host_server_1b_pd_1: - abstract_pd_server_1b_1 - host_pd_server_1b @@ -1240,51 +1219,51 @@ topology_template: vcpus_server_1c1_cmaui_2: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 - forwarder_cmaui_port_2: - - abstract_cmaui_1c1 - - forwarder_cmaui_1c1_cmaui_port - forwarder_cmaui_port_1: + network.incoming.packets_cmaui_1c1_2_mgmt_port_0: - abstract_cmaui_1c1 - - forwarder_cmaui_1c1_cmaui_port + - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.incoming.bytes_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes_pd_server_2_port disk.allocation_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.allocation_pd_server_1b + binding_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.allocation_server_1b_pd_2: - abstract_pd_server_1b - disk.allocation_pd_server_1b attachment_ps_server_1b_port_1: - abstract_pd_server_1b - - attachment_pd_server_1b_ps_server_1b_port + - attachment_pd_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.requests.rate_pd_server_1b disk.device.read.requests.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b + network.incoming.packets_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets_pd_server_2_port disk.write.bytes.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.write.bytes.rate_cmaui_1c1 disk.write.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes.rate_cmaui_1c1 + feature_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2_oam_server_1c2_mgmt_port_0 memory.resident_server_pd_nested1_pattern_4: - nested1_pattern_4 - memory.resident_server_pd - network.outgoing.bytes.rate_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - network.outgoing.bytes.rate_pd_server_port_2 network.outgoing.bytes_ps_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_ps_server_1b_port + - network.outgoing.bytes_pd_server_1b_ps_server_1b_port_1 disk.device.allocation_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.allocation_server_pd - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outpoing.packets_cmaui_1c1_cmaui_port - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outpoing.packets_cmaui_1c1_cmaui_port disk.read.bytes.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -1318,12 +1297,18 @@ topology_template: memory.resident_server_1c1_cmaui_2: - abstract_cmaui_1c1 - memory.resident_cmaui_1c1 + network.incoming.bytes.rate_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 memory.resident_server_1c1_cmaui_1: - abstract_cmaui_1c1 - memory.resident_cmaui_1c1 os_server_1c1_cmaui_2: - abstract_cmaui_1c1 - os_cmaui_1c1 + network.incoming.bytes.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 os_server_1c1_cmaui_1: - abstract_cmaui_1c1 - os_cmaui_1c1 @@ -1333,15 +1318,21 @@ topology_template: instance_server_1c2_oam_1: - abstract_oam_server_1c2_0 - instance_oam_server_1c2 + network.incoming.bytes.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 instance_server_1c2_oam_2: - abstract_oam_server_1c2_1 - instance_oam_server_1c2 memory_server_1c1_cmaui_2: - abstract_cmaui_1c1 - memory_cmaui_1c1 + binding_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - binding_pd_server_2_port network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port_1 disk.device.write.requests.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.write.requests.rate_server_pd @@ -1357,12 +1348,18 @@ topology_template: disk.read.bytes.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.read.bytes.rate_server_pd + forwarder_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_1c1_mgmt_port_0 vcpus_server_1c2_oam_1: - abstract_oam_server_1c2_0 - vcpus_oam_server_1c2 vcpus_server_1c2_oam_2: - abstract_oam_server_1c2_1 - vcpus_oam_server_1c2 + network.incoming.bytes.rate_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - network.incoming.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.allocation_server_1b_pd_2: - abstract_pd_server_1b - disk.device.allocation_pd_server_1b @@ -1387,6 +1384,9 @@ topology_template: disk.device.write.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.bytes.rate_cmaui_1c1 + network.incoming.packets.rate_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.read.requests_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.read.requests_pd_server_1b @@ -1401,7 +1401,7 @@ topology_template: - disk.write.requests_server_pd forwarder_ps_server_1b_port_1: - abstract_pd_server_1b - - forwarder_pd_server_1b_ps_server_1b_port + - forwarder_pd_server_1b_ps_server_1b_port_1 disk.device.write.bytes_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.write.bytes_cmaui_1c1 @@ -1414,6 +1414,9 @@ topology_template: host_server_1c2_oam_1: - abstract_oam_server_1c2_0 - host_oam_server_1c2 + network.outgoing.bytes.rate_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes.rate_pd_server_1_port host_server_1c2_oam_2: - abstract_oam_server_1c2_1 - host_oam_server_1c2 @@ -1432,57 +1435,63 @@ topology_template: binding_server_1b_pd_1: - abstract_pd_server_1b_1 - binding_pd_server_1b - binding_pd_server_port_2_nested1_pattern_4: + network.outpoing.packets_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outpoing.packets_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + forwarder_pd_server_2_port_nested1_pattern_4: - nested1_pattern_4 - - binding_pd_server_port_2 + - forwarder_pd_server_2_port disk.device.read.bytes.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.bytes.rate_cmaui_1c1 disk.device.read.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.bytes.rate_cmaui_1c1 + network.outpoing.packets_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outpoing.packets_pd_server_2_port attachment_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_1 + network.outgoing.packets.rate_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.packets.rate_pd_server_1_port cpu.delta_server_1c2_oam_2: - abstract_oam_server_1c2_1 - cpu.delta_oam_server_1c2 + network.outgoing.bytes.rate_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes.rate_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.ephemeral.size_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.ephemeral.size_pd_server_1b disk.ephemeral.size_server_1b_pd_2: - abstract_pd_server_1b - disk.ephemeral.size_pd_server_1b + network.incoming.bytes_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_1c1_mgmt_port_0 disk.usage_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.usage_cmaui_1c1 disk.usage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.usage_cmaui_1c1 - network.incoming.bytes_oam_port_2: - - abstract_oam_server_1c2_1 - - network.incoming.bytes_oam_server_1c2_oam_port - network.incoming.bytes_oam_port_1: - - abstract_oam_server_1c2_0 - - network.incoming.bytes_oam_server_1c2_oam_port disk.write.bytes.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.bytes.rate_server_pd - attachment_cmaui_port_2: - - abstract_cmaui_1c1 - - attachment_cmaui_1c1_cmaui_port - network.outgoing.bytes.rate_oam_port_1: - - abstract_oam_server_1c2_0 - - network.outgoing.bytes.rate_oam_server_1c2_oam_port + network.incoming.bytes_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes_pd_server_1_port instance_server_1b_pd_1: - abstract_pd_server_1b_1 - instance_pd_server_1b disk.device.capacity_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.capacity_pd_server_1b - network.outgoing.bytes.rate_oam_port_2: - - abstract_oam_server_1c2_1 - - network.outgoing.bytes.rate_oam_server_1c2_oam_port instance_server_1b_pd_2: - abstract_pd_server_1b - instance_pd_server_1b @@ -1492,15 +1501,6 @@ topology_template: disk.capacity_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.capacity_cmaui_1c1 - network.outgoing.packets.rate_cmaui_port_1: - - abstract_cmaui_1c1 - - network.outgoing.packets.rate_cmaui_1c1_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui_1c1 - - network.outgoing.packets.rate_cmaui_1c1_cmaui_port - attachment_cmaui_port_1: - - abstract_cmaui_1c1 - - attachment_cmaui_1c1_cmaui_port disk.capacity_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.capacity_cmaui_1c1 @@ -1510,12 +1510,15 @@ topology_template: disk.ephemeral.size_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.ephemeral.size_oam_server_1c2 + binding_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2_oam_server_1c2_mgmt_port_0 disk.device.read.requests.rate_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 network.incoming.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1 disk.device.read.bytes_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.read.bytes_oam_server_1c2 @@ -1525,6 +1528,12 @@ topology_template: disk.device.read.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 + network.incoming.packets_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.outgoing.bytes_pd_server_1_port_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes_pd_server_1_port cpu.delta_server_1c2_oam_1: - abstract_oam_server_1c2_0 - cpu.delta_oam_server_1c2 @@ -1537,9 +1546,6 @@ topology_template: disk.device.usage_server_1b_pd_2: - abstract_pd_server_1b - disk.device.usage_pd_server_1b - network.incoming.packets.rate_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.packets.rate_pd_server_port_1 disk.device.read.bytes.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.read.bytes.rate_oam_server_1c2 @@ -1549,18 +1555,15 @@ topology_template: disk.write.bytes_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 - feature_oam_port_2: + binding_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_1c1_mgmt_port_0 + network.incoming.bytes_oam_server_1c2_2_mgmt_port_0: - abstract_oam_server_1c2_1 - - feature_oam_server_1c2_oam_port - feature_oam_port_1: - - abstract_oam_server_1c2_0 - - feature_oam_server_1c2_oam_port + - network.incoming.bytes_oam_server_1c2_oam_server_1c2_mgmt_port_0 feature_nested1_pattern_4: - nested1_pattern_4 - feature - network.incoming.packets_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - network.incoming.packets_pd_server_port_1 disk.device.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.latency_cmaui_1c1 @@ -1593,16 +1596,13 @@ topology_template: - cpu.delta_pd_server_1b network.incoming.packets_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.incoming.packets_pd_server_1b_pd_server_1b_port - binding_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - binding_pd_server_port_1 + - network.incoming.packets_pd_server_1b_pd_server_1b_port_1 network.incoming.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1 feature_ps_server_1b_port_1: - abstract_pd_server_1b - - feature_pd_server_1b_ps_server_1b_port + - feature_pd_server_1b_ps_server_1b_port_1 endpoint_server_1c2_oam_2: - abstract_oam_server_1c2_1 - endpoint_oam_server_1c2 @@ -1610,21 +1610,15 @@ topology_template: - abstract_oam_server_1c2_0 - endpoint_oam_server_1c2 requirements: - dependency_oam_port_2: - - abstract_oam_server_1c2_1 - - dependency_oam_server_1c2_oam_port - dependency_oam_port_1: - - abstract_oam_server_1c2_0 - - dependency_oam_server_1c2_oam_port - dependency_pd_server_port_1_nested1_pattern_4: + dependency_pd_server_1_port_nested1_pattern_4: - nested1_pattern_4 - - dependency_pd_server_port_1 - link_pd_server_port_2_nested1_pattern_4: - - nested1_pattern_4 - - link_pd_server_port_2 + - dependency_pd_server_1_port dependency_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_1 + dependency_oam_server_1c2_1_mgmt_port_0: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0 dependency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - dependency_oam_server_1c2 @@ -1637,24 +1631,18 @@ topology_template: local_storage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - local_storage_oam_server_1c2 - dependency_cmaui_port_1: - - abstract_cmaui_1c1 - - dependency_cmaui_1c1_cmaui_port dependency_server_pd_nested1_pattern_4: - nested1_pattern_4 - dependency_server_pd - dependency_pd_server_port_2_nested1_pattern_4: + link_pd_server_1_port_nested1_pattern_4: - nested1_pattern_4 - - dependency_pd_server_port_2 - dependency_cmaui_port_2: - - abstract_cmaui_1c1 - - dependency_cmaui_1c1_cmaui_port + - link_pd_server_1_port + dependency_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - dependency_pd_server_2_port dependency_packet_internal_network_1: - packet_internal_network_1 - dependency - link_pd_server_port_1_nested1_pattern_4: - - nested1_pattern_4 - - link_pd_server_port_1 dependency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - dependency_cmaui_1c1 @@ -1672,16 +1660,22 @@ topology_template: - dependency_cmaui_1c1 link_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - link_pd_server_1b_pd_server_1b_port + - link_pd_server_1b_pd_server_1b_port_1 + dependency_oam_server_1c2_2_mgmt_port_0: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2_oam_server_1c2_mgmt_port_0 link_ps_server_1b_port_1: - abstract_pd_server_1b - - link_pd_server_1b_ps_server_1b_port + - link_pd_server_1b_ps_server_1b_port_1 dependency_packet_external_network_1: - packet_external_network_1 - dependency dependency_ps_server_1b_port_1: - abstract_pd_server_1b - - dependency_pd_server_1b_ps_server_1b_port + - dependency_pd_server_1b_ps_server_1b_port_1 + dependency_cmaui_1c1_1_mgmt_port_0: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0 local_storage_server_1c1_cmaui_2: - abstract_cmaui_1c1 - local_storage_cmaui_1c1 @@ -1696,4 +1690,10 @@ topology_template: - dependency dependency_server_1b_pd_2: - abstract_pd_server_1b - - dependency_pd_server_1b
\ No newline at end of file + - dependency_pd_server_1b + dependency_cmaui_1c1_2_mgmt_port_0: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_1c1_mgmt_port_0 + link_pd_server_2_port_nested1_pattern_4: + - nested1_pattern_4 + - link_pd_server_2_port |