diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities')
13 files changed, 2404 insertions, 2404 deletions
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 |