diff options
| author |   Miroslav Miklus <mmiklus@cisco.com> | 2016-02-17 23:46:01 +0100 |
|---|---|---|
| committer | Miroslav Miklus <mmiklus@cisco.com> | 2016-02-17 22:52:49 +0000 |
| commit | ae0e807c1ea95d3f2ec16a4c7aa9ee027d18c854 (patch) | |
| tree | 09f13cb6a48de0f8eb63a97529133067d6b92ff1 | |
| parent | 8f285166faf13156a4f7c70adac9a7e20549268f (diff) | |
T-REX fixes
- ssh session hang with bash as /bin/sh
- trex-cfg to handle initial configuration
Change-Id: Ibcbde2d17f0e10ce126dc5db6bf9654185b0bb75
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 7 | ||||
| -rwxr-xr-x | resources/tools/t-rex-installer.sh | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 2037d49bc2..bc9678b399 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -51,13 +51,14 @@ class TrafficGenerator(object): ssh.connect(node) (ret, stdout, stderr) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && sudo modprobe uio && " - "sudo insmod ./ko/src/igb_uio.ko'"\ + "sh -c 'cd {0}/scripts/ && " + "sudo ./trex-cfg'"\ .format(trex_path)) (ret, stdout, stderr) = ssh.exec_command( "sh -c 'cd {0}/scripts/ && " - "sudo nohup ./t-rex-64 -i -c 4 --iom 0 > /dev/null 2>&1 &'"\ + "sudo nohup ./t-rex-64 -i -c 4 --iom 0 > /dev/null 2>&1 &'" + "> /dev/null"\ .format(trex_path)) @staticmethod diff --git a/resources/tools/t-rex-installer.sh b/resources/tools/t-rex-installer.sh index bc36774f37..781b73c3c2 100755 --- a/resources/tools/t-rex-installer.sh +++ b/resources/tools/t-rex-installer.sh @@ -33,5 +33,5 @@ unzip ${WORKING_DIR}/${TREX_DOWNLOAD_PACKAGE} -d ${TARGET_DIR} test $? -eq 0 || exit 1 cd ${TREX_INSTALL_DIR}/linux_dpdk/ && ./b configure && ./b build || exit 1 -cd ${TREX_INSTALL_DIR}/scripts/ko/src && make || exit 1 +cd ${TREX_INSTALL_DIR}/scripts/ko/src && make && make install || exit 1 |