From fdfd540284e31d9349173285619f5927aa8fc057 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Thu, 5 May 2016 14:59:32 +0100 Subject: dpdk: Support new way of DPDK configuration in ovs-vswitchd Configuration of DPDK options in ovs-vswitchd has changed. Previously used option --dpdk was deprecated and all DPDK related options have to be configured through ovsdb via ovs-vsctl calls. VSPERF was modified to detect and use correct version of DPDK configuration. New configuration options should be put into VSWITCHD_DPDK_CONFIG dictionary. VSPERF classes specific to OVS were refactored. Change-Id: Ia3fad5906221439f477638f1f9734289dbf737bb JIRA: VSPERF-291 Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Brian Castelli --- vswitches/ovs_vanilla.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'vswitches/ovs_vanilla.py') diff --git a/vswitches/ovs_vanilla.py b/vswitches/ovs_vanilla.py index f5fecc2a..a6b720ae 100644 --- a/vswitches/ovs_vanilla.py +++ b/vswitches/ovs_vanilla.py @@ -18,7 +18,7 @@ import logging from conf import settings from vswitches.ovs import IVSwitchOvs -from src.ovs import VSwitchd, DPCtl +from src.ovs import DPCtl from tools.module_manager import ModuleManager from tools import tasks @@ -39,11 +39,9 @@ class OvsVanilla(IVSwitchOvs): super(OvsVanilla, self).__init__() self._ports = list(nic['device'] for nic in settings.getValue('NICS')) self._logger = logging.getLogger(__name__) - self._vswitchd_args = ["unix:%s" % VSwitchd.get_db_sock_path()] + self._vswitchd_args += ["unix:%s" % self.get_db_sock_path()] self._vswitchd_args += settings.getValue('VSWITCHD_VANILLA_ARGS') - self._vswitchd = VSwitchd(vswitchd_args=self._vswitchd_args, - expected_cmd="db.sock: connected") - self._bridges = {} + self._expect = "db.sock: connected" self._module_manager = ModuleManager() def start(self): -- cgit 1.2.3-korg