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

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

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_prox.py b/yardstick/network_services/vnf_generic/vnf/tg_prox.py
index 40eda75..d12c42e 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_prox.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_prox.py
@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import print_function, absolute_import
-
 import logging
+import copy
 
 from yardstick.network_services.utils import get_nsb_option
 from yardstick.network_services.vnf_generic.vnf.prox_vnf import ProxApproxVnf
@@ -30,23 +29,13 @@ class ProxTrafficGen(SampleVNFTrafficGen):
     LUA_PARAMETER_NAME = "gen"
     WAIT_TIME = 1
 
-    @staticmethod
-    def _sort_vpci(vnfd):
-        """
-
-        :param vnfd: vnfd.yaml
-        :return: trex_cfg.yaml file
-        """
-
-        def key_func(interface):
-            return interface["virtual-interface"]["vpci"], interface["name"]
+    def __init__(self, name, vnfd, task_id, setup_env_helper_type=None,
+                 resource_helper_type=None):
+        vnfd_cpy = copy.deepcopy(vnfd)
+        super(ProxTrafficGen, self).__init__(name, vnfd_cpy, task_id)
 
-        ext_intf = vnfd["vdu"][0]["external-interface"]
-        return sorted(ext_intf, key=key_func)
-
-    def __init__(self, name, vnfd, setup_env_helper_type=None, resource_helper_type=None):
-        # don't call superclass, use custom wrapper of ProxApproxVnf
-        self._vnf_wrapper = ProxApproxVnf(name, vnfd, setup_env_helper_type, resource_helper_type)
+        self._vnf_wrapper = ProxApproxVnf(
+            name, vnfd, task_id, setup_env_helper_type, resource_helper_type)
         self.bin_path = get_nsb_option('bin_path', '')
         self.name = self._vnf_wrapper.name
         self.ssh_helper = self._vnf_wrapper.ssh_helper
@@ -59,13 +48,6 @@ class ProxTrafficGen(SampleVNFTrafficGen):
         self._tg_process = None
         self._traffic_process = None
 
-        # used for generating stats
-        self.vpci_if_name_ascending = self._sort_vpci(vnfd)
-        self.resource_helper.vpci_if_name_ascending = self._sort_vpci(vnfd)
-
-    def listen_traffic(self, traffic_profile):
-        pass
-
     def terminate(self):
         self._vnf_wrapper.terminate()
         super(ProxTrafficGen, self).terminate()