From 8312bd4367395fdba877f084d1f72590f10c44c7 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Mon, 7 Sep 2015 00:44:50 +0100 Subject: Sysmetrics implementation update New sysmetrics implementation is based on pidstat command line tool from sysstat package. Old non-functional implementation was removed. Reporting was refactored to generate report after each TC from values already available in memory. Following files were affected: modified: conf/01_testcases.conf modified: conf/02_vswitch.conf modified: conf/05_collector.conf deleted: core/collector_controller.py modified: core/component_factory.py modified: docs/NEWS.rst modified: packages.txt modified: requirements.txt modified: testcases/testcase.py modified: tools/collectors/collector/collector.py modified: tools/collectors/sysmetrics/__init__.py deleted: tools/collectors/sysmetrics/linuxmetrics.py new file: tools/collectors/sysmetrics/pidstat.py modified: tools/report/report.jinja modified: tools/report/report.py modified: tools/systeminfo.py modified: vsperf JIRA: VSPERF-67 Change-Id: I25a79f2afef405b9ac46ae85c18044af167a62a4 Signed-off-by: Martin Klozik (martinx.klozik@intel.com) Reviewed-by: Billy O Mahony Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Gurpreet Singh Reviewed-by: Tv Rao --- vsperf | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'vsperf') diff --git a/vsperf b/vsperf index 7c9f0187..310e1a40 100755 --- a/vsperf +++ b/vsperf @@ -32,12 +32,8 @@ sys.dont_write_bytecode = True from conf import settings from core.loader import Loader from testcases import TestCase -from tools.report import report from tools import tasks -from tools.collectors import collector from tools.pkt_gen import trafficgen -from vswitches import vswitch -from vnfs import vnf VERBOSITY_LEVELS = { 'debug': logging.DEBUG, @@ -173,9 +169,6 @@ def configure_logging(level): log_file_traffic_gen = os.path.join( settings.getValue('LOG_DIR'), settings.getValue('LOG_FILE_TRAFFIC_GEN')) - log_file_sys_metrics = os.path.join( - settings.getValue('LOG_DIR'), - settings.getValue('LOG_FILE_SYS_METRICS')) logger = logging.getLogger() logger.setLevel(logging.DEBUG) @@ -200,11 +193,6 @@ def configure_logging(level): def filter(self, record): return record.getMessage().startswith(trafficgen.CMD_PREFIX) - class SystemMetricsCommandFilter(logging.Filter): - """Filter out strings beginning with 'gencmd :'""" - def filter(self, record): - return record.getMessage().startswith(collector.CMD_PREFIX) - cmd_logger = logging.FileHandler(filename=log_file_host_cmds) cmd_logger.setLevel(logging.DEBUG) cmd_logger.addFilter(CommandFilter()) @@ -215,11 +203,6 @@ def configure_logging(level): gen_logger.addFilter(TrafficGenCommandFilter()) logger.addHandler(gen_logger) - metrics_logger = logging.FileHandler(filename=log_file_sys_metrics) - metrics_logger.setLevel(logging.DEBUG) - metrics_logger.addFilter(SystemMetricsCommandFilter()) - logger.addHandler(metrics_logger) - def apply_filter(tests, tc_filter): """Allow a subset of tests to be conveniently selected @@ -432,13 +415,6 @@ def main(): files_list = os.listdir(results_path) if files_list == []: shutil.rmtree(results_path) - else: - for file in files_list: - # generate report from all csv files - if file[-3:] == 'csv': - results_csv = os.path.join(results_path, file) - if os.path.isfile(results_csv) and os.access(results_csv, os.R_OK): - report.generate(testcases, results_csv) if __name__ == "__main__": main() -- cgit