diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns')
46 files changed, 717 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0d89b398f9..088c5cb2a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -755,6 +755,26 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_server_pcma1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1305,12 +1325,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.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_pcma_server_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2014,6 +2044,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED instance_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2456,6 +2496,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2492,6 +2537,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2979,6 +3029,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcma_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3361,6 +3421,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3389,6 +3454,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -4002,6 +4072,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c1_scalling_instance_1c1_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4049,6 +4124,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c1_scalling_instance_1c1_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4561,6 +4641,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4649,6 +4734,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5050,6 +5140,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -5078,6 +5173,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -5416,4 +5516,4 @@ node_types: type: tosca.capabilities.Node 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/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index c93ba44157..6384eaff7d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -286,6 +286,9 @@ topology_template: cpu_1c1_scalling_instance: - 1c1_scalling_instance - cpu + forwarder_1c1_scalling_instance_1c1_t2_port: + - 1c1_scalling_instance_1c1_t2_port + - forwarder disk.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes @@ -310,6 +313,9 @@ topology_template: disk.device.write.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests.rate + forwarder_1c1_scalling_instance_1c1_t1_port: + - 1c1_scalling_instance_1c1_t1_port + - forwarder disk.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 89a21731f6..9995398481 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -323,6 +323,9 @@ topology_template: attachment_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - attachment + forwarder_1c2_catalog_instance_1c2_t1_port: + - 1c2_catalog_instance_1c2_t1_port + - forwarder network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: - 1c2_catalog_instance_1c2_t1_port - network.outgoing.packets.rate @@ -341,6 +344,9 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate + forwarder_1c2_catalog_instance_1c2_t2_port: + - 1c2_catalog_instance_1c2_t2_port + - forwarder disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml index 9ca4a68a67..e3b7ea00c8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml @@ -251,6 +251,9 @@ topology_template: cpu.delta_a_single_1a: - a_single_1a - cpu.delta + forwarder_a_single_1a_1a_t1_port: + - a_single_1a_1a_t1_port + - forwarder disk.device.write.requests_a_single_1a: - a_single_1a - disk.device.write.requests @@ -296,6 +299,9 @@ topology_template: memory.usage_a_single_1a: - a_single_1a - memory.usage + forwarder_a_single_1a_1a_t2_port: + - a_single_1a_1a_t2_port + - forwarder disk.device.write.requests.rate_a_single_1a: - a_single_1a - disk.device.write.requests.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml index 2882f0f5df..222d1f8f1a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml @@ -213,6 +213,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -228,6 +231,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml index d86e42e84a..5443e13fdf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -218,6 +218,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -233,6 +236,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml index 41bef51803..87432d3911 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml @@ -327,9 +327,15 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_2: - pcma_server_pcm_port_2 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_2: + - pcma_server_pcm_port_2 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests + forwarder_pcma_server_pcm_port_3: + - pcma_server_pcm_port_3 + - forwarder disk.write.bytes.rate_pcma_server: - pcma_server - disk.write.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml index 0079f2a476..4f927ee3a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -312,6 +312,12 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_1: - pcma_server_pcm_port_1 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_0: + - pcma_server_pcm_port_0 + - forwarder + forwarder_pcma_server_pcm_port_1: + - pcma_server_pcm_port_1 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 2d854439a6..8c6d8cd84c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -537,6 +537,18 @@ topology_template: os_server_pcma2: - abstract_pcma_server - os_pcma_server + forwarder_pcm_port_2: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_2 + forwarder_pcm_port_3: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_3 + forwarder_pcm_port_0: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_0 + forwarder_pcm_port_1: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_1 disk.capacity_server_pcma1: - abstract_pcma_server_1 - disk.capacity_pcma_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml index 2a2b7dcacf..04e97ca016 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -414,6 +414,12 @@ topology_template: disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity + forwarder_pcm_port_00: + - pcm_port_00 + - forwarder + forwarder_pcm_port_01: + - pcm_port_01 + - forwarder instance_server_pcm: - server_pcm - instance @@ -456,4 +462,4 @@ topology_template: - link dependency_server_pcm: - server_pcm - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4b764a3b84..9f74e7911a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -282,6 +282,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_0_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_server_pcma2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -483,6 +488,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_1_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu_util_server_pcma1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -700,6 +710,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_2_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_pcma2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -818,6 +833,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_3_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_pcm_port_1_0: type: tosca.capabilities.Node occurrences: @@ -1301,12 +1321,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.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_pcma_server_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1917,6 +1947,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2442,6 +2482,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2478,6 +2523,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2965,6 +3015,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcma_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3341,6 +3401,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3369,6 +3434,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -3973,6 +4043,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c1_scalling_instance_1c1_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4020,6 +4095,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c1_scalling_instance_1c1_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4526,6 +4606,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4614,6 +4699,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5009,6 +5099,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -5037,6 +5132,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -5438,4 +5538,4 @@ node_types: type: tosca.capabilities.Endpoint 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/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 9e94593103..045f907605 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -271,6 +271,9 @@ topology_template: cpu_1c1_scalling_instance: - 1c1_scalling_instance - cpu + forwarder_1c1_scalling_instance_1c1_t2_port: + - 1c1_scalling_instance_1c1_t2_port + - forwarder disk.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes @@ -295,6 +298,9 @@ topology_template: disk.device.write.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests.rate + forwarder_1c1_scalling_instance_1c1_t1_port: + - 1c1_scalling_instance_1c1_t1_port + - forwarder disk.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index f686203df4..e761770921 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -314,6 +314,9 @@ topology_template: attachment_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - attachment + forwarder_1c2_catalog_instance_1c2_t1_port: + - 1c2_catalog_instance_1c2_t1_port + - forwarder network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: - 1c2_catalog_instance_1c2_t1_port - network.outgoing.packets.rate @@ -332,6 +335,9 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate + forwarder_1c2_catalog_instance_1c2_t2_port: + - 1c2_catalog_instance_1c2_t2_port + - forwarder disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml index 9aa2e2d8e4..c175da1795 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml @@ -242,6 +242,9 @@ topology_template: cpu.delta_a_single_1a: - a_single_1a - cpu.delta + forwarder_a_single_1a_1a_t1_port: + - a_single_1a_1a_t1_port + - forwarder disk.device.write.requests_a_single_1a: - a_single_1a - disk.device.write.requests @@ -287,6 +290,9 @@ topology_template: memory.usage_a_single_1a: - a_single_1a - memory.usage + forwarder_a_single_1a_1a_t2_port: + - a_single_1a_1a_t2_port + - forwarder disk.device.write.requests.rate_a_single_1a: - a_single_1a - disk.device.write.requests.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml index cf69da5d8f..dd68f12949 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml @@ -204,6 +204,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -219,6 +222,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml index 9d6e5d9099..60dd00b7a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -209,6 +209,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -224,6 +227,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml index 4a2f034765..87432d3911 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml @@ -327,9 +327,15 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_2: - pcma_server_pcm_port_2 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_2: + - pcma_server_pcm_port_2 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests + forwarder_pcma_server_pcm_port_3: + - pcma_server_pcm_port_3 + - forwarder disk.write.bytes.rate_pcma_server: - pcma_server - disk.write.bytes.rate @@ -441,4 +447,4 @@ topology_template: - link link_pcma_server_pcm_port_3: - pcma_server_pcm_port_3 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml index 0e25828e1d..eda475a577 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -312,6 +312,12 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_1: - pcma_server_pcm_port_1 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_0: + - pcma_server_pcm_port_0 + - forwarder + forwarder_pcma_server_pcm_port_1: + - pcma_server_pcm_port_1 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests @@ -432,4 +438,4 @@ topology_template: - link dependency_pcma_server_pcm_port_0: - pcma_server_pcm_port_0 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml index 6dcce5e85d..b091afe45f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml @@ -132,4 +132,4 @@ topology_template: - port dependency_jsa_security_group_1: - jsa_security_group_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml index c66869707d..96bccb85ef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -293,6 +293,9 @@ topology_template: disk.device.read.bytes.rate_server_pcma2: - abstract_pcma_server - disk.device.read.bytes.rate_pcma_server + forwarder_pcm_port_0_0: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_0 disk.device.latency_server_pcma2: - abstract_pcma_server - disk.device.latency_pcma_server @@ -395,6 +398,9 @@ topology_template: disk.read.bytes_server_pcma2: - abstract_pcma_server - disk.read.bytes_pcma_server + forwarder_pcm_port_1_0: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_1 cpu_util_server_pcma1: - abstract_pcma_server_1 - cpu_util_pcma_server @@ -506,6 +512,9 @@ topology_template: disk.device.write.requests_server_pcma1: - abstract_pcma_server_1 - disk.device.write.requests_pcma_server + forwarder_pcm_port_2_0: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_2 disk.device.write.requests_server_pcma2: - abstract_pcma_server - disk.device.write.requests_pcma_server @@ -566,6 +575,9 @@ topology_template: network.incoming.bytes_pcm_port_3_0: - abstract_pcma_server - network.incoming.bytes_pcma_server_pcm_port_3 + forwarder_pcm_port_3_0: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_3 feature_pcm_port_1_0: - abstract_pcma_server_1 - feature_pcma_server_pcm_port_1 @@ -653,4 +665,4 @@ topology_template: - link_pcma_server_pcm_port_0 link_pcm_port_3_0: - abstract_pcma_server - - link_pcma_server_pcm_port_3
\ No newline at end of file + - link_pcma_server_pcm_port_3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml index 198b4c8e9a..d881e9e06f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -365,6 +365,12 @@ topology_template: disk.iops_server_pcm: - server_pcm - disk.iops + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.bytes.rate_server_pcm: - server_pcm - disk.read.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml index 49ac20889a..83341fab08 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -751,6 +751,26 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_server_pcma1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1301,12 +1321,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.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_pcma_server_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2006,6 +2036,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED instance_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2442,6 +2482,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2478,6 +2523,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2965,6 +3015,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcma_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3341,6 +3401,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3369,6 +3434,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -3973,6 +4043,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c1_scalling_instance_1c1_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4020,6 +4095,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c1_scalling_instance_1c1_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4526,6 +4606,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4614,6 +4699,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5009,6 +5099,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -5037,6 +5132,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -5375,4 +5475,4 @@ node_types: type: tosca.capabilities.Node 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/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 9e94593103..045f907605 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -271,6 +271,9 @@ topology_template: cpu_1c1_scalling_instance: - 1c1_scalling_instance - cpu + forwarder_1c1_scalling_instance_1c1_t2_port: + - 1c1_scalling_instance_1c1_t2_port + - forwarder disk.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes @@ -295,6 +298,9 @@ topology_template: disk.device.write.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests.rate + forwarder_1c1_scalling_instance_1c1_t1_port: + - 1c1_scalling_instance_1c1_t1_port + - forwarder disk.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index f686203df4..e761770921 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -314,6 +314,9 @@ topology_template: attachment_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - attachment + forwarder_1c2_catalog_instance_1c2_t1_port: + - 1c2_catalog_instance_1c2_t1_port + - forwarder network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: - 1c2_catalog_instance_1c2_t1_port - network.outgoing.packets.rate @@ -332,6 +335,9 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate + forwarder_1c2_catalog_instance_1c2_t2_port: + - 1c2_catalog_instance_1c2_t2_port + - forwarder disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml index 9aa2e2d8e4..c175da1795 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml @@ -242,6 +242,9 @@ topology_template: cpu.delta_a_single_1a: - a_single_1a - cpu.delta + forwarder_a_single_1a_1a_t1_port: + - a_single_1a_1a_t1_port + - forwarder disk.device.write.requests_a_single_1a: - a_single_1a - disk.device.write.requests @@ -287,6 +290,9 @@ topology_template: memory.usage_a_single_1a: - a_single_1a - memory.usage + forwarder_a_single_1a_1a_t2_port: + - a_single_1a_1a_t2_port + - forwarder disk.device.write.requests.rate_a_single_1a: - a_single_1a - disk.device.write.requests.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml index cf69da5d8f..dd68f12949 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml @@ -204,6 +204,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -219,6 +222,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml index 9d6e5d9099..60dd00b7a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -209,6 +209,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -224,6 +227,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml index 41bef51803..87432d3911 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml @@ -327,9 +327,15 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_2: - pcma_server_pcm_port_2 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_2: + - pcma_server_pcm_port_2 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests + forwarder_pcma_server_pcm_port_3: + - pcma_server_pcm_port_3 + - forwarder disk.write.bytes.rate_pcma_server: - pcma_server - disk.write.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml index 0079f2a476..4f927ee3a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -312,6 +312,12 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_1: - pcma_server_pcm_port_1 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_0: + - pcma_server_pcm_port_0 + - forwarder + forwarder_pcma_server_pcm_port_1: + - pcma_server_pcm_port_1 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 676798e9a3..b60c6d29e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -533,6 +533,18 @@ topology_template: os_server_pcma2: - abstract_pcma_server - os_pcma_server + forwarder_pcm_port_2: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_2 + forwarder_pcm_port_3: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_3 + forwarder_pcm_port_0: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_0 + forwarder_pcm_port_1: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_1 disk.capacity_server_pcma1: - abstract_pcma_server_1 - disk.capacity_pcma_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml index 293a19f311..a99b0d53d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -410,6 +410,12 @@ topology_template: disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity + forwarder_pcm_port_00: + - pcm_port_00 + - forwarder + forwarder_pcm_port_01: + - pcm_port_01 + - forwarder instance_server_pcm: - server_pcm - instance @@ -452,4 +458,4 @@ topology_template: - link dependency_server_pcm: - server_pcm - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 963fe97ca1..0c12ab2a37 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -755,6 +755,26 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_server_pcma1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1091,6 +1111,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c12_scalling_instance_1c1_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_1c12_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1883,6 +1908,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED instance_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2177,6 +2212,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c11_scalling_instance_1c1_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_1c11_scalling_instance_1c1_t1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2752,12 +2792,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.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_pcma_server_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3461,6 +3511,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED instance_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3764,6 +3824,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_2c2_catalog_instance_2c202_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED host_2c2_catalog_instance: type: tosca.capabilities.Container valid_source_types: @@ -3930,6 +3995,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_2c2_catalog_instance_1c201_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_2c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4289,6 +4359,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_1c2_catalog_instance_1c201_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4478,6 +4553,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_2c202_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4779,6 +4859,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_2a_1a_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_a_single_2a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5402,6 +5487,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcma_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5790,6 +5885,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -5818,6 +5918,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -6409,6 +6514,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6497,6 +6607,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6892,6 +7007,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -6920,6 +7040,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -7444,6 +7569,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_2b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes.rate_b_single_2b_1b_t2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7504,6 +7634,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_2b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7989,6 +8124,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_2b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes.rate_b_single_2b_1b_t2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8049,6 +8189,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_2b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_b_single_2b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8354,4 +8499,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/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml index 54a6b19444..8bac2de625 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml @@ -221,6 +221,9 @@ topology_template: os_1c11_scalling_instance: - 1c11_scalling_instance - os + forwarder_1c11_scalling_instance_1c1_t1_port: + - 1c11_scalling_instance_1c1_t1_port + - forwarder network.outpoing.packets_1c11_scalling_instance_1c1_t1_port: - 1c11_scalling_instance_1c1_t1_port - network.outpoing.packets diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml index 3f86be5809..f4efa55581 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml @@ -179,6 +179,9 @@ topology_template: feature_1c12_scalling_instance_1c1_t1_port: - 1c12_scalling_instance_1c1_t1_port - feature + forwarder_1c12_scalling_instance_1c1_t1_port: + - 1c12_scalling_instance_1c1_t1_port + - forwarder disk.device.latency_1c12_scalling_instance: - 1c12_scalling_instance - disk.device.latency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 30e5949de0..d770ab9789 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -246,6 +246,9 @@ topology_template: binding_1c2_catalog_instance_1c201_port: - 1c2_catalog_instance_1c201_port - binding + forwarder_1c2_catalog_instance_1c201_port: + - 1c2_catalog_instance_1c201_port + - forwarder disk.write.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.write.bytes.rate @@ -342,6 +345,9 @@ topology_template: disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation + forwarder_1c2_catalog_instance_2c202_port: + - 1c2_catalog_instance_2c202_port + - forwarder disk.device.read.bytes_1c2_catalog_instance: - 1c2_catalog_instance - 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/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml index f9336d5a69..8c3dc82552 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -242,6 +242,9 @@ topology_template: disk.device.write.requests_2c2_catalog_instance: - 2c2_catalog_instance - disk.device.write.requests + forwarder_2c2_catalog_instance_2c202_port: + - 2c2_catalog_instance_2c202_port + - forwarder host_2c2_catalog_instance: - 2c2_catalog_instance - host @@ -326,6 +329,9 @@ topology_template: cpu_2c2_catalog_instance: - 2c2_catalog_instance - cpu + forwarder_2c2_catalog_instance_1c201_port: + - 2c2_catalog_instance_1c201_port + - forwarder disk.ephemeral.size_2c2_catalog_instance: - 2c2_catalog_instance - disk.ephemeral.size diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml index 9ca4a68a67..e3b7ea00c8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml @@ -251,6 +251,9 @@ topology_template: cpu.delta_a_single_1a: - a_single_1a - cpu.delta + forwarder_a_single_1a_1a_t1_port: + - a_single_1a_1a_t1_port + - forwarder disk.device.write.requests_a_single_1a: - a_single_1a - disk.device.write.requests @@ -296,6 +299,9 @@ topology_template: memory.usage_a_single_1a: - a_single_1a - memory.usage + forwarder_a_single_1a_1a_t2_port: + - a_single_1a_1a_t2_port + - forwarder disk.device.write.requests.rate_a_single_1a: - a_single_1a - disk.device.write.requests.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml index b083ad8301..7a8fab1623 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml @@ -172,6 +172,9 @@ topology_template: disk.device.usage_a_single_2a: - a_single_2a - disk.device.usage + forwarder_a_single_2a_1a_t1_port: + - a_single_2a_1a_t1_port + - forwarder disk.read.bytes.rate_a_single_2a: - a_single_2a - disk.read.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml index ee76003a1f..4763d46ae3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml @@ -218,6 +218,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -233,6 +236,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml index ecbe6f0402..fda44d67b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -213,6 +213,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -228,6 +231,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml index 4f4fb3cd6f..44d41d5090 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml @@ -212,6 +212,9 @@ topology_template: disk.usage_b_single_2b: - b_single_2b - disk.usage + forwarder_b_single_2b_1b_t2_port: + - b_single_2b_1b_t2_port + - forwarder network.incoming.bytes.rate_b_single_2b_1b_t2_port: - b_single_2b_1b_t2_port - network.incoming.bytes.rate @@ -242,6 +245,9 @@ topology_template: disk.read.bytes_b_single_2b: - b_single_2b - disk.read.bytes + forwarder_b_single_2b_1b_t1_port: + - b_single_2b_1b_t1_port + - forwarder disk.device.iops_b_single_2b: - b_single_2b - disk.device.iops diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml index 4c9e8982e0..a78b6fd22e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml @@ -207,6 +207,9 @@ topology_template: disk.usage_b_single_2b: - b_single_2b - disk.usage + forwarder_b_single_2b_1b_t2_port: + - b_single_2b_1b_t2_port + - forwarder network.incoming.bytes.rate_b_single_2b_1b_t2_port: - b_single_2b_1b_t2_port - network.incoming.bytes.rate @@ -237,6 +240,9 @@ topology_template: disk.read.bytes_b_single_2b: - b_single_2b - disk.read.bytes + forwarder_b_single_2b_1b_t1_port: + - b_single_2b_1b_t1_port + - forwarder disk.device.iops_b_single_2b: - b_single_2b - disk.device.iops diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml index 41bef51803..87432d3911 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml @@ -327,9 +327,15 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_2: - pcma_server_pcm_port_2 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_2: + - pcma_server_pcm_port_2 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests + forwarder_pcma_server_pcm_port_3: + - pcma_server_pcm_port_3 + - forwarder disk.write.bytes.rate_pcma_server: - pcma_server - disk.write.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml index 0079f2a476..4f927ee3a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -312,6 +312,12 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_1: - pcma_server_pcm_port_1 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_0: + - pcma_server_pcm_port_0 + - forwarder + forwarder_pcma_server_pcm_port_1: + - pcma_server_pcm_port_1 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 2d854439a6..8c6d8cd84c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -537,6 +537,18 @@ topology_template: os_server_pcma2: - abstract_pcma_server - os_pcma_server + forwarder_pcm_port_2: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_2 + forwarder_pcm_port_3: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_3 + forwarder_pcm_port_0: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_0 + forwarder_pcm_port_1: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_1 disk.capacity_server_pcma1: - abstract_pcma_server_1 - disk.capacity_pcma_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml index 2a2b7dcacf..04e97ca016 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -414,6 +414,12 @@ topology_template: disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity + forwarder_pcm_port_00: + - pcm_port_00 + - forwarder + forwarder_pcm_port_01: + - pcm_port_01 + - forwarder instance_server_pcm: - server_pcm - instance @@ -456,4 +462,4 @@ topology_template: - link dependency_server_pcm: - server_pcm - - dependency
\ No newline at end of file + - dependency |