diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-11-07 19:49:47 +0000 |
|---|---|---|
| committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-11-10 15:01:14 +0000 |
| commit | ed130329d8eda6f2143ffd35c2fe2209186e5d64 (patch) | |
| tree | 5987f95af30347f08dc7c92236a1a4a344cc761a /yardstick | |
| parent | 6d170b5075f5750ba34b4647830f4c96bf5379ed (diff) | |
pmu: remove event_download_local workaround script
intel_pmu needs to download a config file based on the
CPU model. When generating VNF images we don't have
access to the actual vCPU that will be used, so we
can't predownload. This code was meant to be a fix
for that by downloading all the configs and then
selecting one that matched the vCPU.
However we have license issues with intel_pmu enven GPLv2 code,
so remove it for now.
Change-Id: I5257ff7c4ddc1d40537dadb29efa40d1d68cb852
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
(cherry picked from commit 7a5c45daa9b146dfc50068165aba5ec6bc2e1e2c)
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/network_services/nfvi/resource.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/yardstick/network_services/nfvi/resource.py b/yardstick/network_services/nfvi/resource.py index 5b96aaf29..c43a41b70 100644 --- a/yardstick/network_services/nfvi/resource.py +++ b/yardstick/network_services/nfvi/resource.py @@ -245,19 +245,6 @@ class ResourceProfile(object): } self._provide_config_file(config_file_path, self.COLLECTD_CONF, kwargs) - def _setup_intel_pmu(self, connection, bin_path): - pmu_event_path = os.path.join(bin_path, "pmu_event.json") - try: - self.plugins["intel_pmu"]["pmu_event_path"] = pmu_event_path - except KeyError: - # if intel_pmu is not a dict, force it into a dict - self.plugins["intel_pmu"] = {"pmu_event_path": pmu_event_path} - LOG.debug("Downloading event list for pmu_stats plugin") - cmd = 'cd {0}; PMU_EVENTS_PATH={1} python event_download_local.py'.format( - bin_path, pmu_event_path) - cmd = "sudo bash -c '{}'".format(cmd) - connection.execute(cmd) - def _setup_ovs_stats(self, connection): try: socket_path = self.plugins["ovs_stats"].get("ovs_socket_path", self.OVS_SOCKET_PATH) @@ -284,8 +271,6 @@ class ResourceProfile(object): # connection.execute("sudo %s '%s' '%s'" % ( # collectd_installer, http_proxy, https_proxy)) return - if "intel_pmu" in self.plugins: - self._setup_intel_pmu(connection, bin_path) if "ovs_stats" in self.plugins: self._setup_ovs_stats(connection) |