From 305ca81ee9058cb3daa96706ba9cb9c071e3e41c Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Mon, 19 Oct 2015 17:38:52 +0100 Subject: 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 Reviewed-by: Maryam Tahhan Reviewed-by: Billy O Mahony Reviewed-by: Brian Castelli Reviewed-by: Gene Snider Reviewed-by: Al Morton Reviewed-by: Tv Rao --- src/ovs/daemon.py | 4 ++-- src/ovs/ofctl.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') 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): -- cgit 1.2.3-korg