diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection')
17 files changed, 417 insertions, 17 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 8b2bc096be..27a8565aaa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -165,6 +165,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -219,6 +224,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -466,4 +476,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index 5c469df2db..e902c09456 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml @@ -160,6 +160,9 @@ topology_template: cpu_util_server_cmaui: - server_cmaui - cpu_util + forwarder_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - forwarder network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.outgoing.bytes.rate @@ -187,6 +190,9 @@ topology_template: network.incoming.bytes_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.incoming.bytes + forwarder_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - forwarder disk.device.usage_server_cmaui: - server_cmaui - disk.device.usage @@ -331,4 +337,4 @@ topology_template: - dependency dependency_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_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/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 31a150f54f..ad6cab222e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -166,6 +166,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -220,6 +225,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -467,4 +477,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/nestedServiceTemplate.yaml index 95cc9a0f70..34b06b1743 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/nestedServiceTemplate.yaml @@ -165,6 +165,9 @@ topology_template: cpu_util_server_cmaui: - server_cmaui - cpu_util + forwarder_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - forwarder network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.outgoing.bytes.rate @@ -192,6 +195,9 @@ topology_template: network.incoming.bytes_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.incoming.bytes + forwarder_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - forwarder disk.device.usage_server_cmaui: - server_cmaui - disk.device.usage @@ -336,4 +342,4 @@ topology_template: - dependency dependency_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_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/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 8d6c8625e8..8915357694 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -575,6 +575,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED 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. @@ -692,6 +697,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -733,6 +743,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -783,6 +798,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.usage_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -837,6 +857,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -943,6 +968,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1372,6 +1402,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED 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. @@ -1478,6 +1513,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2047,6 +2087,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_test_nested4Level_test_nested3Level: type: tosca.capabilities.Node occurrences: @@ -2376,6 +2421,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2501,6 +2551,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui_2: type: tosca.capabilities.network.Bindable occurrences: @@ -2553,6 +2608,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2647,6 +2712,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_template_VMInt_OAM_lb_3: type: tosca.capabilities.Node occurrences: @@ -3574,6 +3644,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3603,6 +3678,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_7_test_nested4Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui_3: type: tosca.capabilities.network.Bindable occurrences: @@ -3625,6 +3705,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3716,6 +3801,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested4Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3983,12 +4073,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_cmaui_4: 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_template_VMInt_OAM_lb_7: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_server_cmaui_4: type: tosca.capabilities.Node occurrences: @@ -4338,4 +4438,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index 7936734b08..ff0d47ba2f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -307,6 +307,9 @@ topology_template: network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_4 disk.device.write.bytes.rate_server_cmaui_1: - server_cmaui_1 - disk.device.write.bytes.rate @@ -367,6 +370,9 @@ topology_template: network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level + forwarder_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - forwarder disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level @@ -388,6 +394,9 @@ topology_template: network.incoming.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_template_VMInt_OAM_lb_4 + forwarder_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - forwarder memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - memory_server_cmaui_4_test_nested4Level_test_nested3Level @@ -415,6 +424,9 @@ topology_template: os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - os_server_cmaui_4_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level disk.usage_server_cmaui_2_test_nested2Level: - test_nested2Level - disk.usage_server_cmaui_2 @@ -442,6 +454,9 @@ topology_template: disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes_server_cmaui_3_test_nested3Level + forwarder_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_3 disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_cmaui_3_test_nested3Level @@ -496,6 +511,9 @@ topology_template: disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_cmaui_3_test_nested3Level + forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_6_test_nested3Level disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.allocation_server_cmaui_3_test_nested3Level @@ -715,6 +733,9 @@ topology_template: disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_5_test_nested3Level disk.write.requests_server_cmaui_1: - server_cmaui_1 - disk.write.requests @@ -769,6 +790,9 @@ topology_template: network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level @@ -964,4 +988,4 @@ topology_template: - dependency_test_nested3Level dependency_server_cmaui_1: - server_cmaui_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index 37ec759d13..50ca47a3b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -221,6 +221,9 @@ topology_template: network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level + forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_7_test_nested4Level feature_test_nested4Level_test_nested3Level: - test_nested3Level - feature_test_nested4Level @@ -386,6 +389,9 @@ topology_template: disk.device.write.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_cmaui_3 + forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_8_test_nested4Level disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_cmaui_3 @@ -449,6 +455,9 @@ topology_template: disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.device.allocation_server_cmaui_4_test_nested4Level + forwarder_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_6 binding_server_cmaui_2: - server_cmaui_2 - binding @@ -476,6 +485,12 @@ topology_template: network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_template_VMInt_OAM_lb_5 + forwarder_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - forwarder + forwarder_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - forwarder disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.read.bytes.rate_server_cmaui_3 @@ -524,6 +539,9 @@ topology_template: binding_template_VMInt_OAM_lb_6_test_nested3Level: - test_nested3Level - binding_template_VMInt_OAM_lb_6 + forwarder_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_5 feature_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - feature @@ -764,4 +782,4 @@ topology_template: - dependency link_template_VMInt_OAM_lb_6_test_nested3Level: - test_nested3Level - - link_template_VMInt_OAM_lb_6
\ No newline at end of file + - link_template_VMInt_OAM_lb_6 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index a394a1bde8..c1274f188a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -358,6 +358,9 @@ topology_template: disk.device.write.bytes_server_cmaui_3: - server_cmaui_3 - disk.device.write.bytes + forwarder_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - forwarder disk.iops_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.iops_server_cmaui_4 @@ -373,6 +376,9 @@ topology_template: disk.allocation_server_cmaui_3: - server_cmaui_3 - disk.allocation + forwarder_template_VMInt_OAM_lb_7_test_nested4Level: + - test_nested4Level + - forwarder_template_VMInt_OAM_lb_7 binding_server_cmaui_3: - server_cmaui_3 - binding @@ -385,6 +391,9 @@ topology_template: scalable_server_cmaui_3: - server_cmaui_3 - scalable + forwarder_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - forwarder network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level: - test_nested4Level - network.outgoing.packets.rate_template_VMInt_OAM_lb_8 @@ -433,6 +442,9 @@ topology_template: disk.device.latency_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.device.latency_server_cmaui_4 + forwarder_template_VMInt_OAM_lb_8_test_nested4Level: + - test_nested4Level + - forwarder_template_VMInt_OAM_lb_8 disk.device.read.requests.rate_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.device.read.requests.rate_server_cmaui_4 @@ -553,4 +565,4 @@ topology_template: - dependency link_template_VMInt_OAM_lb_7_test_nested4Level: - test_nested4Level - - link_template_VMInt_OAM_lb_7
\ No newline at end of file + - link_template_VMInt_OAM_lb_7 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index 603537cc99..e4e375c972 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -131,9 +131,15 @@ topology_template: disk.write.bytes_server_cmaui_4: - server_cmaui_4 - disk.write.bytes + forwarder_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - forwarder disk.device.write.bytes_server_cmaui_4: - server_cmaui_4 - disk.device.write.bytes + forwarder_template_VMInt_OAM_lb_7: + - template_VMInt_OAM_lb_7 + - forwarder feature_server_cmaui_4: - server_cmaui_4 - feature @@ -329,4 +335,4 @@ topology_template: - local_storage link_template_VMInt_OAM_lb_8: - template_VMInt_OAM_lb_8 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 1d966f2d29..95b4b656e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -210,6 +210,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_abc_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - 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. @@ -561,6 +566,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_server_cmaui_1: type: tosca.capabilities.Scalable occurrences: @@ -578,6 +588,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.root.size_server_abc: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1134,6 +1154,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1269,4 +1294,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index c36dce1d2c..696a130ed4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -234,6 +234,9 @@ topology_template: disk.device.usage_server_abc: - server_abc - disk.device.usage + forwarder_abc_port_1: + - abc_port_1 + - forwarder disk.root.size_server_cmaui_1: - server_cmaui_1 - disk.root.size @@ -411,6 +414,9 @@ topology_template: binding_server_cmaui_1: - server_cmaui_1 - binding + forwarder_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - forwarder scalable_server_cmaui_1: - server_cmaui_1 - scalable @@ -420,6 +426,12 @@ topology_template: network.outgoing.bytes.rate_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - network.outgoing.bytes.rate + forwarder_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - forwarder + forwarder_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - forwarder disk.root.size_server_abc: - server_abc - disk.root.size @@ -615,4 +627,4 @@ topology_template: - local_storage local_storage_server_abc: - server_abc - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml index 1d2d9ada48..4d6da778c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -191,6 +191,9 @@ topology_template: binding_server_cmaui: - server_cmaui - binding + forwarder_cmaui_port_1: + - cmaui_port_1 + - forwarder disk.device.read.requests.rate_server_cmaui: - server_cmaui - disk.device.read.requests.rate @@ -272,4 +275,4 @@ topology_template: - dependency link_cmaui_port_1: - cmaui_port_1 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 5be719ef1a..25fd6ea864 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -605,6 +605,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_template_VMInt_OAM_lb_30: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -717,6 +722,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -771,6 +781,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -846,6 +861,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui: type: tosca.capabilities.network.Bindable occurrences: @@ -905,6 +925,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1017,6 +1042,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1128,6 +1158,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_30: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1476,6 +1511,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1571,6 +1611,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2126,6 +2171,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_test_nested4Level_test_nested3Level: type: tosca.capabilities.Node occurrences: @@ -2455,6 +2505,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2580,6 +2635,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui_2: type: tosca.capabilities.network.Bindable occurrences: @@ -2632,6 +2692,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2726,6 +2796,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_template_VMInt_OAM_lb_3: type: tosca.capabilities.Node occurrences: @@ -3653,6 +3728,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3682,6 +3762,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_7_test_nested4Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui_3: type: tosca.capabilities.network.Bindable occurrences: @@ -3704,6 +3789,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3795,6 +3885,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested4Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4062,12 +4157,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_cmaui_4: 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_template_VMInt_OAM_lb_7: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_server_cmaui_4: type: tosca.capabilities.Node occurrences: @@ -4417,4 +4522,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index 26236a13b4..0d5355310e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -328,6 +328,9 @@ topology_template: network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_4 network.outpoing.packets_template_VMInt_OAM_lb_30: - template_VMInt_OAM_lb_30 - network.outpoing.packets @@ -385,6 +388,9 @@ topology_template: network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level + forwarder_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - forwarder disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level @@ -412,6 +418,9 @@ topology_template: disk.usage_server_cmaui: - server_cmaui - disk.usage + forwarder_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - forwarder disk.device.usage_server_cmaui: - server_cmaui - disk.device.usage @@ -451,6 +460,9 @@ topology_template: os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - os_server_cmaui_4_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level binding_server_cmaui: - server_cmaui - binding @@ -481,6 +493,9 @@ topology_template: disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes_server_cmaui_3_test_nested3Level + forwarder_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_3 disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_cmaui_3_test_nested3Level @@ -538,6 +553,9 @@ topology_template: disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_cmaui_3_test_nested3Level + forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_6_test_nested3Level disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.allocation_server_cmaui_3_test_nested3Level @@ -595,6 +613,9 @@ topology_template: disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_30: + - template_VMInt_OAM_lb_30 + - forwarder disk.write.bytes.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_cmaui_2 @@ -772,6 +793,9 @@ topology_template: disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_5_test_nested3Level disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.read.bytes_server_cmaui_3_test_nested3Level @@ -820,6 +844,9 @@ topology_template: network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level + forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level @@ -1018,4 +1045,4 @@ topology_template: - dependency_template_VMInt_OAM_lb_6_test_nested3Level dependency_test_nested3Level_test_nested2Level: - test_nested2Level - - dependency_test_nested3Level
\ No newline at end of file + - dependency_test_nested3Level diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index 255b99a357..0d62e47b44 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -221,6 +221,9 @@ topology_template: network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level + forwarder_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_7_test_nested4Level feature_test_nested4Level_test_nested3Level: - test_nested3Level - feature_test_nested4Level @@ -386,6 +389,9 @@ topology_template: disk.device.write.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_cmaui_3 + forwarder_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_8_test_nested4Level disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_cmaui_3 @@ -449,6 +455,9 @@ topology_template: disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.device.allocation_server_cmaui_4_test_nested4Level + forwarder_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_6 binding_server_cmaui_2: - server_cmaui_2 - binding @@ -476,6 +485,12 @@ topology_template: network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_template_VMInt_OAM_lb_5 + forwarder_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - forwarder + forwarder_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - forwarder disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.read.bytes.rate_server_cmaui_3 @@ -524,6 +539,9 @@ topology_template: binding_template_VMInt_OAM_lb_6_test_nested3Level: - test_nested3Level - binding_template_VMInt_OAM_lb_6 + forwarder_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_5 feature_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - feature @@ -764,4 +782,4 @@ topology_template: - dependency link_template_VMInt_OAM_lb_6_test_nested3Level: - test_nested3Level - - link_template_VMInt_OAM_lb_6
\ No newline at end of file + - link_template_VMInt_OAM_lb_6 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 3280a0e588..b13991b33b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -358,6 +358,9 @@ topology_template: disk.device.write.bytes_server_cmaui_3: - server_cmaui_3 - disk.device.write.bytes + forwarder_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - forwarder disk.iops_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.iops_server_cmaui_4 @@ -373,6 +376,9 @@ topology_template: disk.allocation_server_cmaui_3: - server_cmaui_3 - disk.allocation + forwarder_template_VMInt_OAM_lb_7_test_nested4Level: + - test_nested4Level + - forwarder_template_VMInt_OAM_lb_7 binding_server_cmaui_3: - server_cmaui_3 - binding @@ -385,6 +391,9 @@ topology_template: scalable_server_cmaui_3: - server_cmaui_3 - scalable + forwarder_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - forwarder network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level: - test_nested4Level - network.outgoing.packets.rate_template_VMInt_OAM_lb_8 @@ -433,6 +442,9 @@ topology_template: disk.device.latency_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.device.latency_server_cmaui_4 + forwarder_template_VMInt_OAM_lb_8_test_nested4Level: + - test_nested4Level + - forwarder_template_VMInt_OAM_lb_8 disk.device.read.requests.rate_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.device.read.requests.rate_server_cmaui_4 @@ -553,4 +565,4 @@ topology_template: - dependency link_template_VMInt_OAM_lb_7_test_nested4Level: - test_nested4Level - - link_template_VMInt_OAM_lb_7
\ No newline at end of file + - link_template_VMInt_OAM_lb_7 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index 4189c1eda5..4ccc594953 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -131,9 +131,15 @@ topology_template: disk.write.bytes_server_cmaui_4: - server_cmaui_4 - disk.write.bytes + forwarder_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - forwarder disk.device.write.bytes_server_cmaui_4: - server_cmaui_4 - disk.device.write.bytes + forwarder_template_VMInt_OAM_lb_7: + - template_VMInt_OAM_lb_7 + - forwarder feature_server_cmaui_4: - server_cmaui_4 - feature @@ -329,4 +335,4 @@ topology_template: - local_storage link_template_VMInt_OAM_lb_8: - template_VMInt_OAM_lb_8 - - link
\ No newline at end of file + - link |