From 94802b9b83a0a9edea77cbff76639aaefeca8d8e Mon Sep 17 00:00:00 2001 From: talio Date: Tue, 14 Nov 2017 10:18:03 +0200 Subject: forwarder test fix fix translator tests with forwarder capability Issue-Id : SDC-653 Change-Id: I59db23acb0e2c3b5920bf24662374fee950d479b Signed-off-by: talio --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 20 + .../nested-pcm_v0.1ServiceTemplate.yaml | 8 +- .../nested-pcm_v0.1_2ServiceTemplate.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 7 +- .../mvs.nested.heatServiceTemplate.yaml | 5 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 30 + .../nested2levelServiceTemplate.yaml | 8 +- .../expectedoutputfiles/nestedServiceTemplate.yaml | 14 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 616 +++++++++++---------- .../expectedoutputfiles/MainServiceTemplate.yaml | 12 +- .../nested2levelServiceTemplate.yaml | 14 +- .../nested3levelServiceTemplate.yaml | 8 +- .../expectedoutputfiles/nestedServiceTemplate.yaml | 462 ++++++++-------- .../GlobalSubstitutionTypesServiceTemplate.yaml | 100 ++++ ...ule_1_perimeta_swmu_a_childServiceTemplate.yaml | 20 +- ...ule_1_perimeta_swmu_b_childServiceTemplate.yaml | 20 +- ...odule_2_perimeta_sw_a_childServiceTemplate.yaml | 14 +- ...odule_2_perimeta_sw_b_childServiceTemplate.yaml | 14 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 30 + .../nested-pcm_v0.1ServiceTemplate.yaml | 14 +- .../nested-pcm_v0.1_2ServiceTemplate.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 7 +- .../mvs.nested.heatServiceTemplate.yaml | 5 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 12 +- .../dns_nested_01ServiceTemplate.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 7 +- .../mvs.nested.heatServiceTemplate.yaml | 5 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 7 +- .../mvs.nested.heatServiceTemplate.yaml | 5 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 10 + .../nested-pcm_v0.1ServiceTemplate.yaml | 8 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 10 + .../nested-pcm_v0.1ServiceTemplate.yaml | 8 +- 33 files changed, 994 insertions(+), 530 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 0c8f667dce..e8e9adfc58 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -334,6 +334,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.device.write.requests.rate_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -904,12 +914,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 7e74985b6b..4fec5b52c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -326,9 +326,15 @@ topology_template: disk.device.usage_server_pcm_1: - server_pcm_1 - disk.device.usage + forwarder_pcm_port_00: + - pcm_port_00 + - forwarder disk.device.write.requests_server_pcm_1: - server_pcm_1 - disk.device.write.requests + forwarder_pcm_port_01: + - pcm_port_01 + - forwarder disk.write.bytes_server_pcm_1: - server_pcm_1 - disk.write.bytes @@ -377,4 +383,4 @@ topology_template: - link local_storage_server_pcm_1: - server_pcm_1 - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index b373c12e48..c8f63361d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -270,6 +270,12 @@ topology_template: cpu.delta_server_pcm_2: - server_pcm_2 - cpu.delta + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.device.write.requests.rate_server_pcm_2: - server_pcm_2 - disk.device.write.requests.rate @@ -363,4 +369,4 @@ topology_template: - dependency local_storage_server_pcm_2: - server_pcm_2 - - local_storage \ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index e2c3da021d..83f1db7e2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -436,6 +436,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_mgmt_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_vnfci: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -477,4 +482,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/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 85bd55e44b..ea7b1c9be0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -420,6 +420,9 @@ topology_template: vcpus_vnfci: - vnfci - vcpus + forwarder_mgmt_port: + - mgmt_port + - forwarder cpu.delta_vnfci: - vnfci - cpu.delta @@ -459,4 +462,4 @@ topology_template: - link dependency_boot_volume: - boot_volume - - 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/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 59633bad64..29f9f0e07e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -331,6 +331,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_11_test_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory.usage_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -696,6 +701,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_server_cmaui_2_test_nested2: type: tosca.capabilities.Node occurrences: @@ -886,6 +901,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_22_test_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory.usage_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1197,6 +1217,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_11: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1280,6 +1305,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_22: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index 43b1696867..f360724a3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -247,6 +247,9 @@ topology_template: disk.ephemeral.size_server_cmaui_2: - server_cmaui_2 - disk.ephemeral.size + forwarder_cmaui_port_11: + - cmaui_port_11 + - forwarder disk.capacity_server_cmaui_2: - server_cmaui_2 - disk.capacity @@ -289,6 +292,9 @@ topology_template: disk.read.bytes.rate_server_cmaui_2: - server_cmaui_2 - disk.read.bytes.rate + forwarder_cmaui_port_22: + - cmaui_port_22 + - forwarder cpu.delta_server_cmaui_2: - server_cmaui_2 - cpu.delta @@ -343,4 +349,4 @@ topology_template: - local_storage dependency_server_cmaui_2: - server_cmaui_2 - - 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/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml index e3f39a1a70..aa8cf3245c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml @@ -251,6 +251,9 @@ topology_template: network.incoming.packets_cmaui_port_2: - cmaui_port_2 - network.incoming.packets + forwarder_cmaui_port_11_test_nested2: + - test_nested2 + - forwarder_cmaui_port_11 memory.usage_server_cmaui_2_test_nested2: - test_nested2 - memory.usage_server_cmaui_2 @@ -440,6 +443,12 @@ topology_template: os_server_cmaui_1: - server_cmaui_1 - os + forwarder_cmaui_port_2: + - cmaui_port_2 + - forwarder + forwarder_cmaui_port_1: + - cmaui_port_1 + - forwarder feature_server_cmaui_2_test_nested2: - test_nested2 - feature_server_cmaui_2 @@ -536,6 +545,9 @@ topology_template: disk.latency_server_cmaui_1: - server_cmaui_1 - disk.latency + forwarder_cmaui_port_22_test_nested2: + - test_nested2 + - forwarder_cmaui_port_22 memory.usage_server_cmaui_1: - server_cmaui_1 - memory.usage @@ -578,4 +590,4 @@ topology_template: - dependency dependency_cmaui_port_2: - cmaui_port_2 - - 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/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index c81dd65a22..a04551ad57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -198,12 +198,6 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory.usage_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -250,18 +244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_server_cmaui_3_test_nested3_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_cmaui_port_222_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -273,50 +255,24 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cmaui_port_322_test_nested3_test_nested2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.root.size_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED network.outpoing.packets_cmaui_port_311_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_port_311_test_nested3_test_nested2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED network.outpoing.packets_cmaui_port_322_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui_2_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.iops_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -365,828 +321,932 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_1: + network.incoming.packets_cmaui_port_311_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_311_test_nested3_test_nested2: + disk.latency_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui_3_test_nested3_test_nested2: + disk.device.read.bytes.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui_3_test_nested3_test_nested2: + disk.read.bytes_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_2_test_nested2: + host_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_1: + disk.device.read.bytes.rate_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_1: + disk.write.requests.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_3_test_nested3_test_nested2: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.outgoing.packets.rate_cmaui_port_211_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui_1: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_cmaui_2_test_nested2: + cpu.delta_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_2_test_nested2: + instance_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui_2_test_nested2: + network.incoming.packets.rate_cmaui_port_311_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_1: + memory.usage_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_211_test_nested2: + disk.write.requests.rate_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_2_test_nested2: - type: tosca.capabilities.Endpoint.Admin + disk.capacity_server_cmaui_3_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2: + disk.device.write.bytes_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_server_cmaui_2_test_nested2: + disk.write.requests_server_cmaui_3_test_nested3_test_nested2: 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 - instance_server_cmaui_2_test_nested2: + disk.ephemeral.size_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_cmaui_1: + disk.latency_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_311_test_nested3_test_nested2: + network.incoming.bytes.rate_cmaui_port_211_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_211_test_nested2: - type: tosca.capabilities.Node + binding_server_cmaui_2_test_nested2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_2: + binding_cmaui_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_cmaui_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_server_cmaui_2_test_nested2: + disk.device.write.bytes.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_2_test_nested2: + cpu_util_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui_3_test_nested3_test_nested2: + network.incoming.bytes_cmaui_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: + network.incoming.bytes_cmaui_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_2_test_nested2: + network.incoming.packets_cmaui_port_222_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui_3_test_nested3_test_nested2: + network.incoming.packets.rate_cmaui_port_322_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui_1: + disk.write.bytes.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui_2_test_nested2: + disk.device.write.bytes_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui_1: + disk.read.bytes_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: + memory.resident_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui_2_test_nested2: + attachment_cmaui_port_222_test_nested2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui_2_test_nested2: + network.incoming.packets.rate_cmaui_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_211_test_nested2: + feature_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_222_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2: + attachment_cmaui_port_311_test_nested3_test_nested2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_322_test_nested3_test_nested2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui_2_test_nested2: + network.incoming.packets_cmaui_port_211_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cmaui_port_211_test_nested2: + binding_server_cmaui_1: type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 0 + - 1 - UNBOUNDED - binding_server_cmaui_2_test_nested2: - type: tosca.capabilities.network.Bindable + network.incoming.bytes_cmaui_port_311_test_nested3_test_nested2: + 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 - os_server_cmaui_2_test_nested2: - type: tosca.capabilities.OperatingSystem + scalable_server_cmaui_2_test_nested2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_211_test_nested2: - type: tosca.capabilities.Attachment + feature_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_cmaui_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + scalable_server_cmaui_1: + type: tosca.capabilities.Scalable occurrences: - - 0 + - 1 - UNBOUNDED - binding_cmaui_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.write.requests_server_cmaui_2_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui_2_test_nested2: + disk.read.requests_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_1: + endpoint_server_cmaui_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_2_test_nested2: 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 - vcpus_server_cmaui_2_test_nested2: + disk.usage_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_3_test_nested3_test_nested2: - type: tosca.capabilities.network.Bindable + disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui_1: + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_2: + feature_server_cmaui_2_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_1: + network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui_1: + memory_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: + disk.read.requests_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2: + instance_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_2: + disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_cmaui_3_test_nested3_test_nested2: + network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_1: + disk.device.capacity_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_222_test_nested2: + disk.device.latency_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_222_test_nested2: + disk.usage_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_322_test_nested3_test_nested2: + network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2: + network.outpoing.packets_cmaui_port_211_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_222_test_nested2: + disk.device.allocation_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2: + instance_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui_1: + scalable_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_1: + network.outpoing.packets_cmaui_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_3_test_nested3_test_nested2: + network.outpoing.packets_cmaui_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui_3_test_nested3_test_nested2: + disk.device.read.requests_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_3_test_nested3_test_nested2: + cpu.delta_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_222_test_nested2: - type: tosca.capabilities.Attachment + disk.device.usage_server_cmaui_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_222_test_nested2: + memory_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1: + network.outgoing.bytes_cmaui_port_222_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_2: + binding_cmaui_port_322_test_nested3_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.requests.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui_3_test_nested3_test_nested2: - type: tosca.capabilities.Node + binding_cmaui_port_311_test_nested3_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_2_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_311_test_nested3_test_nested2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_3_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_222_test_nested2: + disk.allocation_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_311_test_nested3_test_nested2: - type: tosca.capabilities.Attachment + cpu_server_cmaui_2_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_1: - type: tosca.capabilities.Node + disk.device.read.bytes_server_cmaui_2_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_2: - type: tosca.capabilities.Node + endpoint_server_cmaui_2_test_nested2: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_1: + cpu_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui_1: + feature_cmaui_port_211_test_nested2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_1: + network.incoming.packets_cmaui_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_322_test_nested3_test_nested2: - type: tosca.capabilities.Attachment + network.incoming.packets_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_3_test_nested3_test_nested2: + disk.capacity_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui_2_test_nested2: + disk.capacity_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_211_test_nested2: + disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_2_test_nested2: + disk.read.bytes.rate_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_cmaui_1: - type: tosca.capabilities.network.Bindable + disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_311_test_nested3_test_nested2: + disk.device.read.requests_server_cmaui_2_test_nested2: 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 - scalable_server_cmaui_2_test_nested2: - type: tosca.capabilities.Scalable + binding_cmaui_port_211_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_port_211_test_nested2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_2: - type: tosca.capabilities.Attachment + os_server_cmaui_2_test_nested2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - feature_test_nested2: - type: tosca.capabilities.Node + attachment_cmaui_port_211_test_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - scalable_server_cmaui_1: - type: tosca.capabilities.Scalable + disk.ephemeral.size_server_cmaui_2_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_nested2: + disk.iops_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_1: + vcpus_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_2: + network.outgoing.bytes.rate_cmaui_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_cmaui_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui_3_test_nested3_test_nested2: + network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui_2_test_nested2: + cpu_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui_3_test_nested3_test_nested2: + network.incoming.packets.rate_cmaui_port_222_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui_1: + network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: + network.outgoing.bytes.rate_cmaui_port_222_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_1: + network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_222_test_nested2: - type: tosca.capabilities.Node + forwarder_cmaui_port_222_test_nested2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_2_test_nested2: + disk.device.latency_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_1: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes_cmaui_port_222_test_nested2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_2_test_nested2: + disk.write.bytes_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_2_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_cmaui_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui_2_test_nested2: + disk.allocation_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_2_test_nested2: + cpu_util_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2: + disk.device.iops_server_cmaui_2_test_nested2: 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 - os_server_cmaui_3_test_nested3_test_nested2: - type: tosca.capabilities.OperatingSystem + network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2: + 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 - os_server_cmaui_1: - type: tosca.capabilities.OperatingSystem + attachment_cmaui_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_211_test_nested2: + disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_2_test_nested2: + network.outgoing.packets.rate_cmaui_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_cmaui_2_test_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - memory_server_cmaui_2_test_nested2: + network.outgoing.packets.rate_cmaui_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2: + disk.device.usage_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: + disk.root.size_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_cmaui_1: + disk.write.requests_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_3_test_nested3_test_nested2: + disk.device.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui_2_test_nested2: + disk.usage_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui_1: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_cmaui_port_211_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_222_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_2_test_nested2: + disk.device.capacity_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_3_test_nested3_test_nested2: + disk.device.read.requests.rate_server_cmaui_2_test_nested2: 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 - vcpus_server_cmaui_3_test_nested3_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_211_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2: + network.outgoing.bytes.rate_cmaui_port_211_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_3_test_nested3_test_nested2: + memory_server_cmaui_2_test_nested2: 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 - instance_server_cmaui_3_test_nested3_test_nested2: + disk.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: + disk.device.iops_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2: + disk.device.write.requests_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_server_cmaui_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_2_test_nested2: + network.incoming.packets.rate_cmaui_port_211_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_3_test_nested3_test_nested2: + disk.read.bytes_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2: + disk.allocation_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui_3_test_nested3_test_nested2: + vcpus_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_211_test_nested2: + network.outgoing.bytes_cmaui_port_211_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_3_test_nested3_test_nested2: + disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui_2_test_nested2: + disk.device.read.bytes_server_cmaui_3_test_nested3_test_nested2: 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 - instance_server_cmaui_1: + disk.device.write.bytes_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1211,8 +1271,8 @@ node_types: occurrences: - 0 - UNBOUNDED - scalable_server_cmaui_3_test_nested3_test_nested2: - type: tosca.capabilities.Scalable + forwarder_cmaui_port_322_test_nested3_test_nested2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1240,42 +1300,12 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_3_test_nested3_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.read.bytes.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_cmaui_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - cpu.delta_server_cmaui_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1411,6 +1441,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_311: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_server_cmaui_3: type: tosca.capabilities.Node occurrences: @@ -1686,6 +1721,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_322: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_cmaui_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2036,6 +2076,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_222: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2184,6 +2229,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_322_test_nested3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_cmaui_port_322_test_nested3: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2536,6 +2586,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_211: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_cmaui_port_322_test_nested3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2595,6 +2650,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_311_test_nested3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml index ed19586cc8..66880be377 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml @@ -102,10 +102,6 @@ topology_template: remote_ip_prefix: ::/0 direction: ingress requirements: - - port: - capability: attachment_cmaui_port_211_test_nested2 - node: test_nested - relationship: org.openecomp.relationships.AttachesTo - port: capability: attachment_cmaui_port_222_test_nested2 node: test_nested @@ -118,6 +114,10 @@ topology_template: capability: attachment_cmaui_port_322_test_nested3_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_cmaui_port_211_test_nested2 + node: test_nested + relationship: org.openecomp.relationships.AttachesTo - port: capability: attachment_cmaui_port_2 node: test_nested @@ -199,11 +199,11 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_cmaui_port_211_test_nested2 + capability: attachment_cmaui_port_311_test_nested3_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cmaui_port_311_test_nested3_test_nested2 + capability: attachment_cmaui_port_211_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index 12b75836dc..6eaa43fa49 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -214,6 +214,9 @@ topology_template: disk.device.capacity_server_cmaui_2: - server_cmaui_2 - disk.device.capacity + forwarder_cmaui_port_222: + - cmaui_port_222 + - forwarder disk.device.read.bytes.rate_server_cmaui_2: - server_cmaui_2 - disk.device.read.bytes.rate @@ -289,6 +292,9 @@ topology_template: scalable_server_cmaui_3_test_nested3: - test_nested3 - scalable_server_cmaui_3 + forwarder_cmaui_port_322_test_nested3: + - test_nested3 + - forwarder_cmaui_port_322 binding_cmaui_port_322_test_nested3: - test_nested3 - binding_cmaui_port_322 @@ -469,6 +475,9 @@ topology_template: host_server_cmaui_2: - server_cmaui_2 - host + forwarder_cmaui_port_211: + - cmaui_port_211 + - forwarder network.outgoing.packets.rate_cmaui_port_322_test_nested3: - test_nested3 - network.outgoing.packets.rate_cmaui_port_322 @@ -499,6 +508,9 @@ topology_template: disk.device.read.requests_server_cmaui_2: - server_cmaui_2 - disk.device.read.requests + forwarder_cmaui_port_311_test_nested3: + - test_nested3 + - forwarder_cmaui_port_311 disk.read.bytes.rate_server_cmaui_2: - server_cmaui_2 - disk.read.bytes.rate @@ -568,4 +580,4 @@ topology_template: - dependency_cmaui_port_322 dependency_server_cmaui_2: - server_cmaui_2 - - 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/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml index ae64c41e8c..59344ca13c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml @@ -142,6 +142,9 @@ topology_template: disk.device.write.bytes_server_cmaui_3: - server_cmaui_3 - disk.device.write.bytes + forwarder_cmaui_port_311: + - cmaui_port_311 + - forwarder feature_server_cmaui_3: - server_cmaui_3 - feature @@ -283,6 +286,9 @@ topology_template: disk.read.bytes.rate_server_cmaui_3: - server_cmaui_3 - disk.read.bytes.rate + forwarder_cmaui_port_322: + - cmaui_port_322 + - forwarder disk.device.write.requests_server_cmaui_3: - server_cmaui_3 - disk.device.write.requests @@ -343,4 +349,4 @@ topology_template: - dependency dependency_cmaui_port_322: - cmaui_port_322 - - 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/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml index 59c7bc8292..dccdb95085 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml @@ -154,9 +154,6 @@ topology_template: network.outpoing.packets_cmaui_port_222_test_nested2: - test_nested2 - network.outpoing.packets_cmaui_port_222 - disk.device.usage_server_cmaui_1: - - server_cmaui_1 - - disk.device.usage memory.usage_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - memory.usage_server_cmaui_3_test_nested3 @@ -181,39 +178,21 @@ topology_template: feature_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - feature_cmaui_port_311_test_nested3 - memory_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - memory_server_cmaui_3_test_nested3 - network.outgoing.bytes_cmaui_port_222_test_nested2: - - test_nested2 - - network.outgoing.bytes_cmaui_port_222 disk.device.write.bytes.rate_server_cmaui_2_test_nested2: - test_nested2 - disk.device.write.bytes.rate_server_cmaui_2 feature_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - feature_cmaui_port_322_test_nested3 - binding_cmaui_port_322_test_nested3_test_nested2: - - test_nested2 - - binding_cmaui_port_322_test_nested3 disk.root.size_server_cmaui_1: - server_cmaui_1 - disk.root.size - disk.device.write.requests.rate_server_cmaui_1: - - server_cmaui_1 - - disk.device.write.requests.rate network.outpoing.packets_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - network.outpoing.packets_cmaui_port_311_test_nested3 - binding_cmaui_port_311_test_nested3_test_nested2: - - test_nested2 - - binding_cmaui_port_311_test_nested3 network.outpoing.packets_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - network.outpoing.packets_cmaui_port_322_test_nested3 - disk.write.bytes.rate_server_cmaui_2_test_nested2: - - test_nested2 - - disk.write.bytes.rate_server_cmaui_2 disk.iops_server_cmaui_2_test_nested2: - test_nested2 - disk.iops_server_cmaui_2 @@ -238,21 +217,12 @@ topology_template: cpu.delta_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - cpu.delta_server_cmaui_3_test_nested3 - disk.device.iops_server_cmaui_1: - - server_cmaui_1 - - disk.device.iops network.incoming.packets_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - network.incoming.packets_cmaui_port_311_test_nested3 - disk.device.allocation_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.device.allocation_server_cmaui_3_test_nested3 disk.latency_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.latency_server_cmaui_3_test_nested3 - disk.allocation_server_cmaui_2_test_nested2: - - test_nested2 - - disk.allocation_server_cmaui_2 disk.device.read.bytes.rate_server_cmaui_1: - server_cmaui_1 - disk.device.read.bytes.rate @@ -265,24 +235,15 @@ topology_template: disk.device.read.bytes_server_cmaui_1: - server_cmaui_1 - disk.device.read.bytes - cpu_server_cmaui_2_test_nested2: - - test_nested2 - - cpu_server_cmaui_2 disk.device.read.bytes.rate_server_cmaui_2_test_nested2: - test_nested2 - disk.device.read.bytes.rate_server_cmaui_2 - disk.device.read.bytes_server_cmaui_2_test_nested2: - - test_nested2 - - disk.device.read.bytes_server_cmaui_2 disk.write.requests.rate_server_cmaui_1: - server_cmaui_1 - disk.write.requests.rate network.outgoing.packets.rate_cmaui_port_211_test_nested2: - test_nested2 - network.outgoing.packets.rate_cmaui_port_211 - endpoint_server_cmaui_2_test_nested2: - - test_nested2 - - endpoint_server_cmaui_2 disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.device.read.bytes.rate_server_cmaui_3_test_nested3 @@ -292,18 +253,9 @@ topology_template: instance_server_cmaui_2_test_nested2: - test_nested2 - instance_server_cmaui_2 - cpu_server_cmaui_1: - - server_cmaui_1 - - cpu network.incoming.packets.rate_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - network.incoming.packets.rate_cmaui_port_311_test_nested3 - feature_cmaui_port_211_test_nested2: - - test_nested2 - - feature_cmaui_port_211 - network.incoming.packets_cmaui_port_2: - - cmaui_port_2 - - network.incoming.packets memory.usage_server_cmaui_2_test_nested2: - test_nested2 - memory.usage_server_cmaui_2 @@ -313,9 +265,6 @@ topology_template: disk.capacity_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.capacity_server_cmaui_3_test_nested3 - network.incoming.packets_cmaui_port_1: - - cmaui_port_1 - - network.incoming.packets disk.device.write.bytes_server_cmaui_2_test_nested2: - test_nested2 - disk.device.write.bytes_server_cmaui_2 @@ -325,105 +274,45 @@ topology_template: disk.ephemeral.size_server_cmaui_1: - server_cmaui_1 - disk.ephemeral.size - disk.capacity_server_cmaui_2_test_nested2: - - test_nested2 - - disk.capacity_server_cmaui_2 - disk.capacity_server_cmaui_1: - - server_cmaui_1 - - disk.capacity - disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.device.write.requests.rate_server_cmaui_3_test_nested3 disk.latency_server_cmaui_2_test_nested2: - test_nested2 - disk.latency_server_cmaui_2 - disk.read.bytes.rate_server_cmaui_2_test_nested2: - - test_nested2 - - disk.read.bytes.rate_server_cmaui_2 network.incoming.bytes.rate_cmaui_port_211_test_nested2: - test_nested2 - network.incoming.bytes.rate_cmaui_port_211 - disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.ephemeral.size_server_cmaui_3_test_nested3 - disk.device.read.requests_server_cmaui_2_test_nested2: - - test_nested2 - - disk.device.read.requests_server_cmaui_2 - binding_cmaui_port_211_test_nested2: - - test_nested2 - - binding_cmaui_port_211 binding_server_cmaui_2_test_nested2: - test_nested2 - binding_server_cmaui_2 - os_server_cmaui_2_test_nested2: - - test_nested2 - - os_server_cmaui_2 - attachment_cmaui_port_211_test_nested2: - - test_nested2 - - attachment_cmaui_port_211 binding_cmaui_port_1: - cmaui_port_1 - binding binding_cmaui_port_2: - cmaui_port_2 - binding - disk.ephemeral.size_server_cmaui_2_test_nested2: - - test_nested2 - - disk.ephemeral.size_server_cmaui_2 - disk.iops_server_cmaui_1: - - server_cmaui_1 - - disk.iops - vcpus_server_cmaui_2_test_nested2: - - test_nested2 - - vcpus_server_cmaui_2 binding_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - binding_server_cmaui_3_test_nested3 disk.device.write.requests_server_cmaui_1: - server_cmaui_1 - disk.device.write.requests - network.outgoing.bytes.rate_cmaui_port_2: - - cmaui_port_2 - - network.outgoing.bytes.rate disk.device.write.bytes.rate_server_cmaui_1: - server_cmaui_1 - disk.device.write.bytes.rate cpu_util_server_cmaui_1: - server_cmaui_1 - cpu_util - network.outgoing.bytes.rate_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2: - - test_nested2 - - network.outgoing.bytes_cmaui_port_322_test_nested3 network.incoming.bytes_cmaui_port_2: - cmaui_port_2 - network.incoming.bytes - cpu_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - cpu_server_cmaui_3_test_nested3 network.incoming.bytes_cmaui_port_1: - cmaui_port_1 - network.incoming.bytes network.incoming.packets_cmaui_port_222_test_nested2: - test_nested2 - network.incoming.packets_cmaui_port_222 - network.incoming.packets.rate_cmaui_port_222_test_nested2: - - test_nested2 - - network.incoming.packets.rate_cmaui_port_222 network.incoming.packets.rate_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - network.incoming.packets.rate_cmaui_port_322_test_nested3 - network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2: - - test_nested2 - - network.incoming.bytes.rate_cmaui_port_311_test_nested3 - network.outgoing.bytes.rate_cmaui_port_222_test_nested2: - - test_nested2 - - network.outgoing.bytes.rate_cmaui_port_222 - network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2: - - test_nested2 - - network.incoming.bytes.rate_cmaui_port_322_test_nested3 disk.write.bytes.rate_server_cmaui_1: - server_cmaui_1 - disk.write.bytes.rate @@ -436,15 +325,9 @@ topology_template: memory.resident_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - memory.resident_server_cmaui_3_test_nested3 - disk.device.latency_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.device.latency_server_cmaui_3_test_nested3 attachment_cmaui_port_222_test_nested2: - test_nested2 - attachment_cmaui_port_222 - network.incoming.bytes_cmaui_port_222_test_nested2: - - test_nested2 - - network.incoming.bytes_cmaui_port_222 network.incoming.packets.rate_cmaui_port_1: - cmaui_port_1 - network.incoming.packets.rate @@ -466,30 +349,15 @@ topology_template: feature_cmaui_port_2: - cmaui_port_2 - feature - disk.write.bytes_server_cmaui_1: - - server_cmaui_1 - - disk.write.bytes - feature_server_cmaui_1: - - server_cmaui_1 - - feature - disk.allocation_server_cmaui_1: - - server_cmaui_1 - - disk.allocation attachment_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - attachment_cmaui_port_322_test_nested3 disk.device.capacity_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.device.capacity_server_cmaui_3_test_nested3 - cpu_util_server_cmaui_2_test_nested2: - - test_nested2 - - cpu_util_server_cmaui_2 network.incoming.packets_cmaui_port_211_test_nested2: - test_nested2 - network.incoming.packets_cmaui_port_211 - disk.device.iops_server_cmaui_2_test_nested2: - - test_nested2 - - disk.device.iops_server_cmaui_2 binding_server_cmaui_1: - server_cmaui_1 - binding @@ -499,18 +367,249 @@ topology_template: scalable_server_cmaui_2_test_nested2: - test_nested2 - scalable_server_cmaui_2 - network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2: - - test_nested2 - - network.incoming.bytes_cmaui_port_322_test_nested3 - attachment_cmaui_port_2: - - cmaui_port_2 - - attachment feature_test_nested2: - test_nested2 - feature scalable_server_cmaui_1: - server_cmaui_1 - scalable + disk.write.requests_server_cmaui_2_test_nested2: + - test_nested2 + - disk.write.requests_server_cmaui_2 + disk.read.requests_server_cmaui_2_test_nested2: + - test_nested2 + - disk.read.requests_server_cmaui_2 + endpoint_server_cmaui_1: + - server_cmaui_1 + - endpoint + memory.resident_server_cmaui_2_test_nested2: + - test_nested2 + - memory.resident_server_cmaui_2 + disk.usage_server_cmaui_2_test_nested2: + - test_nested2 + - disk.usage_server_cmaui_2 + disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.device.read.requests_server_cmaui_3_test_nested3 + forwarder_cmaui_port_2: + - cmaui_port_2 + - forwarder + forwarder_cmaui_port_1: + - cmaui_port_1 + - forwarder + disk.device.write.requests.rate_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.write.requests.rate_server_cmaui_2 + feature_server_cmaui_2_test_nested2: + - test_nested2 + - feature_server_cmaui_2 + disk.device.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.device.allocation + network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_311_test_nested3 + memory_server_cmaui_1: + - server_cmaui_1 + - memory + disk.read.requests_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.read.requests_server_cmaui_3_test_nested3 + instance_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - instance_server_cmaui_3_test_nested3 + disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.write.requests.rate_server_cmaui_3_test_nested3 + network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.bytes.rate_cmaui_port_311_test_nested3 + disk.device.capacity_server_cmaui_1: + - server_cmaui_1 + - disk.device.capacity + disk.device.latency_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.latency_server_cmaui_2 + disk.usage_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.usage_server_cmaui_3_test_nested3 + network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.bytes.rate_cmaui_port_322_test_nested3 + network.outpoing.packets_cmaui_port_211_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_211 + disk.device.allocation_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.allocation_server_cmaui_2 + instance_server_cmaui_1: + - server_cmaui_1 + - instance + scalable_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - scalable_server_cmaui_3_test_nested3 + disk.write.bytes_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.write.bytes_server_cmaui_3_test_nested3 + network.outpoing.packets_cmaui_port_1: + - cmaui_port_1 + - network.outpoing.packets + network.outpoing.packets_cmaui_port_2: + - cmaui_port_2 + - network.outpoing.packets + disk.device.read.requests_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.requests + cpu.delta_server_cmaui_1: + - server_cmaui_1 + - cpu.delta + disk.device.usage_server_cmaui_1: + - server_cmaui_1 + - disk.device.usage + memory_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - memory_server_cmaui_3_test_nested3 + network.outgoing.bytes_cmaui_port_222_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_222 + binding_cmaui_port_322_test_nested3_test_nested2: + - test_nested2 + - binding_cmaui_port_322_test_nested3 + disk.device.write.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.requests.rate + binding_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - binding_cmaui_port_311_test_nested3 + disk.write.bytes.rate_server_cmaui_2_test_nested2: + - test_nested2 + - disk.write.bytes.rate_server_cmaui_2 + forwarder_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - forwarder_cmaui_port_311_test_nested3 + disk.device.iops_server_cmaui_1: + - server_cmaui_1 + - disk.device.iops + disk.device.allocation_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.device.allocation_server_cmaui_3_test_nested3 + disk.allocation_server_cmaui_2_test_nested2: + - test_nested2 + - disk.allocation_server_cmaui_2 + cpu_server_cmaui_2_test_nested2: + - test_nested2 + - cpu_server_cmaui_2 + disk.device.read.bytes_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.read.bytes_server_cmaui_2 + endpoint_server_cmaui_2_test_nested2: + - test_nested2 + - endpoint_server_cmaui_2 + cpu_server_cmaui_1: + - server_cmaui_1 + - cpu + feature_cmaui_port_211_test_nested2: + - test_nested2 + - feature_cmaui_port_211 + network.incoming.packets_cmaui_port_2: + - cmaui_port_2 + - network.incoming.packets + network.incoming.packets_cmaui_port_1: + - cmaui_port_1 + - network.incoming.packets + disk.capacity_server_cmaui_2_test_nested2: + - test_nested2 + - disk.capacity_server_cmaui_2 + disk.capacity_server_cmaui_1: + - server_cmaui_1 + - disk.capacity + disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.device.write.requests.rate_server_cmaui_3_test_nested3 + disk.read.bytes.rate_server_cmaui_2_test_nested2: + - test_nested2 + - disk.read.bytes.rate_server_cmaui_2 + disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.ephemeral.size_server_cmaui_3_test_nested3 + disk.device.read.requests_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.read.requests_server_cmaui_2 + binding_cmaui_port_211_test_nested2: + - test_nested2 + - binding_cmaui_port_211 + forwarder_cmaui_port_211_test_nested2: + - test_nested2 + - forwarder_cmaui_port_211 + os_server_cmaui_2_test_nested2: + - test_nested2 + - os_server_cmaui_2 + attachment_cmaui_port_211_test_nested2: + - test_nested2 + - attachment_cmaui_port_211 + disk.ephemeral.size_server_cmaui_2_test_nested2: + - test_nested2 + - disk.ephemeral.size_server_cmaui_2 + disk.iops_server_cmaui_1: + - server_cmaui_1 + - disk.iops + vcpus_server_cmaui_2_test_nested2: + - test_nested2 + - vcpus_server_cmaui_2 + network.outgoing.bytes.rate_cmaui_port_2: + - cmaui_port_2 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_cmaui_port_1: + - cmaui_port_1 + - network.outgoing.bytes.rate + network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.bytes_cmaui_port_322_test_nested3 + cpu_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - cpu_server_cmaui_3_test_nested3 + network.incoming.packets.rate_cmaui_port_222_test_nested2: + - test_nested2 + - network.incoming.packets.rate_cmaui_port_222 + network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_311_test_nested3 + network.outgoing.bytes.rate_cmaui_port_222_test_nested2: + - test_nested2 + - network.outgoing.bytes.rate_cmaui_port_222 + network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_322_test_nested3 + forwarder_cmaui_port_222_test_nested2: + - test_nested2 + - forwarder_cmaui_port_222 + disk.device.latency_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.device.latency_server_cmaui_3_test_nested3 + network.incoming.bytes_cmaui_port_222_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_222 + disk.write.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.write.bytes + feature_server_cmaui_1: + - server_cmaui_1 + - feature + disk.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.allocation + cpu_util_server_cmaui_2_test_nested2: + - test_nested2 + - cpu_util_server_cmaui_2 + disk.device.iops_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.iops_server_cmaui_2 + network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_322_test_nested3 + attachment_cmaui_port_2: + - cmaui_port_2 + - attachment disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.device.read.requests.rate_server_cmaui_3_test_nested3 @@ -526,9 +625,6 @@ topology_template: disk.device.usage_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.device.usage_server_cmaui_3_test_nested3 - disk.write.requests_server_cmaui_2_test_nested2: - - test_nested2 - - disk.write.requests_server_cmaui_2 disk.root.size_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.root.size_server_cmaui_3_test_nested3 @@ -544,27 +640,12 @@ topology_template: feature_cmaui_port_222_test_nested2: - test_nested2 - feature_cmaui_port_222 - disk.read.requests_server_cmaui_2_test_nested2: - - test_nested2 - - disk.read.requests_server_cmaui_2 - endpoint_server_cmaui_1: - - server_cmaui_1 - - endpoint disk.device.capacity_server_cmaui_2_test_nested2: - test_nested2 - disk.device.capacity_server_cmaui_2 disk.device.read.requests.rate_server_cmaui_2_test_nested2: - test_nested2 - disk.device.read.requests.rate_server_cmaui_2 - memory.resident_server_cmaui_2_test_nested2: - - test_nested2 - - memory.resident_server_cmaui_2 - disk.usage_server_cmaui_2_test_nested2: - - test_nested2 - - disk.usage_server_cmaui_2 - disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.device.read.requests_server_cmaui_3_test_nested3 os_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - os_server_cmaui_3_test_nested3 @@ -574,27 +655,12 @@ topology_template: network.outgoing.bytes.rate_cmaui_port_211_test_nested2: - test_nested2 - network.outgoing.bytes.rate_cmaui_port_211 - disk.device.write.requests.rate_server_cmaui_2_test_nested2: - - test_nested2 - - disk.device.write.requests.rate_server_cmaui_2 - feature_server_cmaui_2_test_nested2: - - test_nested2 - - feature_server_cmaui_2 memory_server_cmaui_2_test_nested2: - test_nested2 - memory_server_cmaui_2 - disk.device.allocation_server_cmaui_1: - - server_cmaui_1 - - disk.device.allocation - network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2: - - test_nested2 - - network.outgoing.bytes_cmaui_port_311_test_nested3 disk.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.write.bytes.rate_server_cmaui_3_test_nested3 - memory_server_cmaui_1: - - server_cmaui_1 - - memory disk.device.iops_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.device.iops_server_cmaui_3_test_nested3 @@ -622,45 +688,12 @@ topology_template: disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.device.write.requests_server_cmaui_3_test_nested3 - disk.read.requests_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.read.requests_server_cmaui_3_test_nested3 - instance_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - instance_server_cmaui_3_test_nested3 - disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.write.requests.rate_server_cmaui_3_test_nested3 - network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2: - - test_nested2 - - network.outgoing.bytes.rate_cmaui_port_311_test_nested3 - disk.device.capacity_server_cmaui_1: - - server_cmaui_1 - - disk.device.capacity - disk.device.latency_server_cmaui_2_test_nested2: - - test_nested2 - - disk.device.latency_server_cmaui_2 - disk.usage_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.usage_server_cmaui_3_test_nested3 - network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2: - - test_nested2 - - network.outgoing.bytes.rate_cmaui_port_322_test_nested3 disk.device.read.bytes_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.device.read.bytes_server_cmaui_3_test_nested3 - network.outpoing.packets_cmaui_port_211_test_nested2: - - test_nested2 - - network.outpoing.packets_cmaui_port_211 disk.device.write.bytes_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - disk.device.write.bytes_server_cmaui_3_test_nested3 - disk.device.allocation_server_cmaui_2_test_nested2: - - test_nested2 - - disk.device.allocation_server_cmaui_2 - instance_server_cmaui_1: - - server_cmaui_1 - - instance disk.device.read.requests.rate_server_cmaui_1: - server_cmaui_1 - disk.device.read.requests.rate @@ -670,9 +703,9 @@ topology_template: binding_cmaui_port_222_test_nested2: - test_nested2 - binding_cmaui_port_222 - scalable_server_cmaui_3_test_nested3_test_nested2: + forwarder_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - scalable_server_cmaui_3_test_nested3 + - forwarder_cmaui_port_322_test_nested3 network.incoming.bytes.rate_cmaui_port_1: - cmaui_port_1 - network.incoming.bytes.rate @@ -685,24 +718,9 @@ topology_template: vcpus_server_cmaui_1: - server_cmaui_1 - vcpus - disk.write.bytes_server_cmaui_3_test_nested3_test_nested2: - - test_nested2 - - disk.write.bytes_server_cmaui_3_test_nested3 disk.read.bytes.rate_server_cmaui_1: - server_cmaui_1 - disk.read.bytes.rate - network.outpoing.packets_cmaui_port_1: - - cmaui_port_1 - - network.outpoing.packets - network.outpoing.packets_cmaui_port_2: - - cmaui_port_2 - - network.outpoing.packets - disk.device.read.requests_server_cmaui_1: - - server_cmaui_1 - - disk.device.read.requests - cpu.delta_server_cmaui_1: - - server_cmaui_1 - - cpu.delta disk.write.bytes_server_cmaui_2_test_nested2: - test_nested2 - disk.write.bytes_server_cmaui_2 @@ -781,4 +799,4 @@ topology_template: - dependency link_cmaui_port_211_test_nested2: - test_nested2 - - link_cmaui_port_211 \ No newline at end of file + - link_cmaui_port_211 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 306576bed5..67df29f6bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -380,6 +380,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_a_mgmt_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory.usage_perimeta_ssc_a_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -392,6 +397,21 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_a_unused_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_perimeta_ssc_a_mgmt_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_perimeta_ssc_a_untrusted_parent_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_perimeta_ssc_a_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -550,6 +570,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_a_trusted_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_perimeta_ssc_a_unused_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -631,6 +656,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_a_ha_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes.rate_perimeta_ssc_a_mgmt_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1211,6 +1241,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_b_mgmt_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_perimeta_ssc_b_trusted_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1253,6 +1288,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_b_untrusted_parent_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_perimeta_ssc_b_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1301,6 +1341,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_b_mgmt_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_perimeta_ssc_b_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1524,6 +1569,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_perimeta_ssc_b_ha_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_perimeta_ssc_b_mgmt_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1582,6 +1632,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_b_unused_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_perimeta_ssc_b_unused_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1735,6 +1790,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_ssc_b_trusted_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_perimeta_ssc_b_unused_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2286,6 +2346,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_rtp_msc_a_mgmt_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes.rate_perimeta_rtp_msc_a_ha_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2304,6 +2369,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_rtp_msc_a_untrusted_parent_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED attachment_perimeta_rtp_msc_a_trusted_0_port: type: tosca.capabilities.Attachment occurrences: @@ -2399,6 +2469,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_rtp_msc_a_ha_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_perimeta_rtp_msc_a_server_0: type: tosca.capabilities.Scalable occurrences: @@ -2423,6 +2498,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_rtp_msc_a_trusted_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets.rate_perimeta_rtp_msc_a_untrusted_parent_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2969,6 +3049,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_rtp_msc_b_trusted_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes.rate_perimeta_rtp_msc_b_ha_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3080,6 +3165,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_rtp_msc_b_mgmt_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_perimeta_rtp_msc_b_mgmt_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3123,6 +3213,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_rtp_msc_b_ha_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_perimeta_rtp_msc_b_trusted_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3187,6 +3282,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_perimeta_rtp_msc_b_untrusted_parent_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_perimeta_rtp_msc_b_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml index 8f8aae3642..ed4dfdd49b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml @@ -510,12 +510,24 @@ topology_template: network.outgoing.bytes_perimeta_ssc_a_ha_0_port: - perimeta_ssc_a_ha_0_port - network.outgoing.bytes + forwarder_perimeta_ssc_a_mgmt_1_port: + - perimeta_ssc_a_mgmt_1_port + - forwarder memory.usage_perimeta_ssc_a_server_0: - perimeta_ssc_a_server_0 - memory.usage network.incoming.packets.rate_perimeta_ssc_a_ha_0_port: - perimeta_ssc_a_ha_0_port - network.incoming.packets.rate + forwarder_perimeta_ssc_a_unused_0_port: + - perimeta_ssc_a_unused_0_port + - forwarder + forwarder_perimeta_ssc_a_mgmt_0_port: + - perimeta_ssc_a_mgmt_0_port + - forwarder + forwarder_perimeta_ssc_a_untrusted_parent_0_port: + - perimeta_ssc_a_untrusted_parent_0_port + - forwarder disk.device.read.requests.rate_perimeta_ssc_a_server_0: - perimeta_ssc_a_server_0 - disk.device.read.requests.rate @@ -597,6 +609,9 @@ topology_template: network.incoming.bytes.rate_perimeta_ssc_a_untrusted_parent_0_port: - perimeta_ssc_a_untrusted_parent_0_port - network.incoming.bytes.rate + forwarder_perimeta_ssc_a_trusted_0_port: + - perimeta_ssc_a_trusted_0_port + - forwarder network.outgoing.bytes.rate_perimeta_ssc_a_unused_0_port: - perimeta_ssc_a_unused_0_port - network.outgoing.bytes.rate @@ -639,6 +654,9 @@ topology_template: disk.device.latency_perimeta_ssc_a_server_0: - perimeta_ssc_a_server_0 - disk.device.latency + forwarder_perimeta_ssc_a_ha_0_port: + - perimeta_ssc_a_ha_0_port + - forwarder network.incoming.bytes.rate_perimeta_ssc_a_mgmt_1_port: - perimeta_ssc_a_mgmt_1_port - network.incoming.bytes.rate @@ -828,4 +846,4 @@ topology_template: - dependency dependency_perimeta_ssc_a_server_0: - perimeta_ssc_a_server_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/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml index 99285a3be6..fffad896af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml @@ -454,6 +454,9 @@ topology_template: host_perimeta_ssc_b_server_0: - perimeta_ssc_b_server_0 - host + forwarder_perimeta_ssc_b_mgmt_1_port: + - perimeta_ssc_b_mgmt_1_port + - forwarder network.outgoing.packets.rate_perimeta_ssc_b_trusted_0_port: - perimeta_ssc_b_trusted_0_port - network.outgoing.packets.rate @@ -475,6 +478,9 @@ topology_template: os_perimeta_ssc_b_server_0: - perimeta_ssc_b_server_0 - os + forwarder_perimeta_ssc_b_untrusted_parent_0_port: + - perimeta_ssc_b_untrusted_parent_0_port + - forwarder memory_perimeta_ssc_b_server_0: - perimeta_ssc_b_server_0 - memory @@ -499,6 +505,9 @@ topology_template: network.outgoing.packets.rate_perimeta_ssc_b_ha_0_port: - perimeta_ssc_b_ha_0_port - network.outgoing.packets.rate + forwarder_perimeta_ssc_b_mgmt_0_port: + - perimeta_ssc_b_mgmt_0_port + - forwarder disk.write.requests.rate_perimeta_ssc_b_server_0: - perimeta_ssc_b_server_0 - disk.write.requests.rate @@ -613,6 +622,9 @@ topology_template: binding_perimeta_ssc_b_ha_0_port: - perimeta_ssc_b_ha_0_port - binding + forwarder_perimeta_ssc_b_ha_0_port: + - perimeta_ssc_b_ha_0_port + - forwarder network.outgoing.bytes.rate_perimeta_ssc_b_mgmt_1_port: - perimeta_ssc_b_mgmt_1_port - network.outgoing.bytes.rate @@ -643,6 +655,9 @@ topology_template: disk.device.latency_perimeta_ssc_b_server_0: - perimeta_ssc_b_server_0 - disk.device.latency + forwarder_perimeta_ssc_b_unused_0_port: + - perimeta_ssc_b_unused_0_port + - forwarder network.incoming.packets_perimeta_ssc_b_unused_0_port: - perimeta_ssc_b_unused_0_port - network.incoming.packets @@ -721,6 +736,9 @@ topology_template: network.incoming.packets.rate_perimeta_ssc_b_unused_0_port: - perimeta_ssc_b_unused_0_port - network.incoming.packets.rate + forwarder_perimeta_ssc_b_trusted_0_port: + - perimeta_ssc_b_trusted_0_port + - forwarder network.outgoing.packets.rate_perimeta_ssc_b_unused_0_port: - perimeta_ssc_b_unused_0_port - network.outgoing.packets.rate @@ -814,4 +832,4 @@ topology_template: - dependency link_perimeta_ssc_b_ha_0_port: - perimeta_ssc_b_ha_0_port - - 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/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml index e1c87c0ea3..370cc8cf86 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml @@ -534,6 +534,9 @@ topology_template: network.incoming.bytes.rate_perimeta_rtp_msc_a_untrusted_parent_0_port: - perimeta_rtp_msc_a_untrusted_parent_0_port - network.incoming.bytes.rate + forwarder_perimeta_rtp_msc_a_mgmt_0_port: + - perimeta_rtp_msc_a_mgmt_0_port + - forwarder network.incoming.bytes.rate_perimeta_rtp_msc_a_ha_0_port: - perimeta_rtp_msc_a_ha_0_port - network.incoming.bytes.rate @@ -543,6 +546,9 @@ topology_template: disk.write.bytes_perimeta_rtp_msc_a_server_0: - perimeta_rtp_msc_a_server_0 - disk.write.bytes + forwarder_perimeta_rtp_msc_a_untrusted_parent_0_port: + - perimeta_rtp_msc_a_untrusted_parent_0_port + - forwarder attachment_perimeta_rtp_msc_a_trusted_0_port: - perimeta_rtp_msc_a_trusted_0_port - attachment @@ -591,6 +597,9 @@ topology_template: network.incoming.packets_perimeta_rtp_msc_a_mgmt_0_port: - perimeta_rtp_msc_a_mgmt_0_port - network.incoming.packets + forwarder_perimeta_rtp_msc_a_ha_0_port: + - perimeta_rtp_msc_a_ha_0_port + - forwarder scalable_perimeta_rtp_msc_a_server_0: - perimeta_rtp_msc_a_server_0 - scalable @@ -603,6 +612,9 @@ topology_template: network.incoming.packets.rate_perimeta_rtp_msc_a_mgmt_0_port: - perimeta_rtp_msc_a_mgmt_0_port - network.incoming.packets.rate + forwarder_perimeta_rtp_msc_a_trusted_0_port: + - perimeta_rtp_msc_a_trusted_0_port + - forwarder network.incoming.packets.rate_perimeta_rtp_msc_a_untrusted_parent_0_port: - perimeta_rtp_msc_a_untrusted_parent_0_port - network.incoming.packets.rate @@ -732,4 +744,4 @@ topology_template: - link dependency_perimeta_rtp_msc_a_mgmt_0_port: - perimeta_rtp_msc_a_mgmt_0_port - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml index ce9748e1f7..6b306a47f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml @@ -439,6 +439,9 @@ topology_template: disk.read.requests_perimeta_rtp_msc_b_server_0: - perimeta_rtp_msc_b_server_0 - disk.read.requests + forwarder_perimeta_rtp_msc_b_trusted_0_port: + - perimeta_rtp_msc_b_trusted_0_port + - forwarder network.incoming.bytes.rate_perimeta_rtp_msc_b_ha_0_port: - perimeta_rtp_msc_b_ha_0_port - network.incoming.bytes.rate @@ -496,6 +499,9 @@ topology_template: disk.capacity_perimeta_rtp_msc_b_server_0: - perimeta_rtp_msc_b_server_0 - disk.capacity + forwarder_perimeta_rtp_msc_b_mgmt_0_port: + - perimeta_rtp_msc_b_mgmt_0_port + - forwarder network.incoming.bytes_perimeta_rtp_msc_b_mgmt_0_port: - perimeta_rtp_msc_b_mgmt_0_port - network.incoming.bytes @@ -517,6 +523,9 @@ topology_template: disk.write.requests.rate_perimeta_rtp_msc_b_server_0: - perimeta_rtp_msc_b_server_0 - disk.write.requests.rate + forwarder_perimeta_rtp_msc_b_ha_0_port: + - perimeta_rtp_msc_b_ha_0_port + - forwarder network.outpoing.packets_perimeta_rtp_msc_b_trusted_0_port: - perimeta_rtp_msc_b_trusted_0_port - network.outpoing.packets @@ -550,6 +559,9 @@ topology_template: network.incoming.packets_perimeta_rtp_msc_b_mgmt_0_port: - perimeta_rtp_msc_b_mgmt_0_port - network.incoming.packets + forwarder_perimeta_rtp_msc_b_untrusted_parent_0_port: + - perimeta_rtp_msc_b_untrusted_parent_0_port + - forwarder disk.device.iops_perimeta_rtp_msc_b_server_0: - perimeta_rtp_msc_b_server_0 - disk.device.iops @@ -718,4 +730,4 @@ topology_template: - link link_perimeta_rtp_msc_b_untrusted_parent_0_port: - perimeta_rtp_msc_b_untrusted_parent_0_port - - 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/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 435c42a81c..6fd0ed7829 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -456,6 +456,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. @@ -1052,6 +1062,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_00_server_pcm_005: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1325,6 +1340,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 network.outpoing.packets_pcm_port_01_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1400,6 +1425,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_01_server_pcm_005: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_pcm_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index a1c67fba97..bc34c490e9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -395,6 +395,9 @@ topology_template: disk.device.read.bytes.rate_server_pcm_1: - server_pcm_1 - disk.device.read.bytes.rate + forwarder_pcm_port_00_server_pcm_005: + - server_pcm_005 + - forwarder_pcm_port_00 disk.write.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.bytes_server_pcm @@ -536,6 +539,12 @@ topology_template: cpu.delta_server_pcm_1: - server_pcm_1 - cpu.delta + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder network.outpoing.packets_pcm_port_01_server_pcm_005: - server_pcm_005 - network.outpoing.packets_pcm_port_01 @@ -575,6 +584,9 @@ topology_template: disk.device.latency_server_pcm_1: - server_pcm_1 - disk.device.latency + forwarder_pcm_port_01_server_pcm_005: + - server_pcm_005 + - forwarder_pcm_port_01 network.outgoing.bytes.rate_pcm_port_1: - pcm_port_1 - network.outgoing.bytes.rate @@ -662,4 +674,4 @@ topology_template: - dependency link_pcm_port_01_server_pcm_005: - server_pcm_005 - - link_pcm_port_01 \ No newline at end of file + - link_pcm_port_01 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index 806d12ea62..ca72528fd8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -336,6 +336,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 @@ -384,4 +390,4 @@ topology_template: - dependency dependency_network_2: - network_2 - - 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/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 6549b60e5e..4753f33ebd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -414,6 +414,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_mgmt_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_vnfci: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -450,4 +455,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/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 0d84b3fc0e..521c13eab2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -351,6 +351,9 @@ topology_template: vcpus_vnfci: - vnfci - vcpus + forwarder_mgmt_port: + - mgmt_port + - forwarder cpu.delta_vnfci: - vnfci - cpu.delta @@ -381,4 +384,4 @@ topology_template: - local_storage link_mgmt_port: - mgmt_port - - 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/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index dc01287086..01f6f14f48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -257,6 +257,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_dns_int_bearer_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED host_dns_servers: type: tosca.capabilities.Container valid_source_types: @@ -436,6 +441,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_dns_oam_protected_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_dns_servers: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -514,4 +524,4 @@ node_types: type: tosca.capabilities.Scalable 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/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml index b777782c3e..020c022d37 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml @@ -269,6 +269,9 @@ topology_template: disk.device.capacity_dns_servers: - dns_servers - disk.device.capacity + forwarder_dns_int_bearer_0_port: + - dns_int_bearer_0_port + - forwarder host_dns_servers: - dns_servers - host @@ -359,6 +362,9 @@ topology_template: disk.device.read.requests_dns_servers: - dns_servers - disk.device.read.requests + forwarder_dns_oam_protected_0_port: + - dns_oam_protected_0_port + - forwarder disk.iops_dns_servers: - dns_servers - disk.iops @@ -419,4 +425,4 @@ topology_template: - link dependency_dns_int_bearer_0_port: - dns_int_bearer_0_port - - dependency \ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 6549b60e5e..4753f33ebd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -414,6 +414,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_mgmt_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_vnfci: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -450,4 +455,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/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 0d84b3fc0e..521c13eab2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -351,6 +351,9 @@ topology_template: vcpus_vnfci: - vnfci - vcpus + forwarder_mgmt_port: + - mgmt_port + - forwarder cpu.delta_vnfci: - vnfci - cpu.delta @@ -381,4 +384,4 @@ topology_template: - local_storage link_mgmt_port: - mgmt_port - - 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/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index e2c3da021d..83f1db7e2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -436,6 +436,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_mgmt_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_vnfci: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -477,4 +482,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/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 85bd55e44b..ea7b1c9be0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -420,6 +420,9 @@ topology_template: vcpus_vnfci: - vnfci - vcpus + forwarder_mgmt_port: + - mgmt_port + - forwarder cpu.delta_vnfci: - vnfci - cpu.delta @@ -459,4 +462,4 @@ topology_template: - link dependency_boot_volume: - boot_volume - - 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/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 9699fe0770..49b834be32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -356,6 +356,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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index f0fffa18ed..6283861921 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -290,6 +290,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 @@ -377,4 +383,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_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/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 9699fe0770..49b834be32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -356,6 +356,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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index f0fffa18ed..6283861921 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -290,6 +290,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 @@ -377,4 +383,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency \ No newline at end of file + - dependency -- cgit