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 3bcb208..322b3f5 100644 (file)
--- a/yardstick/network_services/collector/subscriber.py
+++ b/yardstick/network_services/collector/subscriber.py
@@ -12,28 +12,37 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """This module implements stub for publishing results in yardstick format."""
+import logging
+
+LOG = logging.getLogger(__name__)
 
 
 class Collector(object):
     """Class that handles dictionary of results in yardstick-plot format."""
 
-    def __init__(self, traffic_profile, vnfs):
+    def __init__(self, vnfs):
         super(Collector, self).__init__()
-        self.traffic_profile = traffic_profile
-        self.service = vnfs
+        self.vnfs = vnfs
 
     def start(self):
-        """Nothing to do, yet"""
-        pass
+        for vnf in self.vnfs:
+            vnf.start_collect()
 
     def stop(self):
-        """Nothing to do, yet"""
-        pass
+        for vnf in self.vnfs:
+            vnf.stop_collect()
 
-    @classmethod
-    def get_kpi(cls, vnf):
+    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.
         """
-        return {vnf.name: vnf.collect_kpi()}
+        results = {}
+        for vnf in self.vnfs:
+            # Result example:
+            # {"VNF1: { "tput" : [1000, 999] }, "VNF2": { "latency": 100 }}
+            LOG.debug("collect KPI for %s", vnf.name)
+            results[vnf.name] = vnf.collect_kpi()
+
+        return results