X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_gre.py;h=763fb9d9b99c49e70b1ad5a666a01430b8487bf2;hb=4941afb4f96a20df7dc8b6688f7921a3d713b77d;hp=c604378f2b56928faff43d375545d8cc679175b7;hpb=03ce46219cd0fabfd4918822c5b9fed9ef880de8;p=vpp.git diff --git a/test/test_gre.py b/test/test_gre.py index c604378f2b5..763fb9d9b99 100644 --- a/test/test_gre.py +++ b/test/test_gre.py @@ -9,18 +9,26 @@ from scapy.layers.inet import IP, UDP from scapy.layers.inet6 import IPv6 from scapy.volatile import RandMAC, RandIP -from framework import VppTestCase, VppTestRunner +from framework import VppTestCase +from asfframework import VppTestRunner, tag_fixme_vpp_workers from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint from vpp_gre_interface import VppGreInterface -from vpp_teib import VppNhrp +from vpp_teib import VppTeib from vpp_ip import DpoProto -from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, FibPathProto +from vpp_ip_route import ( + VppIpRoute, + VppRoutePath, + VppIpTable, + VppMplsLabel, +) +from vpp_mpls_tunnel_interface import VppMPLSTunnelInterface from util import ppp, ppc from vpp_papi import VppEnum +@tag_fixme_vpp_workers class TestGREInputNodes(VppTestCase): - """ GRE Input Nodes Test Case """ + """GRE Input Nodes Test Case""" def setUp(self): super(TestGREInputNodes, self).setUp() @@ -39,16 +47,17 @@ class TestGREInputNodes(VppTestCase): super(TestGREInputNodes, self).tearDown() def test_gre_input_node(self): - """ GRE gre input nodes not registerd unless configured """ - pkt = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / - IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) / - GRE()) + """GRE gre input nodes not registerd unless configured""" + pkt = ( + Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) + / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) + / GRE() + ) self.pg0.add_stream(pkt) self.pg_start() # no tunnel created, gre-input not registered - err = self.statistics.get_counter( - '/err/ip4-input/unknown ip protocol')[0] + err = self.statistics.get_counter("/err/ip4-local/unknown_protocol")[0] self.assertEqual(err, 1) err_count = err @@ -59,14 +68,13 @@ class TestGREInputNodes(VppTestCase): self.pg0.add_stream(pkt) self.pg_start() # tunnel created, gre-input registered - err = self.statistics.get_counter( - '/err/ip4-input/unknown ip protocol')[0] + err = self.statistics.get_counter("/err/ip4-local/unknown_protocol")[0] # expect no new errors self.assertEqual(err, err_count) class TestGRE(VppTestCase): - """ GRE Test Case """ + """GRE Test Case""" @classmethod def setUpClass(cls): @@ -114,10 +122,12 @@ class TestGRE(VppTestCase): for i in range(0, 257): info = self.create_packet_info(src_if, src_if) payload = self.info_to_payload(info) - p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / - IP(src=src_ip, dst=dst_ip, tos=tos) / - UDP(sport=1234, dport=1234) / - Raw(payload)) + p = ( + Ether(dst=src_if.local_mac, src=src_if.remote_mac) + / IP(src=src_ip, dst=dst_ip, tos=tos) + / UDP(sport=1234, dport=1234) + / Raw(payload) + ) info.data = p.copy() pkts.append(p) return pkts @@ -128,108 +138,107 @@ class TestGRE(VppTestCase): for i in range(0, 257): info = self.create_packet_info(src_if, src_if) payload = self.info_to_payload(info) - p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / - IPv6(src=src_ip, dst=dst_ip, tc=tc) / - UDP(sport=1234, dport=1234) / - Raw(payload)) + p = ( + Ether(dst=src_if.local_mac, src=src_if.remote_mac) + / IPv6(src=src_ip, dst=dst_ip, tc=tc) + / UDP(sport=1234, dport=1234) + / Raw(payload) + ) info.data = p.copy() pkts.append(p) return pkts - def create_tunnel_stream_4o4(self, src_if, - tunnel_src, tunnel_dst, - src_ip, dst_ip): + def create_tunnel_stream_4o4(self, src_if, tunnel_src, tunnel_dst, src_ip, dst_ip): pkts = [] for i in range(0, 257): info = self.create_packet_info(src_if, src_if) payload = self.info_to_payload(info) - p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / - IP(src=tunnel_src, dst=tunnel_dst) / - GRE() / - IP(src=src_ip, dst=dst_ip) / - UDP(sport=1234, dport=1234) / - Raw(payload)) + p = ( + Ether(dst=src_if.local_mac, src=src_if.remote_mac) + / IP(src=tunnel_src, dst=tunnel_dst) + / GRE() + / IP(src=src_ip, dst=dst_ip) + / UDP(sport=1234, dport=1234) + / Raw(payload) + ) info.data = p.copy() pkts.append(p) return pkts - def create_tunnel_stream_6o4(self, src_if, - tunnel_src, tunnel_dst, - src_ip, dst_ip): + def create_tunnel_stream_6o4(self, src_if, tunnel_src, tunnel_dst, src_ip, dst_ip): pkts = [] for i in range(0, 257): info = self.create_packet_info(src_if, src_if) payload = self.info_to_payload(info) - p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / - IP(src=tunnel_src, dst=tunnel_dst) / - GRE() / - IPv6(src=src_ip, dst=dst_ip) / - UDP(sport=1234, dport=1234) / - Raw(payload)) + p = ( + Ether(dst=src_if.local_mac, src=src_if.remote_mac) + / IP(src=tunnel_src, dst=tunnel_dst) + / GRE() + / IPv6(src=src_ip, dst=dst_ip) + / UDP(sport=1234, dport=1234) + / Raw(payload) + ) info.data = p.copy() pkts.append(p) return pkts - def create_tunnel_stream_6o6(self, src_if, - tunnel_src, tunnel_dst, - src_ip, dst_ip): + def create_tunnel_stream_6o6(self, src_if, tunnel_src, tunnel_dst, src_ip, dst_ip): pkts = [] for i in range(0, 257): info = self.create_packet_info(src_if, src_if) payload = self.info_to_payload(info) - p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / - IPv6(src=tunnel_src, dst=tunnel_dst) / - GRE() / - IPv6(src=src_ip, dst=dst_ip) / - UDP(sport=1234, dport=1234) / - Raw(payload)) + p = ( + Ether(dst=src_if.local_mac, src=src_if.remote_mac) + / IPv6(src=tunnel_src, dst=tunnel_dst) + / GRE() + / IPv6(src=src_ip, dst=dst_ip) + / UDP(sport=1234, dport=1234) + / Raw(payload) + ) info.data = p.copy() pkts.append(p) return pkts - def create_tunnel_stream_l2o4(self, src_if, - tunnel_src, tunnel_dst): + def create_tunnel_stream_l2o4(self, src_if, tunnel_src, tunnel_dst): pkts = [] for i in range(0, 257): info = self.create_packet_info(src_if, src_if) payload = self.info_to_payload(info) - p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / - IP(src=tunnel_src, dst=tunnel_dst) / - GRE() / - Ether(dst=RandMAC('*:*:*:*:*:*'), - src=RandMAC('*:*:*:*:*:*')) / - IP(src=scapy.compat.raw(RandIP()), - dst=scapy.compat.raw(RandIP())) / - UDP(sport=1234, dport=1234) / - Raw(payload)) + p = ( + Ether(dst=src_if.local_mac, src=src_if.remote_mac) + / IP(src=tunnel_src, dst=tunnel_dst) + / GRE() + / Ether(dst=RandMAC("*:*:*:*:*:*"), src=RandMAC("*:*:*:*:*:*")) + / IP(src=scapy.compat.raw(RandIP()), dst=scapy.compat.raw(RandIP())) + / UDP(sport=1234, dport=1234) + / Raw(payload) + ) info.data = p.copy() pkts.append(p) return pkts - def create_tunnel_stream_vlano4(self, src_if, - tunnel_src, tunnel_dst, vlan): + def create_tunnel_stream_vlano4(self, src_if, tunnel_src, tunnel_dst, vlan): pkts = [] for i in range(0, 257): info = self.create_packet_info(src_if, src_if) payload = self.info_to_payload(info) - p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / - IP(src=tunnel_src, dst=tunnel_dst) / - GRE() / - Ether(dst=RandMAC('*:*:*:*:*:*'), - src=RandMAC('*:*:*:*:*:*')) / - Dot1Q(vlan=vlan) / - IP(src=scapy.compat.raw(RandIP()), - dst=scapy.compat.raw(RandIP())) / - UDP(sport=1234, dport=1234) / - Raw(payload)) + p = ( + Ether(dst=src_if.local_mac, src=src_if.remote_mac) + / IP(src=tunnel_src, dst=tunnel_dst) + / GRE() + / Ether(dst=RandMAC("*:*:*:*:*:*"), src=RandMAC("*:*:*:*:*:*")) + / Dot1Q(vlan=vlan) + / IP(src=scapy.compat.raw(RandIP()), dst=scapy.compat.raw(RandIP())) + / UDP(sport=1234, dport=1234) + / Raw(payload) + ) info.data = p.copy() pkts.append(p) return pkts - def verify_tunneled_4o4(self, src_if, capture, sent, - tunnel_src, tunnel_dst, - dscp=0, ecn=0): - + def verify_tunneled_4o4( + self, src_if, capture, sent, tunnel_src, tunnel_dst, dscp=0, ecn=0 + ): self.assertEqual(len(capture), len(sent)) tos = (dscp << 2) | ecn @@ -244,6 +253,7 @@ class TestGRE(VppTestCase): self.assertEqual(rx_ip.src, tunnel_src) self.assertEqual(rx_ip.dst, tunnel_dst) self.assertEqual(rx_ip.tos, tos) + self.assertEqual(rx_ip.len, len(rx_ip)) rx_gre = rx[GRE] rx_ip = rx_gre[IP] @@ -258,10 +268,9 @@ class TestGRE(VppTestCase): self.logger.error(ppp("Tx:", tx)) raise - def verify_tunneled_6o6(self, src_if, capture, sent, - tunnel_src, tunnel_dst, - dscp=0, ecn=0): - + def verify_tunneled_6o6( + self, src_if, capture, sent, tunnel_src, tunnel_dst, dscp=0, ecn=0 + ): self.assertEqual(len(capture), len(sent)) tc = (dscp << 2) | ecn @@ -278,6 +287,9 @@ class TestGRE(VppTestCase): self.assertEqual(rx_ip.tc, tc) rx_gre = GRE(scapy.compat.raw(rx_ip[IPv6].payload)) + + self.assertEqual(rx_ip.plen, len(rx_gre)) + rx_ip = rx_gre[IPv6] self.assertEqual(rx_ip.src, tx_ip.src) @@ -288,9 +300,7 @@ class TestGRE(VppTestCase): self.logger.error(ppp("Tx:", tx)) raise - def verify_tunneled_4o6(self, src_if, capture, sent, - tunnel_src, tunnel_dst): - + def verify_tunneled_4o6(self, src_if, capture, sent, tunnel_src, tunnel_dst): self.assertEqual(len(capture), len(sent)) for i in range(len(capture)): @@ -304,6 +314,9 @@ class TestGRE(VppTestCase): self.assertEqual(rx_ip.dst, tunnel_dst) rx_gre = GRE(scapy.compat.raw(rx_ip[IPv6].payload)) + + self.assertEqual(rx_ip.plen, len(rx_gre)) + tx_ip = tx[IP] rx_ip = rx_gre[IP] @@ -315,9 +328,7 @@ class TestGRE(VppTestCase): self.logger.error(ppp("Tx:", tx)) raise - def verify_tunneled_6o4(self, src_if, capture, sent, - tunnel_src, tunnel_dst): - + def verify_tunneled_6o4(self, src_if, capture, sent, tunnel_src, tunnel_dst): self.assertEqual(len(capture), len(sent)) for i in range(len(capture)): @@ -329,6 +340,7 @@ class TestGRE(VppTestCase): self.assertEqual(rx_ip.src, tunnel_src) self.assertEqual(rx_ip.dst, tunnel_dst) + self.assertEqual(rx_ip.len, len(rx_ip)) rx_gre = GRE(scapy.compat.raw(rx_ip[IP].payload)) rx_ip = rx_gre[IPv6] @@ -342,8 +354,7 @@ class TestGRE(VppTestCase): self.logger.error(ppp("Tx:", tx)) raise - def verify_tunneled_l2o4(self, src_if, capture, sent, - tunnel_src, tunnel_dst): + def verify_tunneled_l2o4(self, src_if, capture, sent, tunnel_src, tunnel_dst): self.assertEqual(len(capture), len(sent)) for i in range(len(capture)): @@ -356,6 +367,7 @@ class TestGRE(VppTestCase): self.assertEqual(rx_ip.src, tunnel_src) self.assertEqual(rx_ip.dst, tunnel_dst) + self.assertEqual(rx_ip.len, len(rx_ip)) rx_gre = rx[GRE] rx_l2 = rx_gre[Ether] @@ -374,8 +386,9 @@ class TestGRE(VppTestCase): self.logger.error(ppp("Tx:", tx)) raise - def verify_tunneled_vlano4(self, src_if, capture, sent, - tunnel_src, tunnel_dst, vlan): + def verify_tunneled_vlano4( + self, src_if, capture, sent, tunnel_src, tunnel_dst, vlan + ): try: self.assertEqual(len(capture), len(sent)) except: @@ -482,7 +495,7 @@ class TestGRE(VppTestCase): raise def test_gre(self): - """ GRE IPv4 tunnel Tests """ + """GRE IPv4 tunnel Tests""" # # Create an L3 GRE tunnel. @@ -490,9 +503,7 @@ class TestGRE(VppTestCase): # - assign an IP Addres # - Add a route via the tunnel # - gre_if = VppGreInterface(self, - self.pg0.local_ip4, - "1.1.1.2") + gre_if = VppGreInterface(self, self.pg0.local_ip4, "1.1.1.2") gre_if.add_vpp_config() # @@ -509,9 +520,9 @@ class TestGRE(VppTestCase): gre_if.admin_up() gre_if.config_ip4() - route_via_tun = VppIpRoute(self, "4.4.4.4", 32, - [VppRoutePath("0.0.0.0", - gre_if.sw_if_index)]) + route_via_tun = VppIpRoute( + self, "4.4.4.4", 32, [VppRoutePath("0.0.0.0", gre_if.sw_if_index)] + ) route_via_tun.add_vpp_config() @@ -528,9 +539,12 @@ class TestGRE(VppTestCase): # # Add a route that resolves the tunnel's destination # - route_tun_dst = VppIpRoute(self, "1.1.1.2", 32, - [VppRoutePath(self.pg0.remote_ip4, - self.pg0.sw_if_index)]) + route_tun_dst = VppIpRoute( + self, + "1.1.1.2", + 32, + [VppRoutePath(self.pg0.remote_ip4, self.pg0.sw_if_index)], + ) route_tun_dst.add_vpp_config() # @@ -539,18 +553,19 @@ class TestGRE(VppTestCase): # tx = self.create_stream_ip4(self.pg0, "5.5.5.5", "4.4.4.4") rx = self.send_and_expect(self.pg0, tx, self.pg0) - self.verify_tunneled_4o4(self.pg0, rx, tx, - self.pg0.local_ip4, "1.1.1.2") + self.verify_tunneled_4o4(self.pg0, rx, tx, self.pg0.local_ip4, "1.1.1.2") # # Send tunneled packets that match the created tunnel and # are decapped and forwarded # - tx = self.create_tunnel_stream_4o4(self.pg0, - "1.1.1.2", - self.pg0.local_ip4, - self.pg0.local_ip4, - self.pg0.remote_ip4) + tx = self.create_tunnel_stream_4o4( + self.pg0, + "1.1.1.2", + self.pg0.local_ip4, + self.pg0.local_ip4, + self.pg0.remote_ip4, + ) rx = self.send_and_expect(self.pg0, tx, self.pg0) self.verify_decapped_4o4(self.pg0, rx, tx) @@ -558,14 +573,16 @@ class TestGRE(VppTestCase): # Send tunneled packets that do not match the tunnel's src # self.vapi.cli("clear trace") - tx = self.create_tunnel_stream_4o4(self.pg0, - "1.1.1.3", - self.pg0.local_ip4, - self.pg0.local_ip4, - self.pg0.remote_ip4) + tx = self.create_tunnel_stream_4o4( + self.pg0, + "1.1.1.3", + self.pg0.local_ip4, + self.pg0.local_ip4, + self.pg0.remote_ip4, + ) self.send_and_assert_no_replies( - self.pg0, tx, - remark="GRE packets forwarded despite no SRC address match") + self.pg0, tx, remark="GRE packets forwarded despite no SRC address match" + ) # # Configure IPv6 on the PG interface so we can route IPv6 @@ -578,14 +595,18 @@ class TestGRE(VppTestCase): # Send IPv6 tunnel encapslated packets # - dropped since IPv6 is not enabled on the tunnel # - tx = self.create_tunnel_stream_6o4(self.pg0, - "1.1.1.2", - self.pg0.local_ip4, - self.pg0.local_ip6, - self.pg0.remote_ip6) - self.send_and_assert_no_replies(self.pg0, tx, - "IPv6 GRE packets forwarded " - "despite IPv6 not enabled on tunnel") + tx = self.create_tunnel_stream_6o4( + self.pg0, + "1.1.1.2", + self.pg0.local_ip4, + self.pg0.local_ip6, + self.pg0.remote_ip6, + ) + self.send_and_assert_no_replies( + self.pg0, + tx, + "IPv6 GRE packets forwarded despite IPv6 not enabled on tunnel", + ) # # Enable IPv6 on the tunnel @@ -596,11 +617,13 @@ class TestGRE(VppTestCase): # Send IPv6 tunnel encapslated packets # - forwarded since IPv6 is enabled on the tunnel # - tx = self.create_tunnel_stream_6o4(self.pg0, - "1.1.1.2", - self.pg0.local_ip4, - self.pg0.local_ip6, - self.pg0.remote_ip6) + tx = self.create_tunnel_stream_6o4( + self.pg0, + "1.1.1.2", + self.pg0.local_ip4, + self.pg0.local_ip6, + self.pg0.remote_ip6, + ) rx = self.send_and_expect(self.pg0, tx, self.pg0) self.verify_decapped_6o4(self.pg0, rx, tx) @@ -608,17 +631,75 @@ class TestGRE(VppTestCase): # Send v6 packets for v4 encap # route6_via_tun = VppIpRoute( - self, "2001::1", 128, - [VppRoutePath("::", - gre_if.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)]) + self, + "2001::1", + 128, + [VppRoutePath("::", gre_if.sw_if_index, proto=DpoProto.DPO_PROTO_IP6)], + ) route6_via_tun.add_vpp_config() tx = self.create_stream_ip6(self.pg0, "2001::2", "2001::1") rx = self.send_and_expect(self.pg0, tx, self.pg0) - self.verify_tunneled_6o4(self.pg0, rx, tx, - self.pg0.local_ip4, "1.1.1.2") + self.verify_tunneled_6o4(self.pg0, rx, tx, self.pg0.local_ip4, "1.1.1.2") + + # + # add a labelled route through the tunnel + # + label_via_tun = VppIpRoute( + self, + "5.4.3.2", + 32, + [VppRoutePath("0.0.0.0", gre_if.sw_if_index, labels=[VppMplsLabel(33)])], + ) + label_via_tun.add_vpp_config() + + tx = self.create_stream_ip4(self.pg0, "5.5.5.5", "5.4.3.2") + rx = self.send_and_expect(self.pg0, tx, self.pg0) + self.verify_tunneled_4o4(self.pg0, rx, tx, self.pg0.local_ip4, "1.1.1.2") + + # + # an MPLS tunnel over the GRE tunnel add a route through + # the mpls tunnel + # + mpls_tun = VppMPLSTunnelInterface( + self, + [ + VppRoutePath( + "0.0.0.0", + gre_if.sw_if_index, + labels=[VppMplsLabel(44), VppMplsLabel(46)], + ) + ], + ) + mpls_tun.add_vpp_config() + mpls_tun.admin_up() + + label_via_mpls = VppIpRoute( + self, + "5.4.3.1", + 32, + [VppRoutePath("0.0.0.0", mpls_tun.sw_if_index, labels=[VppMplsLabel(33)])], + ) + label_via_mpls.add_vpp_config() + + tx = self.create_stream_ip4(self.pg0, "5.5.5.5", "5.4.3.1") + rx = self.send_and_expect(self.pg0, tx, self.pg0) + self.verify_tunneled_4o4(self.pg0, rx, tx, self.pg0.local_ip4, "1.1.1.2") + + mpls_tun_l2 = VppMPLSTunnelInterface( + self, + [ + VppRoutePath( + "0.0.0.0", + gre_if.sw_if_index, + labels=[VppMplsLabel(44), VppMplsLabel(46)], + ) + ], + is_l2=1, + ) + mpls_tun_l2.add_vpp_config() + mpls_tun_l2.admin_up() # # test case cleanup @@ -626,12 +707,16 @@ class TestGRE(VppTestCase): route_tun_dst.remove_vpp_config() route_via_tun.remove_vpp_config() route6_via_tun.remove_vpp_config() + label_via_mpls.remove_vpp_config() + label_via_tun.remove_vpp_config() + mpls_tun.remove_vpp_config() + mpls_tun_l2.remove_vpp_config() gre_if.remove_vpp_config() self.pg0.unconfig_ip6() def test_gre6(self): - """ GRE IPv6 tunnel Tests """ + """GRE IPv6 tunnel Tests""" self.pg1.config_ip6() self.pg1.resolve_ndp() @@ -642,16 +727,14 @@ class TestGRE(VppTestCase): # - assign an IP Address # - Add a route via the tunnel # - gre_if = VppGreInterface(self, - self.pg2.local_ip6, - "1002::1") + gre_if = VppGreInterface(self, self.pg2.local_ip6, "1002::1") gre_if.add_vpp_config() gre_if.admin_up() gre_if.config_ip6() - route_via_tun = VppIpRoute(self, "4004::1", 128, - [VppRoutePath("0::0", - gre_if.sw_if_index)]) + route_via_tun = VppIpRoute( + self, "4004::1", 128, [VppRoutePath("0::0", gre_if.sw_if_index)] + ) route_via_tun.add_vpp_config() @@ -663,15 +746,18 @@ class TestGRE(VppTestCase): # tx = self.create_stream_ip6(self.pg2, "5005::1", "4004::1") self.send_and_assert_no_replies( - self.pg2, tx, - "GRE packets forwarded without DIP resolved") + self.pg2, tx, "GRE packets forwarded without DIP resolved" + ) # # Add a route that resolves the tunnel's destination # - route_tun_dst = VppIpRoute(self, "1002::1", 128, - [VppRoutePath(self.pg2.remote_ip6, - self.pg2.sw_if_index)]) + route_tun_dst = VppIpRoute( + self, + "1002::1", + 128, + [VppRoutePath(self.pg2.remote_ip6, self.pg2.sw_if_index)], + ) route_tun_dst.add_vpp_config() # @@ -680,17 +766,14 @@ class TestGRE(VppTestCase): # tx = self.create_stream_ip6(self.pg2, "5005::1", "4004::1") rx = self.send_and_expect(self.pg2, tx, self.pg2) - self.verify_tunneled_6o6(self.pg2, rx, tx, - self.pg2.local_ip6, "1002::1") + self.verify_tunneled_6o6(self.pg2, rx, tx, self.pg2.local_ip6, "1002::1") # # Test decap. decapped packets go out pg1 # - tx = self.create_tunnel_stream_6o6(self.pg2, - "1002::1", - self.pg2.local_ip6, - "2001::1", - self.pg1.remote_ip6) + tx = self.create_tunnel_stream_6o6( + self.pg2, "1002::1", self.pg2.local_ip6, "2001::1", self.pg1.remote_ip6 + ) rx = self.send_and_expect(self.pg2, tx, self.pg1) # @@ -702,16 +785,15 @@ class TestGRE(VppTestCase): # # Send v4 over v6 # - route4_via_tun = VppIpRoute(self, "1.1.1.1", 32, - [VppRoutePath("0.0.0.0", - gre_if.sw_if_index)]) + route4_via_tun = VppIpRoute( + self, "1.1.1.1", 32, [VppRoutePath("0.0.0.0", gre_if.sw_if_index)] + ) route4_via_tun.add_vpp_config() tx = self.create_stream_ip4(self.pg0, "1.1.1.2", "1.1.1.1") rx = self.send_and_expect(self.pg0, tx, self.pg2) - self.verify_tunneled_4o6(self.pg0, rx, tx, - self.pg2.local_ip6, "1002::1") + self.verify_tunneled_4o6(self.pg0, rx, tx, self.pg2.local_ip6, "1002::1") # # test case cleanup @@ -725,7 +807,7 @@ class TestGRE(VppTestCase): self.pg1.unconfig_ip6() def test_gre_vrf(self): - """ GRE tunnel VRF Tests """ + """GRE tunnel VRF Tests""" e = VppEnum.vl_api_tunnel_encap_decap_flags_t @@ -737,11 +819,15 @@ class TestGRE(VppTestCase): # - assign an IP Addres # gre_if = VppGreInterface( - self, self.pg1.local_ip4, + self, + self.pg1.local_ip4, "2.2.2.2", outer_table_id=1, - flags=(e.TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP | - e.TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN)) + flags=( + e.TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP + | e.TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN + ), + ) gre_if.add_vpp_config() gre_if.admin_up() @@ -750,18 +836,22 @@ class TestGRE(VppTestCase): # # Add a route via the tunnel - in the overlay # - route_via_tun = VppIpRoute(self, "9.9.9.9", 32, - [VppRoutePath("0.0.0.0", - gre_if.sw_if_index)]) + route_via_tun = VppIpRoute( + self, "9.9.9.9", 32, [VppRoutePath("0.0.0.0", gre_if.sw_if_index)] + ) route_via_tun.add_vpp_config() # # Add a route that resolves the tunnel's destination - in the # underlay table # - route_tun_dst = VppIpRoute(self, "2.2.2.2", 32, table_id=1, - paths=[VppRoutePath(self.pg1.remote_ip4, - self.pg1.sw_if_index)]) + route_tun_dst = VppIpRoute( + self, + "2.2.2.2", + 32, + table_id=1, + paths=[VppRoutePath(self.pg1.remote_ip4, self.pg1.sw_if_index)], + ) route_tun_dst.add_vpp_config() # @@ -770,12 +860,11 @@ class TestGRE(VppTestCase): # - packets are GRE encapped # self.vapi.cli("clear trace") - tx = self.create_stream_ip4(self.pg0, "5.5.5.5", "9.9.9.9", - dscp=5, ecn=3) + tx = self.create_stream_ip4(self.pg0, "5.5.5.5", "9.9.9.9", dscp=5, ecn=3) rx = self.send_and_expect(self.pg0, tx, self.pg1) - self.verify_tunneled_4o4(self.pg1, rx, tx, - self.pg1.local_ip4, "2.2.2.2", - dscp=5, ecn=3) + self.verify_tunneled_4o4( + self.pg1, rx, tx, self.pg1.local_ip4, "2.2.2.2", dscp=5, ecn=3 + ) # # Send tunneled packets that match the created tunnel and @@ -783,11 +872,13 @@ class TestGRE(VppTestCase): # does not happen in the encap table # self.vapi.cli("clear trace") - tx = self.create_tunnel_stream_4o4(self.pg1, - "2.2.2.2", - self.pg1.local_ip4, - self.pg0.local_ip4, - self.pg0.remote_ip4) + tx = self.create_tunnel_stream_4o4( + self.pg1, + "2.2.2.2", + self.pg1.local_ip4, + self.pg0.local_ip4, + self.pg0.remote_ip4, + ) rx = self.send_and_expect(self.pg1, tx, self.pg0) self.verify_decapped_4o4(self.pg0, rx, tx) @@ -800,14 +891,16 @@ class TestGRE(VppTestCase): # self.pg2.config_ip4() self.vapi.cli("clear trace") - tx = self.create_tunnel_stream_4o4(self.pg2, - "2.2.2.2", - self.pg1.local_ip4, - self.pg0.local_ip4, - self.pg0.remote_ip4) + tx = self.create_tunnel_stream_4o4( + self.pg2, + "2.2.2.2", + self.pg1.local_ip4, + self.pg0.local_ip4, + self.pg0.remote_ip4, + ) rx = self.send_and_assert_no_replies( - self.pg2, tx, - "GRE decap packets in wrong VRF") + self.pg2, tx, "GRE decap packets in wrong VRF" + ) self.pg2.unconfig_ip4() @@ -819,17 +912,23 @@ class TestGRE(VppTestCase): gre_if.remove_vpp_config() def test_gre_l2(self): - """ GRE tunnel L2 Tests """ + """GRE tunnel L2 Tests""" # # Add routes to resolve the tunnel destinations # - route_tun1_dst = VppIpRoute(self, "2.2.2.2", 32, - [VppRoutePath(self.pg0.remote_ip4, - self.pg0.sw_if_index)]) - route_tun2_dst = VppIpRoute(self, "2.2.2.3", 32, - [VppRoutePath(self.pg0.remote_ip4, - self.pg0.sw_if_index)]) + route_tun1_dst = VppIpRoute( + self, + "2.2.2.2", + 32, + [VppRoutePath(self.pg0.remote_ip4, self.pg0.sw_if_index)], + ) + route_tun2_dst = VppIpRoute( + self, + "2.2.2.3", + 32, + [VppRoutePath(self.pg0.remote_ip4, self.pg0.sw_if_index)], + ) route_tun1_dst.add_vpp_config() route_tun2_dst.add_vpp_config() @@ -837,53 +936,49 @@ class TestGRE(VppTestCase): # # Create 2 L2 GRE tunnels and x-connect them # - gre_if1 = VppGreInterface(self, self.pg0.local_ip4, - "2.2.2.2", - type=(VppEnum.vl_api_gre_tunnel_type_t. - GRE_API_TUNNEL_TYPE_TEB)) - gre_if2 = VppGreInterface(self, self.pg0.local_ip4, - "2.2.2.3", - type=(VppEnum.vl_api_gre_tunnel_type_t. - GRE_API_TUNNEL_TYPE_TEB)) + gre_if1 = VppGreInterface( + self, + self.pg0.local_ip4, + "2.2.2.2", + type=(VppEnum.vl_api_gre_tunnel_type_t.GRE_API_TUNNEL_TYPE_TEB), + ) + gre_if2 = VppGreInterface( + self, + self.pg0.local_ip4, + "2.2.2.3", + type=(VppEnum.vl_api_gre_tunnel_type_t.GRE_API_TUNNEL_TYPE_TEB), + ) gre_if1.add_vpp_config() gre_if2.add_vpp_config() gre_if1.admin_up() gre_if2.admin_up() - self.vapi.sw_interface_set_l2_xconnect(gre_if1.sw_if_index, - gre_if2.sw_if_index, - enable=1) - self.vapi.sw_interface_set_l2_xconnect(gre_if2.sw_if_index, - gre_if1.sw_if_index, - enable=1) + self.vapi.sw_interface_set_l2_xconnect( + gre_if1.sw_if_index, gre_if2.sw_if_index, enable=1 + ) + self.vapi.sw_interface_set_l2_xconnect( + gre_if2.sw_if_index, gre_if1.sw_if_index, enable=1 + ) # # Send in tunnel encapped L2. expect out tunnel encapped L2 # in both directions # - tx = self.create_tunnel_stream_l2o4(self.pg0, - "2.2.2.2", - self.pg0.local_ip4) + tx = self.create_tunnel_stream_l2o4(self.pg0, "2.2.2.2", self.pg0.local_ip4) rx = self.send_and_expect(self.pg0, tx, self.pg0) - self.verify_tunneled_l2o4(self.pg0, rx, tx, - self.pg0.local_ip4, - "2.2.2.3") + self.verify_tunneled_l2o4(self.pg0, rx, tx, self.pg0.local_ip4, "2.2.2.3") - tx = self.create_tunnel_stream_l2o4(self.pg0, - "2.2.2.3", - self.pg0.local_ip4) + tx = self.create_tunnel_stream_l2o4(self.pg0, "2.2.2.3", self.pg0.local_ip4) rx = self.send_and_expect(self.pg0, tx, self.pg0) - self.verify_tunneled_l2o4(self.pg0, rx, tx, - self.pg0.local_ip4, - "2.2.2.2") + self.verify_tunneled_l2o4(self.pg0, rx, tx, self.pg0.local_ip4, "2.2.2.2") - self.vapi.sw_interface_set_l2_xconnect(gre_if1.sw_if_index, - gre_if2.sw_if_index, - enable=0) - self.vapi.sw_interface_set_l2_xconnect(gre_if2.sw_if_index, - gre_if1.sw_if_index, - enable=0) + self.vapi.sw_interface_set_l2_xconnect( + gre_if1.sw_if_index, gre_if2.sw_if_index, enable=0 + ) + self.vapi.sw_interface_set_l2_xconnect( + gre_if2.sw_if_index, gre_if1.sw_if_index, enable=0 + ) # # Create a VLAN sub-interfaces on the GRE TEB interfaces @@ -898,47 +993,39 @@ class TestGRE(VppTestCase): gre_if_11.admin_up() gre_if_12.admin_up() - self.vapi.sw_interface_set_l2_xconnect(gre_if_11.sw_if_index, - gre_if_12.sw_if_index, - enable=1) - self.vapi.sw_interface_set_l2_xconnect(gre_if_12.sw_if_index, - gre_if_11.sw_if_index, - enable=1) + self.vapi.sw_interface_set_l2_xconnect( + gre_if_11.sw_if_index, gre_if_12.sw_if_index, enable=1 + ) + self.vapi.sw_interface_set_l2_xconnect( + gre_if_12.sw_if_index, gre_if_11.sw_if_index, enable=1 + ) # # Configure both to pop thier respective VLAN tags, # so that during the x-coonect they will subsequently push # self.vapi.l2_interface_vlan_tag_rewrite( - sw_if_index=gre_if_12.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1, - push_dot1q=12) + sw_if_index=gre_if_12.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1, push_dot1q=12 + ) self.vapi.l2_interface_vlan_tag_rewrite( - sw_if_index=gre_if_11.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1, - push_dot1q=11) + sw_if_index=gre_if_11.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1, push_dot1q=11 + ) # # Send traffic in both directiond - expect the VLAN tags to # be swapped. # - tx = self.create_tunnel_stream_vlano4(self.pg0, - "2.2.2.2", - self.pg0.local_ip4, - 11) + tx = self.create_tunnel_stream_vlano4( + self.pg0, "2.2.2.2", self.pg0.local_ip4, 11 + ) rx = self.send_and_expect(self.pg0, tx, self.pg0) - self.verify_tunneled_vlano4(self.pg0, rx, tx, - self.pg0.local_ip4, - "2.2.2.3", - 12) - - tx = self.create_tunnel_stream_vlano4(self.pg0, - "2.2.2.3", - self.pg0.local_ip4, - 12) + self.verify_tunneled_vlano4(self.pg0, rx, tx, self.pg0.local_ip4, "2.2.2.3", 12) + + tx = self.create_tunnel_stream_vlano4( + self.pg0, "2.2.2.3", self.pg0.local_ip4, 12 + ) rx = self.send_and_expect(self.pg0, tx, self.pg0) - self.verify_tunneled_vlano4(self.pg0, rx, tx, - self.pg0.local_ip4, - "2.2.2.2", - 11) + self.verify_tunneled_vlano4(self.pg0, rx, tx, self.pg0.local_ip4, "2.2.2.2", 11) # # Cleanup Test resources @@ -951,16 +1038,14 @@ class TestGRE(VppTestCase): route_tun2_dst.add_vpp_config() def test_gre_loop(self): - """ GRE tunnel loop Tests """ + """GRE tunnel loop Tests""" # # Create an L3 GRE tunnel. # - set it admin up # - assign an IP Addres # - gre_if = VppGreInterface(self, - self.pg0.local_ip4, - "1.1.1.2") + gre_if = VppGreInterface(self, self.pg0.local_ip4, "1.1.1.2") gre_if.add_vpp_config() gre_if.admin_up() gre_if.config_ip4() @@ -970,9 +1055,9 @@ class TestGRE(VppTestCase): # through the tunnel, hence forming a loop in the forwarding # graph # - route_dst = VppIpRoute(self, "1.1.1.2", 32, - [VppRoutePath("0.0.0.0", - gre_if.sw_if_index)]) + route_dst = VppIpRoute( + self, "1.1.1.2", 32, [VppRoutePath("0.0.0.0", gre_if.sw_if_index)] + ) route_dst.add_vpp_config() # @@ -986,8 +1071,7 @@ class TestGRE(VppTestCase): # # break the loop # - route_dst.modify([VppRoutePath(self.pg1.remote_ip4, - self.pg1.sw_if_index)]) + route_dst.modify([VppRoutePath(self.pg1.remote_ip4, self.pg1.sw_if_index)]) route_dst.add_vpp_config() rx = self.send_and_expect(self.pg0, tx, self.pg1) @@ -995,15 +1079,14 @@ class TestGRE(VppTestCase): # # a good route throught the tunnel to check it restacked # - route_via_tun_2 = VppIpRoute(self, "2.2.2.2", 32, - [VppRoutePath("0.0.0.0", - gre_if.sw_if_index)]) + route_via_tun_2 = VppIpRoute( + self, "2.2.2.2", 32, [VppRoutePath("0.0.0.0", gre_if.sw_if_index)] + ) route_via_tun_2.add_vpp_config() tx = self.create_stream_ip4(self.pg0, "2.2.2.3", "2.2.2.2") rx = self.send_and_expect(self.pg0, tx, self.pg1) - self.verify_tunneled_4o4(self.pg1, rx, tx, - self.pg0.local_ip4, "1.1.1.2") + self.verify_tunneled_4o4(self.pg1, rx, tx, self.pg0.local_ip4, "1.1.1.2") # # cleanup @@ -1012,7 +1095,7 @@ class TestGRE(VppTestCase): gre_if.remove_vpp_config() def test_mgre(self): - """ mGRE IPv4 tunnel Tests """ + """mGRE IPv4 tunnel Tests""" for itf in self.pg_interfaces[3:]: # @@ -1027,11 +1110,12 @@ class TestGRE(VppTestCase): # - assign an IP Addres # - Add a route via the tunnel # - gre_if = VppGreInterface(self, - itf.local_ip4, - "0.0.0.0", - mode=(VppEnum.vl_api_tunnel_mode_t. - TUNNEL_API_MODE_MP)) + gre_if = VppGreInterface( + self, + itf.local_ip4, + "0.0.0.0", + mode=(VppEnum.vl_api_tunnel_mode_t.TUNNEL_API_MODE_MP), + ) gre_if.add_vpp_config() gre_if.admin_up() gre_if.config_ip4() @@ -1044,11 +1128,13 @@ class TestGRE(VppTestCase): # ensure we don't match to the tunnel if the source address # is all zeros # - tx = self.create_tunnel_stream_4o4(self.pg0, - "0.0.0.0", - itf.local_ip4, - self.pg0.local_ip4, - self.pg0.remote_ip4) + tx = self.create_tunnel_stream_4o4( + self.pg0, + "0.0.0.0", + itf.local_ip4, + self.pg0.local_ip4, + self.pg0.remote_ip4, + ) self.send_and_assert_no_replies(self.pg0, tx) # @@ -1056,44 +1142,58 @@ class TestGRE(VppTestCase): # for ii in range(1, 4): route_addr = "4.4.4.%d" % ii + tx_e = self.create_stream_ip4(self.pg0, "5.5.5.5", route_addr) # # route traffic via the peer # route_via_tun = VppIpRoute( - self, route_addr, 32, - [VppRoutePath(gre_if._remote_hosts[ii].ip4, - gre_if.sw_if_index)]) + self, + route_addr, + 32, + [VppRoutePath(gre_if._remote_hosts[ii].ip4, gre_if.sw_if_index)], + ) route_via_tun.add_vpp_config() + # all packets dropped at this point + rx = self.send_and_assert_no_replies(self.pg0, tx_e) + + gre_if.admin_down() + gre_if.admin_up() + rx = self.send_and_assert_no_replies(self.pg0, tx_e) + # - # Add a NHRP entry resolves the peer + # Add a TEIB entry resolves the peer # - teib = VppNhrp(self, gre_if, - gre_if._remote_hosts[ii].ip4, - itf._remote_hosts[ii].ip4) + teib = VppTeib( + self, + gre_if, + gre_if._remote_hosts[ii].ip4, + itf._remote_hosts[ii].ip4, + ) teib.add_vpp_config() # # Send a packet stream that is routed into the tunnel # - packets are GRE encapped # - tx_e = self.create_stream_ip4(self.pg0, "5.5.5.5", route_addr) rx = self.send_and_expect(self.pg0, tx_e, itf) - self.verify_tunneled_4o4(self.pg0, rx, tx_e, - itf.local_ip4, - itf._remote_hosts[ii].ip4) - - tx_i = self.create_tunnel_stream_4o4(self.pg0, - itf._remote_hosts[ii].ip4, - itf.local_ip4, - self.pg0.local_ip4, - self.pg0.remote_ip4) + self.verify_tunneled_4o4( + self.pg0, rx, tx_e, itf.local_ip4, itf._remote_hosts[ii].ip4 + ) + + tx_i = self.create_tunnel_stream_4o4( + self.pg0, + itf._remote_hosts[ii].ip4, + itf.local_ip4, + self.pg0.local_ip4, + self.pg0.remote_ip4, + ) rx = self.send_and_expect(self.pg0, tx_i, self.pg0) self.verify_decapped_4o4(self.pg0, rx, tx_i) # - # delete and re-add the NHRP + # delete and re-add the TEIB # teib.remove_vpp_config() self.send_and_assert_no_replies(self.pg0, tx_e) @@ -1101,9 +1201,21 @@ class TestGRE(VppTestCase): teib.add_vpp_config() rx = self.send_and_expect(self.pg0, tx_e, itf) - self.verify_tunneled_4o4(self.pg0, rx, tx_e, - itf.local_ip4, - itf._remote_hosts[ii].ip4) + self.verify_tunneled_4o4( + self.pg0, rx, tx_e, itf.local_ip4, itf._remote_hosts[ii].ip4 + ) + rx = self.send_and_expect(self.pg0, tx_i, self.pg0) + self.verify_decapped_4o4(self.pg0, rx, tx_i) + + # + # bounce the interface state and try packets again + # + gre_if.admin_down() + gre_if.admin_up() + rx = self.send_and_expect(self.pg0, tx_e, itf) + self.verify_tunneled_4o4( + self.pg0, rx, tx_e, itf.local_ip4, itf._remote_hosts[ii].ip4 + ) rx = self.send_and_expect(self.pg0, tx_i, self.pg0) self.verify_decapped_4o4(self.pg0, rx, tx_i) @@ -1111,7 +1223,7 @@ class TestGRE(VppTestCase): gre_if.unconfig_ip4() def test_mgre6(self): - """ mGRE IPv6 tunnel Tests """ + """mGRE IPv6 tunnel Tests""" self.pg0.config_ip6() self.pg0.resolve_ndp() @@ -1136,9 +1248,9 @@ class TestGRE(VppTestCase): self, itf.local_ip6, "::", - mode=(VppEnum.vl_api_tunnel_mode_t. - TUNNEL_API_MODE_MP), - flags=e.TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) + mode=(VppEnum.vl_api_tunnel_mode_t.TUNNEL_API_MODE_MP), + flags=e.TUNNEL_API_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP, + ) gre_if.add_vpp_config() gre_if.admin_up() @@ -1152,53 +1264,59 @@ class TestGRE(VppTestCase): route_addr = "4::%d" % ii # - # Add a NHRP entry resolves the peer + # Add a TEIB entry resolves the peer # - teib = VppNhrp(self, gre_if, - gre_if._remote_hosts[ii].ip6, - itf._remote_hosts[ii].ip6) + teib = VppTeib( + self, + gre_if, + gre_if._remote_hosts[ii].ip6, + itf._remote_hosts[ii].ip6, + ) teib.add_vpp_config() # # route traffic via the peer # route_via_tun = VppIpRoute( - self, route_addr, 128, - [VppRoutePath(gre_if._remote_hosts[ii].ip6, - gre_if.sw_if_index)]) + self, + route_addr, + 128, + [VppRoutePath(gre_if._remote_hosts[ii].ip6, gre_if.sw_if_index)], + ) route_via_tun.add_vpp_config() # # Send a packet stream that is routed into the tunnel # - packets are GRE encapped # - tx_e = self.create_stream_ip6(self.pg0, "5::5", route_addr, - dscp=2, ecn=1) + tx_e = self.create_stream_ip6( + self.pg0, "5::5", route_addr, dscp=2, ecn=1 + ) rx = self.send_and_expect(self.pg0, tx_e, itf) - self.verify_tunneled_6o6(self.pg0, rx, tx_e, - itf.local_ip6, - itf._remote_hosts[ii].ip6, - dscp=2) - tx_i = self.create_tunnel_stream_6o6(self.pg0, - itf._remote_hosts[ii].ip6, - itf.local_ip6, - self.pg0.local_ip6, - self.pg0.remote_ip6) + self.verify_tunneled_6o6( + self.pg0, rx, tx_e, itf.local_ip6, itf._remote_hosts[ii].ip6, dscp=2 + ) + tx_i = self.create_tunnel_stream_6o6( + self.pg0, + itf._remote_hosts[ii].ip6, + itf.local_ip6, + self.pg0.local_ip6, + self.pg0.remote_ip6, + ) rx = self.send_and_expect(self.pg0, tx_i, self.pg0) self.verify_decapped_6o6(self.pg0, rx, tx_i) # - # delete and re-add the NHRP + # delete and re-add the TEIB # teib.remove_vpp_config() self.send_and_assert_no_replies(self.pg0, tx_e) teib.add_vpp_config() rx = self.send_and_expect(self.pg0, tx_e, itf) - self.verify_tunneled_6o6(self.pg0, rx, tx_e, - itf.local_ip6, - itf._remote_hosts[ii].ip6, - dscp=2) + self.verify_tunneled_6o6( + self.pg0, rx, tx_e, itf.local_ip6, itf._remote_hosts[ii].ip6, dscp=2 + ) rx = self.send_and_expect(self.pg0, tx_i, self.pg0) self.verify_decapped_6o6(self.pg0, rx, tx_i) @@ -1208,5 +1326,5 @@ class TestGRE(VppTestCase): self.pg0.unconfig_ip6() -if __name__ == '__main__': +if __name__ == "__main__": unittest.main(testRunner=VppTestRunner)