diff options
| author |   Sridhar Rao <sridhar.rao@spirent.com> | 2019-02-16 04:22:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-02-16 04:22:45 +0000 |
| commit | 85cdafd157ce9e5a5fd7e4233608b06058de175a (patch) | |
| tree | 606ea4acc1231c5ce32de52c317e6f6387f62dfc /vswitches | |
| parent | 0adf32a7273da5867c3000f4b24c8de6331055be (diff) | |
| parent | 537fc036819e25826b82e2a01ff211cb04aa3d6f (diff) | |
Merge "VSPERF: Add Timestamps to Logfiles"
Diffstat (limited to 'vswitches')
| -rw-r--r-- | vswitches/ovs.py | 7 | ||||
| -rw-r--r-- | vswitches/vpp_dpdk_vhost.py | 8 |
2 files changed, 12 insertions, 3 deletions
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 = [] |