NSB: fix port topology

[yardstick.git] / yardstick / network_services / libs / ixia_libs / IxNet / IxNet.py

diff --git a/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py b/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py
index 815a2a2..1ec00e5 100644 (file)
--- a/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py
+++ b/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py
@@ -20,13 +20,6 @@ import logging
 import re
 from itertools import product
 
-from yardstick.common.utils import ErrorClass
-
-try:
-    import IxNetwork
-except ImportError:
-    IxNetwork = ErrorClass
-
 log = logging.getLogger(__name__)
 
 IP_VERSION_4 = 4
@@ -120,10 +113,10 @@ class IxNextgen(object):
     }
 
     MODE_SEEDS_MAP = {
-        0: ('private', ['256', '2048']),
+        0: ('private_0', ['256', '2048']),
     }
 
-    MODE_SEEDS_DEFAULT = 'public', ['2048', '256']
+    MODE_SEEDS_DEFAULT = 'public_0', ['2048', '256']
 
     @staticmethod
     def find_view_obj(view_name, views):
@@ -203,6 +196,12 @@ class IxNextgen(object):
         self._cfg = self.get_config(tg_cfg)
 
         sys.path.append(self._cfg["py_lib_path"])
+        # Import IxNetwork after getting ixia lib path
+        try:
+            import IxNetwork
+        except ImportError:
+            raise
+
         self.ixnet = IxNetwork.IxNet()
 
         machine = self._cfg['machine']
@@ -322,13 +321,13 @@ class IxNextgen(object):
 
     def ix_get_statistics(self):
         views = self.ixnet.getList('/statistics', 'view')
+        stats = {}
         view_obj = self.find_view_obj("Traffic Item Statistics", views)
         stats = self.build_stats_map(view_obj, self.STATS_NAME_MAP)
 
-        self.find_view_obj("Port Statistics", views)
+        view_obj = self.find_view_obj("Port Statistics", views)
         ports_stats = self.build_stats_map(view_obj, self.PORT_STATS_NAME_MAP)
 
-        views = self.ixnet.getList('/statistics', 'view')
         view_obj = self.find_view_obj("Flow Statistics", views)
         stats["latency"] = self.build_stats_map(view_obj, self.LATENCY_NAME_MAP)