From 0bb85c9c85b7aeb74761c6a565e554674a7661c1 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Fri, 16 Oct 2015 06:29:30 +0100 Subject: Implement support of 'insmod' and 'modprobe' commands into ModuleManager Module manager has been enhanced to support both 'insmod' and 'modprobe' commands for kernel module insertion. In case, that .ko suffix is detected then insmod will be used otherwise modprobe will be called. This allows user to specify full path to each module. For example vanilla ovs module can be defined as "OVS_DIR_VANILLA + 'datapath/linux/openvswitch.ko'" to load kernel module matching OVS vanilla source tree version. Change-Id: Ib8d16eca84449ad34d6b307ab836f58d2f0d341b JIRA: VSPERF-116 Signed-off-by: Martin Klozik Reviewed-by: Billy O Mahony Reviewed-by: Maryam Tahhan Reviewed-by: Brian Castelli --- vswitches/ovs_vanilla.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vswitches') diff --git a/vswitches/ovs_vanilla.py b/vswitches/ovs_vanilla.py index 6716401d..36ad6054 100644 --- a/vswitches/ovs_vanilla.py +++ b/vswitches/ovs_vanilla.py @@ -19,7 +19,7 @@ import logging from conf import settings from vswitches.vswitch import IVSwitch from src.ovs import VSwitchd, OFBridge -from tools.module_manager import ModuleManager, KernelModuleInsertMode +from tools.module_manager import ModuleManager from tools import tasks _LOGGER = logging.getLogger(__name__) @@ -47,7 +47,7 @@ class OvsVanilla(IVSwitch): self._vswitchd = VSwitchd(vswitchd_args=vswitchd_args, expected_cmd="db.sock: connected") self._bridges = {} - self._module_manager = ModuleManager(KernelModuleInsertMode.MODPROBE) + self._module_manager = ModuleManager() def start(self): """See IVswitch for general description -- cgit 1.2.3-korg