tests: test punt policer bound to worker thread

Add to the IP[46] punt policer handoff tests by binding the policer to
a particular worker and checking all packets are policed on that thread.

Type: test
Signed-off-by: Brian Russell <brian@graphiant.com>
Change-Id: I7fab28659ccb65f13f841cec65a3f808281b3f90

1 files changed, 45 insertions, 2 deletions

diff --git a/test/test_ip4.py b/test/test_ip4.py
index f0b43947736..c89d546023d 100644
--- a/test/test_ip4.py
+++ b/test/test_ip4.py
@@ -1642,8 +1642,7 @@ class TestIPPuntHandoff(IPPuntSetup, VppTestCase):
 
         for worker in [0, 1]:
             self.send_and_expect(self.pg0, pkts, self.pg1, worker=worker)
-            if worker == 0:
-                self.logger.debug(self.vapi.cli("show trace max 100"))
+            self.logger.debug(self.vapi.cli("show trace max 100"))
 
         # Combined stats, all threads
         stats = policer.get_stats()
@@ -1663,6 +1662,50 @@ class TestIPPuntHandoff(IPPuntSetup, VppTestCase):
         self.assertEqual(stats1['exceed_packets'], 0)
         self.assertEqual(stats1['violate_packets'], 0)
 
+        # Bind the policer to worker 1 and repeat
+        policer.bind_vpp_config(1, True)
+        for worker in [0, 1]:
+            self.send_and_expect(self.pg0, pkts, self.pg1, worker=worker)
+            self.logger.debug(self.vapi.cli("show trace max 100"))
+
+        # The 2 workers should now have policed the same amount
+        stats = policer.get_stats()
+        stats0 = policer.get_stats(worker=0)
+        stats1 = policer.get_stats(worker=1)
+
+        self.assertGreater(stats0['conform_packets'], 0)
+        self.assertEqual(stats0['exceed_packets'], 0)
+        self.assertGreater(stats0['violate_packets'], 0)
+
+        self.assertGreater(stats1['conform_packets'], 0)
+        self.assertEqual(stats1['exceed_packets'], 0)
+        self.assertGreater(stats1['violate_packets'], 0)
+
+        self.assertEqual(stats0['conform_packets'] + stats1['conform_packets'],
+                         stats['conform_packets'])
+
+        self.assertEqual(stats0['violate_packets'] + stats1['violate_packets'],
+                         stats['violate_packets'])
+
+        # Unbind the policer and repeat
+        policer.bind_vpp_config(1, False)
+        for worker in [0, 1]:
+            self.send_and_expect(self.pg0, pkts, self.pg1, worker=worker)
+            self.logger.debug(self.vapi.cli("show trace max 100"))
+
+        # The policer should auto-bind to worker 0 when packets arrive
+        stats = policer.get_stats()
+        stats0new = policer.get_stats(worker=0)
+        stats1new = policer.get_stats(worker=1)
+
+        self.assertGreater(stats0new['conform_packets'],
+                           stats0['conform_packets'])
+        self.assertEqual(stats0new['exceed_packets'], 0)
+        self.assertGreater(stats0new['violate_packets'],
+                           stats0['violate_packets'])
+
+        self.assertEqual(stats1, stats1new)
+
         #
         # Clean up
         #