From 5bc60308b6ec764bd1908138694ea8115b3adb35 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Mon, 16 Oct 2017 14:30:13 -0700 Subject: resource: remove cores args We used to try to probe all the cores that the VNF was using and only dump CPU stats for those cores. We can't really detect those core accurately and we would rather dump all the core information and let influxdb and grafana filter the information. We do end up with excessive KPI output, especially on systems with 88 cores, but this is manageable. The core logic was partially removed, this finishes the removal. Change-Id: I5cbb694fd982519e2df54db49a21ed5948e13537 Signed-off-by: Ross Brattain --- tests/unit/network_services/nfvi/test_resource.py | 2 +- yardstick/network_services/nfvi/resource.py | 4 +--- yardstick/network_services/vnf_generic/vnf/sample_vnf.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/unit/network_services/nfvi/test_resource.py b/tests/unit/network_services/nfvi/test_resource.py index f3244fdbd..2eef784fc 100644 --- a/tests/unit/network_services/nfvi/test_resource.py +++ b/tests/unit/network_services/nfvi/test_resource.py @@ -99,7 +99,7 @@ class TestResourceProfile(unittest.TestCase): port_names = \ self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]['vdu'][0]['external-interface'] self.resource_profile = \ - ResourceProfile(mgmt, port_names, [1, 2, 3]) + ResourceProfile(mgmt, port_names) self.resource_profile.connection = self.ssh_mock def test___init__(self): diff --git a/yardstick/network_services/nfvi/resource.py b/yardstick/network_services/nfvi/resource.py index 5b96aaf29..190e1f7bd 100644 --- a/yardstick/network_services/nfvi/resource.py +++ b/yardstick/network_services/nfvi/resource.py @@ -55,8 +55,7 @@ class ResourceProfile(object): DEFAULT_TIMEOUT = 3600 OVS_SOCKET_PATH = "/usr/local/var/run/openvswitch/db.sock" - def __init__(self, mgmt, port_names=None, cores=None, plugins=None, - interval=None, timeout=None): + def __init__(self, mgmt, port_names=None, plugins=None, interval=None, timeout=None): if plugins is None: self.plugins = {} @@ -91,7 +90,6 @@ class ResourceProfile(object): plugins = collectd_options.get("plugins", {}) interval = collectd_options.get("interval") - # use default cores = None to MatchAllCores return cls(node, plugins=plugins, interval=interval, timeout=timeout) def check_if_sa_running(self, process): diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py index 08ec44f65..f0c276ab3 100644 --- a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py @@ -323,7 +323,6 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper): else: self.socket = 1 - cores = self._validate_cpu_cfg() # implicit ordering, presumably by DPDK port num, so pre-sort by port_num # this won't work because we don't have DPDK port numbers yet ports = sorted(self.vnfd_helper.interfaces, key=self.vnfd_helper.port_num) @@ -331,7 +330,7 @@ class DpdkVnfSetupEnvHelper(SetupEnvHelper): collectd_options = self.get_collectd_options() plugins = collectd_options.get("plugins", {}) # we must set timeout to be the same as the VNF otherwise KPIs will die before VNF - return ResourceProfile(self.vnfd_helper.mgmt_interface, port_names=port_names, cores=cores, + return ResourceProfile(self.vnfd_helper.mgmt_interface, port_names=port_names, plugins=plugins, interval=collectd_options.get("interval"), timeout=self.scenario_helper.timeout) -- cgit 1.2.3-korg