X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=e63b8bc5a3053986c288a7d12d51856c8aace2ba;hb=d4d0312773dbb88b65500b75f3628f365ae5f3f7;hp=4b71b59cc7ed31abe86b1c04e731e4ca74409a97;hpb=afe018f552088c2bafbbf3e2e9bd7734db70e283;p=csit.git diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 4b71b59cc7..e63b8bc5a3 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -34,8 +34,8 @@ class TrafficGenerator(object): def initialize_traffic_generator(node, interface1, interface2): """TG initialization :param node: Traffic generator node - :param interface1: PCI address of first interface - :param interface2: PCI address of second interface + :param interface1: interface name of first interface + :param interface2: interface name of second interface :type node: dict :type interface1: str :type interface2: str @@ -54,12 +54,17 @@ class TrafficGenerator(object): "sh -c 'cd {0}/scripts/ && " "sudo ./trex-cfg'"\ .format(trex_path)) + if int(ret) != 0: + logger.error('trex-cfg failed: {0}'.format(stdout + stderr)) + raise RuntimeError('trex-cfg failed') - (ret, stdout, stderr) = ssh.exec_command( + (ret, _, _) = ssh.exec_command( "sh -c 'cd {0}/scripts/ && " "sudo nohup ./t-rex-64 -i -c 4 --iom 0 > /dev/null 2>&1 &'" "> /dev/null"\ .format(trex_path)) + if int(ret) != 0: + raise RuntimeError('t-rex-64 startup failed') @staticmethod def teardown_traffic_generator(node):