1 files changed, 9 insertions, 8 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
index 07bbdae95..3d3fe73ea 100644
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -23,11 +23,6 @@ from yardstick.network_services.vnf_generic.vnf.sample_vnf import SampleVNFTraff
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import ClientResourceHelper
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import Rfc2544ResourceHelper
 
-try:
-    from IxNet import IxNextgen
-except ImportError:
-    IxNextgen = ErrorClass
-
 LOG = logging.getLogger(__name__)
 
 WAIT_AFTER_CFG_LOAD = 10
@@ -36,6 +31,11 @@ IXIA_LIB = os.path.dirname(os.path.realpath(__file__))
 IXNET_LIB = os.path.join(IXIA_LIB, "../../libs/ixia_libs/IxNet")
 sys.path.append(IXNET_LIB)
 
+try:
+    from IxNet import IxNextgen
+except ImportError:
+    IxNextgen = ErrorClass
+
 
 class IxiaRfc2544Helper(Rfc2544ResourceHelper):
 
@@ -59,7 +59,7 @@ class IxiaResourceHelper(ClientResourceHelper):
         self.pub_ports = None
 
     def _connect(self, client=None):
-        self.client.connect(self.vnfd_helper)
+        self.client._connect(self.vnfd_helper)
 
     def _build_ports(self):
         # self.generate_port_pairs(self.topology)
@@ -72,7 +72,7 @@ class IxiaResourceHelper(ClientResourceHelper):
 
     def stop_collect(self):
         self._terminated.value = 0
-        if self.client:
+        if self.client and self.client.ixnet:
             self.client.ix_stop_traffic()
 
     def generate_samples(self, key=None, default=None):
@@ -109,7 +109,7 @@ class IxiaResourceHelper(ClientResourceHelper):
         self.client.ix_assign_ports()
 
         mac = {}
-        for index, interface in enumerate(self.vnfd_helper.interfaces):
+        for index, interface in enumerate(self.vnfd_helper.interfaces, 1):
             virt_intf = interface["virtual-interface"]
             mac.update({
                 "src_mac_{}".format(index): virt_intf["local_mac"],
@@ -146,6 +146,7 @@ class IxiaTrafficGen(SampleVNFTrafficGen):
 
         super(IxiaTrafficGen, self).__init__(name, vnfd, setup_env_helper_type,
                                              resource_helper_type)
+        self.done = True
         self._ixia_traffic_gen = None
         self.ixia_file_name = ''
         self.tg_port_pairs = []