diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance')
4 files changed, 385 insertions, 385 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml index 22d5751be7..b1779bb4cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in/nested1.yml @@ -35,13 +35,13 @@ parameters: type: string resources: - cmaui_port_1: + cmaui_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} replacement_policy: AUTO - cmaui_port_2: + cmaui_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network} @@ -56,7 +56,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1_mgmt_port_0 } server_cmaui_2: type: OS::Nova::Server @@ -66,7 +66,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_2_mgmt_port_0 } packet_internal_network: type: OS::Neutron::Net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1701b9971d..254be7a7da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,34 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui: 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 - required: true - status: SUPPORTED - port_cmaui_port_network: - 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 index_value: type: integer description: Index value of this substitution service template runtime instance @@ -44,12 +16,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cmaui_port_order: - type: integer + port_cmaui_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED vm_flavor_name: @@ -62,49 +34,77 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_mgmt_port_0_replacement_policy: + type: list required: true status: SUPPORTED - compute_cmaui_availability_zone: + entry_schema: + type: string + port_cmaui_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_replacement_policy: + compute_cmaui_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_mgmt_port_0_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 - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subnetpoolid: + port_cmaui_mgmt_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_mgmt_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_cmaui_mgmt_port_0_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_cmaui_cmaui_port: + - dependency_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_cmaui_port: + - link_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -131,6 +131,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_cmaui_cmaui_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.ephemeral.size_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -143,6 +149,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_cmaui_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.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. @@ -168,25 +182,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_cmaui_port: + disk.device.allocation_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.allocation_cmaui: + 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. occurrences: - 1 - UNBOUNDED - disk.read.bytes_cmaui: + 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 - disk.write.requests_cmaui: + network.incoming.packets_cmaui_cmaui_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: @@ -209,9 +223,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_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_cmaui_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -238,14 +251,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_cmaui_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_cmaui_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. + feature_cmaui_cmaui_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -285,40 +292,38 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_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 + attachment_cmaui_cmaui_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - disk.read.requests_cmaui: + network.incoming.bytes.rate_cmaui_cmaui_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_cmaui: + 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.device.write.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 - network.outgoing.bytes_cmaui_cmaui_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 - feature_cmaui_cmaui_port: - type: tosca.capabilities.Node + network.outgoing.packets.rate_cmaui_cmaui_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 @@ -328,23 +333,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_cmaui_port: + network.incoming.bytes_cmaui_cmaui_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: - type: tosca.capabilities.Node + network.outgoing.bytes_cmaui_cmaui_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_cmaui_port: + network.outgoing.bytes.rate_cmaui_cmaui_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: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_cmaui: type: tosca.capabilities.network.Bindable occurrences: @@ -373,24 +384,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cmaui: + network.outpoing.packets_cmaui_cmaui_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_cmaui: + 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. occurrences: - 1 - UNBOUNDED - forwarder_cmaui_cmaui_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cmaui_cmaui_port: + 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: @@ -402,12 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -497,6 +497,13 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_cmaui_1_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - dependency_server_cmaui_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -511,13 +518,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_server_cmaui_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -546,7 +546,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_1: + - dependency_cmaui_2_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -566,6 +566,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cmaui_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.latency_server_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. @@ -608,24 +616,12 @@ 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. - occurrences: - - 1 - - UNBOUNDED disk.read.requests_server_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_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.iops_server_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. @@ -667,6 +663,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_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.bytes_server_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. @@ -715,31 +717,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: + disk.ephemeral.size_server_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.packets_cmaui_port_1: + network.outgoing.packets.rate_cmaui_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.ephemeral.size_server_cmaui_1: + disk.ephemeral.size_server_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_cmaui_2: + disk.capacity_server_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.capacity_server_cmaui_1: + network.outgoing.packets.rate_cmaui_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: @@ -751,147 +753,151 @@ node_types: occurrences: - 1 - UNBOUNDED - end_point_packet_external_network: - type: tosca.capabilities.Endpoint + forwarder_cmaui_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder 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.incoming.bytes_cmaui_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: - - 0 + - 1 - 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 + end_point_packet_external_network: + type: tosca.capabilities.Endpoint occurrences: - - 0 + - 1 - UNBOUNDED - disk.iops_server_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. + forwarder_cmaui_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_1: + network.outgoing.bytes.rate_cmaui_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.requests_server_cmaui_2: + network.outgoing.bytes.rate_cmaui_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.requests_server_cmaui_1: + network.outpoing.packets_cmaui_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_cmaui_port_2: + network.outpoing.packets_cmaui_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.rate_server_cmaui_1: + disk.iops_server_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 - cpu_util_server_cmaui_1: + disk.iops_server_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_cmaui_port_1: + disk.device.write.requests_server_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_cmaui_port_2: + disk.device.write.requests_server_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 - link_packet_external_network: - type: tosca.capabilities.network.Linkable + network.incoming.packets_cmaui_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_cmaui_2: + disk.device.write.bytes.rate_server_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_cmaui_port_1: + network.incoming.bytes.rate_cmaui_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.rate_server_cmaui_2: + cpu_util_server_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_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. + binding_cmaui_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 + link_packet_external_network: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_2: + cpu_util_server_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.write.bytes.rate_server_cmaui_1: + network.incoming.bytes.rate_cmaui_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_cmaui_1: + disk.device.write.bytes.rate_server_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.packets.rate_cmaui_port_1: + disk.write.bytes.rate_server_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.packets.rate_cmaui_port_2: + disk.device.write.bytes_server_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 - feature_cmaui_port_1: - type: tosca.capabilities.Node + disk.write.bytes.rate_server_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 + disk.device.write.bytes_server_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 @@ -934,6 +940,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cmaui_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 binding_server_cmaui_1: type: tosca.capabilities.network.Bindable occurrences: @@ -955,11 +967,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED scalable_server_cmaui_2: type: tosca.capabilities.Scalable occurrences: @@ -970,30 +977,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: + network.incoming.packets.rate_cmaui_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.packets.rate_cmaui_port_2: + disk.write.requests_server_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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.write.requests_server_cmaui_2: + disk.write.requests_server_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.requests_server_cmaui_1: + network.incoming.packets.rate_cmaui_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: @@ -1031,16 +1033,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_cmaui_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - forwarder_cmaui_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_packet_external_network: type: tosca.capabilities.Node occurrences: @@ -1064,6 +1056,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED host_server_cmaui_2: type: tosca.capabilities.Container valid_source_types: @@ -1078,6 +1075,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cmaui_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED link_packet_internal_network: type: tosca.capabilities.network.Linkable occurrences: @@ -1095,25 +1097,23 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_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. + feature_cmaui_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_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. + feature_cmaui_1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1: + instance_server_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: + disk.device.read.requests.rate_server_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: @@ -1137,55 +1137,55 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: + disk.read.bytes.rate_server_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_cmaui_2: + disk.device.read.requests_server_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.outpoing.packets_cmaui_port_2: + cpu.delta_server_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.read.requests_server_cmaui_1: + cpu.delta_server_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 - cpu.delta_server_cmaui_1: + disk.device.read.requests.rate_server_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 - cpu.delta_server_cmaui_2: + memory.resident_server_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.read.requests.rate_server_cmaui_2: + network.outgoing.bytes_cmaui_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 - memory.resident_server_cmaui_2: + memory.resident_server_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 - memory.resident_server_cmaui_1: + network.outgoing.bytes_cmaui_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: @@ -1219,4 +1219,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/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml index b0417f718d..153c258527 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml @@ -11,29 +11,6 @@ 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 - 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 index_value: type: integer description: Index value of this substitution service template runtime instance @@ -41,11 +18,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string + port_cmaui_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_cmaui_port_order: - type: integer + port_cmaui_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true vm_flavor_name: type: string @@ -55,67 +32,90 @@ topology_template: required: true entry_schema: type: string - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cmaui_mgmt_port_0_replacement_policy: + type: list required: true - compute_cmaui_availability_zone: + entry_schema: + type: string + port_cmaui_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_cmaui_port_replacement_policy: + compute_cmaui_availability_zone: type: list required: true entry_schema: type: string - port_cmaui_port_network_role: - type: string + port_cmaui_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_network_role_tag: + type: string + required: true + port_cmaui_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_subnetpoolid: + port_cmaui_mgmt_port_0_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cmaui_mgmt_port_0_subnetpoolid: + type: string + required: true + port_cmaui_mgmt_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_mgmt_port_0_order: + type: integer + required: true + port_cmaui_mgmt_port_0_network_role: type: string required: true node_templates: - cmaui_cmaui_port: + cmaui_cmaui_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_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_cmaui_port_mac_requirements + get_input: port_cmaui_mgmt_port_0_mac_requirements order: - get_input: port_cmaui_port_order + get_input: port_cmaui_mgmt_port_0_order exCP_naming: - get_input: port_cmaui_port_exCP_naming + get_input: port_cmaui_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_cmaui_port_vlan_requirements + get_input: port_cmaui_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_cmaui_port_ip_requirements + get_input: port_cmaui_mgmt_port_0_ip_requirements related_networks: - get_input: port_cmaui_port_related_networks + get_input: port_cmaui_mgmt_port_0_related_networks network_role_tag: - get_input: port_cmaui_port_network_role_tag + get_input: port_cmaui_mgmt_port_0_network_role_tag network_role: - get_input: port_cmaui_port_network_role + get_input: port_cmaui_mgmt_port_0_network_role fixed_ips: get_input: - - port_cmaui_port_fixed_ips + - port_cmaui_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_cmaui_port_subnetpoolid + get_input: port_cmaui_mgmt_port_0_subnetpoolid network: get_input: - - port_cmaui_port_network + - port_cmaui_mgmt_port_0_network - index_value requirements: - binding: @@ -143,12 +143,18 @@ topology_template: disk.read.bytes.rate_cmaui: - cmaui - disk.read.bytes.rate + network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.packets.rate disk.ephemeral.size_cmaui: - cmaui - disk.ephemeral.size disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes + binding_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - binding disk.device.iops_cmaui: - cmaui - disk.device.iops @@ -161,9 +167,6 @@ topology_template: host_cmaui: - cmaui - host - network.incoming.bytes.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.bytes.rate disk.device.allocation_cmaui: - cmaui - disk.device.allocation @@ -173,6 +176,9 @@ topology_template: disk.write.requests_cmaui: - cmaui - disk.write.requests + network.incoming.packets_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.packets scalable_cmaui: - cmaui - scalable @@ -182,9 +188,9 @@ topology_template: cpu.delta_cmaui: - cmaui - cpu.delta - network.incoming.bytes_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.bytes + forwarder_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - forwarder disk.root.size_cmaui: - cmaui - disk.root.size @@ -197,12 +203,9 @@ topology_template: disk.device.read.bytes.rate_cmaui: - cmaui - disk.device.read.bytes.rate - attachment_cmaui_cmaui_port: - - cmaui_cmaui_port - - attachment - network.incoming.packets_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.packets + feature_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - feature disk.device.usage_cmaui: - cmaui - disk.device.usage @@ -221,9 +224,12 @@ topology_template: cpu_cmaui: - cmaui - cpu - binding_cmaui_cmaui_port: - - cmaui_cmaui_port - - binding + attachment_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - attachment + network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.bytes.rate disk.read.requests_cmaui: - cmaui - disk.read.requests @@ -233,24 +239,24 @@ topology_template: disk.device.write.requests_cmaui: - cmaui - disk.device.write.requests - network.outgoing.bytes_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.bytes - feature_cmaui_cmaui_port: - - cmaui_cmaui_port - - feature + network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.packets.rate vcpus_cmaui: - cmaui - vcpus - network.outpoing.packets_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outpoing.packets + network.incoming.bytes_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.incoming.bytes + network.outgoing.bytes_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.bytes + network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outgoing.bytes.rate feature_cmaui: - cmaui - feature - network.outgoing.bytes.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.bytes.rate binding_cmaui: - cmaui - binding @@ -266,24 +272,18 @@ topology_template: memory_cmaui: - cmaui - memory + network.outpoing.packets_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 + - network.outpoing.packets disk.write.requests.rate_cmaui: - cmaui - disk.write.requests.rate disk.usage_cmaui: - cmaui - disk.usage - forwarder_cmaui_cmaui_port: - - cmaui_cmaui_port - - forwarder - network.outgoing.packets.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.outgoing.packets.rate disk.latency_cmaui: - cmaui - disk.latency - network.incoming.packets.rate_cmaui_cmaui_port: - - cmaui_cmaui_port - - network.incoming.packets.rate instance_cmaui: - cmaui - instance @@ -300,15 +300,15 @@ topology_template: - cmaui - disk.device.write.requests.rate requirements: - link_cmaui_cmaui_port: - - cmaui_cmaui_port + link_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 - link - dependency_cmaui_cmaui_port: - - cmaui_cmaui_port + dependency_cmaui_cmaui_mgmt_port_0: + - cmaui_cmaui_mgmt_port_0 - 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/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml index 7e77e65af5..08ded6905c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml @@ -80,24 +80,24 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_network: - - packet_internal_network + port_cmaui_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 0 - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false + port_cmaui_mgmt_port_0_replacement_policy: + - AUTO + port_cmaui_mgmt_port_0_network: + - packet_internal_network compute_cmaui_availability_zone: - get_input: availability_zone_0 - port_cmaui_port_replacement_policy: - - AUTO vm_image_name: get_input: cmaui_image - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false @@ -112,7 +112,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_cmaui_cmaui_port: + - link_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -121,34 +121,34 @@ topology_template: directives: - substitutable properties: - port_cmaui_port_fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - port_cmaui_port_network: - - packet_external_network + port_cmaui_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: cmaui_flavor compute_cmaui_name: - get_input: - cmaui_names - 1 - port_cmaui_port_mac_requirements: - mac_count_required: - is_required: false + port_cmaui_mgmt_port_0_replacement_policy: + - AUTO + port_cmaui_mgmt_port_0_network: + - packet_external_network compute_cmaui_availability_zone: - get_input: availability_zone_0 - port_cmaui_port_replacement_policy: - - AUTO vm_image_name: get_input: cmaui_image - port_cmaui_port_ip_requirements: + port_cmaui_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_cmaui_mgmt_port_0_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -158,7 +158,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_cmaui_cmaui_port: + - link_cmaui_cmaui_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -182,6 +182,9 @@ topology_template: disk.device.usage_server_cmaui_2: - abstract_cmaui_0 - disk.device.usage_cmaui + binding_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - binding_cmaui_cmaui_mgmt_port_0 disk.device.latency_server_cmaui_1: - abstract_cmaui_1 - disk.device.latency_cmaui @@ -203,15 +206,9 @@ topology_template: disk.read.requests_server_cmaui_2: - abstract_cmaui_0 - disk.read.requests_cmaui - network.outgoing.bytes_cmaui_port_2: - - abstract_cmaui_0 - - network.outgoing.bytes_cmaui_cmaui_port disk.read.requests_server_cmaui_1: - abstract_cmaui_1 - disk.read.requests_cmaui - network.outgoing.bytes_cmaui_port_1: - - abstract_cmaui_1 - - network.outgoing.bytes_cmaui_cmaui_port disk.device.iops_server_cmaui_1: - abstract_cmaui_1 - disk.device.iops_cmaui @@ -233,6 +230,9 @@ topology_template: disk.read.bytes_server_cmaui_2: - abstract_cmaui_0 - disk.read.bytes_cmaui + network.incoming.bytes_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.incoming.bytes_cmaui_cmaui_mgmt_port_0 disk.read.bytes_server_cmaui_1: - abstract_cmaui_1 - disk.read.bytes_cmaui @@ -257,33 +257,48 @@ topology_template: cpu_server_cmaui_1: - abstract_cmaui_1 - cpu_cmaui - network.incoming.packets_cmaui_port_2: - - abstract_cmaui_0 - - network.incoming.packets_cmaui_cmaui_port - network.incoming.packets_cmaui_port_1: - - abstract_cmaui_1 - - network.incoming.packets_cmaui_cmaui_port disk.ephemeral.size_server_cmaui_1: - abstract_cmaui_1 - disk.ephemeral.size_cmaui + network.outgoing.packets.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0 disk.ephemeral.size_server_cmaui_2: - abstract_cmaui_0 - disk.ephemeral.size_cmaui disk.capacity_server_cmaui_1: - abstract_cmaui_1 - disk.capacity_cmaui + network.outgoing.packets.rate_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.outgoing.packets.rate_cmaui_cmaui_mgmt_port_0 disk.capacity_server_cmaui_2: - abstract_cmaui_0 - disk.capacity_cmaui + forwarder_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - forwarder_cmaui_cmaui_mgmt_port_0 + network.incoming.bytes_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.incoming.bytes_cmaui_cmaui_mgmt_port_0 end_point_packet_external_network: - packet_external_network - end_point - binding_cmaui_port_1: + forwarder_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - forwarder_cmaui_cmaui_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_1_mgmt_port_0: - abstract_cmaui_1 - - binding_cmaui_cmaui_port - binding_cmaui_port_2: + - network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0 + network.outgoing.bytes.rate_cmaui_2_mgmt_port_0: - abstract_cmaui_0 - - binding_cmaui_cmaui_port + - network.outgoing.bytes.rate_cmaui_cmaui_mgmt_port_0 + network.outpoing.packets_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.outpoing.packets_cmaui_cmaui_mgmt_port_0 + network.outpoing.packets_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.outpoing.packets_cmaui_cmaui_mgmt_port_0 disk.iops_server_cmaui_2: - abstract_cmaui_0 - disk.iops_cmaui @@ -296,30 +311,30 @@ topology_template: disk.device.write.requests_server_cmaui_1: - abstract_cmaui_1 - disk.device.write.requests_cmaui - network.outgoing.bytes.rate_cmaui_port_2: - - abstract_cmaui_0 - - network.outgoing.bytes.rate_cmaui_cmaui_port + network.incoming.packets_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.incoming.packets_cmaui_cmaui_mgmt_port_0 disk.device.write.bytes.rate_server_cmaui_1: - abstract_cmaui_1 - disk.device.write.bytes.rate_cmaui + network.incoming.bytes.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0 cpu_util_server_cmaui_1: - abstract_cmaui_1 - cpu_util_cmaui - network.outgoing.bytes.rate_cmaui_port_1: - - abstract_cmaui_1 - - network.outgoing.bytes.rate_cmaui_cmaui_port - network.incoming.bytes_cmaui_port_2: + binding_cmaui_2_mgmt_port_0: - abstract_cmaui_0 - - network.incoming.bytes_cmaui_cmaui_port + - binding_cmaui_cmaui_mgmt_port_0 link_packet_external_network: - packet_external_network - link cpu_util_server_cmaui_2: - abstract_cmaui_0 - cpu_util_cmaui - network.incoming.bytes_cmaui_port_1: + network.incoming.bytes.rate_cmaui_1_mgmt_port_0: - abstract_cmaui_1 - - network.incoming.bytes_cmaui_cmaui_port + - network.incoming.bytes.rate_cmaui_cmaui_mgmt_port_0 disk.device.write.bytes.rate_server_cmaui_2: - abstract_cmaui_0 - disk.device.write.bytes.rate_cmaui @@ -335,18 +350,6 @@ topology_template: disk.device.write.bytes_server_cmaui_1: - abstract_cmaui_1 - disk.device.write.bytes_cmaui - network.incoming.packets.rate_cmaui_port_1: - - abstract_cmaui_1 - - network.incoming.packets.rate_cmaui_cmaui_port - network.incoming.packets.rate_cmaui_port_2: - - abstract_cmaui_0 - - network.incoming.packets.rate_cmaui_cmaui_port - feature_cmaui_port_1: - - abstract_cmaui_1 - - feature_cmaui_cmaui_port - feature_cmaui_port_2: - - abstract_cmaui_0 - - feature_cmaui_cmaui_port disk.write.bytes_server_cmaui_1: - abstract_cmaui_1 - disk.write.bytes_cmaui @@ -368,6 +371,9 @@ topology_template: disk.allocation_server_cmaui_2: - abstract_cmaui_0 - disk.allocation_cmaui + network.incoming.packets_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.incoming.packets_cmaui_cmaui_mgmt_port_0 binding_server_cmaui_1: - abstract_cmaui_1 - binding_cmaui @@ -380,30 +386,24 @@ topology_template: vcpus_server_cmaui_2: - abstract_cmaui_0 - vcpus_cmaui - attachment_cmaui_port_2: - - abstract_cmaui_0 - - attachment_cmaui_cmaui_port scalable_server_cmaui_2: - abstract_cmaui_0 - scalable_cmaui scalable_server_cmaui_1: - abstract_cmaui_1 - scalable_cmaui - network.outgoing.packets.rate_cmaui_port_1: - - abstract_cmaui_1 - - network.outgoing.packets.rate_cmaui_cmaui_port - network.outgoing.packets.rate_cmaui_port_2: - - abstract_cmaui_0 - - network.outgoing.packets.rate_cmaui_cmaui_port - attachment_cmaui_port_1: + network.incoming.packets.rate_cmaui_1_mgmt_port_0: - abstract_cmaui_1 - - attachment_cmaui_cmaui_port + - network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0 disk.write.requests_server_cmaui_2: - abstract_cmaui_0 - disk.write.requests_cmaui disk.write.requests_server_cmaui_1: - abstract_cmaui_1 - disk.write.requests_cmaui + network.incoming.packets.rate_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.incoming.packets.rate_cmaui_cmaui_mgmt_port_0 disk.usage_server_cmaui_1: - abstract_cmaui_1 - disk.usage_cmaui @@ -422,12 +422,6 @@ topology_template: os_server_cmaui_1: - abstract_cmaui_1 - os_cmaui - forwarder_cmaui_port_2: - - abstract_cmaui_0 - - forwarder_cmaui_cmaui_port - forwarder_cmaui_port_1: - - abstract_cmaui_1 - - forwarder_cmaui_cmaui_port feature_packet_external_network: - packet_external_network - feature @@ -440,12 +434,18 @@ topology_template: memory_server_cmaui_1: - abstract_cmaui_1 - memory_cmaui + attachment_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - attachment_cmaui_cmaui_mgmt_port_0 host_server_cmaui_2: - abstract_cmaui_0 - host_cmaui host_server_cmaui_1: - abstract_cmaui_1 - host_cmaui + attachment_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - attachment_cmaui_cmaui_mgmt_port_0 link_packet_internal_network: - packet_internal_network - link @@ -455,18 +455,18 @@ topology_template: disk.device.capacity_server_cmaui_1: - abstract_cmaui_1 - disk.device.capacity_cmaui + feature_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - feature_cmaui_cmaui_mgmt_port_0 + feature_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - feature_cmaui_cmaui_mgmt_port_0 instance_server_cmaui_1: - abstract_cmaui_1 - instance_cmaui disk.device.read.requests.rate_server_cmaui_1: - abstract_cmaui_1 - disk.device.read.requests.rate_cmaui - network.incoming.bytes.rate_cmaui_port_1: - - abstract_cmaui_1 - - network.incoming.bytes.rate_cmaui_cmaui_port - network.incoming.bytes.rate_cmaui_port_2: - - abstract_cmaui_0 - - network.incoming.bytes.rate_cmaui_cmaui_port vcpus_server_cmaui_1: - abstract_cmaui_1 - vcpus_cmaui @@ -476,15 +476,9 @@ topology_template: disk.read.bytes.rate_server_cmaui_1: - abstract_cmaui_1 - disk.read.bytes.rate_cmaui - network.outpoing.packets_cmaui_port_1: - - abstract_cmaui_1 - - network.outpoing.packets_cmaui_cmaui_port disk.read.bytes.rate_server_cmaui_2: - abstract_cmaui_0 - disk.read.bytes.rate_cmaui - network.outpoing.packets_cmaui_port_2: - - abstract_cmaui_0 - - network.outpoing.packets_cmaui_cmaui_port disk.device.read.requests_server_cmaui_1: - abstract_cmaui_1 - disk.device.read.requests_cmaui @@ -500,9 +494,15 @@ topology_template: memory.resident_server_cmaui_2: - abstract_cmaui_0 - memory.resident_cmaui + network.outgoing.bytes_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - network.outgoing.bytes_cmaui_cmaui_mgmt_port_0 memory.resident_server_cmaui_1: - abstract_cmaui_1 - memory.resident_cmaui + network.outgoing.bytes_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - network.outgoing.bytes_cmaui_cmaui_mgmt_port_0 attachment_packet_external_network: - packet_external_network - attachment @@ -522,21 +522,21 @@ topology_template: dependency_packet_internal_network: - packet_internal_network - dependency - dependency_cmaui_port_1: - - abstract_cmaui_1 - - dependency_cmaui_cmaui_port local_storage_server_cmaui_2: - abstract_cmaui_0 - local_storage_cmaui + dependency_cmaui_2_mgmt_port_0: + - abstract_cmaui_0 + - dependency_cmaui_cmaui_mgmt_port_0 dependency_server_cmaui_2: - abstract_cmaui_0 - dependency_cmaui + dependency_cmaui_1_mgmt_port_0: + - abstract_cmaui_1 + - dependency_cmaui_cmaui_mgmt_port_0 dependency_server_cmaui_1: - abstract_cmaui_1 - dependency_cmaui - dependency_cmaui_port_2: - - abstract_cmaui_0 - - dependency_cmaui_cmaui_port local_storage_server_cmaui_1: - abstract_cmaui_1 - local_storage_cmaui |