diff options
| author |   Martin Klozik <martin.klozik@tieto.com> | 2018-05-04 01:11:46 -0700 |
|---|---|---|
| committer | Martin Klozik <martin.klozik@tieto.com> | 2018-05-04 02:25:21 -0700 |
| commit | 66b47a12b7e41f2899b130666b1c48fa60ccd406 (patch) | |
| tree | a653a18ce04a2e393c30c5955949c03b37002796 /conf | |
| parent | 446e4c14c7f91b797a338db94b9bcb32b1c7d229 (diff) | |
integration: Tunneling protocols support update
Support of tunneling protocols by IxNet was limited to OP2P and PTUNP
deployment scenarios. This patch adds generic support for generation
of VXLAN, GRE and GENEVE frames by IxNet into integration testcases.
As part of this patch, the processing of tunnel type settings was
modified to follow VSPERF priority order during configuration parameter
evaluation.
JIRA: VSPERF-573
Change-Id: I7bf7d4a5545a6b130cc3ac252efaabe4b97bdb29
Signed-off-by: Martin Klozik <martin.klozik@tieto.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Cian Ferriter <cian.ferriter@intel.com>
Reviewed-by: Richard Elias <richard.elias@tieto.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/02_vswitch.conf | 6 | ||||
| -rw-r--r-- | conf/integration/01_testcases.conf | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf index 4d0fc46b..c9ffa0b7 100644 --- a/conf/02_vswitch.conf +++ b/conf/02_vswitch.conf @@ -1,4 +1,4 @@ -# Copyright 2015-2016 Intel Corporation. +# Copyright 2015-2018 Intel Corporation, Tieto and others. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -174,6 +174,10 @@ VSWITCHD_VANILLA_ARGS = [] # Bridge name to be used by VSWTICH VSWITCH_BRIDGE_NAME = 'br0' +# A tunnel type used by OP2P and PTUNP deployments +# Supported values: 'vxlan', 'gre' or 'geneve' +TUNNEL_TYPE = 'vxlan' + # directory where hugepages will be mounted on system init HUGEPAGE_DIR = '/dev/hugepages' diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf index 8c013d2a..142ec812 100644 --- a/conf/integration/01_testcases.conf +++ b/conf/integration/01_testcases.conf @@ -1,4 +1,4 @@ -# Copyright 2015-2017 Intel Corporation. +# Copyright 2015-2018 Intel Corporation, Tieto and others. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,10 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# The 1st value of SUPPORTED_TUNNELING_PROTO is used as the default -# tunneling protocol for OP2P tests. -SUPPORTED_TUNNELING_PROTO = ['vxlan', 'gre', 'geneve'] - # # Generic test configuration options are described at conf/01_testcases.conf # @@ -327,7 +323,6 @@ INTEGRATION_TESTS = [ { "Name": "overlay_p2p_tput", "Deployment": "op2p", - "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0], "Tunnel Operation": "encapsulation", "Description": "Overlay Encapsulation Throughput RFC2544 Test", "Parameters": { @@ -341,7 +336,6 @@ INTEGRATION_TESTS = [ { "Name": "overlay_p2p_cont", "Deployment": "op2p", - "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0], "Tunnel Operation": "encapsulation", "Description": "Overlay Encapsulation RFC2544 Continuous Stream", "Parameters": { @@ -355,7 +349,6 @@ INTEGRATION_TESTS = [ { "Name": "overlay_p2p_decap_tput", "Deployment": "op2p", - "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0], "Tunnel Operation": "decapsulation", "Description": "Overlay Decapsulation Throughput RFC2544 Test", "Parameters": { @@ -369,7 +362,6 @@ INTEGRATION_TESTS = [ { "Name": "overlay_p2p_decap_cont", "Deployment": "op2p", - "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0], "Tunnel Operation": "decapsulation", "Description": "Overlay Decapsulation RFC2544 Continuous Stream", "Parameters": { |