From 3159743120d9e1033c5ed809c1031b814204fd8f Mon Sep 17 00:00:00 2001
From: Yaroslav Brustinov <ybrustin@cisco.com>
Date: Wed, 3 Aug 2016 16:18:50 +0300
Subject: set default stateful duration 1 hour, forbid duration in stateless
 add "add_profile"stateless Python API command fix trex_perf.py

---
 scripts/automation/trex_perf.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'scripts/automation/trex_perf.py')

diff --git a/scripts/automation/trex_perf.py b/scripts/automation/trex_perf.py
index 61874765..08d15caf 100755
--- a/scripts/automation/trex_perf.py
+++ b/scripts/automation/trex_perf.py
@@ -2,13 +2,14 @@
 import h_avc
 
 
-from trex_control_plane.client.trex_client import CTRexClient
 import ConfigParser
 import threading
 import time,signal
 import argparse
 import sys
 import os
+sys.path.append(os.path.join('trex_control_plane', 'stf', 'trex_stf_lib'))
+from trex_client import CTRexClient
 import subprocess
 from time import sleep
 import signal
@@ -54,7 +55,7 @@ class TrexRunException(Exception):
 
 def verify_glibc_version ():
     x = subprocess.check_output("/usr/bin/ldd --version", shell=True)
-    m = re.match("ldd \(GNU libc\) (.*)", x)
+    m = re.match("^ldd \([^\)]+\) (.*)", x)
     if not m:
         raise Exception("Cannot determine LDD version")
     current_version = m.group(1)
-- 
cgit 1.2.3-korg