X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=459a6cc2bb79ed2d8c18637ea34d9e0e1d9bc175;hb=21921596d22a72cc4e4f7dee172ff17d1e5853cd;hp=03881798761d103d2f5ec54412b165c84730f068;hpb=a1309d0a4bb3b7fade955712454685c4aed9044e;p=csit.git diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 0388179876..459a6cc2bb 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -47,9 +47,6 @@ class TGDropRateSearchImpl(DropRateSearch): tg_instance.trex_stl_start_remote_exec(self.get_duration(), unit_rate, frame_size, traffic_type) - # Get latency stats from stream - self._latency_stats = tg_instance.get_latency() - loss = tg_instance.get_loss() sent = tg_instance.get_sent() if self.loss_acceptance_type_is_percentage(): @@ -66,6 +63,16 @@ class TGDropRateSearchImpl(DropRateSearch): else: raise NotImplementedError("TG subtype not supported") + def get_latency(self): + """Return min/avg/max latency. + + :return: 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.""" @@ -107,8 +114,8 @@ class TrafficGenerator(object): """ return self._received - def get_latency(self): - """Return min/avg/max latency. + def get_latency_int(self): + """Return rounded min/avg/max latency. :return: Latency stats. :rtype: list @@ -154,7 +161,7 @@ class TrafficGenerator(object): ssh.connect(tg_node) (ret, stdout, stderr) = ssh.exec_command( - "sudo sh -c '{}/resources/tools/t-rex/" + "sudo -E sh -c '{}/resources/tools/t-rex/" "t-rex-installer.sh'".format(Constants.REMOTE_FW_DIR), timeout=1800) if int(ret) != 0: @@ -476,6 +483,7 @@ class TrafficGenerator(object): 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._latency = [] self._latency.append(self._result.split(', ')[4].split('=')[1]) self._latency.append(self._result.split(', ')[5].split('=')[1])