From 537fc036819e25826b82e2a01ff211cb04aa3d6f Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Mon, 21 Jan 2019 12:29:46 +0530 Subject: VSPERF: Add Timestamps to Logfiles This patch adds timestamps to all the logfiles created by VSPERF. The logfiles covered are: 1. LOG_FILE_VSWITCHD 2. LOG_FILE_OVS 3. LOG_FILE_VPP 4. LOG_FILE_QEMU 5. LOG_FILE_GUEST_CMDS 6. LOG_FILE_TRAFFIC_GEN 7. LOG_FILE_HOST_CMDS Added fix for pylint errors This patch also ensures the extension is only .log always. JIRA: VSPERF-586 Change-Id: I319c075e7d3af06539266f4c759a41f877d4cff2 Signed-off-by: Sridhar K. N. Rao --- vswitches/ovs.py | 7 ++++++- vswitches/vpp_dpdk_vhost.py | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'vswitches') diff --git a/vswitches/ovs.py b/vswitches/ovs.py index 6dbf0cf8..03c8dadd 100644 --- a/vswitches/ovs.py +++ b/vswitches/ovs.py @@ -47,8 +47,13 @@ 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'), + ex=ext) self._logfile = os.path.join(settings.getValue('LOG_DIR'), - settings.getValue('LOG_FILE_VSWITCHD')) + 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'], diff --git a/vswitches/vpp_dpdk_vhost.py b/vswitches/vpp_dpdk_vhost.py index 5d676a01..f639d3d6 100644 --- a/vswitches/vpp_dpdk_vhost.py +++ b/vswitches/vpp_dpdk_vhost.py @@ -37,8 +37,12 @@ class VppDpdkVhost(IVSwitch, tasks.Process): """See IVswitch for general description """ super().__init__() - self._logfile = os.path.join(S.getValue('LOG_DIR'), - S.getValue('LOG_FILE_VPP')) + name, ext = os.path.splitext(S.getValue('LOG_FILE_VPP')) + rename_vpplf = "{name}_{uid}{ex}".format(name=name, + uid=S.getValue( + 'LOG_TIMESTAMP'), + ex=ext) + self._logfile = os.path.join(S.getValue('LOG_DIR'), rename_vpplf) self._expect = r'vpp#' self._cmd_template = ['sudo', '-E', S.getValue('TOOLS')['vpp']] self._phy_ports = [] -- cgit 1.2.3-korg