diff options
author | Deepak S <deepak.s@linux.intel.com> | 2017-08-16 21:20:55 -0700 |
---|---|---|
committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-08-17 09:56:56 -0700 |
commit | 126450b753244c089dbae8f3f10a4a141d65cf57 (patch) | |
tree | f4e6ba32c0e0c8f64c66bcaf3fde2092b724d213 /yardstick/network_services/libs/ixia_libs | |
parent | e07484ef707af89c12ebf3e9ed4490d9ff588750 (diff) |
Fix import error in IxNetwork
This patch fixes import error related to ixnetwork and do not wait for
TG server to start as IXIA is always running :)
Change-Id: I49d6b100eadafad75431cb8974605a6faa496f23
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Diffstat (limited to 'yardstick/network_services/libs/ixia_libs')
-rw-r--r-- | yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py b/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py index d36ec2edd..2b8905b4f 100644 --- 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 @@ -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'] |