diff options
author | Dave Barach <dave@barachs.net> | 2020-04-13 16:44:09 -0400 |
---|---|---|
committer | Dave Barach <dave@barachs.net> | 2020-04-13 16:44:42 -0400 |
commit | fd0834262c517ea3a420fdba05fb95bc4141762b (patch) | |
tree | d4c5b72fd2734cc81120c7f4a1f6b98f9f06560e /test | |
parent | 5e62c84bb7058b58d9f0fa3b5eff9af93c073274 (diff) |
dhcp: fix unicast pkts, clean up state machine
Nominally a bug-fix cherry-pick, but completely manual. Closer to a
full feature backport minus binary api changes.
Send dhcp unicast packets to ip4-lookup. Otherwise, these packets
won't reach a dhcp server on a different subnet.
Do an immediate client scan after processing wakeup events.
Calculate the next process wakeup time by scanning all
clients.
Increase maximum (idle, no-clients-configured) timeout to 1000
seconds.
Reduce log spew.
Type: fix
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I3d10cd4c353298ed0b19e7e30887dc1d8d07b19e
(cherry picked from commit c54162981cdd41d65ed283df36955007552ddffe)
Diffstat (limited to 'test')
-rw-r--r-- | test/test_dhcp.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/test_dhcp.py b/test/test_dhcp.py index 175f6493eb7..5d9c89d5f38 100644 --- a/test/test_dhcp.py +++ b/test/test_dhcp.py @@ -242,6 +242,7 @@ class TestDHCP(VppTestCase): self.verify_dhcp_msg_type(pkt, "discover") self.verify_dhcp_has_option(pkt, "hostname", hostname) if client_id: + client_id = '\x00' + client_id self.verify_dhcp_has_option(pkt, "client_id", client_id) bootp = pkt[BOOTP] self.assertEqual(bootp.ciaddr, "0.0.0.0") |