diff options
Diffstat (limited to 'resources/libraries/python/TrafficGenerator.py')
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 57ff22424d..fafb2b71e7 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -106,6 +106,7 @@ class TGDropRateSearchImpl(DropRateSearch): logger.trace("comparing: {los} < {acc} {typ}".format( los=loss, acc=loss_acceptance, typ=loss_acceptance_type)) return float(loss) <= float(loss_acceptance) + return False def get_latency(self): """Returns min/avg/max latency. @@ -147,6 +148,8 @@ class TrafficGenerator(AbstractMeasurer): self.frame_size = None self.traffic_profile = None self.warmup_time = None + # TODO: Rename "xstats" to something opaque, so TRex is not privileged? + self._xstats = (None, None) @property def node(self): @@ -402,7 +405,7 @@ class TrafficGenerator(AbstractMeasurer): raise RuntimeError('pkill t-rex failed') def _parse_traffic_results(self, stdout): - """Parse stdout of scripts into fieds of self. + """Parse stdout of scripts into fields of self. Block of code to reuse, by sync start, or stop after async. TODO: Is the output TG subtype dependent? @@ -424,20 +427,26 @@ class TrafficGenerator(AbstractMeasurer): def trex_stl_stop_remote_exec(self, node): """Execute script on remote node over ssh to stop running traffic. - Internal state is updated with results. + Internal state is updated with measurement results. :param node: TRex generator node. :type node: dict - :returns: Nothing :raises RuntimeError: If stop traffic script fails. """ # No need to check subtype, we know it is TREX. ssh = SSH() ssh.connect(node) + x_args = "" + for index, value in enumerate(self._xstats): + if value is not None: + # Nested quoting is fun. + value = value.replace("'", "\"") + x_args += " --xstat{i}='\"'\"'{v}'\"'\"'".format( + i=index, v=value) (ret, stdout, _) = ssh.exec_command( - "sh -c '{}/resources/tools/trex/" - "trex_stateless_stop.py'".format(Constants.REMOTE_FW_DIR)) + "sh -c '{d}/resources/tools/trex/trex_stateless_stop.py{a}'"\ + .format(d=Constants.REMOTE_FW_DIR, a=x_args)) if int(ret) != 0: raise RuntimeError('TRex stateless runtime error') @@ -450,6 +459,9 @@ class TrafficGenerator(AbstractMeasurer): rx_port=1): """Execute script on remote node over ssh to start traffic. + In sync mode, measurement results are stored internally. + In async mode, initial data including xstats are stored internally. + :param duration: Time expresed in seconds for how long to send traffic. :param rate: Traffic rate expressed with units (pps, %) :param frame_size: L2 frame size to send (without padding and IPG). @@ -498,7 +510,7 @@ class TrafficGenerator(AbstractMeasurer): frame_size=frame_size, rate=rate, warmup=warmup_time, p_0=p_0, p_1=p_1) if async_call: - command += " --async" + command += " --async_start" if latency: command += " --latency" if unidirection: @@ -513,11 +525,20 @@ class TrafficGenerator(AbstractMeasurer): elif async_call: #no result self._start_time = time.time() - self._rate = float(rate[:-3]) if "pps" in rate else rate + self._rate = float(rate[:-3]) if "pps" in rate else float(rate) self._received = None self._sent = None self._loss = None self._latency = None + xstats = [None, None] + index = 0 + for line in stdout.splitlines(): + if "Xstats snapshot {i}: ".format(i=index) in line: + xstats[index] = line[19:] + index += 1 + if index == 2: + break + self._xstats = tuple(xstats) else: self._parse_traffic_results(stdout) self._start_time = None @@ -526,12 +547,14 @@ class TrafficGenerator(AbstractMeasurer): def stop_traffic_on_tg(self): """Stop all traffic on TG. - :returns: Nothing + :returns: Structure containing the result of the measurement. + :rtype: ReceiveRateMeasurement :raises RuntimeError: If TG is not set. """ subtype = check_subtype(self._node) if subtype == NodeSubTypeTG.TREX: self.trex_stl_stop_remote_exec(self._node) + return self.get_measurement_result() def send_traffic_on_tg( self, duration, rate, frame_size, traffic_profile, warmup_time=5, @@ -539,6 +562,11 @@ class TrafficGenerator(AbstractMeasurer): rx_port=1): """Send traffic from all configured interfaces on TG. + In async mode, xstats is stored internally, + to enable getting correct result when stopping the traffic. + In both modes, stdout is returned, + but _parse_traffic_results only works in sync output. + Note that bidirectional traffic also contains flows transmitted from rx_port and received in tx_port. But some tests use asymmetric traffic, so those arguments are relevant. |