From 0951a3e74be22db8726781aae98531668d946656 Mon Sep 17 00:00:00 2001 From: Dan Klein Date: Mon, 12 Oct 2015 09:55:43 +0300 Subject: merged with master --- scripts/automation/trex_control_plane/client_utils/packet_builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/automation/trex_control_plane/client_utils') diff --git a/scripts/automation/trex_control_plane/client_utils/packet_builder.py b/scripts/automation/trex_control_plane/client_utils/packet_builder.py index 1c643335..c687126b 100755 --- a/scripts/automation/trex_control_plane/client_utils/packet_builder.py +++ b/scripts/automation/trex_control_plane/client_utils/packet_builder.py @@ -1055,8 +1055,8 @@ class CTRexPktBuilder(object): def __init__(self, name, layer_type, ok_type, message=''): self._default_message = "The type of packet layer {layer_name} is of type {layer_type}, " \ "and not of the expected {allowed_type}.".format(layer_name=name, - layer_type=layer_type, - allowed_type=ok_type.__name__) + layer_type=layer_type, + allowed_type=ok_type.__name__) self.message = message or self._default_message super(CTRexPktBuilder.PacketLayerTypeError, self).__init__(-13, self.message) -- cgit From 508703e11a3fad3e44535c5433f803d77f28e245 Mon Sep 17 00:00:00 2001 From: Dan Klein Date: Wed, 14 Oct 2015 02:56:40 +0300 Subject: Fixed trex bugs in Ubuntu disctribution (Firing trex-daemon server) and unresolved domain name handling. --- .../automation/trex_control_plane/client_utils/external_packages.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/automation/trex_control_plane/client_utils') diff --git a/scripts/automation/trex_control_plane/client_utils/external_packages.py b/scripts/automation/trex_control_plane/client_utils/external_packages.py index f8de0323..4b10609b 100755 --- a/scripts/automation/trex_control_plane/client_utils/external_packages.py +++ b/scripts/automation/trex_control_plane/client_utils/external_packages.py @@ -1,7 +1,6 @@ #!/router/bin/python import sys -import site import os CURRENT_PATH = os.path.dirname(os.path.realpath(__file__)) @@ -24,7 +23,7 @@ def import_module_list(modules_list): for p in modules_list: full_path = os.path.join(PATH_TO_PYTHON_LIB, p) fix_path = os.path.normcase(full_path) - site.addsitedir(full_path) + sys.path.insert(1, full_path) import_client_utils_modules() -- cgit