aboutsummaryrefslogtreecommitdiffstats
path: root/vswitches
diff options
context:
space:
mode:
Diffstat (limited to 'vswitches')
-rw-r--r--vswitches/ovs.py6
-rw-r--r--vswitches/ovs_dpdk_vhost.py1
-rw-r--r--vswitches/ovs_vanilla.py1
3 files changed, 3 insertions, 5 deletions
diff --git a/vswitches/ovs.py b/vswitches/ovs.py
index 115ab19b..243619b6 100644
--- a/vswitches/ovs.py
+++ b/vswitches/ovs.py
@@ -38,15 +38,15 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
see the interface.
"""
_logfile = os.path.join(settings.getValue('LOG_DIR'), settings.getValue('LOG_FILE_VSWITCHD'))
- _ovsdb_pidfile_path = os.path.join(settings.getValue('LOG_DIR'), "ovsdb_pidfile.pid")
- _vswitchd_pidfile_path = os.path.join(settings.getValue('LOG_DIR'), "vswitchd_pidfile.pid")
+ _ovsdb_pidfile_path = os.path.join(_OVS_VAR_DIR, "ovsdb-server.pid")
+ _vswitchd_pidfile_path = os.path.join(_OVS_VAR_DIR, "ovs-vswitchd.pid")
_proc_name = 'ovs-vswitchd'
def __init__(self):
"""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):