add ifdef guard to .h file

remove UUID from TUI
STF Python API: show newlines instead of "\n\n\n" in Exception message
STF Python API: remove "During handling of the above exception, another exception occurred:" in Python3.3+
dpdk_nic_bind.py: ensure needed PATH exists for lspci etc.
t-rex-64: remove "stty: standard input: Inappropriate ioctl for device"
t-rex-64: remove "cat: write error: Broken pipe"

Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>

2 files changed, 6 insertions, 3 deletions

diff --git a/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py b/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py
index ecf6083b..e9d2b8a0 100755
--- a/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py
+++ b/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_client.py
@@ -1087,7 +1087,9 @@ class CTRexClient(object):
         """
         # handle known exceptions based on known error codes.
         # if error code is not known, raise ProtocolError
-        raise exception_handler.gen_exception(err)
+        exc = exception_handler.gen_exception(err)
+        exc.__cause__ = None # remove "During handling of the above exception, another exception occurred:" in Python3.3+
+        raise exc
 
 
 class CTRexResult(object):
diff --git a/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_exceptions.py b/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_exceptions.py
index 0de38411..89134e7f 100755
--- a/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_exceptions.py
+++ b/scripts/automation/trex_control_plane/stf/trex_stf_lib/trex_exceptions.py
@@ -19,11 +19,12 @@ class RPCError(Exception):
 
     def __str__(self):
         return self.__repr__()
+
     def __repr__(self):
         if self.args[2] is not None:
-            return u"[errcode:%r] %r. Extended data: %r" % (self.args[0], self.args[1], self.args[2])
+            return u"[errcode:%s] %s. Extended data: %s" % self.args
         else:
-            return u"[errcode:%r] %r" % (self.args[0], self.args[1])
+            return u"[errcode:%s] %s" % self.args[:2]
 
 class TRexException(RPCError):
     """