diff options
| author |   Lukasz Pawlik <lukaszx.pawlik@intel.com> | 2019-09-04 11:17:26 +0100 |
|---|---|---|
| committer |   Emma Finn <emma.finn@intel.com> | 2019-10-29 11:04:24 +0000 |
| commit | 115ea9be50aee7db38d92399bc2d46a60e1d7e2d (patch) | |
| tree | 2647fe6870f32bdbdc4eb5a3e4ee5be5b299befd /vswitches | |
| parent | b984a2f40bec349c802b631a69526590b34bd5de (diff) | |
integration: Fix OVSDPDK tests
Commit c5a075eafc322d9ae62322e90ab4e232df176743 break integration
tests because logs location was changed. This patch fix this by
ensuring that RESULTS_PATH is set before integration tests conf
file is processed and set correct path in integration conf.
Signed-off-by: Lukasz Pawlik <lukaszx.pawlik@intel.com>
Change-Id: I7ca104cfb31c7bc0f6052b58a370a1d65157efe1
Diffstat (limited to 'vswitches')
| -rw-r--r-- | vswitches/ovs.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vswitches/ovs.py b/vswitches/ovs.py index e713fc38..853bef85 100644 --- a/vswitches/ovs.py +++ b/vswitches/ovs.py @@ -47,13 +47,12 @@ class IVSwitchOvs(IVSwitch, tasks.Process): """See IVswitch for general description """ super().__init__() + name, ext = os.path.splitext(settings.getValue('LOG_FILE_VSWITCHD')) rename_vswitchd = "{name}_{uid}{ex}".format(name=name, - uid=settings.getValue( - 'LOG_TIMESTAMP'), + uid=settings.getValue('LOG_TIMESTAMP'), ex=ext) - self._logfile = os.path.join(settings.getValue('RESULTS_PATH'), - rename_vswitchd) + self._logfile = os.path.join(settings.getValue('RESULTS_PATH'), rename_vswitchd) self._ovsdb_pidfile_path = os.path.join(settings.getValue('TOOLS')['ovs_var_tmp'], "ovsdb-server.pid") self._vswitchd_pidfile_path = os.path.join(settings.getValue('TOOLS')['ovs_var_tmp'], |