X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=ddd0ff35771084c6abbc473f7c87a7ffaef84131;hp=267f5d2f0378bafac504fa8d3a5533273f849e81;hb=6000b2abc3d6b8bb8ff2941aacf005a04a33be60;hpb=5460988e99fddda2dd2d5a58e4b8a92851d3c427 diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 267f5d2f03..ddd0ff3577 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -132,8 +132,6 @@ class TrafficGenerator(object): :return: nothing """ - trex_path = "/opt/trex-core-2.02" - topo = Topology() if tg_node['type'] != NodeType.TG: @@ -141,9 +139,19 @@ class TrafficGenerator(object): self._node = tg_node if tg_node['subtype'] == NodeSubTypeTG.TREX: + trex_path = "/opt/trex-core-2.00" + ssh = SSH() ssh.connect(tg_node) +# (ret, stdout, stderr) = ssh.exec_command( +# "sudo sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" +# "t-rex-installer.sh'", timeout=600) +# if int(ret) != 0: +# logger.error('trex installation failed: {0}'.format( +# stdout + stderr)) +# raise RuntimeError('Installation of TG failed') + if1_pci = topo.get_interface_pci_addr(tg_node, tg_if1) if2_pci = topo.get_interface_pci_addr(tg_node, tg_if2) if1_mac = topo.get_interface_mac(tg_node, tg_if1)