From 66b47a12b7e41f2899b130666b1c48fa60ccd406 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Fri, 4 May 2018 01:11:46 -0700 Subject: 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 Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Sridhar Rao Reviewed-by: Cian Ferriter Reviewed-by: Richard Elias --- conf/02_vswitch.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'conf/02_vswitch.conf') 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' -- cgit 1.2.3-korg