From 94802b9b83a0a9edea77cbff76639aaefeca8d8e Mon Sep 17 00:00:00 2001 From: talio Date: Tue, 14 Nov 2017 10:18:03 +0200 Subject: forwarder test fix fix translator tests with forwarder capability Issue-Id : SDC-653 Change-Id: I59db23acb0e2c3b5920bf24662374fee950d479b Signed-off-by: talio --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 207 ++++++++++++++++++++- .../out/Nested_cmaui_1c1_mainServiceTemplate.yaml | 3 + .../Nested_cmaui_1c1_main_1ServiceTemplate.yaml | 3 + .../Nested_cmaui_1c1_nested2ServiceTemplate.yaml | 3 + .../Nested_pd_server_main_1bServiceTemplate.yaml | 5 +- .../Nested_pd_server_main_1b_1ServiceTemplate.yaml | 3 + ...Nested_pd_server_nested2_1bServiceTemplate.yaml | 3 + .../Nested_ps_server_main_1bServiceTemplate.yaml | 5 +- .../Nested_ps_server_main_1b_1ServiceTemplate.yaml | 3 + ...Nested_ps_server_nested2_1bServiceTemplate.yaml | 3 + .../nested-pattern-4-same-typeServiceTemplate.yaml | 8 +- .../out/nested-pattern-4ServiceTemplate.yaml | 8 +- .../out/nested1-no-computeServiceTemplate.yaml | 6 + .../out/nested1ServiceTemplate.yaml | 44 ++++- .../out/nested2ServiceTemplate.yaml | 26 ++- 15 files changed, 323 insertions(+), 7 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 12d24c9a64..ae828c197b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -271,6 +271,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_nested2_1b_pd_server_nested2_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_nested2_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -564,6 +569,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_pd_server_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -593,6 +603,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED attachment_pd_server_port: type: tosca.capabilities.Attachment occurrences: @@ -1018,6 +1033,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pd_server_pattern4_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_pd_server_pattern4_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1598,6 +1623,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pd_server_pattern4_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2142,6 +2177,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pd_server_pattern4_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2471,6 +2516,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_main_cmaui_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3416,12 +3466,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_11: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_12: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_ps_server_main_1b_port_1: type: tosca.capabilities.Node occurrences: @@ -3445,6 +3505,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED os_server_pd_pattern4_test_nested_pattern_4_main_1: type: tosca.capabilities.OperatingSystem occurrences: @@ -3806,6 +3871,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3818,6 +3888,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_main_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_ps_server_main_1b_port_1: type: tosca.capabilities.network.Bindable valid_source_types: @@ -3991,6 +4066,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4063,6 +4143,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_nested2_1b_port_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4495,6 +4580,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_nested2_1b_port_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4660,6 +4750,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4831,6 +4926,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4905,6 +5005,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_1_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.latency_server_nested2_pd_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5243,6 +5348,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5737,6 +5847,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_main_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6641,6 +6756,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_nested2_ps_1b_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7066,6 +7186,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_main_1b_ps_server_main_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7694,6 +7819,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_server_nested2_ps_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7795,6 +7925,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_nested2_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7842,6 +7977,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: type: tosca.capabilities.Attachment occurrences: @@ -8287,12 +8427,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_pd_server_nested2_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_server_nested2_1c1_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8621,6 +8771,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_nested2_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: type: tosca.capabilities.Attachment occurrences: @@ -9180,6 +9335,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9256,6 +9416,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -9998,6 +10163,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_main_1b_pd_server_main_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED attachment_pd_server_main_1b_pd_server_main_1b_port: type: tosca.capabilities.Attachment occurrences: @@ -10419,6 +10589,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_main_1b_pd_server_main_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED attachment_pd_server_main_1b_pd_server_main_1b_port: type: tosca.capabilities.Attachment occurrences: @@ -10774,6 +10949,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_main_1b_ps_server_main_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_ps_server_main_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11252,6 +11432,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_nested2_cmaui_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.allocation_cmaui_1c1_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -11798,6 +11983,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.cmaui_1c1_main: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -12017,6 +12207,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_main_cmaui_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_cmaui_1c1_main: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -12653,6 +12848,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pattern4_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pd_server_pattern4_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_pd_pattern4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -12762,4 +12967,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/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml index 9b9694d6bd..eac65fb38a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml @@ -184,6 +184,9 @@ topology_template: disk.device.write.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes + forwarder_cmaui_1c1_main_cmaui_port: + - cmaui_1c1_main_cmaui_port + - forwarder vcpus_cmaui_1c1_main: - cmaui_1c1_main - vcpus diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml index 3d5388a9b8..d89d169c09 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml @@ -184,6 +184,9 @@ topology_template: disk.device.write.bytes_cmaui_1c1_main: - cmaui_1c1_main - disk.device.write.bytes + forwarder_cmaui_1c1_main_cmaui_port: + - cmaui_1c1_main_cmaui_port + - forwarder vcpus_cmaui_1c1_main: - cmaui_1c1_main - vcpus diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml index 6b35975e45..8955ed13c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml @@ -223,6 +223,9 @@ topology_template: memory_cmaui_1c1_nested2: - cmaui_1c1_nested2 - memory + forwarder_cmaui_1c1_nested2_cmaui_port: + - cmaui_1c1_nested2_cmaui_port + - forwarder disk.allocation_cmaui_1c1_nested2: - cmaui_1c1_nested2 - disk.allocation diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml index 4439f4e1e8..176b539e5f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml @@ -259,6 +259,9 @@ topology_template: disk.device.allocation_pd_server_main_1b: - pd_server_main_1b - disk.device.allocation + forwarder_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - forwarder attachment_pd_server_main_1b_pd_server_main_1b_port: - pd_server_main_1b_pd_server_main_1b_port - attachment @@ -298,4 +301,4 @@ topology_template: - local_storage dependency_pd_server_main_1b_pd_server_main_1b_port: - pd_server_main_1b_pd_server_main_1b_port - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml index c1f087a7f3..ee5a1265f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml @@ -259,6 +259,9 @@ topology_template: disk.device.allocation_pd_server_main_1b: - pd_server_main_1b - disk.device.allocation + forwarder_pd_server_main_1b_pd_server_main_1b_port: + - pd_server_main_1b_pd_server_main_1b_port + - forwarder attachment_pd_server_main_1b_pd_server_main_1b_port: - pd_server_main_1b_pd_server_main_1b_port - attachment diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml index 2c205ebc52..717221622a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml @@ -208,6 +208,9 @@ topology_template: disk.capacity_pd_server_nested2_1b: - pd_server_nested2_1b - disk.capacity + forwarder_pd_server_nested2_1b_pd_server_nested2_1b_port: + - pd_server_nested2_1b_pd_server_nested2_1b_port + - forwarder disk.write.bytes_pd_server_nested2_1b: - pd_server_nested2_1b - disk.write.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index 150bc51517..157bc91ac1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -193,6 +193,9 @@ topology_template: memory.usage_ps_server_main_1b: - ps_server_main_1b - memory.usage + forwarder_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - forwarder disk.write.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.requests.rate @@ -298,4 +301,4 @@ topology_template: - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml index 2aac373139..bc7ddf35ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml @@ -193,6 +193,9 @@ topology_template: memory.usage_ps_server_main_1b: - ps_server_main_1b - memory.usage + forwarder_ps_server_main_1b_ps_server_main_1b_port: + - ps_server_main_1b_ps_server_main_1b_port + - forwarder disk.write.requests.rate_ps_server_main_1b: - ps_server_main_1b - disk.write.requests.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml index b8fe67e9ef..7038b40920 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml @@ -286,6 +286,9 @@ topology_template: disk.device.write.bytes.rate_ps_server_nested2_1b: - ps_server_nested2_1b - disk.device.write.bytes.rate + forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port: + - ps_server_nested2_1b_ps_server_nested2_1b_port + - forwarder requirements: local_storage_ps_server_nested2_1b: - ps_server_nested2_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml index 26fcd68463..1c8510acd2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml @@ -332,6 +332,12 @@ topology_template: disk.read.bytes_server_pd_pattern4_1: - server_pd_pattern4_1 - disk.read.bytes + forwarder_pd_server_pattern4_port_1: + - pd_server_pattern4_port_1 + - forwarder + forwarder_pd_server_pattern4_port_2: + - pd_server_pattern4_port_2 + - forwarder network.outgoing.bytes.rate_pd_server_pattern4_port_1: - pd_server_pattern4_port_1 - network.outgoing.bytes.rate @@ -422,4 +428,4 @@ topology_template: - link dependency_server_pd_pattern4_1: - server_pd_pattern4_1 - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml index 34a80a963a..101ef1e4b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -347,6 +347,12 @@ topology_template: disk.device.iops_server_pd_pattern4: - server_pd_pattern4 - disk.device.iops + forwarder_pd_server_pattern4_port_01: + - pd_server_pattern4_port_01 + - forwarder + forwarder_pd_server_pattern4_port_02: + - pd_server_pattern4_port_02 + - forwarder disk.device.read.bytes.rate_server_pd_pattern4: - server_pd_pattern4 - disk.device.read.bytes.rate @@ -422,4 +428,4 @@ topology_template: - link dependency_server_pd_pattern4: - server_pd_pattern4 - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml index 39ba825a1f..3e91130783 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml @@ -117,6 +117,9 @@ topology_template: network.incoming.packets_pd_server_port: - pd_server_port - network.incoming.packets + forwarder_pd_server_port: + - pd_server_port + - forwarder network.incoming.bytes_pd_server_port: - pd_server_port - network.incoming.bytes @@ -132,6 +135,9 @@ topology_template: attachment_ps_server_port: - ps_server_port - attachment + forwarder_ps_server_port: + - ps_server_port + - forwarder attachment_pd_server_port: - pd_server_port - attachment diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml index f4bca8d6e4..bd14b2f1df 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml @@ -391,9 +391,15 @@ topology_template: disk.root.size_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.root.size_server_nested2_ps_1b + forwarder_cmaui_port_11: + - abstract_cmaui_1c1_main + - forwarder_cmaui_1c1_main_cmaui_port disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.read.requests_server_nested2_1c1_cmaui_2 + forwarder_cmaui_port_12: + - abstract_cmaui_1c1_main + - forwarder_cmaui_1c1_main_cmaui_port feature_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - feature_ps_server_main_1b_ps_server_main_1b_port @@ -406,6 +412,9 @@ topology_template: disk.usage_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.usage_server_nested2_ps_1b + forwarder_cmaui_port_2_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_2 os_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - os_server_pd_pattern4 @@ -589,12 +598,18 @@ topology_template: binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - binding_pd_server_pattern4_port_02 + forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - disk.root.size_server_nested2_1c1_cmaui_1 + forwarder_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - forwarder_ps_server_main_1b_ps_server_main_1b_port binding_ps_server_main_1b_port_1: - abstract_ps_server_main_1b - binding_ps_server_main_1b_ps_server_main_1b_port @@ -685,6 +700,9 @@ topology_template: disk.latency_server_main_1c1_cmaui_11: - abstract_cmaui_1c1_main - disk.latency_cmaui_1c1_main + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - disk.root.size_server_pd_pattern4 @@ -721,6 +739,9 @@ topology_template: network.outgoing.bytes_cmaui_port_2_test_nested2Level: - test_nested2Level - network.outgoing.bytes_cmaui_port_2 + forwarder_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_nested2_1b_port network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file @@ -940,6 +961,9 @@ topology_template: network.incoming.packets.rate_pd_server_main_1b_port_1: - abstract_pd_server_main_1b - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port + forwarder_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - forwarder_ps_server_nested2_1b_port network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 @@ -1024,6 +1048,9 @@ topology_template: disk.write.requests_server_main_ps_1b_1: - abstract_ps_server_main_1b - disk.write.requests_ps_server_main_1b + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - forwarder_pd_server_pattern4_port_02 memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file @@ -1111,6 +1138,9 @@ topology_template: feature_server_main_1c1_cmaui_21: - abstract_cmaui_1c1_main - feature_cmaui_1c1_main + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - forwarder_pd_server_pattern4_port_01 disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_nested2_1c1_cmaui_2 @@ -1150,6 +1180,9 @@ topology_template: scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: - test_nested2Level - scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + forwarder_cmaui_port_1_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_1 disk.latency_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.latency_server_nested2_pd_1b @@ -1321,6 +1354,9 @@ topology_template: disk.device.write.requests_server_nested2_pd_1b_test_nested2Level: - test_nested2Level - disk.device.write.requests_server_nested2_pd_1b + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.usage_server_nested2_1c1_cmaui_2 @@ -1570,6 +1606,9 @@ topology_template: network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: - test_nested2Level - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + forwarder_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - forwarder_pd_server_main_1b_pd_server_main_1b_port network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: - test_nested_pattern_4_main_1 - network.incoming.packets_pd_server_pattern4_port_02 @@ -2032,6 +2071,9 @@ topology_template: memory.usage_server_nested2_1c1_cmaui_1_test_nested2Level: - test_nested2Level - memory.usage_server_nested2_1c1_cmaui_1 + forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file disk.device.allocation_server_nested2_ps_1b_test_nested2Level: - test_nested2Level - disk.device.allocation_server_nested2_ps_1b @@ -2320,4 +2362,4 @@ topology_template: - dependency_test_nested_pattern_4_nested2 dependency_test_nested3Level_test_nested2Level: - test_nested2Level - - dependency_test_nested3Level \ No newline at end of file + - dependency_test_nested3Level diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml index 326bdcf8f3..6b6efc20df 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml @@ -367,6 +367,9 @@ topology_template: disk.device.latency_server_nested2_1c1_cmaui_1: - abstract_cmaui_1c1_nested2 - disk.device.latency_cmaui_1c1_nested2 + forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - forwarder_pd_server_pattern4_port_2 disk.iops_server_nested2_ps_1b: - abstract_ps_server_nested2_1b - disk.iops_ps_server_nested2_1b @@ -418,6 +421,9 @@ topology_template: disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.write.requests_server_pd_pattern4_1 + forwarder_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - forwarder_pd_server_nested2_1b_pd_server_nested2_1b_port memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - memory.resident_server_pd_pattern4_1 @@ -442,6 +448,9 @@ topology_template: binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - binding_pd_server_pattern4_port_1 + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - forwarder_pd_server_pattern4_port_01 attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - attachment_pd_server_pattern4_port_02 @@ -670,9 +679,15 @@ topology_template: network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - network.incoming.bytes_pd_server_pattern4_port_02 + forwarder_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - forwarder_cmaui_1c1_nested2_cmaui_port network.incoming.bytes_pd_server_nested2_1b_port: - abstract_pd_server_nested2_1b - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port + forwarder_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - forwarder_cmaui_1c1_nested2_cmaui_port vcpus_server_nested2_1c1_cmaui_2: - abstract_cmaui_1c1_nested2 - vcpus_cmaui_1c1_nested2 @@ -841,6 +856,9 @@ topology_template: disk.device.write.bytes.rate_server_nested2_pd_1b: - abstract_pd_server_nested2_1b - disk.device.write.bytes.rate_pd_server_nested2_1b + forwarder_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - attachment_pd_server_pattern4_port_2 @@ -1126,6 +1144,9 @@ topology_template: os_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - os_server_pd_pattern4 + forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - forwarder_pd_server_pattern4_port_1 disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: - test_nested_pattern_4_same_type_diff_file - disk.device.read.requests_server_pd_pattern4_1 @@ -1165,6 +1186,9 @@ topology_template: disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.device.read.bytes.rate_server_pd_pattern4 + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - forwarder_pd_server_pattern4_port_02 disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - disk.capacity_server_pd_pattern4 @@ -1474,4 +1498,4 @@ topology_template: - local_storage_cmaui_1c1_nested2 dependency_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency \ No newline at end of file + - dependency -- cgit 1.2.3-korg