diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel')
40 files changed, 418 insertions, 2 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9c1f678489..878cd77858 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -303,6 +303,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_1c2_oam_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -582,6 +587,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1265,6 +1275,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.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. @@ -1751,6 +1766,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2133,6 +2158,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_oam_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_1c2_oam_2: type: tosca.capabilities.network.Bindable occurrences: @@ -2648,6 +2683,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3184,6 +3224,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3791,6 +3836,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_cmaui_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml index 684d246bf2..26286c35f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -259,6 +259,9 @@ topology_template: disk.device.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.requests.rate + forwarder_cmaui_1c1_cmaui_port: + - cmaui_1c1_cmaui_port + - forwarder disk.device.write.bytes_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml index eb89f0b0bf..039859ab0b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -223,6 +223,9 @@ topology_template: endpoint_oam_server_1c2: - oam_server_1c2 - endpoint + forwarder_oam_server_1c2_oam_port: + - oam_server_1c2_oam_port + - forwarder disk.ephemeral.size_oam_server_1c2: - oam_server_1c2 - disk.ephemeral.size diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/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/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml index 1dbe52f405..fbb8c1912d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/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/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml @@ -151,6 +151,9 @@ topology_template: cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta + forwarder_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - forwarder network.incoming.bytes_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - network.incoming.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml index c97cb23644..9f026f4b2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml @@ -166,6 +166,9 @@ topology_template: disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity + forwarder_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - forwarder instance_ps_server_1b: - ps_server_1b - instance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml index e214d825ed..dfff65e98a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml @@ -450,6 +450,9 @@ topology_template: disk.device.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.requests.rate_oam_server_1c2 + forwarder_ps_server_1b_port: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.requests.rate_oam_server_1c2 @@ -699,6 +702,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes.rate_ps_server_1b + forwarder_cmaui_port_2: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port disk.device.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests_ps_server_1b @@ -891,6 +900,12 @@ topology_template: disk.write.bytes.rate_server_1b_pd: - abstract_pd_server_1b - disk.write.bytes.rate_pd_server_1b + forwarder_oam_port_1: + - abstract_oam_server_1c2_0 + - forwarder_oam_server_1c2_oam_port + forwarder_oam_port_2: + - abstract_oam_server_1c2_1 + - forwarder_oam_server_1c2_oam_port binding_server_1c2_oam_2: - abstract_oam_server_1c2_1 - binding_oam_server_1c2 @@ -1152,6 +1167,9 @@ topology_template: network.incoming.bytes_oam_port_1: - abstract_oam_server_1c2_0 - network.incoming.bytes_oam_server_1c2_oam_port + forwarder_pd_server_1b_port: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port disk.device.write.requests.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests.rate_ps_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 697e58424d..b521dae6db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -307,6 +307,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_1c2_oam_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -923,6 +928,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_pd_server_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -941,6 +951,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_server_pd: type: tosca.capabilities.Node occurrences: @@ -1132,6 +1147,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1628,6 +1648,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED link_packet_external_network_0: type: tosca.capabilities.network.Linkable occurrences: @@ -2095,6 +2125,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.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. @@ -2581,6 +2616,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2963,6 +3008,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_oam_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_1c2_oam_2: type: tosca.capabilities.network.Bindable occurrences: @@ -3478,6 +3533,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4014,6 +4074,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4621,6 +4686,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_cmaui_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4671,4 +4741,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml index 684d246bf2..26286c35f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -259,6 +259,9 @@ topology_template: disk.device.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.requests.rate + forwarder_cmaui_1c1_cmaui_port: + - cmaui_1c1_cmaui_port + - forwarder disk.device.write.bytes_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml index e04ee542d9..bd75e5b23f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -230,6 +230,9 @@ topology_template: endpoint_oam_server_1c2: - oam_server_1c2 - endpoint + forwarder_oam_server_1c2_oam_port: + - oam_server_1c2_oam_port + - forwarder disk.ephemeral.size_oam_server_1c2: - oam_server_1c2 - disk.ephemeral.size diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/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/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml index 1dbe52f405..fbb8c1912d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/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/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml @@ -151,6 +151,9 @@ topology_template: cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta + forwarder_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - forwarder network.incoming.bytes_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - network.incoming.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml index c97cb23644..9f026f4b2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml @@ -166,6 +166,9 @@ topology_template: disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity + forwarder_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - forwarder instance_ps_server_1b: - ps_server_1b - instance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/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/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml index be3fbadb31..9a62b2021e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/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/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml @@ -207,6 +207,12 @@ topology_template: network.outpoing.packets_cmaui_port_01: - cmaui_port_01 - network.outpoing.packets + forwarder_cmaui_port_01: + - cmaui_port_01 + - forwarder + forwarder_cmaui_port_02: + - cmaui_port_02 + - forwarder link_packet_external_network_0: - packet_external_network_0 - link @@ -249,4 +255,4 @@ topology_template: - dependency binding_cmaui_port_02: - cmaui_port_02 - - binding
\ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/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/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml index 828ab0dfbd..ec4283632d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/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/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -377,6 +377,9 @@ topology_template: network.outgoing.bytes.rate_pd_server_port_2: - pd_server_port_2 - network.outgoing.bytes.rate + forwarder_pd_server_port_1: + - pd_server_port_1 + - forwarder network.outgoing.bytes.rate_pd_server_port_1: - pd_server_port_1 - network.outgoing.bytes.rate @@ -386,6 +389,9 @@ topology_template: disk.write.bytes.rate_server_pd: - server_pd - disk.write.bytes.rate + forwarder_pd_server_port_2: + - pd_server_port_2 + - forwarder feature_server_pd: - server_pd - feature diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml index a3bf3f973a..e26f1c9137 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml @@ -457,6 +457,9 @@ topology_template: disk.device.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.requests.rate_oam_server_1c2 + forwarder_ps_server_1b_port: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.requests.rate_oam_server_1c2 @@ -706,6 +709,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes.rate_ps_server_1b + forwarder_cmaui_port_2: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port disk.device.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests_ps_server_1b @@ -898,6 +907,12 @@ topology_template: disk.write.bytes.rate_server_1b_pd: - abstract_pd_server_1b - disk.write.bytes.rate_pd_server_1b + forwarder_oam_port_1: + - abstract_oam_server_1c2_0 + - forwarder_oam_server_1c2_oam_port + forwarder_oam_port_2: + - abstract_oam_server_1c2_1 + - forwarder_oam_server_1c2_oam_port binding_server_1c2_oam_2: - abstract_oam_server_1c2_1 - binding_oam_server_1c2 @@ -1159,6 +1174,9 @@ topology_template: network.incoming.bytes_oam_port_1: - abstract_oam_server_1c2_0 - network.incoming.bytes_oam_server_1c2_oam_port + forwarder_pd_server_1b_port: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port disk.device.write.requests.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests.rate_ps_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8fe327f845..d11c757e97 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -378,6 +378,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_cmaui_cmaui_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1017,6 +1022,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_packet_external_network: type: tosca.capabilities.Node occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml index 475aefd1e7..628e583cdc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml @@ -262,6 +262,9 @@ topology_template: disk.usage_cmaui: - cmaui - disk.usage + forwarder_cmaui_cmaui_port: + - cmaui_cmaui_port + - forwarder network.outgoing.packets.rate_cmaui_cmaui_port: - cmaui_cmaui_port - network.outgoing.packets.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml index 89427ca0d8..25ae9137c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml @@ -427,6 +427,12 @@ topology_template: os_server_cmaui_1: - abstract_cmaui_1 - os_cmaui + forwarder_cmaui_port_2: + - abstract_cmaui_0 + - forwarder_cmaui_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui_1 + - forwarder_cmaui_cmaui_port feature_packet_external_network: - packet_external_network - feature diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index e6241b2e11..7e0913eecb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -248,6 +248,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED attachment_packet_external_network: type: tosca.capabilities.Attachment occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml index d12565973c..a6a8cf05fc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml @@ -212,6 +212,12 @@ topology_template: network.outgoing.bytes.rate_cmaui_port_1: - cmaui_port_1 - network.outgoing.bytes.rate + forwarder_cmaui_port_2: + - cmaui_port_2 + - forwarder + forwarder_cmaui_port_1: + - cmaui_port_1 + - forwarder attachment_packet_external_network: - packet_external_network - attachment diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3113acf1d8..5c7b91680c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -378,6 +378,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_cmaui_cmaui_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -982,6 +987,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml index 475aefd1e7..628e583cdc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml @@ -262,6 +262,9 @@ topology_template: disk.usage_cmaui: - cmaui - disk.usage + forwarder_cmaui_cmaui_port: + - cmaui_cmaui_port + - forwarder network.outgoing.packets.rate_cmaui_cmaui_port: - cmaui_cmaui_port - network.outgoing.packets.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml index 37bdfde64b..7c212aadc3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml @@ -344,6 +344,12 @@ topology_template: os_server_cmaui_1: - abstract_cmaui - os_cmaui + forwarder_cmaui_port_2: + - abstract_cmaui + - forwarder_cmaui_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui + - forwarder_cmaui_cmaui_port disk.device.allocation_server_cmaui_1: - abstract_cmaui - disk.device.allocation_cmaui diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index d51e4f4f2f..55cb9b5ba4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -402,6 +402,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_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. @@ -921,12 +926,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_ps_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. occurrences: - 1 - UNBOUNDED + forwarder_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1312,6 +1327,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_ps_server_ps_server_port: type: tosca.capabilities.Node occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/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/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml index 449b05d443..599c465504 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/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/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml @@ -274,6 +274,9 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests + forwarder_pd_server_pd_server_port: + - pd_server_pd_server_port + - forwarder disk.device.latency_pd_server: - pd_server - disk.device.latency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml index a405b38673..f69a2c1f2b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml @@ -145,6 +145,9 @@ topology_template: disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate + forwarder_ps_server_ps_server_port: + - ps_server_ps_server_port + - forwarder feature_ps_server_ps_server_port: - ps_server_ps_server_port - feature diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml index 81884ac853..83240c60ca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml @@ -358,9 +358,15 @@ topology_template: cpu_util_server_ps: - abstract_ps_server - cpu_util_ps_server + forwarder_pd_server_port: + - abstract_pd_server + - forwarder_pd_server_pd_server_port network.incoming.bytes_ps_server_port: - abstract_ps_server - network.incoming.bytes_ps_server_ps_server_port + forwarder_ps_server_port: + - abstract_ps_server + - forwarder_ps_server_ps_server_port disk.device.capacity_server_pd: - abstract_pd_server - disk.device.capacity_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml index b5dc2d96c3..b976cba502 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -402,6 +402,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_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. @@ -665,6 +670,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu_util_server_sm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -683,6 +693,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_sm_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_oam_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. @@ -1672,12 +1687,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_ps_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. occurrences: - 1 - UNBOUNDED + forwarder_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2275,6 +2300,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_oam_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_oam_server_oam_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. @@ -2466,6 +2496,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_sm_server_sm_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_sm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2905,6 +2940,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_ps_server_ps_server_port: type: tosca.capabilities.Node occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml index cf1cf7aa80..81e7332182 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml @@ -253,6 +253,9 @@ topology_template: endpoint_oam_server: - oam_server - endpoint + forwarder_oam_server_oam_server_port: + - oam_server_oam_server_port + - forwarder network.outgoing.bytes.rate_oam_server_oam_server_port: - oam_server_oam_server_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/oneLevel/nestedTwoSameFileOneDiff/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/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml index 449b05d443..599c465504 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/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/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml @@ -274,6 +274,9 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests + forwarder_pd_server_pd_server_port: + - pd_server_pd_server_port + - forwarder disk.device.latency_pd_server: - pd_server - disk.device.latency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml index a405b38673..f69a2c1f2b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml @@ -145,6 +145,9 @@ topology_template: disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate + forwarder_ps_server_ps_server_port: + - ps_server_ps_server_port + - forwarder feature_ps_server_ps_server_port: - ps_server_ps_server_port - feature diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml index 6d6a501c4b..bdb3a94e06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml @@ -136,6 +136,9 @@ topology_template: binding_sm_server_sm_server_port: - sm_server_sm_server_port - binding + forwarder_sm_server_sm_server_port: + - sm_server_sm_server_port + - forwarder disk.iops_sm_server: - sm_server - disk.iops diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml index a17a475867..3044ae9f59 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml @@ -362,9 +362,15 @@ topology_template: cpu_util_server_ps: - abstract_ps_server - cpu_util_ps_server + forwarder_pd_server_port: + - abstract_pd_server + - forwarder_pd_server_pd_server_port network.incoming.bytes_ps_server_port: - abstract_ps_server - network.incoming.bytes_ps_server_ps_server_port + forwarder_ps_server_port: + - abstract_ps_server + - forwarder_ps_server_ps_server_port disk.device.capacity_server_pd: - abstract_pd_server - disk.device.capacity_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml index 72ba7106b1..0429c660e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml @@ -230,6 +230,9 @@ topology_template: disk.read.requests_server_oam: - abstract_oam_server - disk.read.requests_oam_server + forwarder_oam_server_port: + - abstract_oam_server + - forwarder_oam_server_oam_server_port cpu_util_server_sm: - abstract_sm_server - cpu_util_sm_server @@ -239,6 +242,9 @@ topology_template: disk.device.read.bytes_server_oam: - abstract_oam_server - disk.device.read.bytes_oam_server + forwarder_sm_server_port: + - abstract_sm_server + - forwarder_sm_server_sm_server_port network.incoming.bytes_oam_server_port: - abstract_oam_server - network.incoming.bytes_oam_server_oam_server_port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9c2d3e605d..effa6970cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -408,6 +408,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_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. @@ -671,6 +676,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu_util_server_sm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -689,6 +699,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_sm_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_oam_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. @@ -1678,12 +1693,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_ps_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. occurrences: - 1 - UNBOUNDED + forwarder_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2287,6 +2312,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_oam_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_oam_server_oam_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. @@ -2484,6 +2514,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_sm_server_sm_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_sm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2929,6 +2964,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_ps_server_ps_server_port: type: tosca.capabilities.Node occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml index d90e25d8e8..9080572950 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml @@ -262,6 +262,9 @@ topology_template: endpoint_oam_server: - oam_server - endpoint + forwarder_oam_server_oam_server_port: + - oam_server_oam_server_port + - forwarder network.outgoing.bytes.rate_oam_server_oam_server_port: - oam_server_oam_server_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/oneLevel/nestedTwoSameOneDiffWithConnectivity/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/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml index 992d43315e..c07fb4f39c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/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/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml @@ -283,6 +283,9 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests + forwarder_pd_server_pd_server_port: + - pd_server_pd_server_port + - forwarder disk.device.latency_pd_server: - pd_server - disk.device.latency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml index 47aed72dbf..03780b84ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml @@ -154,6 +154,9 @@ topology_template: disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate + forwarder_ps_server_ps_server_port: + - ps_server_ps_server_port + - forwarder feature_ps_server_ps_server_port: - ps_server_ps_server_port - feature diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml index bffd6472b8..4a43a24d9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml @@ -145,6 +145,9 @@ topology_template: binding_sm_server_sm_server_port: - sm_server_sm_server_port - binding + forwarder_sm_server_sm_server_port: + - sm_server_sm_server_port + - forwarder disk.iops_sm_server: - sm_server - disk.iops diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml index a01666fe5b..f730407335 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml @@ -367,9 +367,15 @@ topology_template: cpu_util_server_ps: - abstract_ps_server - cpu_util_ps_server + forwarder_pd_server_port: + - abstract_pd_server + - forwarder_pd_server_pd_server_port network.incoming.bytes_ps_server_port: - abstract_ps_server - network.incoming.bytes_ps_server_ps_server_port + forwarder_ps_server_port: + - abstract_ps_server + - forwarder_ps_server_ps_server_port disk.device.capacity_server_pd: - abstract_pd_server - disk.device.capacity_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml index dbac5b33ff..574225ef0a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml @@ -235,6 +235,9 @@ topology_template: disk.read.requests_server_oam: - abstract_oam_server - disk.read.requests_oam_server + forwarder_oam_server_port: + - abstract_oam_server + - forwarder_oam_server_oam_server_port cpu_util_server_sm: - abstract_sm_server - cpu_util_sm_server @@ -244,6 +247,9 @@ topology_template: disk.device.read.bytes_server_oam: - abstract_oam_server - disk.device.read.bytes_oam_server + forwarder_sm_server_port: + - abstract_sm_server + - forwarder_sm_server_sm_server_port network.incoming.bytes_oam_server_port: - abstract_oam_server - network.incoming.bytes_oam_server_oam_server_port |