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 | 80 ++++++++++++++++++++++ .../out/Nested_oam_serverServiceTemplate.yaml | 3 + .../out/Nested_pd_serverServiceTemplate.yaml | 3 + .../out/Nested_ps_serverServiceTemplate.yaml | 3 + .../out/Nested_sm_serverServiceTemplate.yaml | 3 + .../out/nested1ServiceTemplate.yaml | 18 +++++ .../out/nested2ServiceTemplate.yaml | 12 ++++ .../out/nested3ServiceTemplate.yaml | 6 ++ 8 files changed, 128 insertions(+) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index e8301c06c2..a0142101d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -408,6 +408,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -796,6 +801,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_8: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_7: + 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. @@ -1344,6 +1359,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_oam_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_oam_server_oam_server_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1764,6 +1784,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_sm_server_port_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_server_sm_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. @@ -1996,6 +2021,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_8_test_resourceGroup_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_server_cmaui_test_resourceGroup_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. @@ -2180,6 +2210,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2235,6 +2270,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_port_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_server_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2640,6 +2680,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_7_test_resourceGroup_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_pd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2952,6 +2997,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_server_oam_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. @@ -3607,6 +3657,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu_util_server_sm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3631,6 +3686,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_sm_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_oam_server_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3720,6 +3780,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_8_test_resourceGroup: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_server_oam: type: tosca.capabilities.Scalable occurrences: @@ -4024,6 +4089,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_7_test_resourceGroup: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests_server_cmaui_test_resourceGroup: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4571,6 +4641,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_sm_server_sm_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_sm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5016,6 +5091,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_ps_server_ps_server_port: type: tosca.capabilities.Node occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml index d90e25d8e8..9080572950 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml @@ -262,6 +262,9 @@ topology_template: endpoint_oam_server: - oam_server - endpoint + forwarder_oam_server_oam_server_port: + - oam_server_oam_server_port + - forwarder network.outgoing.bytes.rate_oam_server_oam_server_port: - oam_server_oam_server_port - network.outgoing.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml index 992d43315e..c07fb4f39c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -283,6 +283,9 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests + forwarder_pd_server_pd_server_port: + - pd_server_pd_server_port + - forwarder disk.device.latency_pd_server: - pd_server - disk.device.latency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml index 47aed72dbf..03780b84ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml @@ -154,6 +154,9 @@ topology_template: disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate + forwarder_ps_server_ps_server_port: + - ps_server_ps_server_port + - forwarder feature_ps_server_ps_server_port: - ps_server_ps_server_port - feature diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml index bffd6472b8..4a43a24d9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml @@ -145,6 +145,9 @@ topology_template: binding_sm_server_sm_server_port: - sm_server_sm_server_port - binding + forwarder_sm_server_sm_server_port: + - sm_server_sm_server_port + - forwarder disk.iops_sm_server: - sm_server - disk.iops diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml index 18ad097c1a..824b645089 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml @@ -256,6 +256,9 @@ topology_template: os_server_cmaui_test_resourceGroup_test_nested2Level: - test_nested2Level - os_server_cmaui_test_resourceGroup + forwarder_sm_server_port_test_nested2Level: + - test_nested2Level + - forwarder_sm_server_port disk.read.requests_server_sm_test_nested2Level: - test_nested2Level - disk.read.requests_server_sm @@ -373,6 +376,9 @@ topology_template: feature_test_nested2Level: - test_nested2Level - feature + forwarder_cmaui_port_8_test_resourceGroup_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_8_test_resourceGroup disk.read.bytes_server_cmaui_test_resourceGroup_test_nested2Level: - test_nested2Level - disk.read.bytes_server_cmaui_test_resourceGroup @@ -466,6 +472,9 @@ topology_template: network.incoming.bytes_ps_server_port: - abstract_ps_server - network.incoming.bytes_ps_server_ps_server_port + forwarder_ps_server_port: + - abstract_ps_server + - forwarder_ps_server_ps_server_port disk.device.capacity_server_pd: - abstract_pd_server - disk.device.capacity_pd_server @@ -493,6 +502,9 @@ topology_template: network.incoming.packets.rate_sm_server_port_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_sm_server_port + forwarder_oam_server_port_test_nested2Level: + - test_nested2Level + - forwarder_oam_server_port disk.capacity_server_ps: - abstract_ps_server - disk.capacity_ps_server @@ -700,6 +712,9 @@ topology_template: disk.device.read.requests_server_cmaui_test_resourceGroup_test_nested2Level: - test_nested2Level - disk.device.read.requests_server_cmaui_test_resourceGroup + forwarder_cmaui_port_7_test_resourceGroup_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_7_test_resourceGroup disk.device.write.requests_server_pd: - abstract_pd_server - disk.device.write.requests_pd_server @@ -859,6 +874,9 @@ topology_template: cpu_util_server_ps: - abstract_ps_server - cpu_util_ps_server + forwarder_pd_server_port: + - abstract_pd_server + - forwarder_pd_server_pd_server_port disk.write.bytes.rate_server_oam_test_nested2Level: - test_nested2Level - disk.write.bytes.rate_server_oam diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml index 7983fe32f4..c8e50a5f3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml @@ -303,6 +303,9 @@ topology_template: disk.read.requests_server_oam: - abstract_oam_server - disk.read.requests_oam_server + forwarder_oam_server_port: + - abstract_oam_server + - forwarder_oam_server_oam_server_port cpu_util_server_sm: - abstract_sm_server - cpu_util_sm_server @@ -315,6 +318,9 @@ topology_template: disk.device.read.bytes_server_oam: - abstract_oam_server - disk.device.read.bytes_oam_server + forwarder_sm_server_port: + - abstract_sm_server + - forwarder_sm_server_sm_server_port network.incoming.bytes_oam_server_port: - abstract_oam_server - network.incoming.bytes_oam_server_oam_server_port @@ -360,6 +366,9 @@ topology_template: attachment_oam_server_port: - abstract_oam_server - attachment_oam_server_oam_server_port + forwarder_cmaui_port_8_test_resourceGroup: + - test_resourceGroup + - forwarder_cmaui_port_8 scalable_server_oam: - abstract_oam_server - scalable_oam_server @@ -516,6 +525,9 @@ topology_template: network.incoming.packets.rate_cmaui_port_7_test_resourceGroup: - test_resourceGroup - network.incoming.packets.rate_cmaui_port_7 + forwarder_cmaui_port_7_test_resourceGroup: + - test_resourceGroup + - forwarder_cmaui_port_7 disk.write.requests_server_cmaui_test_resourceGroup: - test_resourceGroup - disk.write.requests_server_cmaui diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml index 0c3a66c407..08d2568d80 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml @@ -320,6 +320,12 @@ topology_template: binding_server_cmaui: - server_cmaui - binding + forwarder_cmaui_port_8: + - cmaui_port_8 + - forwarder + forwarder_cmaui_port_7: + - cmaui_port_7 + - forwarder disk.device.read.requests.rate_server_cmaui: - server_cmaui - disk.device.read.requests.rate -- cgit 1.2.3-korg