X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=ddd0ff35771084c6abbc473f7c87a7ffaef84131;hp=3969891cf9a050610016d10dd2d36098e9aefa12;hb=6000b2abc3d6b8bb8ff2941aacf005a04a33be60;hpb=180d17939d123c04bf142cedf02daa325e3f4fa6

diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index 3969891cf9..ddd0ff3577 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -46,11 +46,16 @@ class TGDropRateSearchImpl(DropRateSearch):
             tg_instance.trex_stl_start_remote_exec(self.get_duration(),
                                                    unit_rate, frame_size,
                                                    traffic_type, False)
-
-            # TODO: getters for tg_instance and loss_acceptance_type
-            logger.trace("comparing: {} < {} ".format(tg_instance._loss,
-                                                      loss_acceptance))
-            if float(tg_instance._loss) > float(loss_acceptance):
+            loss = tg_instance.get_loss()
+            sent = tg_instance.get_sent()
+            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))
+            if float(loss) > float(loss_acceptance):
                 return False
             else:
                 return True
@@ -73,6 +78,30 @@ class TrafficGenerator(object):
         # T-REX interface order mapping
         self._ifaces_reordered = 0
 
+    def get_loss(self):
+        """Return number of lost packets.
+
+        :return: Number of lost packets.
+        :rtype: str
+        """
+        return self._loss
+
+    def get_sent(self):
+        """Return number of sent packets.
+
+        :return: Number of sent packets.
+        :rtype: str
+        """
+        return self._sent
+
+    def get_received(self):
+        """Return number of received packets.
+
+        :return: Number of received packets.
+        :rtype: str
+        """
+        return self._received
+
     #pylint: disable=too-many-arguments, too-many-locals
     def initialize_traffic_generator(self, tg_node, tg_if1, tg_if2,
                                      dut1_node, dut1_if1, dut1_if2,
@@ -103,8 +132,6 @@ class TrafficGenerator(object):
         :return: nothing
         """
 
-        trex_path = "/opt/trex-core-2.00"
-
         topo = Topology()
 
         if tg_node['type'] != NodeType.TG:
@@ -112,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)
@@ -361,7 +398,7 @@ class TrafficGenerator(object):
         return self._result
 
     def no_traffic_loss_occurred(self):
-        """Fail is loss occurred in traffic run.
+        """Fail if loss occurred in traffic run.
 
         :return: nothing
         """
@@ -369,3 +406,23 @@ class TrafficGenerator(object):
             raise Exception('The traffic generation has not been issued')
         if self._loss != '0':
             raise Exception('Traffic loss occurred: {0}'.format(self._loss))
+
+    def partial_traffic_loss_accepted(self, loss_acceptance,
+                                      loss_acceptance_type):
+        """Fail if loss is higher then accepted in traffic run.
+
+        :return: nothing
+        """
+        if self._loss is None:
+            raise Exception('The traffic generation has not been issued')
+
+        if loss_acceptance_type == 'percentage':
+            loss = (float(self._loss) / float(self._sent)) * 100
+        elif loss_acceptance_type == 'frames':
+            loss = float(self._loss)
+        else:
+            raise Exception('Loss acceptance type not supported')
+
+        if loss > float(loss_acceptance):
+            raise Exception("Traffic loss {} above loss acceptance: {}".format(
+                loss, loss_acceptance))