From: Peter Mikus <pmikus@cisco.com>
Date: Mon, 16 May 2016 07:55:39 +0000 (+0200)
Subject: Patch: Detection of running t-rex instance before initializing
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=35bee5e3075afa1f7084a6e1195a6a1403091560

Patch: Detection of running t-rex instance before initializing

- JIRA: CSIT-89
- Add detection of running t-rex traffic generator before new instance
  is initialized.

Change-Id: I77009b0c5e83bb6e162b9800d02b4e5a2abd541f
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---

diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index b125a0b53d..7f53836494 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -167,6 +167,9 @@ class TrafficGenerator(object):
                 logger.error('trex-cfg failed: {0}'.format(stdout + stderr))
                 raise RuntimeError('trex-cfg failed')
 
+            (ret, _, _) = ssh.exec_command(
+                "sh -c 'pgrep t-rex && sudo pkill t-rex'")
+
             (ret, _, _) = ssh.exec_command(
                 "sh -c 'cd {0}/scripts/ && "
                 "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &'"