diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2015-10-19 17:38:52 +0100 |
|---|---|---|
| committer | Martin Klozik <martinx.klozik@intel.com> | 2015-11-03 10:27:09 +0000 |
| commit | 305ca81ee9058cb3daa96706ba9cb9c071e3e41c (patch) | |
| tree | ec483af257af36af83d23fd9d0f496f4d20b9ff2 /src | |
| parent | d9289a06e5cf868407eab996641f89f26a23f967 (diff) | |
bugfix of Vanilla OVS testing scenarios
Automatic selection of OVS and DPDK directories must be performed
before initialization of modules is called. Otherwise modules will
use wrong values with unpredictable results.
Default directory values have been changed to point to sources build
by make.
Clean&sweep of directory usage was performed.
Configuration file for pylint has been renamed to follow pylint
naming convention.
Change-Id: I42c89f8890c021f0062b478a856ae0113f1245fb
JIRA: VSPERF-121
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Billy O Mahony <billy.o.mahony@intel.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Reviewed-by: Gene Snider <eugene.snider@huawei.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Tv Rao <tv.rao@freescale.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ovs/daemon.py | 4 | ||||
| -rw-r--r-- | src/ovs/ofctl.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ovs/daemon.py b/src/ovs/daemon.py index 0d518ea9..09735600 100644 --- a/src/ovs/daemon.py +++ b/src/ovs/daemon.py @@ -31,8 +31,8 @@ _OVSDB_TOOL_BIN = os.path.join( _OVSDB_SERVER_BIN = os.path.join( settings.getValue('OVS_DIR'), 'ovsdb', 'ovsdb-server') -_OVS_VAR_DIR = '/usr/local/var/run/openvswitch/' -_OVS_ETC_DIR = '/usr/local/etc/openvswitch/' +_OVS_VAR_DIR = settings.getValue('OVS_VAR_DIR') +_OVS_ETC_DIR = settings.getValue('OVS_ETC_DIR') _LOG_FILE_VSWITCHD = os.path.join( settings.getValue('LOG_DIR'), settings.getValue('LOG_FILE_VSWITCHD')) diff --git a/src/ovs/ofctl.py b/src/ovs/ofctl.py index 2aae1ec8..c052f85c 100644 --- a/src/ovs/ofctl.py +++ b/src/ovs/ofctl.py @@ -32,8 +32,6 @@ _OVS_VSCTL_BIN = os.path.join(settings.getValue('OVS_DIR'), 'utilities', _OVS_OFCTL_BIN = os.path.join(settings.getValue('OVS_DIR'), 'utilities', 'ovs-ofctl') -_OVS_VAR_DIR = '/usr/local/var/run/openvswitch/' - _OVS_BRIDGE_NAME = settings.getValue('VSWITCH_BRIDGE_NAME') class OFBase(object): |