summaryrefslogtreecommitdiffstats
path: root/vswitches
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2016-07-14 11:44:54 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-14 11:44:54 +0000
commitf35edfc71ee92d67e6cb587b116b64c3a005ac71 (patch)
tree891b67fcada8e75a125d33394facb7d1b4d83dd1 /vswitches
parent8494dca647761592d7dd822849e56546f107dcb1 (diff)
parent9a17a244fde2a209f9a05310d628302447edd60f (diff)
Merge "dpdk: Support of DPDK16.07"
Diffstat (limited to 'vswitches')
-rw-r--r--vswitches/ovs.py2
-rw-r--r--vswitches/ovs_dpdk_vhost.py1
-rw-r--r--vswitches/ovs_vanilla.py1
3 files changed, 1 insertions, 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):