summaryrefslogtreecommitdiffstats
path: root/src/ovs
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2016-04-12 12:56:27 +0100
committerMartin Klozik <martinx.klozik@intel.com>2016-04-27 12:32:10 +0100
commit3a535d0252be0a6fc014e654b61e06620cc615a0 (patch)
tree05afc6f2af8ff316adea7e545a1a57d4e0a3132c /src/ovs
parenteca9105cac5d465dfacf162200e09599c8b98c4b (diff)
integration: Support of PVP and PVVP integration TCs
Integration TC support has been enhanced to support PVP and PVVP scenarios. Definition of integration testcases have been modified to use a sort of macros for repetitive parts. Additional improvements were introduced: * instances of testcases are created only for testcases selected for execution * new TC definition options allow to define test specific vswitch, VNF, traffic generator and test options * tests filter applied on pattern specified by --tests allows to define negative filter only; In that case list of all tests is used as base for negative filter. * traffic values defined within teststep passed to send_traffic is merged with default values; This is essential for execution of TCs with linux_bridge or SRIOV support. It also simplifies integration TC definition * typos removed Change-Id: Icb734a7afd7e5154f27a8ff25615a39e01f58c27 JIRA: VSPERF-213 JIRA: VSPERF-216 Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Diffstat (limited to 'src/ovs')
-rw-r--r--src/ovs/daemon.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ovs/daemon.py b/src/ovs/daemon.py
index 09735600..089bc7a4 100644
--- a/src/ovs/daemon.py
+++ b/src/ovs/daemon.py
@@ -24,13 +24,6 @@ import pexpect
from conf import settings
from tools import tasks
-_OVS_VSWITCHD_BIN = os.path.join(
- settings.getValue('OVS_DIR'), 'vswitchd', 'ovs-vswitchd')
-_OVSDB_TOOL_BIN = os.path.join(
- settings.getValue('OVS_DIR'), 'ovsdb', 'ovsdb-tool')
-_OVSDB_SERVER_BIN = os.path.join(
- settings.getValue('OVS_DIR'), 'ovsdb', 'ovsdb-server')
-
_OVS_VAR_DIR = settings.getValue('OVS_VAR_DIR')
_OVS_ETC_DIR = settings.getValue('OVS_ETC_DIR')
@@ -60,7 +53,9 @@ class VSwitchd(tasks.Process):
self._timeout = timeout
self._expect = expected_cmd
vswitchd_args = vswitchd_args or []
- self._cmd = ['sudo', '-E', _OVS_VSWITCHD_BIN] + vswitchd_args
+ ovs_vswitchd_bin = os.path.join(
+ settings.getValue('OVS_DIR'), 'vswitchd', 'ovs-vswitchd')
+ self._cmd = ['sudo', '-E', ovs_vswitchd_bin] + vswitchd_args
# startup/shutdown
@@ -118,15 +113,20 @@ class VSwitchd(tasks.Process):
:returns: None
"""
- tasks.run_task(['sudo', _OVSDB_TOOL_BIN, 'create',
+ ovsdb_tool_bin = os.path.join(
+ settings.getValue('OVS_DIR'), 'ovsdb', 'ovsdb-tool')
+ tasks.run_task(['sudo', ovsdb_tool_bin, 'create',
os.path.join(_OVS_ETC_DIR, 'conf.db'),
os.path.join(settings.getValue('OVS_DIR'), 'vswitchd',
'vswitch.ovsschema')],
self._logger,
'Creating ovsdb configuration database...')
+ ovsdb_server_bin = os.path.join(
+ settings.getValue('OVS_DIR'), 'ovsdb', 'ovsdb-server')
+
tasks.run_background_task(
- ['sudo', _OVSDB_SERVER_BIN,
+ ['sudo', ovsdb_server_bin,
'--remote=punix:%s' % os.path.join(_OVS_VAR_DIR, 'db.sock'),
'--remote=db:Open_vSwitch,Open_vSwitch,manager_options',
'--pidfile=' + self._ovsdb_pidfile_path, '--overwrite-pidfile'],