diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-11-10 14:58:03 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-11-10 14:58:03 +0000 |
commit | 0ed5c9e36d401fd89614c321470b28e91c6a5755 (patch) | |
tree | ce0cecad5a1ede59c84036fc27161c273cc6b131 /yardstick/network_services | |
parent | 3cfdda00a291cf911e2948da774929ad23a60452 (diff) | |
parent | 7a5c45daa9b146dfc50068165aba5ec6bc2e1e2c (diff) |
Merge "pmu: remove event_download_local workaround script"
Diffstat (limited to 'yardstick/network_services')
-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 190e1f7bd..adf4d8ae6 100644 --- a/yardstick/network_services/nfvi/resource.py +++ b/yardstick/network_services/nfvi/resource.py @@ -243,19 +243,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) @@ -282,8 +269,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) |