diff options
author | 2017-11-14 10:18:03 +0200 | |
---|---|---|
committer | 2017-11-14 10:19:34 +0200 | |
commit | 94802b9b83a0a9edea77cbff76639aaefeca8d8e (patch) | |
tree | 33e4a62c13abfaa8e0d4bf18a1639741abe8b31f /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B | |
parent | d1746c4f5fe77754a57c77f55d657a352972a06e (diff) |
forwarder test fix
fix translator tests with forwarder capability
Issue-Id : SDC-653
Change-Id: I59db23acb0e2c3b5920bf24662374fee950d479b
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/threeNestedLevelsDiffVmTypePattern1B')
12 files changed, 160 insertions, 0 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 20819de371..edff14322c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -260,6 +260,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd02_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -634,6 +639,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_pd01_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1209,6 +1219,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd01_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1506,6 +1521,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam02_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2027,6 +2047,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam01_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2260,6 +2285,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui02_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2793,6 +2823,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui01_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_cmaui_cmaui01_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3541,6 +3576,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_oam02_port_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3931,6 +3971,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam02_port_2_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_oam01_port_1_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4079,6 +4124,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd02_port_2_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4323,6 +4373,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam01_port_1_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_server_oam_1_test_nested2Level: type: tosca.capabilities.Node occurrences: @@ -4429,11 +4484,21 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui02_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_server_oam_2_test_nested2Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + forwarder_pd01_port_1_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.allocation_server_ps_1_test_nested3Level_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. @@ -5241,6 +5306,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd01_port_1_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.latency_server_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. @@ -5294,6 +5364,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_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. @@ -5909,6 +5984,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam02_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets.rate_pd01_port_1_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6343,6 +6423,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd02_port_2_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_server_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. @@ -6624,6 +6709,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_pd02_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_ps_pd02_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7509,6 +7599,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pd02_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml index f2b127a52a..24d5919d63 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml @@ -151,6 +151,9 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes + forwarder_cmaui_cmaui02_port: + - cmaui_cmaui02_port + - forwarder disk.device.iops_cmaui: - cmaui - disk.device.iops diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml index 796de5a6f9..04bbb80287 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml @@ -205,6 +205,9 @@ topology_template: network.incoming.bytes_cmaui_cmaui01_port: - cmaui_cmaui01_port - network.incoming.bytes + forwarder_cmaui_cmaui01_port: + - cmaui_cmaui01_port + - forwarder network.outgoing.packets.rate_cmaui_cmaui01_port: - cmaui_cmaui01_port - network.outgoing.packets.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml index ba64ddf011..89de9a58c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml @@ -202,6 +202,9 @@ topology_template: disk.write.requests_oam: - oam - disk.write.requests + forwarder_oam_oam02_port: + - oam_oam02_port + - forwarder disk.capacity_oam: - oam - disk.capacity diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml index 0e73e79e44..e3171800fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml @@ -250,6 +250,9 @@ topology_template: disk.device.write.requests.rate_oam: - oam - disk.device.write.requests.rate + forwarder_oam_oam01_port: + - oam_oam01_port + - forwarder disk.device.read.bytes_oam: - oam - disk.device.read.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index bf1cc92ea6..f31f70b12a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -198,6 +198,9 @@ topology_template: endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd02_port: + - pd_server_pd02_port + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index a215d7a7fc..7dcab1874c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -252,6 +252,9 @@ topology_template: network.outpoing.packets_pd_server_pd01_port: - pd_server_pd01_port - network.outpoing.packets + forwarder_pd_server_pd01_port: + - pd_server_pd01_port + - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml index 80e2bf544e..416a517339 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml @@ -166,6 +166,9 @@ topology_template: disk.device.usage_ps: - ps - disk.device.usage + forwarder_ps_pd02_port: + - ps_pd02_port + - forwarder network.outgoing.bytes.rate_ps_pd02_port: - ps_pd02_port - network.outgoing.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml index 67c4be1f6f..4da339f039 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml @@ -187,6 +187,9 @@ topology_template: disk.device.write.bytes_ps: - ps - disk.device.write.bytes + forwarder_ps_pd01_port: + - ps_pd01_port + - forwarder cpu.delta_ps: - ps - cpu.delta diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml index c6daefdd25..aa2ed981f2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -342,6 +342,9 @@ topology_template: disk.device.write.bytes.rate_server_ps_2_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_ps_2_test_nested3Level + forwarder_cmaui01_port_1: + - abstract_cmaui_1 + - forwarder_cmaui_cmaui01_port network.outgoing.bytes.rate_oam02_port_2_test_nested2Level: - test_nested2Level - network.outgoing.bytes.rate_oam02_port_2 @@ -543,6 +546,9 @@ topology_template: vcpus_server_oam_1_test_nested2Level: - test_nested2Level - vcpus_server_oam_1 + forwarder_oam02_port_2_test_nested2Level: + - test_nested2Level + - forwarder_oam02_port_2 network.incoming.packets_oam01_port_1_test_nested2Level: - test_nested2Level - network.incoming.packets_oam01_port_1 @@ -618,6 +624,9 @@ topology_template: cpu_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - cpu_server_ps_1_test_nested3Level + forwarder_pd02_port_2_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_pd02_port_2_test_nested3Level disk.device.read.requests_server_cmaui_2: - abstract_cmaui - disk.device.read.requests_cmaui @@ -741,6 +750,9 @@ topology_template: disk.device.capacity_server_cmaui_2: - abstract_cmaui - disk.device.capacity_cmaui + forwarder_oam01_port_1_test_nested2Level: + - test_nested2Level + - forwarder_oam01_port_1 feature_server_oam_1_test_nested2Level: - test_nested2Level - feature_server_oam_1 @@ -795,9 +807,15 @@ topology_template: host_server_oam_2_test_nested2Level: - test_nested2Level - host_server_oam_2 + forwarder_cmaui02_port_2: + - abstract_cmaui + - forwarder_cmaui_cmaui02_port feature_server_oam_2_test_nested2Level: - test_nested2Level - feature_server_oam_2 + forwarder_pd01_port_1_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_pd01_port_1_test_nested3Level disk.allocation_server_ps_1_test_nested3Level_test_nested2Level: - test_nested2Level - disk.allocation_server_ps_1_test_nested3Level diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml index 6432c9e3f4..07c709079f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -178,6 +178,9 @@ topology_template: memory.resident_server_ps_2_test_nested3Level: - test_nested3Level - memory.resident_server_ps_2 + forwarder_pd01_port_1_test_nested3Level: + - test_nested3Level + - forwarder_pd01_port_1 disk.latency_server_oam_1: - abstract_oam_1 - disk.latency_oam @@ -205,6 +208,9 @@ topology_template: disk.device.read.bytes_server_oam_1: - abstract_oam_1 - disk.device.read.bytes_oam + forwarder_oam01_port_1: + - abstract_oam_1 + - forwarder_oam_oam01_port disk.device.read.bytes_server_oam_2: - abstract_oam - disk.device.read.bytes_oam @@ -517,6 +523,9 @@ topology_template: cpu_server_ps_2_test_nested3Level: - test_nested3Level - cpu_server_ps_2 + forwarder_oam02_port_2: + - abstract_oam + - forwarder_oam_oam02_port network.incoming.packets.rate_pd01_port_1_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_pd01_port_1 @@ -739,6 +748,9 @@ topology_template: disk.device.write.bytes.rate_server_ps_2_test_nested3Level: - test_nested3Level - disk.device.write.bytes.rate_server_ps_2 + forwarder_pd02_port_2_test_nested3Level: + - test_nested3Level + - forwarder_pd02_port_2 disk.device.capacity_server_oam_2: - abstract_oam - disk.device.capacity_oam diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml index c286cb2347..1a19d76b8c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -423,6 +423,12 @@ topology_template: vcpus_server_ps_2: - abstract_ps - vcpus_ps + forwarder_pd01_port_1: + - abstract_ps_1 + - forwarder_ps_pd01_port + forwarder_pd02_port_2: + - abstract_ps + - forwarder_ps_pd02_port network.incoming.packets_pd01_port_1: - abstract_ps_1 - network.incoming.packets_ps_pd01_port |