Merge "Rework network_services/vnf_generic/vnf/test_sample_vnf.py:TestVnfSshHelper"

[yardstick.git] / yardstick / network_services / vnf_generic / vnf / tg_rfc2544_trex.py

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py
index 07cec67..7ecb124 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py
@@ -45,11 +45,12 @@ class TrexRfcResourceHelper(tg_trex.TrexResourceHelper):
             time.sleep(self.SAMPLING_PERIOD)
 
         traffic_profile.stop_traffic(self)
-        output = traffic_profile.get_drop_percentage(
+        completed, output = traffic_profile.get_drop_percentage(
             samples, self.rfc2544_helper.tolerance_low,
             self.rfc2544_helper.tolerance_high,
             self.rfc2544_helper.correlated_traffic)
         self._queue.put(output)
+        return completed
 
     def start_client(self, ports, mult=None, duration=None, force=True):
         self.client.start(ports=ports, mult=mult, duration=duration, force=force)
@@ -64,9 +65,9 @@ class TrexTrafficGenRFC(tg_trex.TrexTrafficGen):
     traffic for rfc2544 testcase.
     """
 
-    def __init__(self, name, vnfd, setup_env_helper_type=None, resource_helper_type=None):
+    def __init__(self, name, vnfd, task_id, setup_env_helper_type=None,
+                 resource_helper_type=None):
         if resource_helper_type is None:
             resource_helper_type = TrexRfcResourceHelper
-
-        super(TrexTrafficGenRFC, self).__init__(name, vnfd, setup_env_helper_type,
-                                                resource_helper_type)
+        super(TrexTrafficGenRFC, self).__init__(
+            name, vnfd, task_id, setup_env_helper_type, resource_helper_type)