VNF interfaces are sorted by "vpci" address before being populated

In [1], VNF interfaces in TG PROX are sorted by "vpci" address, before
this value is populated in "vnfd_helper". "vpci_if_name_ascending" is
only used in TP ProxPofile [2] to generate the stats.

This patch delays this sorting process until the stats generation.

[1]https://github.com/opnfv/yardstick/blob/a74ad5a1ec1a73389c5983440b2031b0bc72cea1/yardstick/network_services/vnf_generic/vnf/tg_prox.py#L62-L64
[2]https://github.com/opnfv/yardstick/blob/a74ad5a1ec1a73389c5983440b2031b0bc72cea1/yardstick/network_services/traffic_profile/prox_profile.py#L33

JIRA: YARDSTICK-1044

Change-Id: I988dc48f9a82baa1c64f728d9e6d54f2f4bae010
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>

1 files changed, 0 insertions, 18 deletions

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_prox.py b/yardstick/network_services/vnf_generic/vnf/tg_prox.py
index 151252ce8..282dd92c5 100644
--- a/yardstick/network_services/vnf_generic/vnf/tg_prox.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_prox.py
@@ -30,20 +30,6 @@ 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"]
-
-        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)
@@ -59,10 +45,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 terminate(self):
         self._vnf_wrapper.terminate()
         super(ProxTrafficGen, self).terminate()