X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=698b67ead24c5b46a15a2ba8e69349fa6f656c7a;hp=2a9491286075284853a9f9f8c628d5068768ccbb;hb=b5fe0fd9a4266773125cc4d4c1edaa1c1a8a1731;hpb=490256818796108eb9fc169fc477517c490c5d6a diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 2a94912860..698b67ead2 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -34,15 +34,31 @@ class TGDropRateSearchImpl(DropRateSearch): def measure_loss(self, rate, frame_size, loss_acceptance, loss_acceptance_type, traffic_type): - + """Runs the traffic and evaluate the measured results. + + :param rate: Offered traffic load. + :param frame_size: Size of frame. + :param loss_acceptance: Permitted drop ratio or frames count. + :param loss_acceptance_type: Type of permitted loss. + :param traffic_type: Traffic profile ([2,3]-node-L[2,3], ...). + :type rate: int + :type frame_size: str + :type loss_acceptance: float + :type loss_acceptance_type: LossAcceptanceType + :type traffic_type: str + :returns: Drop threshold exceeded? (True/False) + :rtype: bool + :raises: NotImplementedError if TG is not supported. + :raises: RuntimeError if TG is not specified. + """ # we need instance of TrafficGenerator instantiated by Robot Framework # to be able to use trex_stl-*() tg_instance = BuiltIn().get_library_instance( 'resources.libraries.python.TrafficGenerator') - if tg_instance._node['subtype'] is None: - raise Exception('TG subtype not defined') - elif tg_instance._node['subtype'] == NodeSubTypeTG.TREX: + if tg_instance.node['subtype'] is None: + raise RuntimeError('TG subtype not defined') + elif tg_instance.node['subtype'] == NodeSubTypeTG.TREX: unit_rate = str(rate) + self.get_rate_type_str() tg_instance.trex_stl_start_remote_exec(self.get_duration(), unit_rate, frame_size, @@ -52,7 +68,6 @@ class TGDropRateSearchImpl(DropRateSearch): if self.loss_acceptance_type_is_percentage(): loss = (float(loss) / float(sent)) * 100 - # TODO: getters for tg_instance logger.trace("comparing: {} < {} {}".format(loss, loss_acceptance, loss_acceptance_type)) @@ -64,16 +79,16 @@ class TGDropRateSearchImpl(DropRateSearch): raise NotImplementedError("TG subtype not supported") def get_latency(self): - """Return min/avg/max latency. + """Returns min/avg/max latency. - :return: Latency stats. + :returns: Latency stats. :rtype: list """ - tg_instance = BuiltIn().get_library_instance( 'resources.libraries.python.TrafficGenerator') return tg_instance.get_latency_int() + class TrafficGenerator(object): """Traffic Generator.""" @@ -88,12 +103,21 @@ class TrafficGenerator(object): self._received = None self._node = None # T-REX interface order mapping - self._ifaces_reordered = 0 + self._ifaces_reordered = False + + @property + def node(self): + """Getter. + + :returns: Traffic generator node. + :rtype: dict + """ + return self._node def get_loss(self): """Return number of lost packets. - :return: Number of lost packets. + :returns: Number of lost packets. :rtype: str """ return self._loss @@ -101,7 +125,7 @@ class TrafficGenerator(object): def get_sent(self): """Return number of sent packets. - :return: Number of sent packets. + :returns: Number of sent packets. :rtype: str """ return self._sent @@ -109,7 +133,7 @@ class TrafficGenerator(object): def get_received(self): """Return number of received packets. - :return: Number of received packets. + :returns: Number of received packets. :rtype: str """ return self._received @@ -117,16 +141,16 @@ class TrafficGenerator(object): def get_latency_int(self): """Return rounded min/avg/max latency. - :return: Latency stats. + :returns: Latency stats. :rtype: list """ return self._latency - #pylint: disable=too-many-arguments, too-many-locals def initialize_traffic_generator(self, tg_node, tg_if1, tg_if2, tg_if1_adj_node, tg_if1_adj_if, tg_if2_adj_node, tg_if2_adj_if, - test_type): + test_type, + tg_if1_dst_mac=None, tg_if2_dst_mac=None): """TG initialization. :param tg_node: Traffic generator node. @@ -136,7 +160,9 @@ class TrafficGenerator(object): :param tg_if1_adj_if: TG if1 adjecent interface. :param tg_if2_adj_node: TG if2 adjecent node. :param tg_if2_adj_if: TG if2 adjecent interface. - :test_type: 'L2' or 'L3' - src/dst MAC address. + :param test_type: 'L2', 'L3' or 'L7' - OSI Layer testing type. + :param tg_if1_dst_mac: Interface 1 destination MAC address. + :param tg_if2_dst_mac: Interface 2 destination MAC address. :type tg_node: dict :type tg_if1: str :type tg_if2: str @@ -145,151 +171,180 @@ class TrafficGenerator(object): :type tg_if2_adj_node: dict :type tg_if2_adj_if: str :type test_type: str - :return: nothing + :type tg_if1_dst_mac: str + :type tg_if2_dst_mac: str + :returns: nothing + :raises: RuntimeError in case of issue during initialization. """ - - topo = Topology() - if tg_node['type'] != NodeType.TG: - raise Exception('Node type is not a TG') + raise RuntimeError('Node type is not a TG') self._node = tg_node if tg_node['subtype'] == NodeSubTypeTG.TREX: - trex_path = "/opt/trex-core-2.07" - ssh = SSH() ssh.connect(tg_node) - (ret, stdout, stderr) = ssh.exec_command( - "sudo sh -c '{}/resources/tools/t-rex/" - "t-rex-installer.sh'".format(Constants.REMOTE_FW_DIR), + (ret, _, _) = ssh.exec_command( + "sudo -E sh -c '{0}/resources/tools/trex/" + "trex_installer.sh {1}'".format(Constants.REMOTE_FW_DIR, + Constants.TREX_INSTALL_VERSION), timeout=1800) if int(ret) != 0: - logger.error('trex installation failed: {0}'.format( - stdout + stderr)) - raise RuntimeError('Installation of TG failed') + raise RuntimeError('TRex installation 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) - if2_mac = topo.get_interface_mac(tg_node, tg_if2) + if1_pci = Topology().get_interface_pci_addr(tg_node, tg_if1) + if2_pci = Topology().get_interface_pci_addr(tg_node, tg_if2) + if1_addr = Topology().get_interface_mac(tg_node, tg_if1) + if2_addr = Topology().get_interface_mac(tg_node, tg_if2) if test_type == 'L2': - if1_adj_mac = if2_mac - if2_adj_mac = if1_mac + if1_adj_addr = if2_addr + if2_adj_addr = if1_addr elif test_type == 'L3': - if1_adj_mac = topo.get_interface_mac(tg_if1_adj_node, - tg_if1_adj_if) - if2_adj_mac = topo.get_interface_mac(tg_if2_adj_node, - tg_if2_adj_if) + if1_adj_addr = Topology().get_interface_mac(tg_if1_adj_node, + tg_if1_adj_if) + if2_adj_addr = Topology().get_interface_mac(tg_if2_adj_node, + tg_if2_adj_if) + elif test_type == 'L7': + if1_addr = Topology().get_interface_ip4(tg_node, tg_if1) + if2_addr = Topology().get_interface_ip4(tg_node, tg_if2) + if1_adj_addr = Topology().get_interface_ip4(tg_if1_adj_node, + tg_if1_adj_if) + if2_adj_addr = Topology().get_interface_ip4(tg_if2_adj_node, + tg_if2_adj_if) else: - raise Exception("test_type unknown") + raise ValueError("Unknown Test Type") + + # in case of switched environment we can override MAC addresses + if tg_if1_dst_mac is not None and tg_if2_dst_mac is not None: + if1_adj_addr = tg_if1_dst_mac + if2_adj_addr = tg_if2_dst_mac if min(if1_pci, if2_pci) != if1_pci: - if1_mac, if2_mac = if2_mac, if1_mac if1_pci, if2_pci = if2_pci, if1_pci - if1_adj_mac, if2_adj_mac = if2_adj_mac, if1_adj_mac - self._ifaces_reordered = 1 - - if1_mac_hex = "0x"+if1_mac.replace(":", ",0x") - if2_mac_hex = "0x"+if2_mac.replace(":", ",0x") - if1_adj_mac_hex = "0x"+if1_adj_mac.replace(":", ",0x") - if2_adj_mac_hex = "0x"+if2_adj_mac.replace(":", ",0x") - - (ret, stdout, stderr) = ssh.exec_command( - "sudo sh -c 'cat << EOF > /etc/trex_cfg.yaml\n" - "- port_limit : 2\n" - " version : 2\n" - " interfaces : [\"{}\",\"{}\"]\n" - " port_info :\n" - " - dest_mac : [{}]\n" - " src_mac : [{}]\n" - " - dest_mac : [{}]\n" - " src_mac : [{}]\n" - "EOF'"\ - .format(if1_pci, if2_pci, - if1_adj_mac_hex, if1_mac_hex, - if2_adj_mac_hex, if2_mac_hex)) - if int(ret) != 0: - logger.error("failed to create t-rex config: {}"\ - .format(stdout + stderr)) - raise RuntimeError('trex config generation error') + if1_addr, if2_addr = if2_addr, if1_addr + if1_adj_addr, if2_adj_addr = if2_adj_addr, if1_adj_addr + self._ifaces_reordered = True - (ret, stdout, stderr) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && sudo ./trex-cfg'".format(trex_path)) + if test_type == 'L2' or test_type == 'L3': + (ret, _, _) = ssh.exec_command( + "sudo sh -c 'cat << EOF > /etc/trex_cfg.yaml\n" + "- port_limit: 2\n" + " version: 2\n" + " interfaces: [\"{0}\",\"{1}\"]\n" + " port_info:\n" + " - dest_mac: [{2}]\n" + " src_mac: [{3}]\n" + " - dest_mac: [{4}]\n" + " src_mac: [{5}]\n" + "EOF'"\ + .format(if1_pci, if2_pci, + "0x"+if1_adj_addr.replace(":", ",0x"), + "0x"+if1_addr.replace(":", ",0x"), + "0x"+if2_adj_addr.replace(":", ",0x"), + "0x"+if2_addr.replace(":", ",0x"))) + elif test_type == 'L7': + (ret, _, _) = ssh.exec_command( + "sudo sh -c 'cat << EOF > /etc/trex_cfg.yaml\n" + "- port_limit: 2\n" + " version: 2\n" + " interfaces: [\"{0}\",\"{1}\"]\n" + " port_info:\n" + " - ip: [{2}]\n" + " default_gw: [{3}]\n" + " - ip: [{4}]\n" + " default_gw: [{5}]\n" + "EOF'"\ + .format(if1_pci, if2_pci, + if1_addr, if1_adj_addr, + if2_addr, if2_adj_addr)) + else: + raise ValueError("Unknown Test Type") if int(ret) != 0: - logger.error('trex-cfg failed: {0}'.format(stdout + stderr)) - raise RuntimeError('trex-cfg failed') + raise RuntimeError('TRex config generation error') - max_startup_retries = 3 - while max_startup_retries > 0: - # kill T-rex only if it is already running - (ret, _, _) = ssh.exec_command( - "sh -c 'pgrep t-rex && sudo pkill t-rex'") + for _ in range(0, 3): + # kill TRex only if it is already running + ssh.exec_command( + "sh -c 'pgrep t-rex && sudo pkill t-rex && sleep 3'") - # start T-rex + # configure TRex (ret, _, _) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && " - "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &'" - "> /dev/null"\ - .format(trex_path)) + "sh -c 'cd {0}/scripts/ && sudo ./trex-cfg'"\ + .format(Constants.TREX_INSTALL_DIR)) + if int(ret) != 0: + raise RuntimeError('trex-cfg failed') + + # start TRex + if test_type == 'L2' or test_type == 'L3': + (ret, _, _) = ssh.exec_command( + "sh -c 'cd {0}/scripts/ && " + "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /tmp/trex.log " + "2>&1 &' > /dev/null"\ + .format(Constants.TREX_INSTALL_DIR)) + elif test_type == 'L7': + (ret, _, _) = ssh.exec_command( + "sh -c 'cd {0}/scripts/ && " + "sudo nohup ./t-rex-64 --astf -i -c 7 --iom 0 > " + "/tmp/trex.log 2>&1 &' > /dev/null"\ + .format(Constants.TREX_INSTALL_DIR)) + else: + raise ValueError("Unknown Test Type") if int(ret) != 0: + ssh.exec_command("sh -c 'cat /tmp/trex.log'") raise RuntimeError('t-rex-64 startup failed') - # get T-rex server info + # get TRex server info (ret, _, _) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-server-info.py'"\ + "sh -c 'sleep 3; " + "{0}/resources/tools/trex/trex_server_info.py'"\ .format(Constants.REMOTE_FW_DIR), timeout=120) if int(ret) == 0: - # If we get info T-rex is running + # If we get info TRex is running return - # try again - max_startup_retries -= 1 - # after max retries T-rex is still not responding to API - # critical error occured + # after max retries TRex is still not responding to API + # critical error occurred raise RuntimeError('t-rex-64 startup failed') - @staticmethod def teardown_traffic_generator(node): """TG teardown. :param node: Traffic generator node. :type node: dict - :return: nothing + :returns: nothing + :raises: RuntimeError if TRex teardown failed. + :raises: RuntimeError if node type is not a TG. """ if node['type'] != NodeType.TG: - raise Exception('Node type is not a TG') + raise RuntimeError('Node type is not a TG') if node['subtype'] == NodeSubTypeTG.TREX: ssh = SSH() ssh.connect(node) - (ret, stdout, stderr) = ssh.exec_command( - "sh -c 'sudo pkill t-rex'") + (ret, _, _) = ssh.exec_command( + "sh -c 'sudo pkill t-rex && sleep 3'") if int(ret) != 0: - logger.error('pkill t-rex failed: {0}'.format(stdout + stderr)) raise RuntimeError('pkill t-rex failed') @staticmethod def trex_stl_stop_remote_exec(node): """Execute script on remote node over ssh to stop running traffic. - :param node: T-REX generator node. + :param node: TRex generator node. :type node: dict - :return: Nothing + :returns: Nothing + :raises: RuntimeError if stop traffic script fails. """ ssh = SSH() ssh.connect(node) - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{}/resources/tools/t-rex/" - "t-rex-stateless-stop.py'".format(Constants.REMOTE_FW_DIR)) - logger.trace(ret) - logger.trace(stdout) - logger.trace(stderr) + (ret, _, _) = ssh.exec_command( + "sh -c '{}/resources/tools/trex/" + "trex_stateless_stop.py'".format(Constants.REMOTE_FW_DIR)) if int(ret) != 0: - raise RuntimeError('T-rex stateless runtime error') + raise RuntimeError('TRex stateless runtime error') def trex_stl_start_remote_exec(self, duration, rate, framesize, traffic_type, async_call=False, @@ -305,168 +360,42 @@ class TrafficGenerator(object): :param warmup_time: Warmup time period. :type duration: int :type rate: str - :type framesize: int + :type framesize: str :type traffic_type: str :type async_call: bool :type latency: bool :type warmup_time: int - :return: Nothing + :returns: Nothing + :raises: RuntimeError in case of TG driver issue. """ ssh = SSH() ssh.connect(self._node) - _p0 = 1 - _p1 = 2 _async = "--async" if async_call else "" _latency = "--latency" if latency else "" - - if self._ifaces_reordered != 0: - _p0, _p1 = _p1, _p0 - - if traffic_type in ["3-node-xconnect", "3-node-bridge"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} " - "--p{4}_src_start_ip 10.10.10.1 " - "--p{4}_src_end_ip 10.10.10.254 " - "--p{4}_dst_start_ip 20.20.20.1 " - "--p{5}_src_start_ip 20.20.20.1 " - "--p{5}_src_end_ip 20.20.20.254 " - "--p{5}_dst_start_ip 10.10.10.1 " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - elif traffic_type in ["3-node-IPv4"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} " - "--p{4}_src_start_ip 10.10.10.2 " - "--p{4}_src_end_ip 10.10.10.254 " - "--p{4}_dst_start_ip 20.20.20.2 " - "--p{5}_src_start_ip 20.20.20.2 " - "--p{5}_src_end_ip 20.20.20.254 " - "--p{5}_dst_start_ip 10.10.10.2 " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - elif traffic_type in ["3-node-IPv4-dst-10000"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} " - "--p{4}_src_start_ip 10.0.0.1 " - "--p{4}_dst_start_ip 20.0.0.0 " - "--p{4}_dst_end_ip 20.0.39.15 " - "--p{5}_src_start_ip 20.0.0.1 " - "--p{5}_dst_start_ip 10.0.0.0 " - "--p{5}_dst_end_ip 10.0.39.15 " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - elif traffic_type in ["3-node-IPv4-dst-100000"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} " - "--p{4}_src_start_ip 10.0.0.1 " - "--p{4}_dst_start_ip 20.0.0.0 " - "--p{4}_dst_end_ip 20.1.134.159 " - "--p{5}_src_start_ip 20.0.0.1 " - "--p{5}_dst_start_ip 10.0.0.0 " - "--p{5}_dst_end_ip 10.1.134.159 " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - elif traffic_type in ["3-node-IPv4-dst-1000000"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} " - "--p{4}_src_start_ip 10.0.0.1 " - "--p{4}_dst_start_ip 20.0.0.0 " - "--p{4}_dst_end_ip 20.15.66.63 " - "--p{5}_src_start_ip 20.0.0.1 " - "--p{5}_dst_start_ip 10.0.0.0 " - "--p{5}_dst_end_ip 10.15.66.63 " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - elif traffic_type in ["3-node-IPv6"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} -6 " - "--p{4}_src_start_ip 2001:1::2 " - "--p{4}_src_end_ip 2001:1::FE " - "--p{4}_dst_start_ip 2001:2::2 " - "--p{5}_src_start_ip 2001:2::2 " - "--p{5}_src_end_ip 2001:2::FE " - "--p{5}_dst_start_ip 2001:1::2 " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - elif traffic_type in ["3-node-IPv6-dst-10000"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} -6 " - "--p{4}_src_start_ip 2001:1::1 " - "--p{4}_dst_start_ip 2001:2::0 " - "--p{4}_dst_end_ip 2001:2::270F " - "--p{5}_src_start_ip 2001:2::1 " - "--p{5}_dst_start_ip 2001:1::0 " - "--p{5}_dst_end_ip 2001:1::270F " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - elif traffic_type in ["3-node-IPv6-dst-100000"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} -6 " - "--p{4}_src_start_ip 2001:1::1 " - "--p{4}_dst_start_ip 2001:2::0 " - "--p{4}_dst_end_ip 2001:2::1:869F " - "--p{5}_src_start_ip 2001:2::1 " - "--p{5}_dst_start_ip 2001:1::0 " - "--p{5}_dst_end_ip 2001:1::1:869F " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - elif traffic_type in ["3-node-IPv6-dst-1000000"]: - (ret, stdout, stderr) = ssh.exec_command( - "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " - "--duration={1} -r {2} -s {3} -6 " - "--p{4}_src_start_ip 2001:1::1 " - "--p{4}_dst_start_ip 2001:2::0 " - "--p{4}_dst_end_ip 2001:2::F:423F " - "--p{5}_src_start_ip 2001:2::1 " - "--p{5}_dst_start_ip 2001:1::0 " - "--p{5}_dst_end_ip 2001:1::F:423F " - "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR, - duration, rate, framesize, - _p0, _p1, _async, _latency, - warmup_time), - timeout=int(duration)+60) - else: - raise NotImplementedError('Unsupported traffic type') - - logger.trace(ret) - logger.trace(stdout) - logger.trace(stderr) + _p0, _p1 = (2, 1) if self._ifaces_reordered else (1, 2) + + profile_path = ("{0}/resources/traffic_profiles/trex/" + "{1}.py".format(Constants.REMOTE_FW_DIR, + traffic_type)) + (ret, stdout, _) = ssh.exec_command( + "sh -c " + "'{0}/resources/tools/trex/trex_stateless_profile.py " + "--profile {1} " + "--duration {2} " + "--frame_size {3} " + "--rate {4} " + "--warmup_time {5} " + "--port_0 {6} " + "--port_1 {7} " + "{8} " # --async + "{9}'". # --latency + format(Constants.REMOTE_FW_DIR, profile_path, duration, framesize, + rate, warmup_time, _p0 - 1, _p1 - 1, _async, _latency), + timeout=int(duration) + 60) if int(ret) != 0: - raise RuntimeError('T-rex stateless runtime error') + raise RuntimeError('TRex stateless runtime error') elif async_call: #no result self._received = None @@ -485,22 +414,14 @@ class TrafficGenerator(object): self._loss = self._result.split(', ')[3].split('=')[1] self._latency = [] - lat_int_list = [] - #round latency numbers - lat_str = self._result.split(', ')[4].split('=')[1] - for lat in lat_str.split("/"): - lat_int_list.append(int(float(lat))) - self._latency.append("/".join(str(tmp) for tmp in lat_int_list)) - lat_int_list = [] - lat_str = self._result.split(', ')[5].split('=')[1] - for lat in lat_str.split("/"): - lat_int_list.append(int(float(lat))) - self._latency.append("/".join(str(tmp) for tmp in lat_int_list)) + self._latency.append(self._result.split(', ')[4].split('=')[1]) + self._latency.append(self._result.split(', ')[5].split('=')[1]) def stop_traffic_on_tg(self): - """Stop all traffic on TG + """Stop all traffic on TG. - :return: Nothing + :returns: Nothing + :raises: RuntimeError if TG is not set. """ if self._node is None: raise RuntimeError("TG is not set") @@ -516,14 +437,21 @@ class TrafficGenerator(object): :param rate: Offered load per interface (e.g. 1%, 3gbps, 4mpps, ...). :param framesize: Frame size (L2) in Bytes. :param traffic_type: Traffic profile. + :param warmup_time: Warmup phase in seconds. + :param async_call: Async mode. :param latency: With latency measurement. :type duration: str :type rate: str :type framesize: str :type traffic_type: str + :type warmup_time: int + :type async_call: bool :type latency: bool - :return: TG output. + :returns: TG output. :rtype: str + :raises: RuntimeError if TG is not set. + :raises: RuntimeError if node is not TG or subtype is not specified. + :raises: NotImplementedError if TG is not supported. """ node = self._node @@ -531,12 +459,12 @@ class TrafficGenerator(object): raise RuntimeError("TG is not set") if node['type'] != NodeType.TG: - raise Exception('Node type is not a TG') + raise RuntimeError('Node type is not a TG') if node['subtype'] is None: - raise Exception('TG subtype not defined') + raise RuntimeError('TG subtype not defined') elif node['subtype'] == NodeSubTypeTG.TREX: - self.trex_stl_start_remote_exec(duration, rate, framesize, + self.trex_stl_start_remote_exec(int(duration), rate, framesize, traffic_type, async_call, latency, warmup_time=warmup_time) else: @@ -547,7 +475,8 @@ class TrafficGenerator(object): def no_traffic_loss_occurred(self): """Fail if loss occurred in traffic run. - :return: nothing + :returns: nothing + :raises: Exception if loss occured. """ if self._loss is None: raise Exception('The traffic generation has not been issued') @@ -558,7 +487,12 @@ class TrafficGenerator(object): loss_acceptance_type): """Fail if loss is higher then accepted in traffic run. - :return: nothing + :param loss_acceptance: Permitted drop ratio or frames count. + :param loss_acceptance_type: Type of permitted loss. + :type loss_acceptance: float + :type loss_acceptance_type: LossAcceptanceType + :returns: nothing + :raises: Exception if loss is above acceptance criteria. """ if self._loss is None: raise Exception('The traffic generation has not been issued')