Merge "Replace cinder create volume with shade client."

[yardstick.git] / yardstick / network_services / collector / subscriber.py

diff --git a/yardstick/network_services/collector/subscriber.py b/yardstick/network_services/collector/subscriber.py
index 4dc5a79..322b3f5 100644 (file)
--- a/yardstick/network_services/collector/subscriber.py
+++ b/yardstick/network_services/collector/subscriber.py
@@ -14,42 +14,29 @@
 """This module implements stub for publishing results in yardstick format."""
 import logging
 
-from yardstick.network_services.nfvi.resource import ResourceProfile
-from yardstick.network_services.utils import get_nsb_option
-
 LOG = logging.getLogger(__name__)
 
 
 class Collector(object):
     """Class that handles dictionary of results in yardstick-plot format."""
 
-    def __init__(self, vnfs, nodes, traffic_profile, timeout=3600):
+    def __init__(self, vnfs):
         super(Collector, self).__init__()
-        self.traffic_profile = traffic_profile
         self.vnfs = vnfs
-        self.nodes = nodes
-        self.timeout = timeout
-        self.bin_path = get_nsb_option('bin_path', '')
-        self.resource_profiles = {node_name: ResourceProfile.make_from_node(node, self.timeout)
-                                  for node_name, node in self.nodes.items()
-                                  if node.get("collectd")}
 
     def start(self):
-        """Nothing to do, yet"""
-        for resource in self.resource_profiles.values():
-            resource.initiate_systemagent(self.bin_path)
-            resource.start()
-            resource.amqp_process_for_nfvi_kpi()
+        for vnf in self.vnfs:
+            vnf.start_collect()
 
     def stop(self):
-        """Nothing to do, yet"""
-        for resource in self.resource_profiles.values():
-            resource.stop()
+        for vnf in self.vnfs:
+            vnf.stop_collect()
 
     def get_kpi(self):
         """Returns dictionary of results in yardstick-plot format
 
-        :return:
+        :return: (dict) dictionary of kpis collected from the VNFs;
+                 the keys are the names of the VNFs.
         """
         results = {}
         for vnf in self.vnfs:
@@ -58,16 +45,4 @@ class Collector(object):
             LOG.debug("collect KPI for %s", vnf.name)
             results[vnf.name] = vnf.collect_kpi()
 
-        for node_name, resource in self.resource_profiles.items():
-            # Result example:
-            # {"VNF1: { "tput" : [1000, 999] }, "VNF2": { "latency": 100 }}
-            LOG.debug("collect KPI for %s", node_name)
-            if resource.check_if_sa_running("collectd")[0] != 0:
-                continue
-
-            try:
-                results[node_name] = {"core": resource.amqp_collect_nfvi_kpi()}
-                LOG.debug("%s collect KPIs %s", node_name, results[node_name]['core'])
-            except Exception:
-                LOG.exception("")
         return results