X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_dhcp.py;h=16b0f470b0a93403e4dadfb69a32abbbb9ff7995;hb=038e1dfbd;hp=6fc291824ec6c44c19737caa8eb2e2d9bc533d7f;hpb=808c5b21c2759564689933d004223052b7895a42;p=vpp.git diff --git a/test/test_dhcp.py b/test/test_dhcp.py index 6fc291824ec..16b0f470b0a 100644 --- a/test/test_dhcp.py +++ b/test/test_dhcp.py @@ -4,14 +4,15 @@ import unittest import socket import struct -from framework import VppTestCase, VppTestRunner +from framework import VppTestCase, VppTestRunner, running_extended_tests from vpp_neighbor import VppNeighbor -from vpp_ip_route import find_route +from vpp_ip_route import find_route, VppIpTable from util import mk_ll_addr - -from scapy.layers.l2 import Ether, getmacbyip, ARP +import scapy.compat +from scapy.layers.l2 import Ether, getmacbyip, ARP, Dot1Q from scapy.layers.inet import IP, UDP, ICMP -from scapy.layers.inet6 import IPv6, in6_getnsmac, in6_mactoifaceid +from scapy.layers.inet6 import IPv6, in6_getnsmac +from scapy.utils6 import in6_mactoifaceid from scapy.layers.dhcp import DHCP, BOOTP, DHCPTypes from scapy.layers.dhcp6 import DHCP6, DHCP6_Solicit, DHCP6_RelayForward, \ DHCP6_RelayReply, DHCP6_Advertise, DHCP6OptRelayMsg, DHCP6OptIfaceId, \ @@ -19,6 +20,10 @@ from scapy.layers.dhcp6 import DHCP6, DHCP6_Solicit, DHCP6_RelayForward, \ from socket import AF_INET, AF_INET6 from scapy.utils import inet_pton, inet_ntop from scapy.utils6 import in6_ptop +from vpp_papi import mac_pton, VppEnum +from vpp_sub_interface import VppDot1QSubint +from vpp_qos import VppQosEgressMap, VppQosMark + DHCP4_CLIENT_PORT = 68 DHCP4_SERVER_PORT = 67 @@ -29,16 +34,34 @@ DHCP6_SERVER_PORT = 546 class TestDHCP(VppTestCase): """ DHCP Test Case """ + @classmethod + def setUpClass(cls): + super(TestDHCP, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(TestDHCP, cls).tearDownClass() + def setUp(self): super(TestDHCP, self).setUp() - # create 3 pg interfaces - self.create_pg_interfaces(range(4)) + # create 6 pg interfaces for pg0 to pg5 + self.create_pg_interfaces(range(6)) + self.tables = [] - # pg0 and 1 are IP configured in VRF 0 and 1. - # pg2 and 3 are non IP-configured in VRF 0 and 1 + # pg0 to 2 are IP configured in VRF 0, 1 and 2. + # pg3 to 5 are non IP-configured in VRF 0, 1 and 2. table_id = 0 - for i in self.pg_interfaces[:2]: + for table_id in range(1, 4): + tbl4 = VppIpTable(self, table_id) + tbl4.add_vpp_config() + self.tables.append(tbl4) + tbl6 = VppIpTable(self, table_id, is_ip6=1) + tbl6.add_vpp_config() + self.tables.append(tbl6) + + table_id = 0 + for i in self.pg_interfaces[:3]: i.admin_up() i.set_table_ip4(table_id) i.set_table_ip6(table_id) @@ -49,25 +72,22 @@ class TestDHCP(VppTestCase): table_id += 1 table_id = 0 - for i in self.pg_interfaces[2:]: + for i in self.pg_interfaces[3:]: i.admin_up() i.set_table_ip4(table_id) i.set_table_ip6(table_id) table_id += 1 def tearDown(self): - super(TestDHCP, self).tearDown() - for i in self.pg_interfaces: + for i in self.pg_interfaces[:3]: i.unconfig_ip4() i.unconfig_ip6() - i.admin_down() - def send_and_assert_no_replies(self, intf, pkts, remark): - intf.add_stream(pkts) - self.pg_enable_capture(self.pg_interfaces) - self.pg_start() for i in self.pg_interfaces: - i.assert_nothing_captured(remark=remark) + i.set_table_ip4(0) + i.set_table_ip6(0) + i.admin_down() + super(TestDHCP, self).tearDown() def verify_dhcp_has_option(self, pkt, option, value): dhcp = pkt[DHCP] @@ -81,10 +101,11 @@ class TestDHCP(VppTestCase): self.assertTrue(found) - def validate_relay_options(self, pkt, intf, ip_addr, fib_id, oui): + def validate_relay_options(self, pkt, intf, ip_addr, vpn_id, fib_id, oui): dhcp = pkt[DHCP] found = 0 data = [] + id_len = len(vpn_id) for i in dhcp.options: if type(i) is tuple: @@ -95,6 +116,8 @@ class TestDHCP(VppTestCase): data = i[1] if oui != 0: self.assertEqual(len(data), 24) + elif len(vpn_id) > 0: + self.assertEqual(len(data), len(vpn_id)+17) else: self.assertEqual(len(data), 12) @@ -127,8 +150,9 @@ class TestDHCP(VppTestCase): self.assertEqual(data[11], claddr[3]) if oui != 0: - # sub-option 151 encodes the 3 byte oui - # and the 4 byte fib_id + # sub-option 151 encodes vss_type 1, + # the 3 byte oui and the 4 byte fib_id + self.assertEqual(id_len, 0) self.assertEqual(ord(data[12]), 151) self.assertEqual(ord(data[13]), 8) self.assertEqual(ord(data[14]), 1) @@ -144,6 +168,19 @@ class TestDHCP(VppTestCase): self.assertEqual(ord(data[22]), 152) self.assertEqual(ord(data[23]), 0) + if id_len > 0: + # sub-option 151 encode vss_type of 0 + # followerd by vpn_id in ascii + self.assertEqual(oui, 0) + self.assertEqual(ord(data[12]), 151) + self.assertEqual(ord(data[13]), id_len+1) + self.assertEqual(ord(data[14]), 0) + self.assertEqual(data[15:15+id_len], vpn_id) + + # VSS control sub-option + self.assertEqual(ord(data[15+len(vpn_id)]), 152) + self.assertEqual(ord(data[16+len(vpn_id)]), 0) + found = 1 self.assertTrue(found) @@ -159,7 +196,7 @@ class TestDHCP(VppTestCase): found = True self.assertTrue(found) - def verify_dhcp_offer(self, pkt, intf, fib_id=0, oui=0): + def verify_dhcp_offer(self, pkt, intf, vpn_id="", fib_id=0, oui=0): ether = pkt[Ether] self.assertEqual(ether.dst, "ff:ff:ff:ff:ff:ff") self.assertEqual(ether.src, intf.local_mac) @@ -174,23 +211,33 @@ class TestDHCP(VppTestCase): self.verify_dhcp_msg_type(pkt, "offer") data = self.validate_relay_options(pkt, intf, intf.local_ip4, - fib_id, oui) + vpn_id, fib_id, oui) - def verify_orig_dhcp_pkt(self, pkt, intf): + def verify_orig_dhcp_pkt(self, pkt, intf, dscp, l2_bc=True): ether = pkt[Ether] - self.assertEqual(ether.dst, "ff:ff:ff:ff:ff:ff") + if l2_bc: + self.assertEqual(ether.dst, "ff:ff:ff:ff:ff:ff") + else: + self.assertEqual(ether.dst, intf.remote_mac) self.assertEqual(ether.src, intf.local_mac) ip = pkt[IP] - self.assertEqual(ip.dst, "255.255.255.255") - self.assertEqual(ip.src, "0.0.0.0") + + if (l2_bc): + self.assertEqual(ip.dst, "255.255.255.255") + self.assertEqual(ip.src, "0.0.0.0") + else: + self.assertEqual(ip.dst, intf.remote_ip4) + self.assertEqual(ip.src, intf.local_ip4) + self.assertEqual(ip.tos, dscp) udp = pkt[UDP] self.assertEqual(udp.dport, DHCP4_SERVER_PORT) self.assertEqual(udp.sport, DHCP4_CLIENT_PORT) - def verify_orig_dhcp_discover(self, pkt, intf, hostname, client_id=None): - self.verify_orig_dhcp_pkt(pkt, intf) + def verify_orig_dhcp_discover(self, pkt, intf, hostname, client_id=None, + broadcast=True, dscp=0): + self.verify_orig_dhcp_pkt(pkt, intf, dscp) self.verify_dhcp_msg_type(pkt, "discover") self.verify_dhcp_has_option(pkt, "hostname", hostname) @@ -199,21 +246,36 @@ class TestDHCP(VppTestCase): bootp = pkt[BOOTP] self.assertEqual(bootp.ciaddr, "0.0.0.0") self.assertEqual(bootp.giaddr, "0.0.0.0") - self.assertEqual(bootp.flags, 0x8000) + if broadcast: + self.assertEqual(bootp.flags, 0x8000) + else: + self.assertEqual(bootp.flags, 0x0000) - def verify_orig_dhcp_request(self, pkt, intf, hostname, ip): - self.verify_orig_dhcp_pkt(pkt, intf) + def verify_orig_dhcp_request(self, pkt, intf, hostname, ip, + broadcast=True, + l2_bc=True, + dscp=0): + self.verify_orig_dhcp_pkt(pkt, intf, dscp, l2_bc=l2_bc) self.verify_dhcp_msg_type(pkt, "request") self.verify_dhcp_has_option(pkt, "hostname", hostname) self.verify_dhcp_has_option(pkt, "requested_addr", ip) bootp = pkt[BOOTP] - self.assertEqual(bootp.ciaddr, "0.0.0.0") + + if l2_bc: + self.assertEqual(bootp.ciaddr, "0.0.0.0") + else: + self.assertEqual(bootp.ciaddr, intf.local_ip4) self.assertEqual(bootp.giaddr, "0.0.0.0") - self.assertEqual(bootp.flags, 0x8000) + + if broadcast: + self.assertEqual(bootp.flags, 0x8000) + else: + self.assertEqual(bootp.flags, 0x0000) def verify_relayed_dhcp_discover(self, pkt, intf, src_intf=None, fib_id=0, oui=0, + vpn_id="", dst_mac=None, dst_ip=None): if not dst_mac: dst_mac = intf.remote_mac @@ -244,11 +306,13 @@ class TestDHCP(VppTestCase): data = self.validate_relay_options(pkt, src_intf, src_intf.local_ip4, + vpn_id, fib_id, oui) return data def verify_dhcp6_solicit(self, pkt, intf, peer_ip, peer_mac, + vpn_id="", fib_id=0, oui=0, dst_mac=None, @@ -278,7 +342,10 @@ class TestDHCP(VppTestCase): self.assertEqual(cll.lltype, 1) self.assertEqual(cll.clladdr, peer_mac) + id_len = len(vpn_id) + if fib_id != 0: + self.assertEqual(id_len, 0) vss = pkt[DHCP6OptVSS] self.assertEqual(vss.optlen, 8) self.assertEqual(vss.type, 1) @@ -292,6 +359,13 @@ class TestDHCP(VppTestCase): self.assertEqual(ord(vss.data[5]), 0) self.assertEqual(ord(vss.data[6]), fib_id) + if id_len > 0: + self.assertEqual(oui, 0) + vss = pkt[DHCP6OptVSS] + self.assertEqual(vss.optlen, id_len+1) + self.assertEqual(vss.type, 0) + self.assertEqual(vss.data[0:id_len], vpn_id) + # the relay message should be an encoded Solicit msg = pkt[DHCP6OptRelayMsg] sol = DHCP6_Solicit() @@ -314,6 +388,16 @@ class TestDHCP(VppTestCase): # not sure why this is not decoding # adv = pkt[DHCP6_Advertise] + def wait_for_no_route(self, address, length, + n_tries=50, s_time=1): + while (n_tries): + if not find_route(self, address, length): + return True + n_tries = n_tries - 1 + self.sleep(s_time) + + return False + def test_dhcp_proxy(self): """ DHCPv4 Proxy """ @@ -321,7 +405,7 @@ class TestDHCP(VppTestCase): # Verify no response to DHCP request without DHCP config # p_disc_vrf0 = (Ether(dst="ff:ff:ff:ff:ff:ff", - src=self.pg2.remote_mac) / + src=self.pg3.remote_mac) / IP(src="0.0.0.0", dst="255.255.255.255") / UDP(sport=DHCP4_CLIENT_PORT, dport=DHCP4_SERVER_PORT) / @@ -329,17 +413,27 @@ class TestDHCP(VppTestCase): DHCP(options=[('message-type', 'discover'), ('end')])) pkts_disc_vrf0 = [p_disc_vrf0] p_disc_vrf1 = (Ether(dst="ff:ff:ff:ff:ff:ff", - src=self.pg3.remote_mac) / + src=self.pg4.remote_mac) / IP(src="0.0.0.0", dst="255.255.255.255") / UDP(sport=DHCP4_CLIENT_PORT, dport=DHCP4_SERVER_PORT) / BOOTP(op=1) / DHCP(options=[('message-type', 'discover'), ('end')])) - pkts_disc_vrf1 = [p_disc_vrf0] + pkts_disc_vrf1 = [p_disc_vrf1] + p_disc_vrf2 = (Ether(dst="ff:ff:ff:ff:ff:ff", + src=self.pg5.remote_mac) / + IP(src="0.0.0.0", dst="255.255.255.255") / + UDP(sport=DHCP4_CLIENT_PORT, + dport=DHCP4_SERVER_PORT) / + BOOTP(op=1) / + DHCP(options=[('message-type', 'discover'), ('end')])) + pkts_disc_vrf2 = [p_disc_vrf2] - self.send_and_assert_no_replies(self.pg2, pkts_disc_vrf0, + self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf0, + "DHCP with no configuration") + self.send_and_assert_no_replies(self.pg4, pkts_disc_vrf1, "DHCP with no configuration") - self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf1, + self.send_and_assert_no_replies(self.pg5, pkts_disc_vrf2, "DHCP with no configuration") # @@ -356,7 +450,7 @@ class TestDHCP(VppTestCase): # Discover packets from the client are dropped because there is no # IP address configured on the client facing interface # - self.send_and_assert_no_replies(self.pg2, pkts_disc_vrf0, + self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf0, "Discover DHCP no relay address") # @@ -371,13 +465,13 @@ class TestDHCP(VppTestCase): DHCP(options=[('message-type', 'offer'), ('end')])) pkts = [p] - self.send_and_assert_no_replies(self.pg2, pkts, + self.send_and_assert_no_replies(self.pg3, pkts, "Offer DHCP no relay address") # # configure an IP address on the client facing interface # - self.pg2.config_ip4() + self.pg3.config_ip4() # # Try again with a discover packet @@ -386,7 +480,7 @@ class TestDHCP(VppTestCase): # UDP source ports are unchanged # we've no option 82 config so that should be absent # - self.pg2.add_stream(pkts_disc_vrf0) + self.pg3.add_stream(pkts_disc_vrf0) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -394,7 +488,7 @@ class TestDHCP(VppTestCase): rx = rx[0] option_82 = self.verify_relayed_dhcp_discover(rx, self.pg0, - src_intf=self.pg2) + src_intf=self.pg3) # # Create an DHCP offer reply from the server with a correctly formatted @@ -414,17 +508,17 @@ class TestDHCP(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg2.get_capture(1) + rx = self.pg3.get_capture(1) rx = rx[0] - self.verify_dhcp_offer(rx, self.pg2) + self.verify_dhcp_offer(rx, self.pg3) # # Bogus Option 82: # # 1. not our IP address = not checked by VPP? so offer is replayed # to client - bad_ip = option_82[0:8] + chr(33) + option_82[9:] + bad_ip = option_82[0:8] + scapy.compat.chb(33) + option_82[9:] p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) / @@ -438,7 +532,7 @@ class TestDHCP(VppTestCase): "DHCP offer option 82 bad address") # 2. Not a sw_if_index VPP knows - bad_if_index = option_82[0:2] + chr(33) + option_82[3:] + bad_if_index = option_82[0:2] + scapy.compat.chb(33) + option_82[3:] p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) / @@ -454,7 +548,7 @@ class TestDHCP(VppTestCase): # # Send a DHCP request in VRF 1. should be dropped. # - self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf1, + self.send_and_assert_no_replies(self.pg4, pkts_disc_vrf1, "DHCP with no configuration VRF 1") # @@ -466,65 +560,91 @@ class TestDHCP(VppTestCase): rx_table_id=0, is_add=0) - self.send_and_assert_no_replies(self.pg2, pkts_disc_vrf0, + self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf0, "DHCP config removed VRF 0") - self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf1, + self.send_and_assert_no_replies(self.pg4, pkts_disc_vrf1, "DHCP config removed VRF 1") # - # Add DHCP config for VRF 1 + # Add DHCP config for VRF 1 & 2 # - server_addr = self.pg1.remote_ip4n - src_addr = self.pg1.local_ip4n - self.vapi.dhcp_proxy_config(server_addr, - src_addr, + server_addr1 = self.pg1.remote_ip4n + src_addr1 = self.pg1.local_ip4n + self.vapi.dhcp_proxy_config(server_addr1, + src_addr1, rx_table_id=1, server_table_id=1) + server_addr2 = self.pg2.remote_ip4n + src_addr2 = self.pg2.local_ip4n + self.vapi.dhcp_proxy_config(server_addr2, + src_addr2, + rx_table_id=2, + server_table_id=2) # - # Confim DHCP requests ok in VRF 1. + # Confim DHCP requests ok in VRF 1 & 2. # - dropped on IP config on client interface # - self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf1, + self.send_and_assert_no_replies(self.pg4, pkts_disc_vrf1, "DHCP config removed VRF 1") + self.send_and_assert_no_replies(self.pg5, pkts_disc_vrf2, + "DHCP config removed VRF 2") # # configure an IP address on the client facing interface # - self.pg3.config_ip4() - - self.pg3.add_stream(pkts_disc_vrf1) + self.pg4.config_ip4() + self.pg4.add_stream(pkts_disc_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg1.get_capture(1) rx = rx[0] - self.verify_relayed_dhcp_discover(rx, self.pg1, src_intf=self.pg3) + self.verify_relayed_dhcp_discover(rx, self.pg1, src_intf=self.pg4) + + self.pg5.config_ip4() + self.pg5.add_stream(pkts_disc_vrf2) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + rx = self.pg2.get_capture(1) + rx = rx[0] + self.verify_relayed_dhcp_discover(rx, self.pg2, src_intf=self.pg5) # # Add VSS config - # table=1, fib=id=1, oui=4 - self.vapi.dhcp_proxy_set_vss(1, 1, 4) + # table=1, vss_type=1, vpn_index=1, oui=4 + # table=2, vss_type=0, vpn_id = "ip4-table-2" + self.vapi.dhcp_proxy_set_vss(1, 1, vpn_index=1, oui=4, is_add=1) + self.vapi.dhcp_proxy_set_vss(2, 0, "ip4-table-2", is_add=1) - self.pg3.add_stream(pkts_disc_vrf1) + self.pg4.add_stream(pkts_disc_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() rx = self.pg1.get_capture(1) rx = rx[0] self.verify_relayed_dhcp_discover(rx, self.pg1, - src_intf=self.pg3, + src_intf=self.pg4, fib_id=1, oui=4) + self.pg5.add_stream(pkts_disc_vrf2) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + + rx = self.pg2.get_capture(1) + rx = rx[0] + self.verify_relayed_dhcp_discover(rx, self.pg2, + src_intf=self.pg5, + vpn_id="ip4-table-2") + # # Add a second DHCP server in VRF 1 # expect clients messages to be relay to both configured servers # self.pg1.generate_remote_hosts(2) - server_addr2 = socket.inet_pton(AF_INET, self.pg1.remote_hosts[1].ip4) + server_addr12 = socket.inet_pton(AF_INET, self.pg1.remote_hosts[1].ip4) - self.vapi.dhcp_proxy_config(server_addr2, - src_addr, + self.vapi.dhcp_proxy_config(server_addr12, + src_addr1, rx_table_id=1, server_table_id=1, is_add=1) @@ -543,7 +663,7 @@ class TestDHCP(VppTestCase): # The frist packet is sent to the second server # We're not enforcing that here, it's just the way it is. # - self.pg3.add_stream(pkts_disc_vrf1) + self.pg4.add_stream(pkts_disc_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -551,12 +671,12 @@ class TestDHCP(VppTestCase): option_82 = self.verify_relayed_dhcp_discover( rx[0], self.pg1, - src_intf=self.pg3, + src_intf=self.pg4, dst_mac=self.pg1.remote_hosts[1].mac, dst_ip=self.pg1.remote_hosts[1].ip4, fib_id=1, oui=4) self.verify_relayed_dhcp_discover(rx[1], self.pg1, - src_intf=self.pg3, + src_intf=self.pg4, fib_id=1, oui=4) # @@ -582,10 +702,10 @@ class TestDHCP(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg3.get_capture(2) + rx = self.pg4.get_capture(2) - self.verify_dhcp_offer(rx[0], self.pg3, fib_id=1, oui=4) - self.verify_dhcp_offer(rx[1], self.pg3, fib_id=1, oui=4) + self.verify_dhcp_offer(rx[0], self.pg4, fib_id=1, oui=4) + self.verify_dhcp_offer(rx[1], self.pg4, fib_id=1, oui=4) # # Ensure offers from non-servers are dropeed @@ -604,7 +724,7 @@ class TestDHCP(VppTestCase): # Ensure only the discover is sent to multiple servers # p_req_vrf1 = (Ether(dst="ff:ff:ff:ff:ff:ff", - src=self.pg3.remote_mac) / + src=self.pg4.remote_mac) / IP(src="0.0.0.0", dst="255.255.255.255") / UDP(sport=DHCP4_CLIENT_PORT, dport=DHCP4_SERVER_PORT) / @@ -612,7 +732,7 @@ class TestDHCP(VppTestCase): DHCP(options=[('message-type', 'request'), ('end')])) - self.pg3.add_stream(p_req_vrf1) + self.pg4.add_stream(p_req_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -621,8 +741,8 @@ class TestDHCP(VppTestCase): # # Remove the second DHCP server # - self.vapi.dhcp_proxy_config(server_addr2, - src_addr, + self.vapi.dhcp_proxy_config(server_addr12, + src_addr1, rx_table_id=1, server_table_id=1, is_add=0) @@ -630,43 +750,55 @@ class TestDHCP(VppTestCase): # # Test we can still relay with the first # - self.pg3.add_stream(pkts_disc_vrf1) + self.pg4.add_stream(pkts_disc_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() rx = self.pg1.get_capture(1) rx = rx[0] self.verify_relayed_dhcp_discover(rx, self.pg1, - src_intf=self.pg3, + src_intf=self.pg4, fib_id=1, oui=4) # # Remove the VSS config # relayed DHCP has default vlaues in the option. # - self.vapi.dhcp_proxy_set_vss(1, 1, 4, is_add=0) + self.vapi.dhcp_proxy_set_vss(1, is_add=0) + self.vapi.dhcp_proxy_set_vss(2, is_add=0) - self.pg3.add_stream(pkts_disc_vrf1) + self.pg4.add_stream(pkts_disc_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() rx = self.pg1.get_capture(1) rx = rx[0] - self.verify_relayed_dhcp_discover(rx, self.pg1, src_intf=self.pg3) + self.verify_relayed_dhcp_discover(rx, self.pg1, src_intf=self.pg4) # # remove DHCP config to cleanup # - self.vapi.dhcp_proxy_config(server_addr, - src_addr, + self.vapi.dhcp_proxy_config(server_addr1, + src_addr1, rx_table_id=1, server_table_id=1, is_add=0) + self.vapi.dhcp_proxy_config(server_addr2, + src_addr2, + rx_table_id=2, + server_table_id=2, + is_add=0) - self.send_and_assert_no_replies(self.pg2, pkts_disc_vrf0, + self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf0, "DHCP cleanup VRF 0") - self.send_and_assert_no_replies(self.pg3, pkts_disc_vrf1, + self.send_and_assert_no_replies(self.pg4, pkts_disc_vrf1, "DHCP cleanup VRF 1") + self.send_and_assert_no_replies(self.pg5, pkts_disc_vrf2, + "DHCP cleanup VRF 2") + + self.pg3.unconfig_ip4() + self.pg4.unconfig_ip4() + self.pg5.unconfig_ip4() def test_dhcp6_proxy(self): """ DHCPv6 Proxy""" @@ -674,30 +806,41 @@ class TestDHCP(VppTestCase): # Verify no response to DHCP request without DHCP config # dhcp_solicit_dst = "ff02::1:2" - dhcp_solicit_src_vrf0 = mk_ll_addr(self.pg2.remote_mac) - dhcp_solicit_src_vrf1 = mk_ll_addr(self.pg3.remote_mac) + dhcp_solicit_src_vrf0 = mk_ll_addr(self.pg3.remote_mac) + dhcp_solicit_src_vrf1 = mk_ll_addr(self.pg4.remote_mac) + dhcp_solicit_src_vrf2 = mk_ll_addr(self.pg5.remote_mac) server_addr_vrf0 = self.pg0.remote_ip6n src_addr_vrf0 = self.pg0.local_ip6n server_addr_vrf1 = self.pg1.remote_ip6n src_addr_vrf1 = self.pg1.local_ip6n + server_addr_vrf2 = self.pg2.remote_ip6n + src_addr_vrf2 = self.pg2.local_ip6n dmac = in6_getnsmac(inet_pton(socket.AF_INET6, dhcp_solicit_dst)) - p_solicit_vrf0 = (Ether(dst=dmac, src=self.pg2.remote_mac) / + p_solicit_vrf0 = (Ether(dst=dmac, src=self.pg3.remote_mac) / IPv6(src=dhcp_solicit_src_vrf0, dst=dhcp_solicit_dst) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_CLIENT_PORT) / DHCP6_Solicit()) - p_solicit_vrf1 = (Ether(dst=dmac, src=self.pg3.remote_mac) / + p_solicit_vrf1 = (Ether(dst=dmac, src=self.pg4.remote_mac) / IPv6(src=dhcp_solicit_src_vrf1, dst=dhcp_solicit_dst) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_CLIENT_PORT) / DHCP6_Solicit()) + p_solicit_vrf2 = (Ether(dst=dmac, src=self.pg5.remote_mac) / + IPv6(src=dhcp_solicit_src_vrf2, + dst=dhcp_solicit_dst) / + UDP(sport=DHCP6_SERVER_PORT, + dport=DHCP6_CLIENT_PORT) / + DHCP6_Solicit()) - self.send_and_assert_no_replies(self.pg2, p_solicit_vrf0, + self.send_and_assert_no_replies(self.pg3, p_solicit_vrf0, "DHCP with no configuration") - self.send_and_assert_no_replies(self.pg3, p_solicit_vrf1, + self.send_and_assert_no_replies(self.pg4, p_solicit_vrf1, + "DHCP with no configuration") + self.send_and_assert_no_replies(self.pg5, p_solicit_vrf2, "DHCP with no configuration") # @@ -711,20 +854,20 @@ class TestDHCP(VppTestCase): server_table_id=0, is_ipv6=1) - self.send_and_assert_no_replies(self.pg2, p_solicit_vrf0, + self.send_and_assert_no_replies(self.pg3, p_solicit_vrf0, "DHCP with no configuration") - self.send_and_assert_no_replies(self.pg3, p_solicit_vrf1, + self.send_and_assert_no_replies(self.pg4, p_solicit_vrf1, "DHCP with no configuration") # # configure an IP address on the client facing interface # - self.pg2.config_ip6() + self.pg3.config_ip6() # # Now the DHCP requests are relayed to the server # - self.pg2.add_stream(p_solicit_vrf0) + self.pg3.add_stream(p_solicit_vrf0) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -732,7 +875,7 @@ class TestDHCP(VppTestCase): self.verify_dhcp6_solicit(rx[0], self.pg0, dhcp_solicit_src_vrf0, - self.pg2.remote_mac) + self.pg3.remote_mac) # # Exception cases for rejected relay responses @@ -743,7 +886,7 @@ class TestDHCP(VppTestCase): IPv6(dst=self.pg0.local_ip6, src=self.pg0.remote_ip6) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_SERVER_PORT) / DHCP6_Advertise()) - self.send_and_assert_no_replies(self.pg2, p_adv_vrf0, + self.send_and_assert_no_replies(self.pg3, p_adv_vrf0, "DHCP6 not a relay reply") # 2 - no relay message option @@ -752,7 +895,7 @@ class TestDHCP(VppTestCase): UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_SERVER_PORT) / DHCP6_RelayReply() / DHCP6_Advertise()) - self.send_and_assert_no_replies(self.pg2, p_adv_vrf0, + self.send_and_assert_no_replies(self.pg3, p_adv_vrf0, "DHCP not a relay message") # 3 - no circuit ID @@ -762,7 +905,7 @@ class TestDHCP(VppTestCase): DHCP6_RelayReply() / DHCP6OptRelayMsg(optlen=0) / DHCP6_Advertise()) - self.send_and_assert_no_replies(self.pg2, p_adv_vrf0, + self.send_and_assert_no_replies(self.pg3, p_adv_vrf0, "DHCP6 no circuit ID") # 4 - wrong circuit ID p_adv_vrf0 = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / @@ -772,7 +915,7 @@ class TestDHCP(VppTestCase): DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x05') / DHCP6OptRelayMsg(optlen=0) / DHCP6_Advertise()) - self.send_and_assert_no_replies(self.pg2, p_adv_vrf0, + self.send_and_assert_no_replies(self.pg3, p_adv_vrf0, "DHCP6 wrong circuit ID") # @@ -782,7 +925,7 @@ class TestDHCP(VppTestCase): IPv6(dst=self.pg0.local_ip6, src=self.pg0.remote_ip6) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_SERVER_PORT) / DHCP6_RelayReply() / - DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x03') / + DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x04') / DHCP6OptRelayMsg(optlen=0) / DHCP6_Advertise(trid=1) / DHCP6OptStatusCode(statuscode=0)) @@ -792,9 +935,9 @@ class TestDHCP(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg2.get_capture(1) + rx = self.pg3.get_capture(1) - self.verify_dhcp6_advert(rx[0], self.pg2, "::") + self.verify_dhcp6_advert(rx[0], self.pg3, "::") # # Send the relay response (the advertisement) @@ -803,7 +946,7 @@ class TestDHCP(VppTestCase): IPv6(dst=self.pg0.local_ip6, src=self.pg0.remote_ip6) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_SERVER_PORT) / DHCP6_RelayReply(peeraddr=dhcp_solicit_src_vrf0) / - DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x03') / + DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x04') / DHCP6OptRelayMsg(optlen=0) / DHCP6_Advertise(trid=1) / DHCP6OptStatusCode(statuscode=0)) @@ -813,24 +956,31 @@ class TestDHCP(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg2.get_capture(1) + rx = self.pg3.get_capture(1) - self.verify_dhcp6_advert(rx[0], self.pg2, dhcp_solicit_src_vrf0) + self.verify_dhcp6_advert(rx[0], self.pg3, dhcp_solicit_src_vrf0) # - # Add all the config for VRF 1 + # Add all the config for VRF 1 & 2 # self.vapi.dhcp_proxy_config(server_addr_vrf1, src_addr_vrf1, rx_table_id=1, server_table_id=1, is_ipv6=1) - self.pg3.config_ip6() + self.pg4.config_ip6() + + self.vapi.dhcp_proxy_config(server_addr_vrf2, + src_addr_vrf2, + rx_table_id=2, + server_table_id=2, + is_ipv6=1) + self.pg5.config_ip6() # # VRF 1 solicit # - self.pg3.add_stream(p_solicit_vrf1) + self.pg4.add_stream(p_solicit_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -838,7 +988,20 @@ class TestDHCP(VppTestCase): self.verify_dhcp6_solicit(rx[0], self.pg1, dhcp_solicit_src_vrf1, - self.pg3.remote_mac) + self.pg4.remote_mac) + + # + # VRF 2 solicit + # + self.pg5.add_stream(p_solicit_vrf2) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + + rx = self.pg2.get_capture(1) + + self.verify_dhcp6_solicit(rx[0], self.pg2, + dhcp_solicit_src_vrf2, + self.pg5.remote_mac) # # VRF 1 Advert @@ -847,7 +1010,7 @@ class TestDHCP(VppTestCase): IPv6(dst=self.pg1.local_ip6, src=self.pg1.remote_ip6) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_SERVER_PORT) / DHCP6_RelayReply(peeraddr=dhcp_solicit_src_vrf1) / - DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x04') / + DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x05') / DHCP6OptRelayMsg(optlen=0) / DHCP6_Advertise(trid=1) / DHCP6OptStatusCode(statuscode=0)) @@ -857,16 +1020,18 @@ class TestDHCP(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg3.get_capture(1) + rx = self.pg4.get_capture(1) - self.verify_dhcp6_advert(rx[0], self.pg3, dhcp_solicit_src_vrf1) + self.verify_dhcp6_advert(rx[0], self.pg4, dhcp_solicit_src_vrf1) # # Add VSS config - # table=1, fib=id=1, oui=4 - self.vapi.dhcp_proxy_set_vss(1, 1, 4, is_ip6=1) + # table=1, vss_type=1, vpn_index=1, oui=4 + # table=2, vss_type=0, vpn_id = "ip6-table-2" + self.vapi.dhcp_proxy_set_vss(1, 1, oui=4, vpn_index=1, is_ip6=1) + self.vapi.dhcp_proxy_set_vss(2, 0, "IPv6-table-2", is_ip6=1) - self.pg3.add_stream(p_solicit_vrf1) + self.pg4.add_stream(p_solicit_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -874,17 +1039,28 @@ class TestDHCP(VppTestCase): self.verify_dhcp6_solicit(rx[0], self.pg1, dhcp_solicit_src_vrf1, - self.pg3.remote_mac, + self.pg4.remote_mac, fib_id=1, oui=4) + self.pg5.add_stream(p_solicit_vrf2) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + + rx = self.pg2.get_capture(1) + + self.verify_dhcp6_solicit(rx[0], self.pg2, + dhcp_solicit_src_vrf2, + self.pg5.remote_mac, + vpn_id="IPv6-table-2") + # # Remove the VSS config # relayed DHCP has default vlaues in the option. # - self.vapi.dhcp_proxy_set_vss(1, 1, 4, is_ip6=1, is_add=0) + self.vapi.dhcp_proxy_set_vss(1, is_ip6=1, is_add=0) - self.pg3.add_stream(p_solicit_vrf1) + self.pg4.add_stream(p_solicit_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -892,16 +1068,17 @@ class TestDHCP(VppTestCase): self.verify_dhcp6_solicit(rx[0], self.pg1, dhcp_solicit_src_vrf1, - self.pg3.remote_mac) + self.pg4.remote_mac) # # Add a second DHCP server in VRF 1 # expect clients messages to be relay to both configured servers # self.pg1.generate_remote_hosts(2) - server_addr2 = socket.inet_pton(AF_INET6, self.pg1.remote_hosts[1].ip6) + server_addr12 = socket.inet_pton(AF_INET6, + self.pg1.remote_hosts[1].ip6) - self.vapi.dhcp_proxy_config(server_addr2, + self.vapi.dhcp_proxy_config(server_addr12, src_addr_vrf1, rx_table_id=1, server_table_id=1, @@ -913,8 +1090,7 @@ class TestDHCP(VppTestCase): nd_entry = VppNeighbor(self, self.pg1.sw_if_index, self.pg1.remote_hosts[1].mac, - self.pg1.remote_hosts[1].ip6, - af=AF_INET6) + self.pg1.remote_hosts[1].ip6) nd_entry.add_vpp_config() # @@ -922,7 +1098,7 @@ class TestDHCP(VppTestCase): # The frist packet is sent to the second server # We're not enforcing that here, it's just the way it is. # - self.pg3.add_stream(p_solicit_vrf1) + self.pg4.add_stream(p_solicit_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -930,10 +1106,10 @@ class TestDHCP(VppTestCase): self.verify_dhcp6_solicit(rx[0], self.pg1, dhcp_solicit_src_vrf1, - self.pg3.remote_mac) + self.pg4.remote_mac) self.verify_dhcp6_solicit(rx[1], self.pg1, dhcp_solicit_src_vrf1, - self.pg3.remote_mac, + self.pg4.remote_mac, dst_mac=self.pg1.remote_hosts[1].mac, dst_ip=self.pg1.remote_hosts[1].ip6) @@ -944,7 +1120,7 @@ class TestDHCP(VppTestCase): IPv6(dst=self.pg1.local_ip6, src=self.pg1.remote_ip6) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_SERVER_PORT) / DHCP6_RelayReply(peeraddr=dhcp_solicit_src_vrf1) / - DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x04') / + DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x05') / DHCP6OptRelayMsg(optlen=0) / DHCP6_Advertise(trid=1) / DHCP6OptStatusCode(statuscode=0)) @@ -952,7 +1128,7 @@ class TestDHCP(VppTestCase): IPv6(dst=self.pg1.local_ip6, src=self.pg1._remote_hosts[1].ip6) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_SERVER_PORT) / DHCP6_RelayReply(peeraddr=dhcp_solicit_src_vrf1) / - DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x04') / + DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x05') / DHCP6OptRelayMsg(optlen=0) / DHCP6_Advertise(trid=1) / DHCP6OptStatusCode(statuscode=0)) @@ -963,22 +1139,22 @@ class TestDHCP(VppTestCase): self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg3.get_capture(2) + rx = self.pg4.get_capture(2) - self.verify_dhcp6_advert(rx[0], self.pg3, dhcp_solicit_src_vrf1) - self.verify_dhcp6_advert(rx[1], self.pg3, dhcp_solicit_src_vrf1) + self.verify_dhcp6_advert(rx[0], self.pg4, dhcp_solicit_src_vrf1) + self.verify_dhcp6_advert(rx[1], self.pg4, dhcp_solicit_src_vrf1) # # Ensure only solicit messages are duplicated # - p_request_vrf1 = (Ether(dst=dmac, src=self.pg3.remote_mac) / + p_request_vrf1 = (Ether(dst=dmac, src=self.pg4.remote_mac) / IPv6(src=dhcp_solicit_src_vrf1, dst=dhcp_solicit_dst) / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_CLIENT_PORT) / DHCP6_Request()) - self.pg3.add_stream(p_request_vrf1) + self.pg4.add_stream(p_request_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -992,7 +1168,7 @@ class TestDHCP(VppTestCase): IPv6(dst=self.pg1.local_ip6, src="3001::1") / UDP(sport=DHCP6_SERVER_PORT, dport=DHCP6_SERVER_PORT) / DHCP6_RelayReply(peeraddr=dhcp_solicit_src_vrf1) / - DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x04') / + DHCP6OptIfaceId(optlen=4, ifaceid='\x00\x00\x00\x05') / DHCP6OptRelayMsg(optlen=0) / DHCP6_Advertise(trid=1) / DHCP6OptStatusCode(statuscode=0)) @@ -1002,7 +1178,7 @@ class TestDHCP(VppTestCase): # # Remove the second DHCP server # - self.vapi.dhcp_proxy_config(server_addr2, + self.vapi.dhcp_proxy_config(server_addr12, src_addr_vrf1, rx_table_id=1, server_table_id=1, @@ -1012,7 +1188,7 @@ class TestDHCP(VppTestCase): # # Test we can still relay with the first # - self.pg3.add_stream(p_solicit_vrf1) + self.pg4.add_stream(p_solicit_vrf1) self.pg_enable_capture(self.pg_interfaces) self.pg_start() @@ -1020,11 +1196,17 @@ class TestDHCP(VppTestCase): self.verify_dhcp6_solicit(rx[0], self.pg1, dhcp_solicit_src_vrf1, - self.pg3.remote_mac) + self.pg4.remote_mac) # # Cleanup # + self.vapi.dhcp_proxy_config(server_addr_vrf2, + src_addr_vrf2, + rx_table_id=2, + server_table_id=2, + is_ipv6=1, + is_add=0) self.vapi.dhcp_proxy_config(server_addr_vrf1, src_addr_vrf1, rx_table_id=1, @@ -1045,145 +1227,440 @@ class TestDHCP(VppTestCase): server_table_id=0, is_ipv6=1, is_add=0) + self.pg3.unconfig_ip6() + self.pg4.unconfig_ip6() + self.pg5.unconfig_ip6() def test_dhcp_client(self): """ DHCP Client""" + vdscp = VppEnum.vl_api_ip_dscp_t hostname = 'universal-dp' self.pg_enable_capture(self.pg_interfaces) # - # Configure DHCP client on PG2 and capture the discover sent + # Configure DHCP client on PG3 and capture the discover sent # - self.vapi.dhcp_client(self.pg2.sw_if_index, hostname) + self.vapi.dhcp_client_config(self.pg3.sw_if_index, hostname) - rx = self.pg2.get_capture(1) + rx = self.pg3.get_capture(1) - self.verify_orig_dhcp_discover(rx[0], self.pg2, hostname) + self.verify_orig_dhcp_discover(rx[0], self.pg3, hostname) # - # Sned back on offer, expect the request + # Send back on offer, expect the request # - p_offer = (Ether(dst=self.pg2.local_mac, src=self.pg2.remote_mac) / - IP(src=self.pg2.remote_ip4, dst="255.255.255.255") / + p_offer = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) / + IP(src=self.pg3.remote_ip4, dst="255.255.255.255") / UDP(sport=DHCP4_SERVER_PORT, dport=DHCP4_CLIENT_PORT) / - BOOTP(op=1, yiaddr=self.pg2.local_ip4) / + BOOTP(op=1, + yiaddr=self.pg3.local_ip4, + chaddr=mac_pton(self.pg3.local_mac)) / DHCP(options=[('message-type', 'offer'), - ('server_id', self.pg2.remote_ip4), - ('end')])) + ('server_id', self.pg3.remote_ip4), + 'end'])) - self.pg2.add_stream(p_offer) + self.pg3.add_stream(p_offer) self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg2.get_capture(1) - self.verify_orig_dhcp_request(rx[0], self.pg2, hostname, - self.pg2.local_ip4) + rx = self.pg3.get_capture(1) + self.verify_orig_dhcp_request(rx[0], self.pg3, hostname, + self.pg3.local_ip4) # - # Send an acknowloedgement + # Send an acknowledgment # - p_ack = (Ether(dst=self.pg2.local_mac, src=self.pg2.remote_mac) / - IP(src=self.pg2.remote_ip4, dst="255.255.255.255") / + p_ack = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) / + IP(src=self.pg3.remote_ip4, dst="255.255.255.255") / UDP(sport=DHCP4_SERVER_PORT, dport=DHCP4_CLIENT_PORT) / - BOOTP(op=1, yiaddr=self.pg2.local_ip4) / + BOOTP(op=1, yiaddr=self.pg3.local_ip4, + chaddr=mac_pton(self.pg3.local_mac)) / DHCP(options=[('message-type', 'ack'), ('subnet_mask', "255.255.255.0"), - ('router', self.pg2.remote_ip4), - ('server_id', self.pg2.remote_ip4), + ('router', self.pg3.remote_ip4), + ('server_id', self.pg3.remote_ip4), ('lease_time', 43200), - ('end')])) + 'end'])) - self.pg2.add_stream(p_ack) + self.pg3.add_stream(p_ack) self.pg_enable_capture(self.pg_interfaces) self.pg_start() # # We'll get an ARP request for the router address # - rx = self.pg2.get_capture(1) + rx = self.pg3.get_capture(1) - self.assertEqual(rx[0][ARP].pdst, self.pg2.remote_ip4) + self.assertEqual(rx[0][ARP].pdst, self.pg3.remote_ip4) self.pg_enable_capture(self.pg_interfaces) # # At the end of this procedure there should be a connected route # in the FIB # - self.assertTrue(find_route(self, self.pg2.local_ip4, 24)) - self.assertTrue(find_route(self, self.pg2.local_ip4, 32)) + self.assertTrue(find_route(self, self.pg3.local_ip4, 24)) + self.assertTrue(find_route(self, self.pg3.local_ip4, 32)) # remove the left over ARP entry - self.vapi.ip_neighbor_add_del(self.pg2.sw_if_index, - self.pg2.remote_mac, - self.pg2.remote_ip4, + self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index, + self.pg3.remote_mac, + self.pg3.remote_ip4, is_add=0) + # # remove the DHCP config # - self.vapi.dhcp_client(self.pg2.sw_if_index, hostname, is_add=0) + self.vapi.dhcp_client_config(self.pg3.sw_if_index, hostname, is_add=0) # # and now the route should be gone # - self.assertFalse(find_route(self, self.pg2.local_ip4, 32)) - self.assertFalse(find_route(self, self.pg2.local_ip4, 24)) + self.assertFalse(find_route(self, self.pg3.local_ip4, 32)) + self.assertFalse(find_route(self, self.pg3.local_ip4, 24)) # # Start the procedure again. this time have VPP send the client-ID + # and set the DSCP value # - self.pg2.admin_down() + self.pg3.admin_down() self.sleep(1) - self.pg2.admin_up() - self.vapi.dhcp_client(self.pg2.sw_if_index, hostname, - client_id=self.pg2.local_mac) + self.pg3.admin_up() + self.vapi.dhcp_client_config(self.pg3.sw_if_index, hostname, + client_id=self.pg3.local_mac, + dscp=vdscp.IP_API_DSCP_EF) - rx = self.pg2.get_capture(1) + rx = self.pg3.get_capture(1) - self.verify_orig_dhcp_discover(rx[0], self.pg2, hostname, - self.pg2.local_mac) + self.verify_orig_dhcp_discover(rx[0], self.pg3, hostname, + self.pg3.local_mac, + dscp=vdscp.IP_API_DSCP_EF) - self.pg2.add_stream(p_offer) + # TODO: VPP DHCP client should not accept DHCP OFFER message with + # the XID (Transaction ID) not matching the XID of the most recent + # DHCP DISCOVERY message. + # Such DHCP OFFER message must be silently discarded - RFC2131. + # Reported in Jira ticket: VPP-99 + self.pg3.add_stream(p_offer) self.pg_enable_capture(self.pg_interfaces) self.pg_start() - rx = self.pg2.get_capture(1) - self.verify_orig_dhcp_request(rx[0], self.pg2, hostname, - self.pg2.local_ip4) + rx = self.pg3.get_capture(1) + self.verify_orig_dhcp_request(rx[0], self.pg3, hostname, + self.pg3.local_ip4, + dscp=vdscp.IP_API_DSCP_EF) # # unicast the ack to the offered address # - p_ack = (Ether(dst=self.pg2.local_mac, src=self.pg2.remote_mac) / - IP(src=self.pg2.remote_ip4, dst=self.pg2.local_ip4) / + p_ack = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) / + IP(src=self.pg3.remote_ip4, dst=self.pg3.local_ip4) / + UDP(sport=DHCP4_SERVER_PORT, dport=DHCP4_CLIENT_PORT) / + BOOTP(op=1, yiaddr=self.pg3.local_ip4, + chaddr=mac_pton(self.pg3.local_mac)) / + DHCP(options=[('message-type', 'ack'), + ('subnet_mask', "255.255.255.0"), + ('router', self.pg3.remote_ip4), + ('server_id', self.pg3.remote_ip4), + ('lease_time', 43200), + 'end'])) + + self.pg3.add_stream(p_ack) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + + # + # We'll get an ARP request for the router address + # + rx = self.pg3.get_capture(1) + + self.assertEqual(rx[0][ARP].pdst, self.pg3.remote_ip4) + self.pg_enable_capture(self.pg_interfaces) + + # + # At the end of this procedure there should be a connected route + # in the FIB + # + self.assertTrue(find_route(self, self.pg3.local_ip4, 32)) + self.assertTrue(find_route(self, self.pg3.local_ip4, 24)) + + # + # remove the DHCP config + # + self.vapi.dhcp_client_config(self.pg3.sw_if_index, hostname, is_add=0) + + self.assertFalse(find_route(self, self.pg3.local_ip4, 32)) + self.assertFalse(find_route(self, self.pg3.local_ip4, 24)) + + # + # Rince and repeat, this time with VPP configured not to set + # the braodcast flag in the discover and request messages, + # and for the server to unicast the responses. + # + # Configure DHCP client on PG3 and capture the discover sent + # + self.vapi.dhcp_client_config(self.pg3.sw_if_index, hostname, + set_broadcast_flag=0) + + rx = self.pg3.get_capture(1) + + self.verify_orig_dhcp_discover(rx[0], self.pg3, hostname, + broadcast=False) + + # + # Send back on offer, unicasted to the offered address. + # Expect the request. + # + p_offer = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) / + IP(src=self.pg3.remote_ip4, dst=self.pg3.local_ip4) / + UDP(sport=DHCP4_SERVER_PORT, dport=DHCP4_CLIENT_PORT) / + BOOTP(op=1, yiaddr=self.pg3.local_ip4, + chaddr=mac_pton(self.pg3.local_mac)) / + DHCP(options=[('message-type', 'offer'), + ('server_id', self.pg3.remote_ip4), + 'end'])) + + self.pg3.add_stream(p_offer) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + + rx = self.pg3.get_capture(1) + self.verify_orig_dhcp_request(rx[0], self.pg3, hostname, + self.pg3.local_ip4, + broadcast=False) + + # + # Send an acknowledgment, the lease renewal time is 2 seconds + # so we should expect the renew straight after + # + p_ack = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) / + IP(src=self.pg3.remote_ip4, dst=self.pg3.local_ip4) / UDP(sport=DHCP4_SERVER_PORT, dport=DHCP4_CLIENT_PORT) / - BOOTP(op=1, yiaddr=self.pg2.local_ip4) / + BOOTP(op=1, yiaddr=self.pg3.local_ip4, + chaddr=mac_pton(self.pg3.local_mac)) / DHCP(options=[('message-type', 'ack'), ('subnet_mask', "255.255.255.0"), - ('router', self.pg2.remote_ip4), - ('server_id', self.pg2.remote_ip4), + ('router', self.pg3.remote_ip4), + ('server_id', self.pg3.remote_ip4), ('lease_time', 43200), - ('end')])) + ('renewal_time', 2), + 'end'])) - self.pg2.add_stream(p_ack) + self.pg3.add_stream(p_ack) self.pg_enable_capture(self.pg_interfaces) self.pg_start() + # + # We'll get an ARP request for the router address + # + rx = self.pg3.get_capture(1) + + self.assertEqual(rx[0][ARP].pdst, self.pg3.remote_ip4) + self.pg_enable_capture(self.pg_interfaces) + # # At the end of this procedure there should be a connected route # in the FIB # - self.assertTrue(find_route(self, self.pg2.local_ip4, 32)) - self.assertTrue(find_route(self, self.pg2.local_ip4, 24)) + self.assertTrue(find_route(self, self.pg3.local_ip4, 24)) + self.assertTrue(find_route(self, self.pg3.local_ip4, 32)) + + # + # wait for the unicasted renewal + # the first attempt will be an ARP packet, since we have not yet + # responded to VPP's request + # + self.logger.info(self.vapi.cli("sh dhcp client intfc pg3 verbose")) + rx = self.pg3.get_capture(1, timeout=10) + + self.assertEqual(rx[0][ARP].pdst, self.pg3.remote_ip4) + + # respond to the arp + p_arp = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) / + ARP(op="is-at", + hwdst=self.pg3.local_mac, + hwsrc=self.pg3.remote_mac, + pdst=self.pg3.local_ip4, + psrc=self.pg3.remote_ip4)) + self.pg3.add_stream(p_arp) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + + # the next packet is the unicasted renewal + rx = self.pg3.get_capture(1, timeout=10) + self.verify_orig_dhcp_request(rx[0], self.pg3, hostname, + self.pg3.local_ip4, + l2_bc=False, + broadcast=False) + + # + # read the DHCP client details from a dump + # + clients = self.vapi.dhcp_client_dump() + + self.assertEqual(clients[0].client.sw_if_index, + self.pg3.sw_if_index) + self.assertEqual(clients[0].lease.sw_if_index, + self.pg3.sw_if_index) + self.assertEqual(clients[0].client.hostname.rstrip('\0'), + hostname) + self.assertEqual(clients[0].lease.hostname.rstrip('\0'), + hostname) + self.assertEqual(clients[0].lease.is_ipv6, 0) + # 0 = DISCOVER, 1 = REQUEST, 2 = BOUND + self.assertEqual(clients[0].lease.state, 2) + self.assertEqual(clients[0].lease.mask_width, 24) + self.assertEqual(clients[0].lease.router_address.rstrip('\0'), + self.pg3.remote_ip4n) + self.assertEqual(clients[0].lease.host_address.rstrip('\0'), + self.pg3.local_ip4n) + + # remove the left over ARP entry + self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index, + self.pg3.remote_mac, + self.pg3.remote_ip4, + is_add=0) # # remove the DHCP config # - self.vapi.dhcp_client(self.pg2.sw_if_index, hostname, is_add=0) + self.vapi.dhcp_client_config(self.pg3.sw_if_index, hostname, is_add=0) + + # + # and now the route should be gone + # + self.assertFalse(find_route(self, self.pg3.local_ip4, 32)) + self.assertFalse(find_route(self, self.pg3.local_ip4, 24)) + + # + # Start the procedure again. Use requested lease time option. + # + hostname += "-2" + self.pg3.admin_down() + self.sleep(1) + self.pg3.admin_up() + self.pg_enable_capture(self.pg_interfaces) + self.vapi.dhcp_client_config(self.pg3.sw_if_index, hostname) + + rx = self.pg3.get_capture(1) + + self.verify_orig_dhcp_discover(rx[0], self.pg3, hostname) + + # + # Send back on offer with requested lease time, expect the request + # + lease_time = 1 + p_offer = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) / + IP(src=self.pg3.remote_ip4, dst='255.255.255.255') / + UDP(sport=DHCP4_SERVER_PORT, dport=DHCP4_CLIENT_PORT) / + BOOTP(op=1, + yiaddr=self.pg3.local_ip4, + chaddr=mac_pton(self.pg3.local_mac)) / + DHCP(options=[('message-type', 'offer'), + ('server_id', self.pg3.remote_ip4), + ('lease_time', lease_time), + 'end'])) + + self.pg3.add_stream(p_offer) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + + rx = self.pg3.get_capture(1) + self.verify_orig_dhcp_request(rx[0], self.pg3, hostname, + self.pg3.local_ip4) + + # + # Send an acknowledgment + # + p_ack = (Ether(dst=self.pg3.local_mac, src=self.pg3.remote_mac) / + IP(src=self.pg3.remote_ip4, dst='255.255.255.255') / + UDP(sport=DHCP4_SERVER_PORT, dport=DHCP4_CLIENT_PORT) / + BOOTP(op=1, yiaddr=self.pg3.local_ip4, + chaddr=mac_pton(self.pg3.local_mac)) / + DHCP(options=[('message-type', 'ack'), + ('subnet_mask', '255.255.255.0'), + ('router', self.pg3.remote_ip4), + ('server_id', self.pg3.remote_ip4), + ('lease_time', lease_time), + 'end'])) + + self.pg3.add_stream(p_ack) + self.pg_enable_capture(self.pg_interfaces) + self.pg_start() + + # + # We'll get an ARP request for the router address + # + rx = self.pg3.get_capture(1) + + self.assertEqual(rx[0][ARP].pdst, self.pg3.remote_ip4) + + # + # At the end of this procedure there should be a connected route + # in the FIB + # + self.assertTrue(find_route(self, self.pg3.local_ip4, 32)) + self.assertTrue(find_route(self, self.pg3.local_ip4, 24)) + + # remove the left over ARP entry + self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index, + self.pg3.remote_mac, + self.pg3.remote_ip4, + is_add=0) + + # + # the route should be gone after the lease expires + # + self.assertTrue(self.wait_for_no_route(self.pg3.local_ip4, 32)) + self.assertTrue(self.wait_for_no_route(self.pg3.local_ip4, 24)) + + # + # remove the DHCP config + # + self.vapi.dhcp_client_config(self.pg3.sw_if_index, hostname, is_add=0) + + def test_dhcp_client_vlan(self): + """ DHCP Client w/ VLAN""" + + vdscp = VppEnum.vl_api_ip_dscp_t + vqos = VppEnum.vl_api_qos_source_t + hostname = 'universal-dp' + + self.pg_enable_capture(self.pg_interfaces) + + vlan_100 = VppDot1QSubint(self, self.pg3, 100) + vlan_100.admin_up() + + output = [scapy.compat.chb(4)] * 256 + os = b''.join(output) + rows = [{'outputs': os}, + {'outputs': os}, + {'outputs': os}, + {'outputs': os}] + + qem1 = VppQosEgressMap(self, 1, rows).add_vpp_config() + qm1 = VppQosMark(self, vlan_100, qem1, + vqos.QOS_API_SOURCE_VLAN).add_vpp_config() + + # + # Configure DHCP client on PG3 and capture the discover sent + # + self.vapi.dhcp_client_config(vlan_100.sw_if_index, + hostname, + dscp=vdscp.IP_API_DSCP_EF) + + rx = self.pg3.get_capture(1) + + self.assertEqual(rx[0][Dot1Q].vlan, 100) + self.assertEqual(rx[0][Dot1Q].prio, 4) + + self.verify_orig_dhcp_discover(rx[0], self.pg3, hostname, + dscp=vdscp.IP_API_DSCP_EF) - self.assertFalse(find_route(self, self.pg2.local_ip4, 32)) - self.assertFalse(find_route(self, self.pg2.local_ip4, 24)) + self.vapi.dhcp_client_config(vlan_100.sw_if_index, + hostname, + is_add=0) if __name__ == '__main__':