tests: Use errno value rather than a specific int
[vpp.git] / test / test_punt.py
index 7959b98..8ee43f1 100644 (file)
-#!/usr/bin/env python
-import binascii
+#!/usr/bin/env python3
 import random
 import socket
-import unittest
 import os
-import scapy.layers.inet6 as inet6
 import threading
-import struct
+import copy
+import fcntl
+import time
+import errno
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
-from struct import unpack, unpack_from
-from util import ppp, ppc
-from re import compile
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether
+from scapy.layers.l2 import Dot1Q
 from scapy.layers.inet import IP, UDP, ICMP
-from scapy.layers.inet6 import IPv6, ICMPv6DestUnreach
-from framework import VppTestCase, VppTestRunner
-
-
-# Format MAC Address
-def get_mac_addr(bytes_addr):
-    return ':'.join('%02x' % ord(b) for b in bytes_addr)
-
-
-# Format IP Address
-def ipv4(bytes_addr):
-    return '.'.join('%d' % ord(b) for b in bytes_addr)
-
-
-# Unpack Ethernet Frame
-def ethernet_frame(data):
-    dest_mac, src_mac, proto = struct.unpack('! 6s 6s H', data[:14])
-    return dest_mac, src_mac, socket.htons(proto), data[14:]
-
-
-# Unpack IPv4 Packets
-def ipv4_packet(data):
-    proto, src, target = struct.unpack('! 8x 1x B 2x 4s 4s', data[:20])
-    return proto, src, target, data[20:]
-
-
-# Unpack IPv6 Packets
-def ipv6_packet(data):
-    nh, src, target = struct.unpack('! 6x B 1x 16s 16s', data[:40])
-    return nh, src, target, data[40:]
-
-
-# Unpacks any UDP Packet
-def udp_seg(data):
-    src_port, dest_port, size = struct.unpack('! H H 2x H', data[:8])
-    return src_port, dest_port, size, data[8:]
-
-
-# Unpacks any TCP Packet
-def tcp_seg(data):
-    src_port, dest_port, seq, flag = struct.unpack('! H H L 4x H', data[:14])
-    return src_port, dest_port, seq, data[((flag >> 12) * 4):]
-
-
-def receivePackets(sock, counters):
-    # Wait for some packets on socket
-    while True:
-        data = sock.recv(65536)
+from scapy.layers.ipsec import ESP
+import scapy.layers.inet6 as inet6
+from scapy.layers.inet6 import IPv6
+from scapy.contrib.ospf import OSPF_Hdr, OSPFv3_Hello
+from framework import VppTestCase
+from asfframework import VppTestRunner, tag_fixme_vpp_workers
+from vpp_sub_interface import VppDot1QSubint
 
-        # punt socket metadata
-        # packet_desc = data[0:8]
+from vpp_ip import DpoProto
+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ipsec import VppIpsecSA, VppIpsecTunProtect, VppIpsecInterface
+from vpp_papi import VppEnum
 
-        # Ethernet
-        _, _, eth_proto, data = ethernet_frame(data[8:])
-        # Ipv4
-        if eth_proto == 8:
-            proto, _, _, data = ipv4_packet(data)
-            # TCP
-            if proto == 6:
-                _, dst_port, _, data = udp_seg(data)
-            # UDP
-            elif proto == 17:
-                _, dst_port, _, data = udp_seg(data)
-                counters[dst_port] = 0
-        # Ipv6
-        elif eth_proto == 0xdd86:
-            nh, _, _, data = ipv6_packet(data)
-            # TCP
-            if nh == 6:
-                _, dst_port, _, data = udp_seg(data)
-            # UDP
-            elif nh == 17:
-                _, dst_port, _, data = udp_seg(data)
-                counters[dst_port] = 0
+NUM_PKTS = 67
 
 
 class serverSocketThread(threading.Thread):
-    """ Socket server thread"""
+    """Socket server thread"""
 
-    def __init__(self, threadID, sockName, counters):
+    def __init__(self, threadID, sockName):
         threading.Thread.__init__(self)
         self.threadID = threadID
         self.sockName = sockName
         self.sock = None
-        self.counters = counters
+        self.rx_pkts = []
+        self.stop_running = False
+
+    def rx_packets(self):
+        # Wait for some packets on socket
+        while True:
+            try:
+                data = self.sock.recv(65536)
+
+                # punt socket metadata
+                # packet_desc = data[0:8]
+
+                # Ethernet
+                self.rx_pkts.append(Ether(data[8:]))
+            except IOError as e:
+                if e.errno == errno.EAGAIN:
+                    # nothing to receive, stop running or sleep a little
+                    if self.stop_running:
+                        break
+                    time.sleep(0.1)
+                    pass
+                else:
+                    raise
 
     def run(self):
         self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
@@ -106,18 +71,28 @@ class serverSocketThread(threading.Thread):
             os.unlink(self.sockName)
         except:
             pass
+        self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 65536)
+        self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 65536)
+        fcntl.fcntl(self.sock, fcntl.F_SETFL, os.O_NONBLOCK)
         self.sock.bind(self.sockName)
 
-        receivePackets(self.sock, self.counters)
+        self.rx_packets()
+
+    def close(self):
+        self.stop_running = True
+        threading.Thread.join(self)
+        self.sock.close()
+        return self.rx_pkts
 
 
 class TestPuntSocket(VppTestCase):
-    """ Punt Socket """
+    """Punt Socket"""
 
     ports = [1111, 2222, 3333, 4444]
     sock_servers = list()
-    portsCheck = dict()
-    nr_packets = 256
+    # FIXME: nr_packets > 3 results in failure
+    # nr_packets = 3 makes the test unstable
+    nr_packets = 2
 
     @classmethod
     def setUpClass(cls):
@@ -129,8 +104,13 @@ class TestPuntSocket(VppTestCase):
 
     @classmethod
     def setUpConstants(cls):
-        cls.extra_vpp_punt_config = [
-            "punt", "{", "socket", cls.tempdir+"/socket_punt", "}"]
+        cls.extra_vpp_config = [
+            "punt",
+            "{",
+            "socket",
+            cls.tempdir + "/socket_punt",
+            "}",
+        ]
         super(TestPuntSocket, cls).setUpConstants()
 
     def setUp(self):
@@ -146,17 +126,71 @@ class TestPuntSocket(VppTestCase):
         super(TestPuntSocket, self).tearDown()
 
     def socket_client_create(self, sock_name, id=None):
-        thread = serverSocketThread(id, sock_name, self.portsCheck)
+        thread = serverSocketThread(id, sock_name)
         self.sock_servers.append(thread)
         thread.start()
+        return thread
 
     def socket_client_close(self):
+        rx_pkts = []
         for thread in self.sock_servers:
-            thread.sock.close()
+            rx_pkts += thread.close()
+        return rx_pkts
+
+    def verify_port(self, pr, vpr):
+        self.assertEqual(vpr.punt.type, pr["type"])
+        self.assertEqual(vpr.punt.punt.l4.port, pr["punt"]["l4"]["port"])
+        self.assertEqual(vpr.punt.punt.l4.protocol, pr["punt"]["l4"]["protocol"])
+        self.assertEqual(vpr.punt.punt.l4.af, pr["punt"]["l4"]["af"])
+
+    def verify_exception(self, pr, vpr):
+        self.assertEqual(vpr.punt.type, pr["type"])
+        self.assertEqual(vpr.punt.punt.exception.id, pr["punt"]["exception"]["id"])
+
+    def verify_ip_proto(self, pr, vpr):
+        self.assertEqual(vpr.punt.type, pr["type"])
+        self.assertEqual(vpr.punt.punt.ip_proto.af, pr["punt"]["ip_proto"]["af"])
+        self.assertEqual(
+            vpr.punt.punt.ip_proto.protocol, pr["punt"]["ip_proto"]["protocol"]
+        )
+
+    def verify_udp_pkts(self, rxs, n_rx, port):
+        n_match = 0
+        for rx in rxs:
+            self.assertTrue(rx.haslayer(UDP))
+            if rx[UDP].dport == port:
+                n_match += 1
+        self.assertEqual(n_match, n_rx)
+
+
+def set_port(pr, port):
+    pr["punt"]["l4"]["port"] = port
+    return pr
+
+
+def set_reason(pr, reason):
+    pr["punt"]["exception"]["id"] = reason
+    return pr
+
+
+def mk_vpp_cfg4():
+    pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+    af_ip4 = VppEnum.vl_api_address_family_t.ADDRESS_IP4
+    udp_proto = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_UDP
+    punt_l4 = {"type": pt_l4, "punt": {"l4": {"af": af_ip4, "protocol": udp_proto}}}
+    return punt_l4
+
+
+def mk_vpp_cfg6():
+    pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+    af_ip6 = VppEnum.vl_api_address_family_t.ADDRESS_IP6
+    udp_proto = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_UDP
+    punt_l4 = {"type": pt_l4, "punt": {"l4": {"af": af_ip6, "protocol": udp_proto}}}
+    return punt_l4
 
 
 class TestIP4PuntSocket(TestPuntSocket):
-    """ Punt Socket for IPv4 """
+    """Punt Socket for IPv4 UDP"""
 
     @classmethod
     def setUpClass(cls):
@@ -180,227 +214,210 @@ class TestIP4PuntSocket(TestPuntSocket):
             i.admin_down()
 
     def test_punt_socket_dump(self):
-        """ Punt socket registration/deregistration"""
+        """Punt socket registration/deregistration"""
+
+        pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+        af_ip4 = VppEnum.vl_api_address_family_t.ADDRESS_IP4
+        udp_proto = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_UDP
 
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
         #
         # configure a punt socket
         #
-        self.vapi.punt_socket_register(1111, self.tempdir+"/socket_punt_1111")
-        self.vapi.punt_socket_register(2222, self.tempdir+"/socket_punt_2222")
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+        punt_l4 = mk_vpp_cfg4()
+
+        self.vapi.punt_socket_register(
+            set_port(punt_l4, 1111), "%s/socket_punt_1111" % self.tempdir
+        )
+        self.vapi.punt_socket_register(
+            set_port(punt_l4, 2222), "%s/socket_punt_2222" % self.tempdir
+        )
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 2)
-        self.assertEqual(punts[0].punt.l4_port, 1111)
-        self.assertEqual(punts[1].punt.l4_port, 2222)
+        self.verify_port(set_port(punt_l4, 1111), punts[0])
+        self.verify_port(set_port(punt_l4, 2222), punts[1])
 
         #
         # deregister a punt socket
         #
-        self.vapi.punt_socket_deregister(1111)
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+        self.vapi.punt_socket_deregister(set_port(punt_l4, 1111))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 1)
 
         #
         # configure a punt socket again
         #
-        self.vapi.punt_socket_register(1111, self.tempdir+"/socket_punt_1111")
-        self.vapi.punt_socket_register(3333, self.tempdir+"/socket_punt_3333")
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+        self.vapi.punt_socket_register(
+            set_port(punt_l4, 1111), "%s/socket_punt_1111" % self.tempdir
+        )
+        self.vapi.punt_socket_register(
+            set_port(punt_l4, 3333), "%s/socket_punt_3333" % self.tempdir
+        )
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 3)
 
+        self.logger.info(self.vapi.cli("sh punt sock reg"))
+
         #
         # deregister all punt socket
         #
-        self.vapi.punt_socket_deregister(1111)
-        self.vapi.punt_socket_deregister(2222)
-        self.vapi.punt_socket_deregister(3333)
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+        self.vapi.punt_socket_deregister(set_port(punt_l4, 1111))
+        self.vapi.punt_socket_deregister(set_port(punt_l4, 2222))
+        self.vapi.punt_socket_deregister(set_port(punt_l4, 3333))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
     def test_punt_socket_traffic_single_port_single_socket(self):
-        """ Punt socket traffic single port single socket"""
+        """Punt socket traffic single port single socket"""
 
         port = self.ports[0]
+        pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+        punt_l4 = set_port(mk_vpp_cfg4(), port)
 
-        p = (Ether(src=self.pg0.remote_mac,
-                   dst=self.pg0.local_mac) /
-             IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) /
-             UDP(sport=9876, dport=port) /
-             Raw('\xa5' * 100))
+        p = (
+            Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
+            / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4)
+            / UDP(sport=9876, dport=port)
+            / Raw(b"\xa5" * 100)
+        )
 
         pkts = p * self.nr_packets
-        self.portsCheck[port] = self.nr_packets
 
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
         #
         # expect ICMP - port unreachable for all packets
         #
-        self.vapi.cli("clear trace")
-        self.pg0.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        # FIXME - when punt socket deregister is implemented
-        # rx = self.pg0.get_capture(self.nr_packets)
-        # for p in rx:
-        #     self.assertEqual(int(p[IP].proto), 1)   # ICMP
-        #     self.assertEqual(int(p[ICMP].code), 3)  # unreachable
+        rx = self.send_and_expect_some(self.pg0, pkts, self.pg0)
+
+        for p in rx:
+            self.assertEqual(int(p[IP].proto), 1)  # ICMP
+            self.assertEqual(int(p[ICMP].code), 3)  # unreachable
 
         #
         # configure a punt socket
         #
-        self.socket_client_create(self.tempdir+"/socket_" + str(port))
-        self.vapi.punt_socket_register(port, self.tempdir+"/socket_" +
-                                       str(port))
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+        self.socket_client_create("%s/socket_%d" % (self.tempdir, port))
+        self.vapi.punt_socket_register(punt_l4, "%s/socket_%d" % (self.tempdir, port))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 1)
 
-        self.logger.debug("Sending %s packets to port %d",
-                          str(self.portsCheck[port]), port)
         #
         # expect punt socket and no packets on pg0
         #
-        self.vapi.cli("clear errors")
-        self.vapi.cli("clear trace")
-        self.pg0.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        self.pg0.get_capture(0)
-        self.logger.info(self.vapi.cli("show trace"))
-        self.socket_client_close()
-        self.assertEqual(self.portsCheck[port], 0)
+        self.send_and_assert_no_replies(self.pg0, pkts)
+        rx = self.socket_client_close()
+        self.verify_udp_pkts(rx, len(pkts), port)
 
         #
         # remove punt socket. expect ICMP - port unreachable for all packets
         #
-        self.vapi.punt_socket_deregister(port)
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+        self.vapi.punt_socket_deregister(punt_l4)
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
-        self.pg0.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        # FIXME - when punt socket deregister is implemented
-        # self.pg0.get_capture(nr_packets)
 
-    def test_punt_socket_traffic_multi_port_multi_sockets(self):
-        """ Punt socket traffic multi ports and multi sockets"""
+        rx = self.send_and_expect_some(self.pg0, pkts, self.pg0)
+        for p in rx:
+            self.assertEqual(int(p[IP].proto), 1)  # ICMP
+            self.assertEqual(int(p[ICMP].code), 3)  # unreachable
 
-        for p in self.ports:
-            self.portsCheck[p] = 0
+    def test_punt_socket_traffic_multi_ports_multi_sockets(self):
+        """Punt socket traffic multi ports and multi sockets"""
+
+        punt_l4 = mk_vpp_cfg4()
+
+        # configuration for each UDP port
+        cfgs = dict()
 
         #
-        # create stream with random pakets count per given ports
+        # create stream of packets for each port
         #
-        pkts = list()
-        for _ in range(0, self.nr_packets):
+        for port in self.ports:
             # choose port from port list
-            p = random.choice(self.ports)
-            pkts.append((
-                Ether(src=self.pg0.remote_mac,
-                      dst=self.pg0.local_mac) /
-                IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) /
-                UDP(sport=9876, dport=p) /
-                Raw('\xa5' * 100)))
-            self.portsCheck[p] += 1
-        #
-        # no punt socket
-        #
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
-        self.assertEqual(len(punts), 0)
+            cfgs[port] = {}
+
+            pkt = (
+                Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
+                / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4)
+                / UDP(sport=9876, dport=port)
+                / Raw(b"\xa5" * 100)
+            )
+            cfgs[port]["pkts"] = pkt * self.nr_packets
+            cfgs[port]["port"] = port
+            cfgs[port]["vpp"] = copy.deepcopy(set_port(punt_l4, port))
+
+            # configure punt sockets
+            cfgs[port]["sock"] = self.socket_client_create(
+                "%s/socket_%d" % (self.tempdir, port)
+            )
+            self.vapi.punt_socket_register(
+                cfgs[port]["vpp"], "%s/socket_%d" % (self.tempdir, port)
+            )
 
         #
-        # configure a punt socket
+        # send the packets that get punted
         #
-        for p in self.ports:
-            self.socket_client_create(self.tempdir+"/socket_" + str(p))
-            self.vapi.punt_socket_register(p, self.tempdir+"/socket_" + str(p))
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
-        self.assertEqual(len(punts), len(self.ports))
-
-        for p in self.ports:
-            self.logger.debug("Sending %s packets to port %d",
-                              str(self.portsCheck[p]), p)
+        for cfg in cfgs.values():
+            self.send_and_assert_no_replies(self.pg0, cfg["pkts"])
 
         #
-        # expect punt socket and no packets on pg0
+        # test that we got the excepted packets on the expected socket
         #
-        self.vapi.cli("clear errors")
-        self.vapi.cli("clear trace")
-        self.pg0.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        self.pg0.get_capture(0)
-        self.logger.info(self.vapi.cli("show trace"))
-        self.socket_client_close()
-
-        for p in self.ports:
-            self.assertEqual(self.portsCheck[p], 0)
-            self.vapi.punt_socket_deregister(p)
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
-        self.assertEqual(len(punts), 0)
+        for cfg in cfgs.values():
+            rx = cfg["sock"].close()
+            self.verify_udp_pkts(rx, len(cfg["pkts"]), cfg["port"])
+            self.vapi.punt_socket_deregister(cfg["vpp"])
 
     def test_punt_socket_traffic_multi_ports_single_socket(self):
-        """ Punt socket traffic multi ports and single socket"""
+        """Punt socket traffic multi ports and single socket"""
 
-        for p in self.ports:
-            self.portsCheck[p] = 0
+        pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+        punt_l4 = mk_vpp_cfg4()
 
         #
-        # create stream with random pakets count per given ports
+        # create stream of packets with each port
         #
-        pkts = list()
-        for _ in range(0, self.nr_packets):
+        pkts = []
+        for port in self.ports:
             # choose port from port list
-            p = random.choice(self.ports)
-            pkts.append((
-                Ether(src=self.pg0.remote_mac,
-                      dst=self.pg0.local_mac) /
-                IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) /
-                UDP(sport=9876, dport=p) /
-                Raw('\xa5' * 100)))
-            self.portsCheck[p] += 1
+            pkt = (
+                Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
+                / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4)
+                / UDP(sport=9876, dport=port)
+                / Raw(b"\xa5" * 100)
+            )
+            pkts += pkt * self.nr_packets
 
         #
-        # no punt socket
-        #
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
-        self.assertEqual(len(punts), 0)
-
         # configure a punt socket
         #
-        self.socket_client_create(self.tempdir+"/socket_multi")
+        self.socket_client_create("%s/socket_multi" % self.tempdir)
         for p in self.ports:
-            self.vapi.punt_socket_register(p, self.tempdir+"/socket_multi")
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+            self.vapi.punt_socket_register(
+                set_port(punt_l4, p), "%s/socket_multi" % self.tempdir
+            )
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), len(self.ports))
 
-        for p in self.ports:
-            self.logger.debug("Sending %s packets to port %d",
-                              str(self.portsCheck[p]), p)
         #
         # expect punt socket and no packets on pg0
         #
-        self.vapi.cli("clear errors")
-        self.vapi.cli("clear trace")
-        self.pg0.add_stream(pkts)
-        self.pg_enable_capture(self.pg_interfaces)
-        self.pg_start()
-        self.pg0.get_capture(0)
+        self.send_and_assert_no_replies(self.pg0, pkts)
         self.logger.info(self.vapi.cli("show trace"))
-        self.socket_client_close()
+        rx = self.socket_client_close()
 
         for p in self.ports:
-            self.assertEqual(self.portsCheck[p], 0)
-            self.vapi.punt_socket_deregister(p)
-        punts = self.vapi.punt_socket_dump(is_ip6=0)
+            self.verify_udp_pkts(rx, self.nr_packets, p)
+            self.vapi.punt_socket_deregister(set_port(punt_l4, p))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
 
 class TestIP6PuntSocket(TestPuntSocket):
-    """ Punt Socket for IPv6"""
+    """Punt Socket for IPv6 UDP"""
 
     @classmethod
     def setUpClass(cls):
@@ -424,62 +441,86 @@ class TestIP6PuntSocket(TestPuntSocket):
             i.admin_down()
 
     def test_punt_socket_dump(self):
-        """ Punt socket registration """
+        """Punt socket registration"""
 
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+        af_ip6 = VppEnum.vl_api_address_family_t.ADDRESS_IP6
+        udp_proto = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_UDP
+        #
+        # configure a punt socket
+        #
+        punt_l4 = {"type": pt_l4, "punt": {"l4": {"af": af_ip6, "protocol": udp_proto}}}
+
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
         #
         # configure a punt socket
         #
-        self.vapi.punt_socket_register(1111, self.tempdir+"/socket_1111",
-                                       is_ip4=0)
-        self.vapi.punt_socket_register(2222, self.tempdir+"/socket_2222",
-                                       is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        self.vapi.punt_socket_register(
+            set_port(punt_l4, 1111), "%s/socket_1111" % self.tempdir
+        )
+        self.vapi.punt_socket_register(
+            set_port(punt_l4, 2222), "%s/socket_2222" % self.tempdir
+        )
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 2)
-        self.assertEqual(punts[0].punt.l4_port, 1111)
-        self.assertEqual(punts[1].punt.l4_port, 2222)
+        self.verify_port(set_port(punt_l4, 1111), punts[0])
+        self.verify_port(set_port(punt_l4, 2222), punts[1])
 
         #
         # deregister a punt socket
         #
-        self.vapi.punt_socket_deregister(1111, is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        self.vapi.punt_socket_deregister(set_port(punt_l4, 1111))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 1)
 
         #
         # configure a punt socket again
         #
-        self.vapi.punt_socket_register(1111, self.tempdir+"/socket_1111",
-                                       is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        self.vapi.punt_socket_register(
+            set_port(punt_l4, 1111), "%s/socket_1111" % self.tempdir
+        )
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 2)
 
         #
         # deregister all punt socket
         #
-        self.vapi.punt_socket_deregister(1111, is_ip4=0)
-        self.vapi.punt_socket_deregister(2222, is_ip4=0)
-        self.vapi.punt_socket_deregister(3333, is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        self.vapi.punt_socket_deregister(set_port(punt_l4, 1111))
+        self.vapi.punt_socket_deregister(set_port(punt_l4, 2222))
+        self.vapi.punt_socket_deregister(set_port(punt_l4, 3333))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
     def test_punt_socket_traffic_single_port_single_socket(self):
-        """ Punt socket traffic single port single socket"""
+        """Punt socket traffic single port single socket"""
 
         port = self.ports[0]
-
-        p = (Ether(src=self.pg0.remote_mac,
-                   dst=self.pg0.local_mac) /
-             IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6) /
-             inet6.UDP(sport=9876, dport=port) /
-             Raw('\xa5' * 100))
+        pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+        af_ip6 = VppEnum.vl_api_address_family_t.ADDRESS_IP6
+        udp_proto = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_UDP
+        punt_l4 = {
+            "type": pt_l4,
+            "punt": {
+                "l4": {
+                    "af": af_ip6,
+                    "protocol": udp_proto,
+                    "port": port,
+                }
+            },
+        }
+
+        p = (
+            Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
+            / IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6)
+            / inet6.UDP(sport=9876, dport=port)
+            / Raw(b"\xa5" * 100)
+        )
 
         pkts = p * self.nr_packets
-        self.portsCheck[port] = self.nr_packets
 
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
         #
@@ -498,14 +539,11 @@ class TestIP6PuntSocket(TestPuntSocket):
         #
         # configure a punt socket
         #
-        self.socket_client_create(self.tempdir+"/socket_" + str(port))
-        self.vapi.punt_socket_register(port, self.tempdir+"/socket_" +
-                                       str(port), is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        self.socket_client_create("%s/socket_%d" % (self.tempdir, port))
+        self.vapi.punt_socket_register(punt_l4, "%s/socket_%d" % (self.tempdir, port))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 1)
 
-        self.logger.debug("Sending %s packets to port %d",
-                          str(self.portsCheck[port]), port)
         #
         # expect punt socket and no packets on pg0
         #
@@ -516,14 +554,14 @@ class TestIP6PuntSocket(TestPuntSocket):
         self.pg_start()
         self.pg0.get_capture(0)
         self.logger.info(self.vapi.cli("show trace"))
-        self.socket_client_close()
-        self.assertEqual(self.portsCheck[port], 0)
+        rx = self.socket_client_close()
+        self.verify_udp_pkts(rx, len(pkts), port)
 
         #
         # remove punt socket. expect ICMP - dest. unreachable for all packets
         #
-        self.vapi.punt_socket_deregister(port, is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        self.vapi.punt_socket_deregister(punt_l4)
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
         self.pg0.add_stream(pkts)
         self.pg_enable_capture(self.pg_interfaces)
@@ -531,46 +569,100 @@ class TestIP6PuntSocket(TestPuntSocket):
         # FIXME - when punt socket deregister is implemented
         # self.pg0.get_capture(nr_packets)
 
-    def test_punt_socket_traffic_multi_port_multi_sockets(self):
-        """ Punt socket traffic multi ports and multi sockets"""
+    def test_punt_socket_traffic_multi_ports_multi_sockets(self):
+        """Punt socket traffic multi ports and multi sockets"""
 
-        for p in self.ports:
-            self.portsCheck[p] = 0
+        punt_l4 = mk_vpp_cfg6()
+
+        # configuration for each UDP port
+        cfgs = dict()
+
+        #
+        # create stream of packets for each port
+        #
+        for port in self.ports:
+            # choose port from port list
+            cfgs[port] = {}
+
+            pkt = (
+                Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
+                / IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6)
+                / UDP(sport=9876, dport=port)
+                / Raw(b"\xa5" * 100)
+            )
+            cfgs[port]["pkts"] = pkt * self.nr_packets
+            cfgs[port]["port"] = port
+            cfgs[port]["vpp"] = copy.deepcopy(set_port(punt_l4, port))
+
+            # configure punt sockets
+            cfgs[port]["sock"] = self.socket_client_create(
+                "%s/socket_%d" % (self.tempdir, port)
+            )
+            self.vapi.punt_socket_register(
+                cfgs[port]["vpp"], "%s/socket_%d" % (self.tempdir, port)
+            )
+
+        #
+        # send the packets that get punted
+        #
+        for cfg in cfgs.values():
+            self.send_and_assert_no_replies(self.pg0, cfg["pkts"])
+
+        #
+        # test that we got the excepted packets on the expected socket
+        #
+        for cfg in cfgs.values():
+            rx = cfg["sock"].close()
+            self.verify_udp_pkts(rx, len(cfg["pkts"]), cfg["port"])
+            self.vapi.punt_socket_deregister(cfg["vpp"])
+
+    def test_punt_socket_traffic_multi_ports_single_socket(self):
+        """Punt socket traffic multi ports and single socket"""
+
+        pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+        af_ip6 = VppEnum.vl_api_address_family_t.ADDRESS_IP6
+        udp_proto = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_UDP
+        punt_l4 = {
+            "type": pt_l4,
+            "punt": {
+                "l4": {
+                    "af": af_ip6,
+                    "protocol": udp_proto,
+                }
+            },
+        }
 
         #
-        # create stream with random pakets count per given ports
+        # create stream of packets with each port
         #
-        pkts = list()
-        for _ in range(0, self.nr_packets):
+        pkts = []
+        for port in self.ports:
             # choose port from port list
-            p = random.choice(self.ports)
-            pkts.append((
-                Ether(src=self.pg0.remote_mac,
-                      dst=self.pg0.local_mac) /
-                IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6) /
-                inet6.UDP(sport=9876, dport=p) /
-                Raw('\xa5' * 100)))
-            self.portsCheck[p] += 1
+            pkt = (
+                Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
+                / IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6)
+                / UDP(sport=9876, dport=port)
+                / Raw(b"\xa5" * 100)
+            )
+            pkts += pkt * self.nr_packets
+
         #
         # no punt socket
         #
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
         #
         # configure a punt socket
         #
+        self.socket_client_create("%s/socket_multi" % self.tempdir)
         for p in self.ports:
-            self.socket_client_create(self.tempdir+"/socket_" + str(p))
-            self.vapi.punt_socket_register(p, self.tempdir+"/socket_" + str(p),
-                                           is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+            self.vapi.punt_socket_register(
+                set_port(punt_l4, p), "%s/socket_multi" % self.tempdir
+            )
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), len(self.ports))
 
-        for p in self.ports:
-            self.logger.debug("Sending %s packets to port %d",
-                              str(self.portsCheck[p]), p)
-
         #
         # expect punt socket and no packets on pg0
         #
@@ -579,73 +671,634 @@ class TestIP6PuntSocket(TestPuntSocket):
         self.pg0.add_stream(pkts)
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
+        # give a chance to punt socket to collect all packets
+        self.sleep(1)
         self.pg0.get_capture(0)
-        self.logger.info(self.vapi.cli("show trace"))
-        self.socket_client_close()
+        rx = self.socket_client_close()
 
         for p in self.ports:
-            self.assertEqual(self.portsCheck[p], 0)
-            self.vapi.punt_socket_deregister(p, is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+            self.verify_udp_pkts(rx, self.nr_packets, p)
+            self.vapi.punt_socket_deregister(set_port(punt_l4, p))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
         self.assertEqual(len(punts), 0)
 
-    def test_punt_socket_traffic_multi_ports_single_socket(self):
-        """ Punt socket traffic multi ports and single socket"""
 
-        for p in self.ports:
-            self.portsCheck[p] = 0
+class TestExceptionPuntSocket(TestPuntSocket):
+    """Punt Socket for Exceptions"""
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestExceptionPuntSocket, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestExceptionPuntSocket, cls).tearDownClass()
+
+    def setUp(self):
+        super(TestExceptionPuntSocket, self).setUp()
+
+        self.create_pg_interfaces(range(2))
+        for i in self.pg_interfaces:
+            i.config_ip4()
+            i.resolve_arp()
+
+    def tearDown(self):
+        super(TestExceptionPuntSocket, self).tearDown()
+        for i in self.pg_interfaces:
+            i.unconfig_ip4()
+            i.admin_down()
+
+    def test_registration(self):
+        """Punt socket registration/deregistration"""
+
+        pt_ex = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_EXCEPTION
+
+        punts = self.vapi.punt_socket_dump(type=pt_ex)
+        self.assertEqual(len(punts), 0)
 
         #
-        # create stream with random pakets count per given ports
+        # configure a punt socket
         #
-        pkts = list()
-        for _ in range(0, self.nr_packets):
-            # choose port from port list
-            p = random.choice(self.ports)
-            pkts.append((
-                Ether(src=self.pg0.remote_mac,
-                      dst=self.pg0.local_mac) /
-                IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6) /
-                inet6.UDP(sport=9876, dport=p) /
-                Raw('\xa5' * 100)))
-            self.portsCheck[p] += 1
+        punt_ex = {"type": pt_ex, "punt": {"exception": {}}}
+
+        self.vapi.punt_socket_register(
+            set_reason(punt_ex, 1), "%s/socket_punt_1" % self.tempdir
+        )
+        self.vapi.punt_socket_register(
+            set_reason(punt_ex, 2), "%s/socket_punt_2" % self.tempdir
+        )
+        punts = self.vapi.punt_socket_dump(type=pt_ex)
+        self.assertEqual(len(punts), 2)
+        self.verify_exception(set_reason(punt_ex, 1), punts[0])
+        self.verify_exception(set_reason(punt_ex, 2), punts[1])
 
         #
-        # no punt socket
+        # deregister a punt socket
+        #
+        self.vapi.punt_socket_deregister(set_reason(punt_ex, 1))
+        punts = self.vapi.punt_socket_dump(type=pt_ex)
+        self.assertEqual(len(punts), 1)
+
+        #
+        # configure a punt socket again
+        #
+        self.vapi.punt_socket_register(
+            set_reason(punt_ex, 1), "%s/socket_punt_1" % self.tempdir
+        )
+        self.vapi.punt_socket_register(
+            set_reason(punt_ex, 3), "%s/socket_punt_3" % self.tempdir
+        )
+        punts = self.vapi.punt_socket_dump(type=pt_ex)
+        self.assertEqual(len(punts), 3)
+
+        self.logger.info(self.vapi.cli("sh punt sock reg exception"))
+
+        #
+        # deregister all punt socket
         #
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
+        self.vapi.punt_socket_deregister(set_reason(punt_ex, 1))
+        self.vapi.punt_socket_deregister(set_reason(punt_ex, 2))
+        self.vapi.punt_socket_deregister(set_reason(punt_ex, 3))
+        punts = self.vapi.punt_socket_dump(type=pt_ex)
+        self.assertEqual(len(punts), 0)
+
+    def verify_esp_pkts(self, rxs, n_sent, spi, has_udp):
+        self.assertEqual(len(rxs), n_sent)
+        for rx in rxs:
+            self.assertTrue(rx.haslayer(IP))
+            self.assertTrue(rx.haslayer(ESP))
+            self.assertEqual(rx[ESP].spi, spi)
+            if has_udp:
+                self.assertTrue(rx.haslayer(UDP))
+
+    def test_traffic(self):
+        """Punt socket traffic"""
+
+        port = self.ports[0]
+        pt_ex = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_EXCEPTION
+        punt_ex = {"type": pt_ex, "punt": {"exception": {}}}
+
+        #
+        # we're dealing with IPSec tunnels punting for no-such-tunnel
+        # (SPI=0 goes to ikev2)
+        #
+        cfgs = dict()
+        cfgs["ipsec4-no-such-tunnel"] = {"spi": 99, "udp": False, "itf": self.pg0}
+
+        #
+        # find the VPP ID for these punt exception reasin
+        #
+        rs = self.vapi.punt_reason_dump()
+        for key in cfgs:
+            for r in rs:
+                print(r.reason.name)
+                print(key)
+                if r.reason.name == key:
+                    cfgs[key]["id"] = r.reason.id
+                    cfgs[key]["vpp"] = copy.deepcopy(
+                        set_reason(punt_ex, cfgs[key]["id"])
+                    )
+                    break
+
+        #
+        # configure punt sockets
+        #
+        for cfg in cfgs.values():
+            cfg["sock"] = self.socket_client_create(
+                "%s/socket_%d" % (self.tempdir, cfg["id"])
+            )
+            self.vapi.punt_socket_register(
+                cfg["vpp"], "%s/socket_%d" % (self.tempdir, cfg["id"])
+            )
+
+        #
+        # create packet streams for 'no-such-tunnel' exception
+        #
+        for cfg in cfgs.values():
+            pkt = Ether(src=cfg["itf"].remote_mac, dst=cfg["itf"].local_mac) / IP(
+                src=cfg["itf"].remote_ip4, dst=cfg["itf"].local_ip4
+            )
+            if cfg["udp"]:
+                pkt = pkt / UDP(sport=666, dport=4500)
+            pkt = pkt / ESP(spi=cfg["spi"], seq=3) / Raw(b"\xa5" * 100)
+            cfg["pkts"] = [pkt]
+
+        #
+        # send packets for each SPI we expect to be punted
+        #
+        for cfg in cfgs.values():
+            self.send_and_assert_no_replies(cfg["itf"], cfg["pkts"])
+
+        #
+        # verify the punted packets arrived on the associated socket
+        #
+        for cfg in cfgs.values():
+            rx = cfg["sock"].close()
+            self.verify_esp_pkts(rx, len(cfg["pkts"]), cfg["spi"], cfg["udp"])
+
+        #
+        # add some tunnels, make sure it still punts
+        #
+        tun = VppIpsecInterface(self).add_vpp_config()
+        sa_in = VppIpsecSA(
+            self,
+            11,
+            11,
+            (VppEnum.vl_api_ipsec_integ_alg_t.IPSEC_API_INTEG_ALG_SHA1_96),
+            b"0123456701234567",
+            (VppEnum.vl_api_ipsec_crypto_alg_t.IPSEC_API_CRYPTO_ALG_AES_CBC_128),
+            b"0123456701234567",
+            50,
+            self.pg0.local_ip4,
+            self.pg0.remote_ip4,
+        ).add_vpp_config()
+        sa_out = VppIpsecSA(
+            self,
+            22,
+            22,
+            (VppEnum.vl_api_ipsec_integ_alg_t.IPSEC_API_INTEG_ALG_SHA1_96),
+            b"0123456701234567",
+            (VppEnum.vl_api_ipsec_crypto_alg_t.IPSEC_API_CRYPTO_ALG_AES_CBC_128),
+            b"0123456701234567",
+            50,
+            self.pg0.local_ip4,
+            self.pg0.remote_ip4,
+        ).add_vpp_config()
+        protect = VppIpsecTunProtect(self, tun, sa_out, [sa_in]).add_vpp_config()
+
+        #
+        # send packets for each SPI we expect to be punted
+        #
+        for cfg in cfgs.values():
+            self.send_and_assert_no_replies(cfg["itf"], cfg["pkts"])
+
+        #
+        # verify the punted packets arrived on the associated socket
+        #
+        for cfg in cfgs.values():
+            rx = cfg["sock"].close()
+            self.verify_esp_pkts(rx, len(cfg["pkts"]), cfg["spi"], cfg["udp"])
+        #
+        # socket deregister
+        #
+        for cfg in cfgs.values():
+            self.vapi.punt_socket_deregister(cfg["vpp"])
+
+
+class TestIpProtoPuntSocket(TestPuntSocket):
+    """Punt Socket for IP packets"""
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestIpProtoPuntSocket, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIpProtoPuntSocket, cls).tearDownClass()
+
+    def setUp(self):
+        super(TestIpProtoPuntSocket, self).setUp()
+
+        for i in self.pg_interfaces:
+            i.config_ip4()
+            i.resolve_arp()
+
+    def tearDown(self):
+        super(TestIpProtoPuntSocket, self).tearDown()
+        for i in self.pg_interfaces:
+            i.unconfig_ip4()
+            i.admin_down()
+
+    def test_registration(self):
+        """Punt socket registration/deregistration"""
+
+        af_ip4 = VppEnum.vl_api_address_family_t.ADDRESS_IP4
+        pt_ip = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_IP_PROTO
+        proto_ospf = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_OSPF
+        proto_eigrp = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_EIGRP
+
+        punts = self.vapi.punt_socket_dump(type=pt_ip)
         self.assertEqual(len(punts), 0)
 
         #
         # configure a punt socket
         #
-        self.socket_client_create(self.tempdir+"/socket_multi")
-        for p in self.ports:
-            self.vapi.punt_socket_register(p, self.tempdir+"/socket_multi",
-                                           is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
-        self.assertEqual(len(punts), len(self.ports))
+        punt_ospf = {
+            "type": pt_ip,
+            "punt": {"ip_proto": {"af": af_ip4, "protocol": proto_ospf}},
+        }
+        punt_eigrp = {
+            "type": pt_ip,
+            "punt": {"ip_proto": {"af": af_ip4, "protocol": proto_eigrp}},
+        }
+
+        self.vapi.punt_socket_register(punt_ospf, "%s/socket_punt_1" % self.tempdir)
+        self.vapi.punt_socket_register(punt_eigrp, "%s/socket_punt_2" % self.tempdir)
+        self.logger.info(self.vapi.cli("sh punt sock reg ip"))
+        punts = self.vapi.punt_socket_dump(type=pt_ip)
+        self.assertEqual(len(punts), 2)
+        self.verify_ip_proto(punt_ospf, punts[0])
+        self.verify_ip_proto(punt_eigrp, punts[1])
 
-        for p in self.ports:
-            self.logger.debug("Send %s packets to port %d",
-                              str(self.portsCheck[p]), p)
         #
-        # expect punt socket and no packets on pg0
+        # deregister a punt socket
         #
-        self.vapi.cli("clear errors")
+        self.vapi.punt_socket_deregister(punt_ospf)
+        punts = self.vapi.punt_socket_dump(type=pt_ip)
+        self.assertEqual(len(punts), 1)
+
+        #
+        # configure a punt socket again
+        #
+        self.vapi.punt_socket_register(punt_ospf, "%s/socket_punt_3" % self.tempdir)
+        punts = self.vapi.punt_socket_dump(type=pt_ip)
+        self.assertEqual(len(punts), 2)
+
+        self.logger.info(self.vapi.cli("sh punt sock reg exception"))
+
+        #
+        # deregister all punt socket
+        #
+        self.vapi.punt_socket_deregister(punt_eigrp)
+        self.vapi.punt_socket_deregister(punt_ospf)
+        punts = self.vapi.punt_socket_dump(type=pt_ip)
+        self.assertEqual(len(punts), 0)
+
+    def verify_ospf_pkts(self, rxs, n_sent):
+        self.assertEqual(len(rxs), n_sent)
+        for rx in rxs:
+            self.assertTrue(rx.haslayer(OSPF_Hdr))
+
+    def test_traffic(self):
+        """Punt socket traffic"""
+
+        af_ip4 = VppEnum.vl_api_address_family_t.ADDRESS_IP4
+        pt_ip = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_IP_PROTO
+        proto_ospf = VppEnum.vl_api_ip_proto_t.IP_API_PROTO_OSPF
+
+        #
+        # configure a punt socket to capture OSPF packets
+        #
+        punt_ospf = {
+            "type": pt_ip,
+            "punt": {"ip_proto": {"af": af_ip4, "protocol": proto_ospf}},
+        }
+
+        #
+        # create packet streams and configure a punt sockets
+        #
+        pkt = (
+            Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
+            / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4)
+            / OSPF_Hdr()
+            / OSPFv3_Hello()
+        )
+        pkts = pkt * 7
+
+        sock = self.socket_client_create("%s/socket_1" % self.tempdir)
+        self.vapi.punt_socket_register(punt_ospf, "%s/socket_1" % self.tempdir)
+
+        #
+        # send packets for each SPI we expect to be punted
+        #
+        self.send_and_assert_no_replies(self.pg0, pkts)
+
+        #
+        # verify the punted packets arrived on the associated socket
+        #
+        rx = sock.close()
+        self.verify_ospf_pkts(rx, len(pkts))
+        self.vapi.punt_socket_deregister(punt_ospf)
+
+
+class TestDot1QPuntSocket(TestPuntSocket):
+    """Punt Socket for 802.1Q (dot1q)"""
+
+    def setUp(self):
+        super(TestDot1QPuntSocket, self).setUp()
+
+        for i in self.pg_interfaces:
+            i.admin_up()
+            i.config_ip4()
+            i.resolve_arp()
+
+    def tearDown(self):
+        super(TestDot1QPuntSocket, self).tearDown()
+        for i in self.pg_interfaces:
+            i.unconfig_ip4()
+            i.admin_down()
+
+    def test_dot1q_header_punt(self):
+        """Punt socket traffic with Dot1q header"""
+
+        port = self.ports[0]
+        pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
+        punt_l4 = set_port(mk_vpp_cfg4(), port)
+
+        # VLAN ID
+        vlan_id = 100
+
+        # Create a subinterface with the VLAN ID
+        subif = VppDot1QSubint(self, self.pg0, vlan_id)
+        subif.admin_up()
+        subif.config_ip4()
+
+        # Configure an IP address on the subinterface
+        subif_ip4 = subif.local_ip4
+
+        p = (
+            Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
+            / Dot1Q(vlan=vlan_id)
+            / IP(src=self.pg0.remote_ip4, dst=subif_ip4)
+            / UDP(sport=9876, dport=port)
+            / Raw(b"\xa5" * 100)
+        )
+
+        pkts = p * self.nr_packets
+
+        # Expect ICMP - port unreachable for all packets
+        rx = self.send_and_expect_some(self.pg0, pkts, self.pg0)
+
+        for p in rx:
+            self.assertEqual(int(p[IP].proto), 1)  # ICMP
+            self.assertEqual(int(p[ICMP].code), 3)  # unreachable
+
+        # Configure a punt socket
+        self.socket_client_create("%s/socket_%d" % (self.tempdir, port))
+        self.vapi.punt_socket_register(punt_l4, "%s/socket_%d" % (self.tempdir, port))
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
+        self.assertEqual(len(punts), 1)
+
+        # Expect punt socket and no packets on pg0
+        self.send_and_assert_no_replies(self.pg0, pkts)
+        rx = self.socket_client_close()
+        self.logger.info("RXPKT")
+        self.logger.info(rx)
+        self.verify_udp_pkts(rx, len(pkts), port)
+        for pkt in rx:
+            self.assertEqual(pkt[Ether].src, self.pg0.remote_mac)
+            self.assertEqual(pkt[Ether].dst, self.pg0.local_mac)
+            self.assertEqual(pkt[Dot1Q].vlan, 100)
+
+        # Remove punt socket. Expect ICMP - port unreachable for all packets
+        self.vapi.punt_socket_deregister(punt_l4)
+        punts = self.vapi.punt_socket_dump(type=pt_l4)
+        self.assertEqual(len(punts), 0)
+
+        rx = self.send_and_expect_some(self.pg0, pkts, self.pg0)
+        for p in rx:
+            self.assertEqual(int(p[IP].proto), 1)  # ICMP
+            self.assertEqual(int(p[ICMP].code), 3)  # unreachable
+
+
+@tag_fixme_vpp_workers
+class TestPunt(VppTestCase):
+    """Exception Punt Test Case"""
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestPunt, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestPunt, cls).tearDownClass()
+
+    def setUp(self):
+        super(TestPunt, self).setUp()
+
+        self.create_pg_interfaces(range(4))
+
+        for i in self.pg_interfaces:
+            i.admin_up()
+            i.config_ip4()
+            i.resolve_arp()
+            i.config_ip6()
+            i.resolve_ndp()
+
+    def tearDown(self):
+        for i in self.pg_interfaces:
+            i.unconfig_ip4()
+            i.unconfig_ip6()
+            i.admin_down()
+        super(TestPunt, self).tearDown()
+
+    def test_punt(self):
+        """Exception Path testing"""
+
+        #
+        # dump the punt registered reasons
+        #  search for a few we know should be there
+        #
+        rs = self.vapi.punt_reason_dump()
+
+        reasons = [
+            "ipsec6-no-such-tunnel",
+            "ipsec4-no-such-tunnel",
+            "ipsec4-spi-o-udp-0",
+        ]
+
+        for reason in reasons:
+            found = False
+            for r in rs:
+                if r.reason.name == reason:
+                    found = True
+                    break
+            self.assertTrue(found)
+
+        #
+        # Using the test CLI we will hook in a exception path to
+        # send ACL deny packets out of pg0 and pg1.
+        # the ACL is src,dst = 1.1.1.1,1.1.1.2
+        #
+        ip_1_1_1_2 = VppIpRoute(
+            self,
+            "1.1.1.2",
+            32,
+            [VppRoutePath(self.pg3.remote_ip4, self.pg3.sw_if_index)],
+        )
+        ip_1_1_1_2.add_vpp_config()
+        ip_1_2 = VppIpRoute(
+            self,
+            "1::2",
+            128,
+            [
+                VppRoutePath(
+                    self.pg3.remote_ip6,
+                    self.pg3.sw_if_index,
+                    proto=DpoProto.DPO_PROTO_IP6,
+                )
+            ],
+        )
+        ip_1_2.add_vpp_config()
+
+        p4 = (
+            Ether(src=self.pg2.remote_mac, dst=self.pg2.local_mac)
+            / IP(src="1.1.1.1", dst="1.1.1.2")
+            / UDP(sport=1234, dport=1234)
+            / Raw(b"\xa5" * 100)
+        )
+        p6 = (
+            Ether(src=self.pg2.remote_mac, dst=self.pg2.local_mac)
+            / IPv6(src="1::1", dst="1::2")
+            / UDP(sport=1234, dport=1234)
+            / Raw(b"\xa5" * 100)
+        )
+        self.send_and_expect(self.pg2, p4 * 1, self.pg3)
+        self.send_and_expect(self.pg2, p6 * 1, self.pg3)
+
+        #
+        # apply the punting features
+        #
+        self.vapi.cli("test punt pg2")
+
+        #
+        # dump the punt reasons to learn the IDs assigned
+        #
+        rs = self.vapi.punt_reason_dump(reason={"name": "reason-v4"})
+        r4 = rs[0].reason.id
+        rs = self.vapi.punt_reason_dump(reason={"name": "reason-v6"})
+        r6 = rs[0].reason.id
+
+        #
+        # pkts now dropped
+        #
+        self.send_and_assert_no_replies(self.pg2, p4 * NUM_PKTS)
+        self.send_and_assert_no_replies(self.pg2, p6 * NUM_PKTS)
+
+        #
+        # Check state:
+        #  1 - node error counters
+        #  2 - per-reason counters
+        #    2, 3 are the index of the assigned punt reason
+        #
+        stats = self.statistics.get_err_counter("/err/punt-dispatch/No registrations")
+        self.assertEqual(stats, 2 * NUM_PKTS)
+
+        stats = self.statistics.get_counter("/net/punt")
+        self.assertEqual(stats[0][r4]["packets"], NUM_PKTS)
+        self.assertEqual(stats[0][r6]["packets"], NUM_PKTS)
+
+        #
+        # use the test CLI to test a client that punts exception
+        # packets out of pg0
+        #
+        self.vapi.cli("test punt pg0 %s" % self.pg0.remote_ip4)
+        self.vapi.cli("test punt pg0 %s" % self.pg0.remote_ip6)
+
+        rx4s = self.send_and_expect(self.pg2, p4 * NUM_PKTS, self.pg0)
+        rx6s = self.send_and_expect(self.pg2, p6 * NUM_PKTS, self.pg0)
+
+        #
+        # check the packets come out IP unmodified but destined to pg0 host
+        #
+        for rx in rx4s:
+            self.assertEqual(rx[Ether].dst, self.pg0.remote_mac)
+            self.assertEqual(rx[Ether].src, self.pg0.local_mac)
+            self.assertEqual(p4[IP].dst, rx[IP].dst)
+            self.assertEqual(p4[IP].ttl, rx[IP].ttl)
+        for rx in rx6s:
+            self.assertEqual(rx[Ether].dst, self.pg0.remote_mac)
+            self.assertEqual(rx[Ether].src, self.pg0.local_mac)
+            self.assertEqual(p6[IPv6].dst, rx[IPv6].dst)
+            self.assertEqual(p6[IPv6].hlim, rx[IPv6].hlim)
+
+        stats = self.statistics.get_counter("/net/punt")
+        self.assertEqual(stats[0][r4]["packets"], 2 * NUM_PKTS)
+        self.assertEqual(stats[0][r6]["packets"], 2 * NUM_PKTS)
+
+        #
+        # add another registration for the same reason to send packets
+        # out of pg1
+        #
+        self.vapi.cli("test punt pg1 %s" % self.pg1.remote_ip4)
+        self.vapi.cli("test punt pg1 %s" % self.pg1.remote_ip6)
+
         self.vapi.cli("clear trace")
-        self.pg0.add_stream(pkts)
+        self.pg2.add_stream(p4 * NUM_PKTS)
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
-        self.pg0.get_capture(0)
-        self.logger.info(self.vapi.cli("show trace"))
-        self.socket_client_close()
 
-        for p in self.ports:
-            self.assertEqual(self.portsCheck[p], 0)
-            self.vapi.punt_socket_deregister(p, is_ip4=0)
-        punts = self.vapi.punt_socket_dump(is_ip6=1)
-        self.assertEqual(len(punts), 0)
+        rxd = self.pg0.get_capture(NUM_PKTS)
+        for rx in rxd:
+            self.assertEqual(rx[Ether].dst, self.pg0.remote_mac)
+            self.assertEqual(rx[Ether].src, self.pg0.local_mac)
+            self.assertEqual(p4[IP].dst, rx[IP].dst)
+            self.assertEqual(p4[IP].ttl, rx[IP].ttl)
+        rxd = self.pg1.get_capture(NUM_PKTS)
+        for rx in rxd:
+            self.assertEqual(rx[Ether].dst, self.pg1.remote_mac)
+            self.assertEqual(rx[Ether].src, self.pg1.local_mac)
+            self.assertEqual(p4[IP].dst, rx[IP].dst)
+            self.assertEqual(p4[IP].ttl, rx[IP].ttl)
+
+        self.vapi.cli("clear trace")
+        self.pg2.add_stream(p6 * NUM_PKTS)
+        self.pg_enable_capture(self.pg_interfaces)
+        self.pg_start()
 
-if __name__ == '__main__':
+        rxd = self.pg0.get_capture(NUM_PKTS)
+        for rx in rxd:
+            self.assertEqual(rx[Ether].dst, self.pg0.remote_mac)
+            self.assertEqual(rx[Ether].src, self.pg0.local_mac)
+            self.assertEqual(p6[IPv6].dst, rx[IPv6].dst)
+            self.assertEqual(p6[IPv6].hlim, rx[IPv6].hlim)
+        rxd = self.pg1.get_capture(NUM_PKTS)
+        for rx in rxd:
+            self.assertEqual(rx[Ether].dst, self.pg1.remote_mac)
+            self.assertEqual(rx[Ether].src, self.pg1.local_mac)
+            self.assertEqual(p6[IPv6].dst, rx[IPv6].dst)
+            self.assertEqual(p6[IPv6].hlim, rx[IPv6].hlim)
+
+        stats = self.statistics.get_counter("/net/punt")
+        self.assertEqual(stats[0][r4]["packets"], 3 * NUM_PKTS)
+        self.assertEqual(stats[0][r6]["packets"], 3 * NUM_PKTS)
+
+        self.logger.info(self.vapi.cli("show vlib graph punt-dispatch"))
+        self.logger.info(self.vapi.cli("show punt client"))
+        self.logger.info(self.vapi.cli("show punt reason"))
+        self.logger.info(self.vapi.cli("show punt stats"))
+        self.logger.info(self.vapi.cli("show punt db"))
+
+
+if __name__ == "__main__":
     unittest.main(testRunner=VppTestRunner)