X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_punt.py;h=ecd34f6eea7a315962fdcf7b2c0a355e3400cd7d;hb=2dbee9361e74d03727a8b618ba80a5e28c006011;hp=28c17daa08af02ab27625655f4e701d6e0b475f7;hpb=50f0ac0f097e5495da1f2b1816106e3d420ff34b;p=vpp.git diff --git a/test/test_punt.py b/test/test_punt.py index 28c17daa08a..ecd34f6eea7 100644 --- a/test/test_punt.py +++ b/test/test_punt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import binascii import random import socket @@ -6,6 +6,9 @@ import os import threading import struct import copy +import fcntl +import time + from struct import unpack, unpack_from try: @@ -22,7 +25,7 @@ from scapy.layers.inet import IP, UDP, ICMP from scapy.layers.ipsec import ESP import scapy.layers.inet6 as inet6 from scapy.layers.inet6 import IPv6, ICMPv6DestUnreach -import six +from scapy.contrib.ospf import OSPF_Hdr, OSPFv3_Hello from framework import VppTestCase, VppTestRunner from vpp_ip import DpoProto @@ -42,17 +45,26 @@ class serverSocketThread(threading.Thread): self.sockName = sockName self.sock = None self.rx_pkts = [] + self.keep_running = True def rx_packets(self): # Wait for some packets on socket - while True: - data = self.sock.recv(65536) - - # punt socket metadata - # packet_desc = data[0:8] - - # Ethernet - self.rx_pkts.append(Ether(data[8:])) + while self.keep_running: + 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 == 11: + # nothing to receive, sleep a little + time.sleep(0.1) + pass + else: + raise def run(self): self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) @@ -62,12 +74,14 @@ class serverSocketThread(threading.Thread): 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) self.rx_packets() def close(self): self.sock.close() + self.keep_running = False return self.rx_pkts @@ -76,7 +90,9 @@ class TestPuntSocket(VppTestCase): ports = [1111, 2222, 3333, 4444] sock_servers = list() - nr_packets = 3 + # FIXME: nr_packets > 3 results in failure + # nr_packets = 3 makes the test unstable + nr_packets = 2 @classmethod def setUpClass(cls): @@ -114,6 +130,7 @@ class TestPuntSocket(VppTestCase): rx_pkts = [] for thread in self.sock_servers: rx_pkts += thread.close() + thread.join() return rx_pkts def verify_port(self, pr, vpr): @@ -130,6 +147,13 @@ class TestPuntSocket(VppTestCase): 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: @@ -182,7 +206,7 @@ def mk_vpp_cfg6(): class TestIP4PuntSocket(TestPuntSocket): - """ Punt Socket for IPv4 """ + """ Punt Socket for IPv4 UDP """ @classmethod def setUpClass(cls): @@ -221,11 +245,9 @@ class TestIP4PuntSocket(TestPuntSocket): punt_l4 = mk_vpp_cfg4() self.vapi.punt_socket_register(set_port(punt_l4, 1111), - b"%s/socket_punt_1111" % - six.ensure_binary(self.tempdir)) + "%s/socket_punt_1111" % self.tempdir) self.vapi.punt_socket_register(set_port(punt_l4, 2222), - b"%s/socket_punt_2222" % - six.ensure_binary(self.tempdir)) + "%s/socket_punt_2222" % self.tempdir) punts = self.vapi.punt_socket_dump(type=pt_l4) self.assertEqual(len(punts), 2) self.verify_port(set_port(punt_l4, 1111), punts[0]) @@ -242,11 +264,9 @@ class TestIP4PuntSocket(TestPuntSocket): # configure a punt socket again # self.vapi.punt_socket_register(set_port(punt_l4, 1111), - b"%s/socket_punt_1111" % - six.ensure_binary(self.tempdir)) + "%s/socket_punt_1111" % self.tempdir) self.vapi.punt_socket_register(set_port(punt_l4, 3333), - b"%s/socket_punt_3333" % - six.ensure_binary(self.tempdir)) + "%s/socket_punt_3333" % self.tempdir) punts = self.vapi.punt_socket_dump(type=pt_l4) self.assertEqual(len(punts), 3) @@ -272,7 +292,7 @@ class TestIP4PuntSocket(TestPuntSocket): dst=self.pg0.local_mac) / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) / UDP(sport=9876, dport=port) / - Raw('\xa5' * 100)) + Raw(b'\xa5' * 100)) pkts = p * self.nr_packets @@ -291,10 +311,9 @@ class TestIP4PuntSocket(TestPuntSocket): # # configure a punt socket # - self.socket_client_create(b"%s/socket_%d" % ( - six.ensure_binary(self.tempdir), port)) - self.vapi.punt_socket_register(punt_l4, b"%s/socket_%d" % ( - six.ensure_binary(self.tempdir), port)) + 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) @@ -336,18 +355,17 @@ class TestIP4PuntSocket(TestPuntSocket): dst=self.pg0.local_mac) / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) / UDP(sport=9876, dport=port) / - Raw('\xa5' * 100)) + 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( - b"%s/socket_%d" % (six.ensure_binary(self.tempdir), port)) + "%s/socket_%d" % (self.tempdir, port)) self.vapi.punt_socket_register( cfgs[port]['vpp'], - b"%s/socket_%d" % (six.ensure_binary(self.tempdir), - port)) + "%s/socket_%d" % (self.tempdir, port)) # # send the packets that get punted @@ -379,18 +397,16 @@ class TestIP4PuntSocket(TestPuntSocket): dst=self.pg0.local_mac) / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) / UDP(sport=9876, dport=port) / - Raw('\xa5' * 100)) + Raw(b'\xa5' * 100)) pkts += pkt * self.nr_packets # # configure a punt socket # - self.socket_client_create(b"%s/socket_multi" % - six.ensure_binary(self.tempdir)) + self.socket_client_create("%s/socket_multi" % self.tempdir) for p in self.ports: self.vapi.punt_socket_register(set_port(punt_l4, p), - b"%s/socket_multi" % - six.ensure_binary(self.tempdir)) + "%s/socket_multi" % self.tempdir) punts = self.vapi.punt_socket_dump(type=pt_l4) self.assertEqual(len(punts), len(self.ports)) @@ -409,7 +425,7 @@ class TestIP4PuntSocket(TestPuntSocket): class TestIP6PuntSocket(TestPuntSocket): - """ Punt Socket for IPv6""" + """ Punt Socket for IPv6 UDP """ @classmethod def setUpClass(cls): @@ -458,11 +474,9 @@ class TestIP6PuntSocket(TestPuntSocket): # configure a punt socket # self.vapi.punt_socket_register(set_port(punt_l4, 1111), - b"%s/socket_1111" % - six.ensure_binary(self.tempdir)) + "%s/socket_1111" % self.tempdir) self.vapi.punt_socket_register(set_port(punt_l4, 2222), - b"%s/socket_2222" % - six.ensure_binary(self.tempdir)) + "%s/socket_2222" % self.tempdir) punts = self.vapi.punt_socket_dump(type=pt_l4) self.assertEqual(len(punts), 2) self.verify_port(set_port(punt_l4, 1111), punts[0]) @@ -479,8 +493,7 @@ class TestIP6PuntSocket(TestPuntSocket): # configure a punt socket again # self.vapi.punt_socket_register(set_port(punt_l4, 1111), - b"%s/socket_1111" % - six.ensure_binary(self.tempdir)) + "%s/socket_1111" % self.tempdir) punts = self.vapi.punt_socket_dump(type=pt_l4) self.assertEqual(len(punts), 2) @@ -515,7 +528,7 @@ class TestIP6PuntSocket(TestPuntSocket): 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)) + Raw(b'\xa5' * 100)) pkts = p * self.nr_packets @@ -538,10 +551,9 @@ class TestIP6PuntSocket(TestPuntSocket): # # configure a punt socket # - self.socket_client_create(b"%s/socket_%d" % ( - six.ensure_binary(self.tempdir), port)) - self.vapi.punt_socket_register(punt_l4, b"%s/socket_%d" % ( - six.ensure_binary(self.tempdir), port)) + 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) @@ -589,18 +601,17 @@ class TestIP6PuntSocket(TestPuntSocket): dst=self.pg0.local_mac) / IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6) / UDP(sport=9876, dport=port) / - Raw('\xa5' * 100)) + 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( - b"%s/socket_%d" % (six.ensure_binary(self.tempdir), port)) + "%s/socket_%d" % (self.tempdir, port)) self.vapi.punt_socket_register( cfgs[port]['vpp'], - b"%s/socket_%d" % (six.ensure_binary(self.tempdir), - port)) + "%s/socket_%d" % (self.tempdir, port)) # # send the packets that get punted @@ -642,7 +653,7 @@ class TestIP6PuntSocket(TestPuntSocket): dst=self.pg0.local_mac) / IPv6(src=self.pg0.remote_ip6, dst=self.pg0.local_ip6) / UDP(sport=9876, dport=port) / - Raw('\xa5' * 100)) + Raw(b'\xa5' * 100)) pkts += pkt * self.nr_packets # @@ -654,12 +665,10 @@ class TestIP6PuntSocket(TestPuntSocket): # # configure a punt socket # - self.socket_client_create(b"%s/socket_multi" % - six.ensure_binary(self.tempdir)) + self.socket_client_create("%s/socket_multi" % self.tempdir) for p in self.ports: self.vapi.punt_socket_register(set_port(punt_l4, p), - b"%s/socket_multi" % - six.ensure_binary(self.tempdir)) + "%s/socket_multi" % self.tempdir) punts = self.vapi.punt_socket_dump(type=pt_l4) self.assertEqual(len(punts), len(self.ports)) @@ -671,6 +680,8 @@ 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) rx = self.socket_client_close() @@ -695,6 +706,7 @@ class TestExceptionPuntSocket(TestPuntSocket): 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() @@ -724,11 +736,9 @@ class TestExceptionPuntSocket(TestPuntSocket): } self.vapi.punt_socket_register(set_reason(punt_ex, 1), - b"%s/socket_punt_1" % - six.ensure_binary(self.tempdir)) + "%s/socket_punt_1" % self.tempdir) self.vapi.punt_socket_register(set_reason(punt_ex, 2), - b"%s/socket_punt_2" % - six.ensure_binary(self.tempdir)) + "%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]) @@ -745,11 +755,9 @@ class TestExceptionPuntSocket(TestPuntSocket): # configure a punt socket again # self.vapi.punt_socket_register(set_reason(punt_ex, 1), - b"%s/socket_punt_1" % - six.ensure_binary(self.tempdir)) + "%s/socket_punt_1" % self.tempdir) self.vapi.punt_socket_register(set_reason(punt_ex, 3), - b"%s/socket_punt_3" % - six.ensure_binary(self.tempdir)) + "%s/socket_punt_3" % self.tempdir) punts = self.vapi.punt_socket_dump(type=pt_ex) self.assertEqual(len(punts), 3) @@ -764,11 +772,14 @@ class TestExceptionPuntSocket(TestPuntSocket): punts = self.vapi.punt_socket_dump(type=pt_ex) self.assertEqual(len(punts), 0) - def verify_esp_pkts(self, rxs, n_sent, spi): + 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 """ @@ -782,27 +793,17 @@ class TestExceptionPuntSocket(TestPuntSocket): } } - # - # we need an IPSec tunnel for this to work otherwise ESP gets dropped - # due to unknown IP proto - # - VppIpsecTunInterface(self, self.pg0, 1000, 1000, - (VppEnum.vl_api_ipsec_crypto_alg_t. - IPSEC_API_CRYPTO_ALG_AES_CBC_128), - "0123456701234567", - "0123456701234567", - (VppEnum.vl_api_ipsec_integ_alg_t. - IPSEC_API_INTEG_ALG_SHA1_96), - "0123456701234567", - "0123456701234567").add_vpp_config() - # # we're dealing with IPSec tunnels punting for no-such-tunnel # adn SPI=0 # cfgs = dict() - cfgs['ipsec4-no-such-tunnel'] = {'spi': 99} - cfgs['ipsec4-spi-0'] = {'spi': 0} + cfgs['ipsec4-no-such-tunnel'] = {'spi': 99, + 'udp': False, + 'itf': self.pg0} + cfgs['ipsec4-spi-o-udp-0'] = {'spi': 0, + 'udp': True, + 'itf': self.pg1} # # find the VPP ID for these punt exception reasin @@ -810,6 +811,8 @@ class TestExceptionPuntSocket(TestPuntSocket): 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( @@ -818,40 +821,231 @@ class TestExceptionPuntSocket(TestPuntSocket): break # - # create packet streams and configure a punt sockets + # configure punt sockets # for cfg in cfgs.values(): - pkt = (Ether(src=self.pg0.remote_mac, - dst=self.pg0.local_mac) / - IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) / - ESP(spi=cfg['spi'], seq=3) / - Raw('\xa5' * 100)) - cfg['pkts'] = pkt * self.nr_packets - - cfg['sock'] = self.socket_client_create(b"%s/socket_%d" % ( - six.ensure_binary(self.tempdir), cfg['id'])) + cfg['sock'] = self.socket_client_create("%s/socket_%d" % + (self.tempdir, cfg['id'])) self.vapi.punt_socket_register( - cfg['vpp'], - b"%s/socket_%d" % (six.ensure_binary(self.tempdir), - cfg['id'])) + 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(self.pg0, cfg['pkts']) + 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']) + self.verify_esp_pkts(rx, len(cfg['pkts']), + cfg['spi'], cfg['udp']) + + # + # add some tunnels, make sure it still punts + # + VppIpsecTunInterface(self, self.pg0, 1000, 1000, + (VppEnum.vl_api_ipsec_crypto_alg_t. + IPSEC_API_CRYPTO_ALG_AES_CBC_128), + b"0123456701234567", + b"0123456701234567", + (VppEnum.vl_api_ipsec_integ_alg_t. + IPSEC_API_INTEG_ALG_SHA1_96), + b"0123456701234567", + b"0123456701234567").add_vpp_config() + VppIpsecTunInterface(self, self.pg1, 1000, 1000, + (VppEnum.vl_api_ipsec_crypto_alg_t. + IPSEC_API_CRYPTO_ALG_AES_CBC_128), + b"0123456701234567", + b"0123456701234567", + (VppEnum.vl_api_ipsec_integ_alg_t. + IPSEC_API_INTEG_ALG_SHA1_96), + b"0123456701234567", + b"0123456701234567", + udp_encap=True).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 + # + 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]) + + # + # deregister a punt socket + # + 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 TestPunt(VppTestCase): - """ Punt Test Case """ + """ Exception Punt Test Case """ @classmethod def setUpClass(cls): @@ -877,13 +1071,30 @@ class TestPunt(VppTestCase): for i in self.pg_interfaces: i.unconfig_ip4() i.unconfig_ip6() - i.ip6_disable() 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. @@ -896,20 +1107,19 @@ class TestPunt(VppTestCase): ip_1_2 = VppIpRoute(self, "1::2", 128, [VppRoutePath(self.pg3.remote_ip6, self.pg3.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + 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('\xa5' * 100)) + 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('\xa5' * 100)) + Raw(b'\xa5' * 100)) self.send_and_expect(self.pg2, p4*1, self.pg3) self.send_and_expect(self.pg2, p6*1, self.pg3) @@ -918,6 +1128,14 @@ class TestPunt(VppTestCase): # 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 # @@ -935,8 +1153,8 @@ class TestPunt(VppTestCase): self.assertEqual(stats, 2*NUM_PKTS) stats = self.statistics.get_counter("/net/punt") - self.assertEqual(stats[0][7]['packets'], NUM_PKTS) - self.assertEqual(stats[0][8]['packets'], NUM_PKTS) + 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 @@ -963,8 +1181,8 @@ class TestPunt(VppTestCase): self.assertEqual(p6[IPv6].hlim, rx[IPv6].hlim) stats = self.statistics.get_counter("/net/punt") - self.assertEqual(stats[0][7]['packets'], 2*NUM_PKTS) - self.assertEqual(stats[0][8]['packets'], 2*NUM_PKTS) + 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 @@ -1010,8 +1228,8 @@ class TestPunt(VppTestCase): self.assertEqual(p6[IPv6].hlim, rx[IPv6].hlim) stats = self.statistics.get_counter("/net/punt") - self.assertEqual(stats[0][7]['packets'], 3*NUM_PKTS) - self.assertEqual(stats[0][8]['packets'], 3*NUM_PKTS) + 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")) @@ -1019,25 +1237,6 @@ class TestPunt(VppTestCase): self.logger.info(self.vapi.cli("show punt stats")) self.logger.info(self.vapi.cli("show punt db")) - # - # 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", - "ipsec6-spi-0", - "ipsec4-spi-0"] - - for reason in reasons: - found = False - for r in rs: - if r.reason.name == reason: - found = True - break - self.assertTrue(found) - if __name__ == '__main__': unittest.main(testRunner=VppTestRunner)