X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip6.py;h=a3da6650d8b9bd8e1e1ce9a5a380f10eeff50e7e;hb=98d82ca04ba438cd2ba3c03de6e1e82e4786cd83;hp=a9244bd3d60b1ba0a312a484d8f89d3ee2b55f37;hpb=a1f360647f1c89908294bf06667fba60f4369e8b;p=vpp.git

diff --git a/test/test_ip6.py b/test/test_ip6.py
index a9244bd3d60..a3da6650d8b 100644
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -31,7 +31,7 @@ from vpp_ip_route import VppIpRoute, VppRoutePath, find_route, VppIpMRoute, \
 from vpp_neighbor import find_nbr, VppNeighbor
 from vpp_pg_interface import is_ipv6_misc
 from vpp_sub_interface import VppSubInterface, VppDot1QSubint
-from vpp_policer import VppPolicer
+from vpp_policer import VppPolicer, PolicerAction
 from ipaddress import IPv6Network, IPv6Address
 
 AF_INET6 = socket.AF_INET6
@@ -2248,6 +2248,13 @@ class TestIP6Punt(IP6PuntSetup, VppTestCase):
         # but not equal to the number sent, since some were policed
         #
         rx = self.pg1._get_capture(1)
+        stats = policer.get_stats()
+
+        # Single rate policer - expect conform, violate but no exceed
+        self.assertGreater(stats['conform_packets'], 0)
+        self.assertEqual(stats['exceed_packets'], 0)
+        self.assertGreater(stats['violate_packets'], 0)
+
         self.assertGreater(len(rx), 0)
         self.assertLess(len(rx), len(pkts))
 
@@ -2309,6 +2316,75 @@ class TestIP6Punt(IP6PuntSetup, VppTestCase):
         self.assertEqual(str(punts[2].punt.nh), '::')
 
 
+class TestIP6PuntHandoff(IP6PuntSetup, VppTestCase):
+    """ IPv6 Punt Police/Redirect """
+    worker_config = "workers 2"
+
+    def setUp(self):
+        super(TestIP6PuntHandoff, self).setUp()
+        super(TestIP6PuntHandoff, self).punt_setup()
+
+    def tearDown(self):
+        super(TestIP6PuntHandoff, self).punt_teardown()
+        super(TestIP6PuntHandoff, self).tearDown()
+
+    def test_ip_punt(self):
+        """ IP6 punt policer thread handoff """
+        pkts = self.pkt * NUM_PKTS
+
+        #
+        # Configure a punt redirect via pg1.
+        #
+        nh_addr = self.pg1.remote_ip6
+        ip_punt_redirect = VppIpPuntRedirect(self, self.pg0.sw_if_index,
+                                             self.pg1.sw_if_index, nh_addr)
+        ip_punt_redirect.add_vpp_config()
+
+        action_tx = PolicerAction(
+            VppEnum.vl_api_sse2_qos_action_type_t.SSE2_QOS_ACTION_API_TRANSMIT,
+            0)
+        #
+        # This policer drops no packets, we are just
+        # testing that they get to the right thread.
+        #
+        policer = VppPolicer(self, "ip6-punt", 400, 0, 10, 0, 1,
+                             0, 0, False, action_tx, action_tx, action_tx)
+        policer.add_vpp_config()
+        ip_punt_policer = VppIpPuntPolicer(self, policer.policer_index,
+                                           is_ip6=True)
+        ip_punt_policer.add_vpp_config()
+
+        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"))
+
+        # Combined stats, all threads
+        stats = policer.get_stats()
+
+        # Single rate policer - expect conform, violate but no exceed
+        self.assertGreater(stats['conform_packets'], 0)
+        self.assertEqual(stats['exceed_packets'], 0)
+        self.assertGreater(stats['violate_packets'], 0)
+
+        # Worker 0, should have done all the policing
+        stats0 = policer.get_stats(worker=0)
+        self.assertEqual(stats, stats0)
+
+        # Worker 1, should have handed everything off
+        stats1 = policer.get_stats(worker=1)
+        self.assertEqual(stats1['conform_packets'], 0)
+        self.assertEqual(stats1['exceed_packets'], 0)
+        self.assertEqual(stats1['violate_packets'], 0)
+
+        #
+        # Clean up
+        #
+        ip_punt_policer.remove_vpp_config()
+        policer.remove_vpp_config()
+        ip_punt_redirect.remove_vpp_config()
+
+
 class TestIPDeag(VppTestCase):
     """ IPv6 Deaggregate Routes """