Merge "Allow to see steady state status in the yardstick logs"

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

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_ping.py b/yardstick/network_services/vnf_generic/vnf/tg_ping.py
index 9cd9f25..a3b5afa 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_ping.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_ping.py
@@ -14,7 +14,6 @@
 """ PING acts as traffic generation and vnf definitions based on IETS Spec """
 
 from __future__ import absolute_import
-from __future__ import print_function
 import logging
 import re
 
@@ -72,7 +71,7 @@ class PingResourceHelper(ClientResourceHelper):
         self._queue = Queue()
         self._parser = PingParser(self._queue)
 
-    def run_traffic(self, traffic_profile):
+    def run_traffic(self, traffic_profile, *args):
         # drop the connection in order to force a new one
         self.ssh_helper.drop_connection()
 
@@ -104,20 +103,16 @@ class PingTrafficGen(SampleVNFTrafficGen):
     APP_NAME = 'Ping'
     RUN_WAIT = 4
 
-    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 setup_env_helper_type is None:
             setup_env_helper_type = PingSetupEnvHelper
         if resource_helper_type is None:
             resource_helper_type = PingResourceHelper
-
-        super(PingTrafficGen, self).__init__(name, vnfd, setup_env_helper_type,
-                                             resource_helper_type)
+        super(PingTrafficGen, self).__init__(
+            name, vnfd, task_id, setup_env_helper_type, resource_helper_type)
         self._result = {}
 
-    def scale(self, flavor=""):
-        """ scale vnf-based on flavor input """
-        pass
-
     def _check_status(self):
         return self._tg_process.is_alive()
 
@@ -127,22 +122,10 @@ class PingTrafficGen(SampleVNFTrafficGen):
             "packets_received": 0,
             "rtt": 0,
         }
+        self.setup_helper.setup_vnf_environment()
         intf = self.vnfd_helper.interfaces[0]["virtual-interface"]
         self.resource_helper.cmd_kwargs = {
             'target_ip': IPv4Interface(intf["dst_ip"]).ip.exploded,
             'local_ip': IPv4Interface(intf["local_ip"]).ip.exploded,
             'local_if_name': intf["local_iface_name"].split('/')[0],
         }
-
-        self.setup_helper.setup_vnf_environment()
-
-    def wait_for_instantiate(self):
-        pass
-
-    def listen_traffic(self, traffic_profile):
-        """ Not needed for ping
-
-        :param traffic_profile:
-        :return:
-        """
-        pass