bugfix: Vanilla OVS kernel module broken dependencies

Vsperf doesn't install OVS kernel module into standard directory,
to keep host OS untouched. Thus kernel module must be inserted
by insmod and module dependencies solved manually. List of kernel
modules was updated to load all dependencies for recent OVS version.

Change-Id: Id147615ca95cfbde26d1dc8d6c9801f7bb3b5d36
JIRA: VSPERF-161
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>

diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index 8085f3c..ff07f97 100644 (file)
--- a/conf/02_vswitch.conf
+++ b/conf/02_vswitch.conf
@@ -71,7 +71,7 @@ VSWITCHD_VANILLA_ARGS = ['--pidfile']
 VSWITCH_VANILLA_PHY_PORT_NAMES = ['', '']
 
 # use full module path to load module matching OVS version built from the source
-VSWITCH_VANILLA_KERNEL_MODULES = [os.path.join(OVS_DIR_VANILLA, 'datapath/linux/openvswitch.ko')]
+VSWITCH_VANILLA_KERNEL_MODULES = ['libcrc32c', 'ip_tunnel', 'vxlan', 'gre', 'nf_conntrack', 'nf_defrag_ipv4', 'nf_defrag_ipv6', os.path.join(OVS_DIR_VANILLA, 'datapath/linux/openvswitch.ko')]
 
 # Bridge name to be used by VSWTICH
 VSWITCH_BRIDGE_NAME = 'br0'