X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fnfvi%2Fresource.py;h=adf4d8ae6eea5aa4578dad1de1e54139dc41efdd;hb=7a5c45daa9b146dfc50068165aba5ec6bc2e1e2c;hp=5b96aaf297e3df9c6e63cc9c95caafb2f57749d2;hpb=e32ba9faff25661b74da47d3d84bada126150c91;p=yardstick.git

diff --git a/yardstick/network_services/nfvi/resource.py b/yardstick/network_services/nfvi/resource.py
index 5b96aaf29..adf4d8ae6 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):
@@ -245,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)
@@ -284,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)