summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vnfs/qemu/qemu.py2
-rwxr-xr-xvsperf27
-rw-r--r--vswitches/ovs.py2
-rw-r--r--vswitches/vpp_dpdk_vhost.py2
4 files changed, 18 insertions, 15 deletions
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py
index 2ccf3aa0..684222a7 100644
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@ -53,7 +53,7 @@ class IVnfQemu(IVnf):
ex=ext)
self._expect = S.getValue('GUEST_PROMPT_LOGIN')[self._number]
self._logger = logging.getLogger(__name__)
- self._logfile = os.path.join(S.getValue('LOG_DIR'), rename_qemu)
+ self._logfile = os.path.join(S.getValue('RESULTS_PATH'), rename_qemu)
self._timeout = S.getValue('GUEST_TIMEOUT')[self._number]
self._monitor = '%s/vm%dmonitor' % ('/tmp', self._number)
# read GUEST NICs configuration and use only defined NR of NICS
diff --git a/vsperf b/vsperf
index 1afe858f..003ca88b 100755
--- a/vsperf
+++ b/vsperf
@@ -241,21 +241,21 @@ def configure_logging(level):
'LOG_TIMESTAMP'),
ex=ext)
log_file_default = os.path.join(
- settings.getValue('LOG_DIR'), rename_default)
+ settings.getValue('RESULTS_PATH'), rename_default)
name, ext = os.path.splitext(settings.getValue('LOG_FILE_HOST_CMDS'))
rename_hostcmd = "{name}_{uid}{ex}".format(name=name,
uid=settings.getValue(
'LOG_TIMESTAMP'),
ex=ext)
log_file_host_cmds = os.path.join(
- settings.getValue('LOG_DIR'), rename_hostcmd)
+ settings.getValue('RESULTS_PATH'), rename_hostcmd)
name, ext = os.path.splitext(settings.getValue('LOG_FILE_TRAFFIC_GEN'))
rename_traffic = "{name}_{uid}{ex}".format(name=name,
uid=settings.getValue(
'LOG_TIMESTAMP'),
ex=ext)
log_file_traffic_gen = os.path.join(
- settings.getValue('LOG_DIR'), rename_traffic)
+ settings.getValue('RESULTS_PATH'), rename_traffic)
metrics_file = (settings.getValue('LOG_FILE_INFRA_METRICS_PFX') +
settings.getValue('LOG_TIMESTAMP') + '.log')
log_file_infra_metrics = os.path.join(settings.getValue('LOG_DIR'),
@@ -704,8 +704,20 @@ def main():
# if required, handle list-* operations
handle_list_options(args)
+ # generate results directory name
+ results_dir = "results_" + timestamp
+ results_path = os.path.join(settings.getValue('LOG_DIR'), results_dir)
+ settings.setValue('RESULTS_PATH', results_path)
+
+ # create results directory
+ if not os.path.exists(results_path):
+ os.makedirs(results_path)
+
configure_logging(settings.getValue('VERBOSITY'))
+ # CI build support
+ _LOGGER.info("Creating result directory: %s", results_path)
+
# check and fix locale
check_and_set_locale()
@@ -785,16 +797,7 @@ def main():
# for backward compatibility
settings.setValue('WHITELIST_NICS', list(nic['pci'] for nic in nic_list))
- # generate results directory name
- # date = datetime.datetime.fromtimestamp(time.time())
- results_dir = "results_" + timestamp
- results_path = os.path.join(settings.getValue('LOG_DIR'), results_dir)
- settings.setValue('RESULTS_PATH', results_path)
- # create results directory
- if not os.path.exists(results_path):
- _LOGGER.info("Creating result directory: %s", results_path)
- os.makedirs(results_path)
# pylint: disable=too-many-nested-blocks
if settings.getValue('mode') == 'trafficgen':
# execute only traffic generator
diff --git a/vswitches/ovs.py b/vswitches/ovs.py
index 03c8dadd..e713fc38 100644
--- a/vswitches/ovs.py
+++ b/vswitches/ovs.py
@@ -52,7 +52,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process):
uid=settings.getValue(
'LOG_TIMESTAMP'),
ex=ext)
- self._logfile = os.path.join(settings.getValue('LOG_DIR'),
+ 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")
diff --git a/vswitches/vpp_dpdk_vhost.py b/vswitches/vpp_dpdk_vhost.py
index f639d3d6..5dfc314d 100644
--- a/vswitches/vpp_dpdk_vhost.py
+++ b/vswitches/vpp_dpdk_vhost.py
@@ -42,7 +42,7 @@ class VppDpdkVhost(IVSwitch, tasks.Process):
uid=S.getValue(
'LOG_TIMESTAMP'),
ex=ext)
- self._logfile = os.path.join(S.getValue('LOG_DIR'), rename_vpplf)
+ self._logfile = os.path.join(S.getValue('RESULTS_PATH'), rename_vpplf)
self._expect = r'vpp#'
self._cmd_template = ['sudo', '-E', S.getValue('TOOLS')['vpp']]
self._phy_ports = []