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 --- ...d_On_Module_QRouterTemplateServiceTemplate.yaml | 8 ++- ..._On_Module_vLBAgentTemplateServiceTemplate.yaml | 11 ++++- ...FEAdd_On_Module_vLBTemplateServiceTemplate.yaml | 11 ++++- ...dd_On_Module_vProbeTemplateServiceTemplate.yaml | 11 ++++- .../GlobalSubstitutionTypesServiceTemplate.yaml | 57 +++++++++++++++++++++- 5 files changed, 93 insertions(+), 5 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml index 9ca9550e5a..82b8920144 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml @@ -460,6 +460,9 @@ topology_template: memory_QRouter1: - QRouter1 - memory + forwarder_oam_private_net_network_port: + - oam_private_net_network_port + - forwarder disk.usage_QRouter1: - QRouter1 - disk.usage @@ -475,6 +478,9 @@ topology_template: network.incoming.bytes_cdr_network_port_1: - cdr_network_port_1 - network.incoming.bytes + forwarder_cdr_network_port_1: + - cdr_network_port_1 + - forwarder disk.write.bytes_QRouter1: - QRouter1 - disk.write.bytes @@ -562,4 +568,4 @@ topology_template: - dependency dependency_cdr_network_port_1: - cdr_network_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/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml index 5d0b6433cd..13f06302f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml @@ -474,6 +474,9 @@ topology_template: network.outpoing.packets_oam_private_net_network_port_3: - oam_private_net_network_port_3 - network.outpoing.packets + forwarder_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - forwarder binding_packet_internal_network_port: - packet_internal_network_port - binding @@ -489,6 +492,9 @@ topology_template: binding_oam_private_net_network_port_3: - oam_private_net_network_port_3 - binding + forwarder_packet_internal_network_port: + - packet_internal_network_port + - forwarder endpoint_vLBAgentInstance: - vLBAgentInstance - endpoint @@ -609,6 +615,9 @@ topology_template: network.outgoing.bytes_oam_private_net_network_port_3: - oam_private_net_network_port_3 - network.outgoing.bytes + forwarder_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - forwarder cpu.delta_vLBAgentInstance: - vLBAgentInstance - cpu.delta @@ -687,4 +696,4 @@ topology_template: - link local_storage_vLBAgentInstance: - vLBAgentInstance - - 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/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml index e3896b2be6..af4eef130d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml @@ -496,6 +496,9 @@ topology_template: network.incoming.bytes.rate_packet_internal_network_port_2: - packet_internal_network_port_2 - network.incoming.bytes.rate + forwarder_packet_mirror_network_port: + - packet_mirror_network_port + - forwarder cpu.delta_vLBInstance: - vLBInstance - cpu.delta @@ -589,6 +592,12 @@ topology_template: disk.device.write.requests.rate_vLBInstance: - vLBInstance - disk.device.write.requests.rate + forwarder_packet_internal_network_port_2: + - packet_internal_network_port_2 + - forwarder + forwarder_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - forwarder disk.read.bytes_vLBInstance: - vLBInstance - disk.read.bytes @@ -664,4 +673,4 @@ topology_template: - link link_packet_internal_network_port_2: - packet_internal_network_port_2 - - 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/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml index 5edca0a8d6..2aaf8e5688 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml @@ -625,6 +625,12 @@ topology_template: network.incoming.bytes_oam_private_net_network_port_1: - oam_private_net_network_port_1 - network.incoming.bytes + forwarder_packet_internal_network_port_1: + - packet_internal_network_port_1 + - forwarder + forwarder_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - forwarder disk.device.read.requests.rate_ProbeInstance: - ProbeInstance - disk.device.read.requests.rate @@ -643,6 +649,9 @@ topology_template: disk.usage_ProbeInstance: - ProbeInstance - disk.usage + forwarder_cdr_network_port: + - cdr_network_port + - forwarder binding_cdr_network_port: - cdr_network_port - binding @@ -691,4 +700,4 @@ topology_template: - link dependency_vprobe_volume_2: - vprobe_volume_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/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml index 01329a4aab..4d8b9ab2f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -446,6 +446,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_private_net_network_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.usage_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -477,6 +482,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdr_network_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -932,6 +942,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_packet_mirror_network_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_packet_internal_network_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -963,6 +978,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_packet_internal_network_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_vLBAgentInstance: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -1195,6 +1215,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_private_net_network_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1705,6 +1730,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_packet_mirror_network_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1884,6 +1914,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_packet_internal_network_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_oam_private_net_network_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2592,6 +2632,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_packet_internal_network_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_oam_private_net_network_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2628,6 +2678,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdr_network_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_cdr_network_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2658,4 +2713,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 -- cgit 1.2.3-korg