X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=751dc8885f4d3b9d72a021f3d1c686bc3a13d0c5;hb=9fa0aef913e76f2b40efbd6657749235eb26f160;hp=b6d28a4ca6afb3b9dffb49bc7db9b33e88686c2f;hpb=bab0b570345ceb6ffeaec9e47a50e62d7303387e;p=csit.git diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index b6d28a4ca6..751dc8885f 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -328,18 +328,12 @@ class TrafficGenerator(AbstractMeasurer): self._node, cmd, sudo=True, message='Unbind PCI ports from driver failed!') - cmd = ("sh -c 'cd {dir}/scripts/ && ./trex-cfg " - "--unbind-unused-ports'" - .format(dir=Constants.TREX_INSTALL_DIR)) - exec_cmd_no_error( - self._node, cmd, sudo=True, message='Config TRex failed!') - # Start TRex. cmd = ("sh -c 'cd {dir}/scripts/ && " - "nohup ./t-rex-64 {mode} -i -c 7 > " + "nohup ./t-rex-64 --hdrh{mode} -i -c 7 > " "/tmp/trex.log 2>&1 &' > /dev/null" .format(dir=Constants.TREX_INSTALL_DIR, - mode='--astf' if osi_layer == 'L7' else '')) + mode=' --astf' if osi_layer == 'L7' else '')) try: exec_cmd_no_error(self._node, cmd, sudo=True) except RuntimeError: @@ -406,12 +400,12 @@ class TrafficGenerator(AbstractMeasurer): line = stdout.splitlines()[-1] self._result = line logger.info('TrafficGen result: {0}'.format(self._result)) - self._received = self._result.split(', ')[1].split('=')[1] - self._sent = self._result.split(', ')[2].split('=')[1] - self._loss = self._result.split(', ')[3].split('=')[1] + self._received = self._result.split(', ')[1].split('=', 1)[1] + self._sent = self._result.split(', ')[2].split('=', 1)[1] + self._loss = self._result.split(', ')[3].split('=', 1)[1] self._latency = [] - self._latency.append(self._result.split(', ')[4].split('=')[1]) - self._latency.append(self._result.split(', ')[5].split('=')[1]) + self._latency.append(self._result.split(', ')[4].split('=', 1)[1]) + self._latency.append(self._result.split(', ')[5].split('=', 1)[1]) def trex_stl_stop_remote_exec(self, node): """Execute script on remote node over ssh to stop running traffic.