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 /conf | |
| 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 'conf')
| -rw-r--r-- | conf/integration/01b_dpdk_regression_tests.conf | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/conf/integration/01b_dpdk_regression_tests.conf b/conf/integration/01b_dpdk_regression_tests.conf index abc56c28..a637e3e2 100644 --- a/conf/integration/01b_dpdk_regression_tests.conf +++ b/conf/integration/01b_dpdk_regression_tests.conf @@ -21,6 +21,10 @@ # Generic configuration used by OVSDPDK testcases # ############################################################ + +# required to import path to the log file +from conf import settings + _OVSDPDK_1st_PMD_CORE = 4 _OVSDPDK_2nd_PMD_CORE = 5 # calculate PMD mask from core IDs configured above @@ -32,8 +36,11 @@ _OVSDPDK_GUEST_5_CORES = [('7', '8', '9', '10', '11')] # number of queues configured in OVS and GUEST _OVSDPDK_MQ = '2' -# Path to the log file -_OVSDPDK_VSWITCH_LOG = os.path.join(LOG_DIR, LOG_FILE_VSWITCHD) +# path to the log file +_RESULTS_PATH = settings.getValue('RESULTS_PATH') +name, ext = os.path.splitext(settings.getValue('LOG_FILE_VSWITCHD')) +log_file = "{name}_{uid}{ex}".format(name=name,uid=settings.getValue('LOG_TIMESTAMP'),ex=ext) +_OVSDPDK_VSWITCH_LOG = os.path.join(_RESULTS_PATH, log_file) _OVSDPDK_HEADER_LEN = 18 # length of frame headers in bytes, it's used for calculation # of payload size, i.e. payload = frame_size - header_len |