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 --- core/component_factory.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'core/component_factory.py') diff --git a/core/component_factory.py b/core/component_factory.py index f92de204..e8bb4de3 100644 --- a/core/component_factory.py +++ b/core/component_factory.py @@ -20,7 +20,6 @@ from core.vswitch_controller_p2p import VswitchControllerP2P from core.vswitch_controller_pvp import VswitchControllerPVP from core.vnf_controller_p2p import VnfControllerP2P from core.vnf_controller_pvp import VnfControllerPVP -from core.collector_controller import CollectorController from tools.load_gen.stress.stress import Stress from tools.load_gen.stress_ng.stress_ng import StressNg from tools.load_gen.dummy.dummy import DummyLoadGen @@ -86,20 +85,15 @@ def create_vnf(deployment_scenario, vnf_class): elif deployment_scenario.find("pvp") >= 0: return VnfControllerPVP(vnf_class) -def create_collector(collector, collector_class): - """Return a new CollectorController of the given class +def create_collector(collector_class, result_dir, test_name): + """Return a new Collector of the given class - Supported collector type strings: - 'cpu' - 'memory': - - :param collector: Collector type string :param collector_class: The collector class to be used. + :param result_dir: Directory with test results + :param test_name: Test to be run :return: A new CollectorController. """ - collector = collector.lower() - if "cpu" in collector or "memory" in collector: - return CollectorController(collector_class) + return collector_class(result_dir, test_name) def create_loadgen(loadgen_type, loadgen_cfg): """Return a new ILoadGenerator for the loadgen type. -- cgit 1.2.3-korg