From 9a17a244fde2a209f9a05310d628302447edd60f Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Wed, 13 Jul 2016 11:04:35 +0100 Subject: dpdk: Support of DPDK16.07 DPDK 16.07 changed the default log level of DPDK enabled applications. Detection of the end of OVS initialization procedure has been changed to work for various DPDK versions and for both DPDK and Vanilla OVS. JIRA: VSPERF-316 Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Reviewed-by: --- vswitches/ovs.py | 2 +- vswitches/ovs_dpdk_vhost.py | 1 - vswitches/ovs_vanilla.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/vswitches/ovs.py b/vswitches/ovs.py index 115ab19b..659f7cfa 100644 --- a/vswitches/ovs.py +++ b/vswitches/ovs.py @@ -46,7 +46,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process): """See IVswitch for general description """ self._logger = logging.getLogger(__name__) - self._expect = None + self._expect = r'bridge|INFO|ovs-vswitchd' self._timeout = 30 self._bridges = {} self._vswitchd_args = ['--pidfile=' + self._vswitchd_pidfile_path, diff --git a/vswitches/ovs_dpdk_vhost.py b/vswitches/ovs_dpdk_vhost.py index 2d424bc5..0950c426 100644 --- a/vswitches/ovs_dpdk_vhost.py +++ b/vswitches/ovs_dpdk_vhost.py @@ -39,7 +39,6 @@ class OvsDpdkVhost(IVSwitchOvs): def __init__(self): super(OvsDpdkVhost, self).__init__() self._logger = logging.getLogger(__name__) - self._expect = r'EAL: Master l*core \d+ is ready' vswitchd_args = [] diff --git a/vswitches/ovs_vanilla.py b/vswitches/ovs_vanilla.py index 89023a79..f880dfaf 100644 --- a/vswitches/ovs_vanilla.py +++ b/vswitches/ovs_vanilla.py @@ -41,7 +41,6 @@ class OvsVanilla(IVSwitchOvs): self._logger = logging.getLogger(__name__) self._vswitchd_args += ["unix:%s" % self.get_db_sock_path()] self._vswitchd_args += settings.getValue('VSWITCHD_VANILLA_ARGS') - self._expect = "db.sock: connected" self._module_manager = ModuleManager() def start(self): -- cgit 1.2.3-korg