From 3119b72c74288864761c2bb6d24e0ba672bca42d Mon Sep 17 00:00:00 2001
From: Ross Brattain <ross.b.brattain@intel.com>
Date: Mon, 11 Sep 2017 16:36:49 -0700
Subject: install pmu tools collectd plugin

Added review dependency, removed collectd commit-id
replicating bash script, added pmu roles to playbook

Create local mirror for event list generation, copy script
to image, and run event list generation at runtime if
intel_pmu is enabled.

Change-Id: Ie46a2b197f4d2037cf3eed194764ce9eb5670415
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
---
 yardstick/network_services/nfvi/collectd.conf | 2 +-
 yardstick/network_services/nfvi/resource.py   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'yardstick/network_services')

diff --git a/yardstick/network_services/nfvi/collectd.conf b/yardstick/network_services/nfvi/collectd.conf
index 22bd5d49d..e6a1f0d8c 100644
--- a/yardstick/network_services/nfvi/collectd.conf
+++ b/yardstick/network_services/nfvi/collectd.conf
@@ -86,7 +86,7 @@ LoadPlugin {{ plugin }}
    ReportHardwareCacheEvents true
    ReportKernelPMUEvents true
    ReportSoftwareEvents true
-   EventList "/root/.cache/pmu-events/GenuineIntel-6-2D-core.json"
+   EventList "/opt/nsb_bin/pmu_event.json"
    HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
 </Plugin>
 {% endif %}
diff --git a/yardstick/network_services/nfvi/resource.py b/yardstick/network_services/nfvi/resource.py
index e3d0e3bca..a32948ae8 100644
--- a/yardstick/network_services/nfvi/resource.py
+++ b/yardstick/network_services/nfvi/resource.py
@@ -253,6 +253,10 @@ class ResourceProfile(object):
             # connection.execute("sudo %s '%s' '%s'" % (
             #     collectd_installer, http_proxy, https_proxy))
             return
+        if "intel_pmu" in self.plugins:
+            LOG.debug("Downloading event list for pmu_stats plugin")
+            cmd = 'sudo bash -c \'cd /opt/tempT/pmu-tools/; python event_download_local.py\''
+            connection.execute(cmd)
         LOG.debug("Starting collectd to collect NFVi stats")
         # ensure collectd.conf.d exists to avoid error/warning
         connection.execute("sudo mkdir -p /etc/collectd/collectd.conf.d")
-- 
cgit 1.2.3-korg