diff options
| author |   talio <tali.orenbach@amdocs.com> | 2017-11-05 11:34:51 +0200 |
|---|---|---|
| committer | talio <tali.orenbach@amdocs.com> | 2017-11-06 10:17:35 +0200 |
| commit | 777a3493a4dc4bfeb854b3b820dc5968124af87e (patch) | |
| tree | 29836c3cb2ab846b0b3241727f4b92782afdac1e /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities | |
| parent | 7b492b5f191cd5c22e3c4254f5f3ef7476122e9d (diff) | |
duplicate ids
throw an exception when a zip with duplicate ids in different files is getting uploaded
Issue - Id : SDC-554
Change-Id: I213233d8833b89788f980db859d9597d2c1cb950
Signed-off-by: talio <tali.orenbach@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities')
9 files changed, 512 insertions, 512 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-no-compute.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-no-compute.yml index 5e0627f053..9e49695258 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-no-compute.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-no-compute.yml @@ -35,14 +35,14 @@ parameters: type: string resources: - cmaui_port_1: + cmaui_port_11: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_port_12: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network} 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 5907ec3648..65ef047317 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 @@ -36,9 +36,9 @@ parameters: description: Flavor for CMAUI server cmaui_oam_ips: type: string - packet_internal_network_name: + packet_internal_network_1_name: type: string - packet_external_network_name: + packet_external_network_1_name: type: string net: type: string @@ -66,14 +66,14 @@ parameters: type: string resources: - pd_server_1b_port: + pd_server_1b_port_1: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 0]}}] replacement_policy: AUTO - ps_server_1b_port: + ps_server_1b_port_1: type: OS::Neutron::Port properties: network: { get_param: net } @@ -88,7 +88,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port } + - port: { get_resource: pd_server_1b_port_1 } server_1b_pd_2: type: OS::Nova::Server @@ -98,19 +98,19 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port } + - port: { get_resource: ps_server_1b_port_1 } cmaui_port_1: type: OS::Neutron::Port properties: - network: {get_resource: packet_internal_network} + network: {get_resource: packet_external_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO cmaui_port_2: type: OS::Neutron::Port properties: - network: {get_resource: packet_internal_network} + network: {get_resource: packet_external_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO @@ -137,14 +137,14 @@ resources: oam_port_1: type: OS::Neutron::Port properties: - network: {get_resource: packet_internal_network} + network: {get_resource: packet_internal_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}] replacement_policy: AUTO oam_port_2: type: OS::Neutron::Port properties: - network: {get_resource: packet_external_network} + network: {get_resource: packet_external_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}] replacement_policy: AUTO @@ -179,17 +179,17 @@ resources: properties: p2: {get_param: p2} - packet_internal_network: + packet_internal_network_1: type: OS::Neutron::Net properties: name: - get_param: packet_internal_network_name + get_param: packet_internal_network_1_name - packet_external_network: + packet_external_network_1: type: OS::Neutron::Net properties: name: - get_param: packet_external_network_name + get_param: packet_external_network_1_name outputs: all_pattern_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/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 3a5d110bd0..33a64f5cc1 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 @@ -103,14 +103,14 @@ resources: BE_port_1: type: OS::Neutron::Port properties: - network: {get_resource: packet_internal_network} + network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 0]}}] replacement_policy: AUTO BE_port_2: type: OS::Neutron::Port properties: - network: {get_resource: packet_internal_network} + network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 0]}}] replacement_policy: AUTO @@ -137,14 +137,14 @@ resources: osm_port_1: type: OS::Neutron::Port properties: - network: {get_resource: packet_internal_network} + network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 1]}}] replacement_policy: AUTO osm_port_2: type: OS::Neutron::Port properties: - network: {get_resource: packet_external_network} + network: {get_resource: packet_external_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 1]}}] replacement_policy: AUTO @@ -179,13 +179,13 @@ resources: properties: p2: {get_param: p2} - packet_internal_network: + packet_internal_network_2: type: OS::Neutron::Net properties: name: get_param: packet_internal_network_name - packet_external_network: + packet_external_network_2: type: OS::Neutron::Net properties: name: 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 ae6c22ede7..8ad3b6e69a 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 @@ -2706,10 +2706,6 @@ node_types: type: string required: true status: SUPPORTED - packet_internal_network_name: - type: string - required: true - status: SUPPORTED pd_server_1b_names: type: list description: PD server names @@ -2757,7 +2753,11 @@ node_types: type: string required: true status: SUPPORTED - packet_external_network_name: + packet_internal_network_1_name: + type: string + required: true + status: SUPPORTED + packet_external_network_1_name: type: string required: true status: SUPPORTED @@ -2924,19 +2924,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_1b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_oam_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -2944,61 +2931,67 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_packet_external_network: + - dependency_packet_internal_network_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port: + - dependency_server_1c1_cmaui_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_packet_internal_network: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn + - local_storage_server_1c1_cmaui_2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_server_1c1_cmaui_2: + - dependency_server_1c1_cmaui_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_1c1_cmaui_2: + - local_storage_server_1c1_cmaui_1: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_server_1c1_cmaui_1: + - dependency_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_1c1_cmaui_1: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pd_server_1b_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED + - link_pd_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_oam_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -3006,6 +2999,13 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_packet_external_network_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED capabilities: disk.device.write.bytes.rate_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer @@ -3037,6 +3037,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - 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. @@ -3078,12 +3085,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_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 feature_server_1c1_cmaui_2: type: tosca.capabilities.Node occurrences: @@ -3095,6 +3096,12 @@ node_types: 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_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3125,6 +3132,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_port_1: + type: tosca.capabilities.Node + 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. @@ -3159,17 +3171,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_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 - attachment_ps_server_1b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.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. @@ -3269,6 +3270,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.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. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_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. @@ -3280,6 +3287,11 @@ node_types: occurrences: - 1 - UNBOUNDED + link_packet_internal_network_1: + type: tosca.capabilities.network.Linkable + 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. @@ -3382,6 +3394,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_packet_internal_network_1: + type: tosca.capabilities.Attachment + 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. @@ -3408,6 +3425,11 @@ node_types: occurrences: - 0 - UNBOUNDED + end_point_packet_internal_network_1: + type: tosca.capabilities.Endpoint + occurrences: + - 1 + - UNBOUNDED os_server_pd_nested1_pattern_4: type: tosca.capabilities.OperatingSystem occurrences: @@ -3425,6 +3447,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_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.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. + occurrences: + - 1 + - UNBOUNDED + 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 attachment_pd_server_port_1_nested1_pattern_4: type: tosca.capabilities.Attachment occurrences: @@ -3507,6 +3547,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.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. + occurrences: + - 1 + - UNBOUNDED memory.resident_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. @@ -3582,12 +3628,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_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 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. @@ -3628,6 +3668,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.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. + occurrences: + - 1 + - UNBOUNDED attachment_pd_server_port_2_nested1_pattern_4: type: tosca.capabilities.Attachment occurrences: @@ -3718,6 +3764,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.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. + occurrences: + - 1 + - UNBOUNDED host_server_1b_pd_1: type: tosca.capabilities.Container valid_source_types: @@ -3725,12 +3777,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_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 disk.root.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. @@ -3760,12 +3806,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_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 host_server_1b_pd_2: type: tosca.capabilities.Container valid_source_types: @@ -3773,24 +3813,12 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED vcpus_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 - binding_ps_server_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.latency_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. @@ -3803,11 +3831,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_external_network: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.write.requests.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. @@ -3832,6 +3855,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_1b_port_1: + type: tosca.capabilities.Attachment + 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. @@ -3856,6 +3884,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.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. @@ -3868,13 +3903,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.requests.rate_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. @@ -3949,6 +3977,12 @@ node_types: 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. + occurrences: + - 1 + - UNBOUNDED disk.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. @@ -4053,12 +4087,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_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 memory.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. @@ -4077,11 +4105,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_packet_external_network: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.read.requests_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. @@ -4130,12 +4153,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_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_util_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. @@ -4206,6 +4223,11 @@ node_types: occurrences: - 1 - UNBOUNDED + end_point_packet_external_network_1: + type: tosca.capabilities.Endpoint + occurrences: + - 1 + - UNBOUNDED binding_server_1c1_cmaui_2: type: tosca.capabilities.network.Bindable occurrences: @@ -4222,11 +4244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.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. @@ -4255,24 +4272,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_pd_nested1_pattern_4: + 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. occurrences: - 1 - UNBOUNDED - attachment_packet_internal_network: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.device.read.bytes.rate_server_1b_pd_2: + disk.device.write.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_pd_server_1b_port: + 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. occurrences: @@ -4320,6 +4332,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.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.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. @@ -4464,12 +4482,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_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 disk.write.requests_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. @@ -4481,12 +4493,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_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 disk.device.write.requests.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. @@ -4590,11 +4596,6 @@ node_types: occurrences: - 1 - UNBOUNDED - end_point_packet_external_network: - type: tosca.capabilities.Endpoint - occurrences: - - 1 - - UNBOUNDED cpu_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. @@ -4607,12 +4608,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_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 disk.device.read.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. @@ -4653,21 +4648,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_port: + 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 - disk.write.requests_server_1c1_cmaui_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 - 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. + link_packet_external_network_1: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED @@ -4701,6 +4695,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_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_port_2_nested1_pattern_4: type: tosca.capabilities.network.Bindable valid_source_types: @@ -4720,11 +4720,6 @@ node_types: occurrences: - 1 - UNBOUNDED - link_packet_external_network: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED 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. @@ -4737,6 +4732,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_1b_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_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. @@ -4749,6 +4749,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_packet_external_network_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED 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. @@ -4761,6 +4766,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_packet_internal_network_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.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. @@ -4797,22 +4807,12 @@ node_types: occurrences: - 1 - UNBOUNDED - end_point_packet_internal_network: - type: tosca.capabilities.Endpoint - occurrences: - - 1 - - UNBOUNDED network.incoming.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. occurrences: - 1 - UNBOUNDED - feature_packet_internal_network: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED network.incoming.bytes_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. @@ -4931,6 +4931,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.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. + occurrences: + - 1 + - UNBOUNDED endpoint_server_1b_pd_2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -4953,13 +4959,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_1c1_cmaui_2: + network.incoming.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 - network.incoming.packets_ps_server_1b_port: + disk.device.read.requests.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: @@ -4971,11 +4977,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -5042,13 +5043,12 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_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. + feature_packet_external_network_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_port: + disk.write.bytes_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: @@ -5082,12 +5082,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_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 feature_nested1_pattern_4: type: tosca.capabilities.Node occurrences: @@ -5116,11 +5110,6 @@ node_types: occurrences: - 1 - UNBOUNDED - link_packet_internal_network: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED disk.device.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. @@ -5190,12 +5179,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_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 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. @@ -5226,6 +5209,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.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 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. @@ -5251,11 +5240,22 @@ node_types: occurrences: - 1 - 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. + occurrences: + - 1 + - UNBOUNDED feature_pd_server_port_2_nested1_pattern_4: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED endpoint_server_1c2_oam_2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -6176,83 +6176,83 @@ node_types: description: no_compute_attr_1 status: SUPPORTED requirements: - - dependency_cmaui_port_2: + - dependency_cmaui_port_12: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - binding_cmaui_port_2: + - binding_cmaui_port_12: capability: tosca.capabilities.network.Bindable relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - dependency_packet_external_network: + - dependency_cmaui_port_11: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_packet_internal_network: + - binding_cmaui_port_11: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + - dependency_packet_external_network: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_1: + - dependency_packet_internal_network: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - binding_cmaui_port_1: - capability: tosca.capabilities.network.Bindable - relationship: tosca.relationships.network.BindsTo - occurrences: - - 1 - - 1 capabilities: - network.incoming.packets_cmaui_port_2: + network.outgoing.bytes.rate_cmaui_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: + network.outgoing.bytes.rate_cmaui_port_12: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1: + network.outpoing.packets_cmaui_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2: + network.outpoing.packets_cmaui_port_12: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_1: - type: tosca.capabilities.Node + end_point_packet_internal_network: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - feature_cmaui_port_2: + feature_cmaui_port_12: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - end_point_packet_internal_network: - type: tosca.capabilities.Endpoint + feature_cmaui_port_11: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -6266,106 +6266,112 @@ node_types: occurrences: - 1 - UNBOUNDED - end_point_packet_external_network: - type: tosca.capabilities.Endpoint - occurrences: - - 1 - - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_cmaui_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_2: + network.incoming.bytes.rate_cmaui_port_12: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + end_point_packet_external_network: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_2: + network.outgoing.bytes_cmaui_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_1: + network.outgoing.bytes_cmaui_port_12: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_1: + attachment_packet_internal_network: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_cmaui_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.outgoing.packets.rate_cmaui_port_12: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_cmaui_port_2: + binding_cmaui_port_12: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1: + network.outgoing.packets.rate_cmaui_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_port_11: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_cmaui_port_12: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_packet_internal_network: + attachment_cmaui_port_11: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: + network.incoming.packets.rate_cmaui_port_12: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_2: + network.incoming.packets.rate_cmaui_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: + attachment_packet_external_network: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_cmaui_port_12: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: + network.incoming.packets_cmaui_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_packet_external_network: - type: tosca.capabilities.Attachment + network.incoming.packets_cmaui_port_12: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_2: + network.incoming.bytes_cmaui_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6381,12 +6387,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -7899,4 +7899,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 581e296e13..16ea9d76c1 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 @@ -296,16 +296,6 @@ topology_template: port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false - packet_external_network: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - network_name: - get_input: packet_external_network_name - packet_internal_network: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - network_name: - get_input: packet_internal_network_name abstract_osm_server_1c2_0: type: org.openecomp.resource.abstract.nodes.osm_server_1c2 directives: @@ -314,7 +304,7 @@ topology_template: port_osm_port_replacement_policy: - AUTO port_osm_port_network: - - packet_internal_network + - packet_internal_network_2 compute_osm_server_1c2_name: - get_input: - osm_server_1c2_names @@ -350,7 +340,7 @@ topology_template: requirements: - link_osm_server_1c2_osm_port: capability: tosca.capabilities.network.Linkable - node: packet_internal_network + node: packet_internal_network_2 relationship: tosca.relationships.network.LinksTo abstract_osm_server_1c2_1: type: org.openecomp.resource.abstract.nodes.osm_server_1c2 @@ -360,7 +350,7 @@ topology_template: port_osm_port_replacement_policy: - AUTO port_osm_port_network: - - packet_external_network + - packet_external_network_2 compute_osm_server_1c2_name: - get_input: - osm_server_1c2_names @@ -413,8 +403,18 @@ topology_template: requirements: - link_osm_server_1c2_osm_port: capability: tosca.capabilities.network.Linkable - node: packet_external_network + node: packet_external_network_2 relationship: tosca.relationships.network.LinksTo + packet_internal_network_2: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_internal_network_name + packet_external_network_2: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_external_network_name abstract_BE_1c1: type: org.openecomp.resource.abstract.nodes.BE_1c1 directives: @@ -434,7 +434,7 @@ topology_template: - get_input: availability_zone_0 - get_input: availability_zone_0 port_BE_port_network: - - packet_internal_network + - packet_internal_network_2 port_BE_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -463,7 +463,7 @@ topology_template: requirements: - link_BE_1c1_BE_port: capability: tosca.capabilities.network.Linkable - node: packet_internal_network + node: packet_internal_network_2 relationship: tosca.relationships.network.LinksTo test_nested_all_patterns: type: org.openecomp.resource.abstract.nodes.heat.nested1 @@ -499,8 +499,8 @@ topology_template: description: nested1 members: - nested2_pattern_4 - - packet_external_network - - packet_internal_network + - packet_internal_network_2 + - packet_external_network_2 - abstract_rd_server_1b - abstract_rd_server_1b_1 - abstract_osm_server_1c2_0 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 b3373b5408..dc28b6c51e 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 @@ -298,4 +298,4 @@ topology_template: - dependency link_pd_server_1b_ps_server_1b_port: - pd_server_1b_ps_server_1b_port - - link + - 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 0d2a6a0347..b64b311741 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 @@ -305,4 +305,4 @@ topology_template: - link dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency + - 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-no-computeServiceTemplate.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-no-computeServiceTemplate.yaml index 76061f4f9c..3d08eb04fb 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-no-computeServiceTemplate.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-no-computeServiceTemplate.yaml @@ -65,7 +65,7 @@ topology_template: immutable: false type: string node_templates: - cmaui_port_2: + cmaui_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO @@ -89,17 +89,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo - packet_external_network: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - network_name: - get_input: packet_external_network_name - packet_internal_network: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - network_name: - get_input: packet_internal_network_name - cmaui_port_1: + cmaui_port_11: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO @@ -123,6 +113,16 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo + packet_external_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_external_network_name + packet_internal_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_internal_network_name groups: nested-no-compute_group: type: org.openecomp.groups.heat.HeatStack @@ -130,10 +130,10 @@ topology_template: heat_file: ../Artifacts/nested-no-compute.yml description: nested1 members: - - cmaui_port_2 + - cmaui_port_12 + - cmaui_port_11 - packet_external_network - packet_internal_network - - cmaui_port_1 outputs: no_compute_attr_1: description: no_compute_attr_1 @@ -141,86 +141,89 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-no-compute capabilities: - network.incoming.packets_cmaui_port_2: - - cmaui_port_2 - - network.incoming.packets - network.incoming.packets_cmaui_port_1: - - cmaui_port_1 - - network.incoming.packets - network.incoming.packets.rate_cmaui_port_1: - - cmaui_port_1 - - network.incoming.packets.rate - network.incoming.packets.rate_cmaui_port_2: - - cmaui_port_2 - - network.incoming.packets.rate - feature_cmaui_port_1: - - cmaui_port_1 - - feature - feature_cmaui_port_2: - - cmaui_port_2 - - feature + network.outgoing.bytes.rate_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_cmaui_port_12: + - cmaui_port_12 + - network.outgoing.bytes.rate + network.outpoing.packets_cmaui_port_11: + - cmaui_port_11 + - network.outpoing.packets + network.outpoing.packets_cmaui_port_12: + - cmaui_port_12 + - network.outpoing.packets end_point_packet_internal_network: - packet_internal_network - end_point + feature_cmaui_port_12: + - cmaui_port_12 + - feature + feature_cmaui_port_11: + - cmaui_port_11 + - feature link_packet_internal_network: - packet_internal_network - link feature_packet_internal_network: - packet_internal_network - feature + network.incoming.bytes.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes.rate + network.incoming.bytes.rate_cmaui_port_12: + - cmaui_port_12 + - network.incoming.bytes.rate end_point_packet_external_network: - packet_external_network - end_point - attachment_cmaui_port_2: - - cmaui_port_2 - - attachment - network.outgoing.bytes_cmaui_port_2: - - cmaui_port_2 + network.outgoing.bytes_cmaui_port_11: + - cmaui_port_11 - network.outgoing.bytes - network.outgoing.packets.rate_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_cmaui_port_2: - - cmaui_port_2 - - network.outgoing.packets.rate - network.outgoing.bytes_cmaui_port_1: - - cmaui_port_1 + network.outgoing.bytes_cmaui_port_12: + - cmaui_port_12 - network.outgoing.bytes - attachment_cmaui_port_1: - - cmaui_port_1 + attachment_packet_internal_network: + - packet_internal_network - attachment - binding_cmaui_port_1: - - cmaui_port_1 + network.outgoing.packets.rate_cmaui_port_12: + - cmaui_port_12 + - network.outgoing.packets.rate + binding_cmaui_port_12: + - cmaui_port_12 - binding - binding_cmaui_port_2: - - cmaui_port_2 + network.outgoing.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.packets.rate + binding_cmaui_port_11: + - cmaui_port_11 - binding - network.incoming.bytes.rate_cmaui_port_1: - - cmaui_port_1 - - network.incoming.bytes.rate - network.incoming.bytes.rate_cmaui_port_2: - - cmaui_port_2 - - network.incoming.bytes.rate - attachment_packet_internal_network: - - packet_internal_network + attachment_cmaui_port_12: + - cmaui_port_12 - attachment - network.outpoing.packets_cmaui_port_1: - - cmaui_port_1 - - network.outpoing.packets - network.outpoing.packets_cmaui_port_2: - - cmaui_port_2 - - network.outpoing.packets - network.outgoing.bytes.rate_cmaui_port_2: - - cmaui_port_2 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.bytes.rate + attachment_cmaui_port_11: + - cmaui_port_11 + - attachment + network.incoming.packets.rate_cmaui_port_12: + - cmaui_port_12 + - network.incoming.packets.rate + network.incoming.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets.rate attachment_packet_external_network: - packet_external_network - attachment - network.incoming.bytes_cmaui_port_2: - - cmaui_port_2 + network.incoming.bytes_cmaui_port_12: + - cmaui_port_12 + - network.incoming.bytes + network.incoming.packets_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets + network.incoming.packets_cmaui_port_12: + - cmaui_port_12 + - network.incoming.packets + network.incoming.bytes_cmaui_port_11: + - cmaui_port_11 - network.incoming.bytes link_packet_external_network: - packet_external_network @@ -228,25 +231,22 @@ topology_template: feature_packet_external_network: - packet_external_network - feature - network.incoming.bytes_cmaui_port_1: - - cmaui_port_1 - - network.incoming.bytes requirements: - binding_cmaui_port_1: - - cmaui_port_1 - - binding - binding_cmaui_port_2: - - cmaui_port_2 + dependency_cmaui_port_11: + - cmaui_port_11 + - dependency + dependency_cmaui_port_12: + - cmaui_port_12 + - dependency + binding_cmaui_port_12: + - cmaui_port_12 - binding dependency_packet_internal_network: - packet_internal_network - dependency - dependency_cmaui_port_1: - - cmaui_port_1 - - dependency - dependency_cmaui_port_2: - - cmaui_port_2 - - dependency + binding_cmaui_port_11: + - cmaui_port_11 + - binding dependency_packet_external_network: - packet_external_network - - dependency + - 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/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 19f9133272..b1b6a677d7 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 @@ -27,10 +27,6 @@ topology_template: hidden: false immutable: false type: string - packet_internal_network_name: - hidden: false - immutable: false - type: string pd_server_1b_names: hidden: false immutable: false @@ -78,7 +74,11 @@ topology_template: hidden: false immutable: false type: string - packet_external_network_name: + packet_internal_network_1_name: + hidden: false + immutable: false + type: string + packet_external_network_1_name: hidden: false immutable: false type: string @@ -176,7 +176,7 @@ topology_template: - cmaui_oam_ips - 0 port_cmaui_port_network: - - packet_internal_network + - packet_external_network_1 compute_cmaui_1c1_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -213,7 +213,7 @@ topology_template: requirements: - link_cmaui_1c1_cmaui_port: capability: tosca.capabilities.network.Linkable - node: packet_internal_network + node: packet_external_network_1 relationship: tosca.relationships.network.LinksTo nested1_pattern_4: type: org.openecomp.resource.abstract.nodes.heat.pd_server @@ -283,16 +283,11 @@ topology_template: - SELF - service_template_filter - index_value - packet_external_network: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - network_name: - get_input: packet_external_network_name - packet_internal_network: + packet_internal_network_1: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: network_name: - get_input: packet_internal_network_name + get_input: packet_internal_network_1_name abstract_oam_server_1c2_1: type: org.openecomp.resource.abstract.nodes.oam_server_1c2 directives: @@ -306,7 +301,7 @@ topology_template: - oam_server_1c2_names - 1 port_oam_port_network: - - packet_external_network + - packet_external_network_1 vm_flavor_name: get_input: oam_server_1c2_flavor compute_oam_server_1c2_availability_zone: @@ -354,7 +349,7 @@ topology_template: requirements: - link_oam_server_1c2_oam_port: capability: tosca.capabilities.network.Linkable - node: packet_external_network + node: packet_external_network_1 relationship: tosca.relationships.network.LinksTo abstract_oam_server_1c2_0: type: org.openecomp.resource.abstract.nodes.oam_server_1c2 @@ -369,7 +364,7 @@ topology_template: - oam_server_1c2_names - 0 port_oam_port_network: - - packet_internal_network + - packet_internal_network_1 vm_flavor_name: get_input: oam_server_1c2_flavor compute_oam_server_1c2_availability_zone: @@ -400,8 +395,13 @@ topology_template: requirements: - link_oam_server_1c2_oam_port: capability: tosca.capabilities.network.Linkable - node: packet_internal_network + node: packet_internal_network_1 relationship: tosca.relationships.network.LinksTo + packet_external_network_1: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_external_network_1_name groups: nested1_group: type: org.openecomp.groups.heat.HeatStack @@ -410,8 +410,8 @@ topology_template: description: nested1 members: - nested1_pattern_4 - - packet_external_network - - packet_internal_network + - packet_internal_network_1 + - packet_external_network_1 - abstract_oam_server_1c2_0 - abstract_oam_server_1c2_1 - abstract_pd_server_1b @@ -442,6 +442,9 @@ topology_template: memory_server_pd_nested1_pattern_4: - nested1_pattern_4 - memory_server_pd + binding_ps_server_1b_port_1: + - abstract_pd_server_1b + - binding_pd_server_1b_ps_server_1b_port disk.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.iops_oam_server_1c2 @@ -463,15 +466,15 @@ topology_template: disk.usage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.usage_oam_server_1c2 - network.incoming.bytes_pd_server_1b_port: - - abstract_pd_server_1b_1 - - network.incoming.bytes_pd_server_1b_pd_server_1b_port feature_server_1c1_cmaui_2: - abstract_cmaui_1c1 - feature_cmaui_1c1 disk.read.requests_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.read.requests_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 @@ -487,6 +490,9 @@ topology_template: network.outgoing.bytes_cmaui_port_1: - abstract_cmaui_1c1 - network.outgoing.bytes_cmaui_1c1_cmaui_port + 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 @@ -505,12 +511,6 @@ topology_template: feature_server_pd_nested1_pattern_4: - nested1_pattern_4 - feature_server_pd - network.incoming.packets_pd_server_1b_port: - - abstract_pd_server_1b_1 - - network.incoming.packets_pd_server_1b_pd_server_1b_port - attachment_ps_server_1b_port: - - abstract_pd_server_1b - - attachment_pd_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.requests.rate_oam_server_1c2 @@ -562,12 +562,18 @@ topology_template: vcpus_server_pd_nested1_pattern_4: - nested1_pattern_4 - vcpus_server_pd + network.outgoing.packets.rate_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port 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 + link_packet_internal_network_1: + - packet_internal_network_1 + - link network.outpoing.packets_pd_server_port_1_nested1_pattern_4: - nested1_pattern_4 - network.outpoing.packets_pd_server_port_1 @@ -619,6 +625,9 @@ topology_template: network.outpoing.packets_oam_port_1: - abstract_oam_server_1c2_0 - network.outpoing.packets_oam_server_1c2_oam_port + attachment_packet_internal_network_1: + - packet_internal_network_1 + - attachment network.outpoing.packets_oam_port_2: - abstract_oam_server_1c2_1 - network.outpoing.packets_oam_server_1c2_oam_port @@ -631,6 +640,9 @@ topology_template: binding_cmaui_port_2: - abstract_cmaui_1c1 - binding_cmaui_1c1_cmaui_port + end_point_packet_internal_network_1: + - packet_internal_network_1 + - end_point os_server_pd_nested1_pattern_4: - nested1_pattern_4 - os_server_pd @@ -640,6 +652,15 @@ topology_template: cpu_util_server_1c2_oam_2: - abstract_oam_server_1c2_1 - 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.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_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 @@ -682,6 +703,9 @@ topology_template: disk.device.iops_server_1c1_cmaui_1: - abstract_cmaui_1c1 - 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 memory.resident_server_1b_pd_2: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -721,9 +745,6 @@ topology_template: feature_cmaui_port_1: - abstract_cmaui_1c1 - feature_cmaui_1c1_cmaui_port - network.incoming.bytes.rate_pd_server_1b_port: - - abstract_pd_server_1b_1 - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port network.outgoing.bytes_oam_port_2: - abstract_oam_server_1c2_1 - network.outgoing.bytes_oam_server_1c2_oam_port @@ -745,6 +766,9 @@ topology_template: 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 @@ -793,12 +817,12 @@ topology_template: endpoint_server_1c1_cmaui_2: - abstract_cmaui_1c1 - 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 host_server_1b_pd_1: - abstract_pd_server_1b_1 - host_pd_server_1b - network.outgoing.packets.rate_ps_server_1b_port: - - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port disk.root.size_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.root.size_pd_server_1b @@ -814,30 +838,18 @@ topology_template: disk.device.usage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.device.usage_cmaui_1c1 - network.incoming.bytes_ps_server_1b_port: - - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_ps_server_1b_port host_server_1b_pd_2: - abstract_pd_server_1b - host_pd_server_1b - attachment_pd_server_1b_port: - - abstract_pd_server_1b_1 - - attachment_pd_server_1b_pd_server_1b_port vcpus_server_1c1_cmaui_2: - abstract_cmaui_1c1 - vcpus_cmaui_1c1 - binding_ps_server_1b_port: - - abstract_pd_server_1b - - binding_pd_server_1b_ps_server_1b_port disk.device.latency_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.latency_oam_server_1c2 disk.device.latency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.latency_oam_server_1c2 - feature_packet_external_network: - - packet_external_network - - feature disk.write.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.requests.rate_cmaui_1c1 @@ -850,6 +862,9 @@ topology_template: 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 cpu_util_server_1c1_cmaui_2: - abstract_cmaui_1c1 - cpu_util_cmaui_1c1 @@ -862,15 +877,15 @@ topology_template: cpu_util_server_1c1_cmaui_1: - abstract_cmaui_1c1 - cpu_util_cmaui_1c1 + binding_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - binding_pd_server_1b_pd_server_1b_port disk.device.latency_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.latency_server_pd disk.write.requests_server_1b_pd_2: - abstract_pd_server_1b - disk.write.requests_pd_server_1b - binding_pd_server_1b_port: - - abstract_pd_server_1b_1 - - binding_pd_server_1b_pd_server_1b_port disk.device.read.requests.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.requests.rate_pd_server_1b @@ -907,6 +922,9 @@ topology_template: 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 disk.read.bytes.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.read.bytes.rate_cmaui_1c1 @@ -958,9 +976,6 @@ topology_template: memory.usage_server_1b_pd_1: - abstract_pd_server_1b_1 - memory.usage_pd_server_1b - network.outpoing.packets_ps_server_1b_port: - - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_ps_server_1b_port memory.usage_server_1c2_oam_1: - abstract_oam_server_1c2_0 - memory.usage_oam_server_1c2 @@ -970,9 +985,6 @@ topology_template: disk.latency_server_1b_pd_2: - abstract_pd_server_1b - disk.latency_pd_server_1b - attachment_packet_external_network: - - packet_external_network - - attachment disk.read.requests_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.read.requests_oam_server_1c2 @@ -997,9 +1009,6 @@ topology_template: disk.device.write.requests_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.write.requests_pd_server_1b - network.incoming.bytes.rate_ps_server_1b_port: - - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port cpu_util_server_pd_nested1_pattern_4: - nested1_pattern_4 - cpu_util_server_pd @@ -1036,6 +1045,9 @@ topology_template: memory.usage_server_1c1_cmaui_2: - abstract_cmaui_1c1 - memory.usage_cmaui_1c1 + end_point_packet_external_network_1: + - packet_external_network_1 + - end_point binding_server_1c1_cmaui_2: - abstract_cmaui_1c1 - binding_cmaui_1c1 @@ -1045,9 +1057,6 @@ topology_template: binding_server_1c1_cmaui_1: - abstract_cmaui_1c1 - binding_cmaui_1c1 - feature_ps_server_1b_port: - - abstract_pd_server_1b - - feature_pd_server_1b_ps_server_1b_port disk.device.iops_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.iops_oam_server_1c2 @@ -1063,18 +1072,15 @@ topology_template: binding_server_1c2_oam_1: - abstract_oam_server_1c2_0 - binding_oam_server_1c2 + network.incoming.bytes.rate_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.device.write.requests.rate_server_pd - attachment_packet_internal_network: - - packet_internal_network - - attachment disk.device.read.bytes.rate_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.bytes.rate_pd_server_1b - network.outgoing.packets.rate_pd_server_1b_port: - - abstract_pd_server_1b_1 - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port disk.write.requests.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.write.requests.rate_pd_server_1b @@ -1096,6 +1102,9 @@ topology_template: disk.device.read.bytes.rate_server_1b_pd_1: - abstract_pd_server_1b_1 - 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: - nested1_pattern_4 - network.outgoing.packets.rate_pd_server_port_2 @@ -1168,18 +1177,12 @@ topology_template: cpu_util_server_1b_pd_1: - abstract_pd_server_1b_1 - cpu_util_pd_server_1b - network.outgoing.bytes.rate_ps_server_1b_port: - - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port disk.write.requests_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.requests_server_pd feature_server_1b_pd_1: - abstract_pd_server_1b_1 - feature_pd_server_1b - network.incoming.packets.rate_ps_server_1b_port: - - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.write.requests.rate_cmaui_1c1 @@ -1231,18 +1234,12 @@ topology_template: disk.iops_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.iops_pd_server_1b - end_point_packet_external_network: - - packet_external_network - - end_point cpu_server_pd_nested1_pattern_4: - nested1_pattern_4 - cpu_server_pd disk.iops_server_1b_pd_2: - abstract_pd_server_1b - disk.iops_pd_server_1b - network.outpoing.packets_pd_server_1b_port: - - abstract_pd_server_1b_1 - - network.outpoing.packets_pd_server_1b_pd_server_1b_port disk.device.read.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.requests_cmaui_1c1 @@ -1264,15 +1261,15 @@ topology_template: disk.device.allocation_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.allocation_oam_server_1c2 - network.outgoing.bytes_pd_server_1b_port: - - abstract_pd_server_1b_1 - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port disk.write.requests_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.requests_cmaui_1c1 disk.write.requests_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.write.requests_cmaui_1c1 + 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 @@ -1288,6 +1285,9 @@ topology_template: 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 binding_pd_server_port_2_nested1_pattern_4: - nested1_pattern_4 - binding_pd_server_port_2 @@ -1297,27 +1297,33 @@ topology_template: cpu_server_1c2_oam_2: - abstract_oam_server_1c2_1 - cpu_oam_server_1c2 - link_packet_external_network: - - packet_external_network - - link 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 + attachment_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - attachment_pd_server_1b_pd_server_1b_port disk.write.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.write.requests.rate_oam_server_1c2 disk.device.read.bytes_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.bytes_pd_server_1b + attachment_packet_external_network_1: + - packet_external_network_1 + - attachment cpu.delta_server_1c2_oam_2: - abstract_oam_server_1c2_1 - cpu.delta_oam_server_1c2 disk.device.read.bytes_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b + feature_packet_internal_network_1: + - packet_internal_network_1 + - feature disk.iops_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.iops_server_pd @@ -1336,15 +1342,9 @@ topology_template: disk.usage_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.usage_cmaui_1c1 - end_point_packet_internal_network: - - packet_internal_network - - end_point network.incoming.bytes_oam_port_2: - abstract_oam_server_1c2_1 - network.incoming.bytes_oam_server_1c2_oam_port - feature_packet_internal_network: - - packet_internal_network - - feature network.incoming.bytes_oam_port_1: - abstract_oam_server_1c2_0 - network.incoming.bytes_oam_server_1c2_oam_port @@ -1405,6 +1405,9 @@ topology_template: 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 endpoint_server_1b_pd_2: - abstract_pd_server_1b - endpoint_pd_server_1b @@ -1417,18 +1420,15 @@ topology_template: disk.device.read.bytes_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.read.bytes_oam_server_1c2 + network.incoming.bytes_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.incoming.bytes_pd_server_1b_pd_server_1b_port disk.device.read.requests.rate_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.read.requests.rate_cmaui_1c1 - network.incoming.packets_ps_server_1b_port: - - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_ps_server_1b_port instance_server_pd_nested1_pattern_4: - nested1_pattern_4 - instance_server_pd - feature_pd_server_1b_port: - - abstract_pd_server_1b_1 - - feature_pd_server_1b_pd_server_1b_port disk.latency_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.latency_cmaui_1c1 @@ -1462,12 +1462,12 @@ topology_template: disk.device.read.bytes.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.read.bytes.rate_oam_server_1c2 + feature_packet_external_network_1: + - packet_external_network_1 + - feature disk.write.bytes_server_1c1_cmaui_1: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 - network.outgoing.bytes.rate_pd_server_1b_port: - - abstract_pd_server_1b_1 - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port disk.write.bytes_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.write.bytes_cmaui_1c1 @@ -1483,9 +1483,6 @@ topology_template: disk.device.latency_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.latency_pd_server_1b - network.incoming.packets.rate_pd_server_1b_port: - - abstract_pd_server_1b_1 - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port feature_nested1_pattern_4: - nested1_pattern_4 - feature @@ -1501,9 +1498,6 @@ topology_template: disk.read.bytes_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.read.bytes_server_pd - link_packet_internal_network: - - packet_internal_network - - link disk.device.latency_server_1c1_cmaui_2: - abstract_cmaui_1c1 - disk.device.latency_cmaui_1c1 @@ -1540,9 +1534,6 @@ topology_template: network.incoming.bytes.rate_cmaui_port_1: - abstract_cmaui_1c1 - network.incoming.bytes.rate_cmaui_1c1_cmaui_port - network.outgoing.bytes_ps_server_1b_port: - - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_ps_server_1b_port network.incoming.bytes.rate_cmaui_port_2: - abstract_cmaui_1c1 - network.incoming.bytes.rate_cmaui_1c1_cmaui_port @@ -1558,6 +1549,9 @@ topology_template: disk.device.read.requests_server_1b_pd_1: - abstract_pd_server_1b_1 - disk.device.read.requests_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 disk.device.write.bytes_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.bytes_oam_server_1c2 @@ -1570,9 +1564,15 @@ topology_template: disk.write.bytes_server_pd_nested1_pattern_4: - nested1_pattern_4 - disk.write.bytes_server_pd + 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 feature_pd_server_port_2_nested1_pattern_4: - nested1_pattern_4 - feature_pd_server_port_2 + feature_ps_server_1b_port_1: + - abstract_pd_server_1b + - feature_pd_server_1b_ps_server_1b_port endpoint_server_1c2_oam_2: - abstract_oam_server_1c2_1 - endpoint_oam_server_1c2 @@ -1580,9 +1580,6 @@ topology_template: - abstract_oam_server_1c2_0 - endpoint_oam_server_1c2 requirements: - link_pd_server_1b_port: - - abstract_pd_server_1b_1 - - link_pd_server_1b_pd_server_1b_port dependency_oam_port_2: - abstract_oam_server_1c2_1 - dependency_oam_server_1c2_oam_port @@ -1595,12 +1592,9 @@ topology_template: link_pd_server_port_2_nested1_pattern_4: - nested1_pattern_4 - link_pd_server_port_2 - link_ps_server_1b_port: - - abstract_pd_server_1b - - link_pd_server_1b_ps_server_1b_port - dependency_ps_server_1b_port: - - abstract_pd_server_1b - - dependency_pd_server_1b_ps_server_1b_port + dependency_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - dependency_pd_server_1b_pd_server_1b_port dependency_server_1c2_oam_1: - abstract_oam_server_1c2_0 - dependency_oam_server_1c2 @@ -1625,8 +1619,8 @@ topology_template: dependency_cmaui_port_2: - abstract_cmaui_1c1 - dependency_cmaui_1c1_cmaui_port - dependency_packet_external_network: - - packet_external_network + dependency_packet_internal_network_1: + - packet_internal_network_1 - dependency link_pd_server_port_1_nested1_pattern_4: - nested1_pattern_4 @@ -1646,12 +1640,18 @@ topology_template: dependency_server_1c1_cmaui_2: - abstract_cmaui_1c1 - dependency_cmaui_1c1 - dependency_pd_server_1b_port: + link_pd_server_1b_port_1: - abstract_pd_server_1b_1 - - dependency_pd_server_1b_pd_server_1b_port - dependency_packet_internal_network: - - packet_internal_network + - link_pd_server_1b_pd_server_1b_port + link_ps_server_1b_port_1: + - abstract_pd_server_1b + - link_pd_server_1b_ps_server_1b_port + 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 local_storage_server_1c1_cmaui_2: - abstract_cmaui_1c1 - local_storage_cmaui_1c1 @@ -1666,4 +1666,4 @@ topology_template: - dependency dependency_server_1b_pd_2: - abstract_pd_server_1b - - dependency_pd_server_1b + - dependency_pd_server_1b
\ No newline at end of file |