Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DHCP server unit tests #410

Merged
merged 6 commits into from
Mar 13, 2024
Merged

DHCP server unit tests #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7380cd
Fixed a bug in AllocateIP function
amitlimaye Feb 29, 2024
4ab8395
Fixed a bug in AllocateIP function
amitlimaye Feb 29, 2024
d9a8243
Merge branch 'master' of github.com:githedgehog/fabric into iss394
amitlimaye Feb 29, 2024
acbf4e9
Unit tests for dhcp
amitlimaye Mar 12, 2024
6e943be
fix merges
amitlimaye Mar 12, 2024
46959a9
Merge branch 'master' of github.com:githedgehog/fabric into unittests
amitlimaye Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 36 additions & 22 deletions pkg/dhcpd/dhcphandlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ func handleDiscover4(req, resp *dhcpv4.DHCPv4) error {
}
// We did not see the request that follows. We need to release the IP
delete(subnet.allocations.allocation, req.ClientHWAddr.String())
subnet.pool.Free(reservation.address)
if err := subnet.pool.Free(reservation.address); err != nil {
log.Errorf("Failed to free reservation %s:%s with error: %v", req.ClientHWAddr.String(), reservation.address.String(), err)
}
}
})

Expand Down Expand Up @@ -132,7 +134,9 @@ func handleRequest4(req, resp *dhcpv4.DHCPv4) error {
Expiry: metav1.NewTime(reservation.expiry),
Hostname: reservation.Hostname,
}
updateBackend4(subnet.dhcpSubnet)
if err := updateBackend4(subnet.dhcpSubnet); err != nil {
log.Warnf("Update Backend failed for record with Mac Address: %s IP %s", req.ClientHWAddr.String(), reservation.address.IP.String())
}
return nil
}
ipnet, err := subnet.pool.Allocate()
Expand All @@ -156,7 +160,9 @@ func handleRequest4(req, resp *dhcpv4.DHCPv4) error {
Expiry: metav1.NewTime(time.Now().Add(leaseTime)),
Hostname: req.HostName(),
}
updateBackend4(subnet.dhcpSubnet)
if err := updateBackend4(subnet.dhcpSubnet); err != nil {
log.Warnf("Update Backend failed for record with Mac Address: %s IP %s", req.ClientHWAddr.String(), ipnet.String())
}

}
return nil
Expand Down Expand Up @@ -184,7 +190,10 @@ func handleDecline4(req, resp *dhcpv4.DHCPv4) error {
log.Errorf("IP address %s could not be released", reservation.address.String())
}
delete(subnet.dhcpSubnet.Status.Allocated, req.ClientHWAddr.String())
updateBackend4(subnet.dhcpSubnet)
if err := updateBackend4(subnet.dhcpSubnet); err != nil {
log.Warnf("Update Backend failed for record with Mac Address: %s IP %s", req.ClientHWAddr.String(), reservation.address.IP.String())
}

}

return nil
Expand Down Expand Up @@ -212,7 +221,9 @@ func handleRelease4(req, resp *dhcpv4.DHCPv4) error {
log.Errorf("IP address %s could not be released", reservation.address.String())
}
delete(subnet.dhcpSubnet.Status.Allocated, req.ClientHWAddr.String())
updateBackend4(subnet.dhcpSubnet)
if err := updateBackend4(subnet.dhcpSubnet); err != nil {
log.Warnf("Update Backend failed for record with Mac Address: %s IP %s", req.ClientHWAddr.String(), reservation.address.IP.String())
}
}
return nil
}
Expand All @@ -231,35 +242,38 @@ func handleExpiredLeases() {
// wake up every 2 min and try looking for expired leases
// This is a long loop we migh want to break this so we don't spend too much time here
ticker := time.NewTicker(120 * time.Second)
for {
select {
case <-ticker.C:
if pluginHdl.dhcpSubnets == nil {
continue
}
pluginHdl.dhcpSubnets.Lock()
for _, v := range pluginHdl.dhcpSubnets.subnets {
for hwmacaddress, reservation := range v.allocations.allocation {
if time.Now().After(reservation.expiry) {
// lease expired
delete(v.allocations.allocation, hwmacaddress)
delete(v.dhcpSubnet.Status.Allocated, hwmacaddress)
}
for range ticker.C {

if pluginHdl.dhcpSubnets == nil {
continue
}
pluginHdl.dhcpSubnets.Lock()
for _, v := range pluginHdl.dhcpSubnets.subnets {
for hwmacaddress, reservation := range v.allocations.allocation {
if time.Now().After(reservation.expiry) {
// lease expired
delete(v.allocations.allocation, hwmacaddress)
delete(v.dhcpSubnet.Status.Allocated, hwmacaddress)
}
if err := updateBackend4(v.dhcpSubnet); err != nil {
log.Warnf("Update Backend failed for record with Mac Address: %s IP %s", hwmacaddress, reservation.address.String())
}
updateBackend4(v.dhcpSubnet)
}
pluginHdl.dhcpSubnets.Unlock()
}
pluginHdl.dhcpSubnets.Unlock()

}
}

func addPxeInfo(req, resp *dhcpv4.DHCPv4, subnet *ManagedSubnet) {

relayAgentInfo := req.RelayAgentInfo()
if relayAgentInfo == nil {
if relayAgentInfo == nil || subnet.dhcpSubnet == nil {
return
}
circuitID := relayAgentInfo.Get(dhcpv4.AgentCircuitIDSubOption)
vrfName := relayAgentInfo.Get(dhcpv4.VirtualSubnetSelectionSubOption)

// Add TFTP server Option Name
if len(subnet.dhcpSubnet.Spec.PXEURL) <= 0 &&
(req.IsOptionRequested(dhcpv4.OptionTFTPServerName) || req.IsOptionRequested(dhcpv4.OptionBootfileName)) { // PxeURL is not specified return early with an error message
Expand Down
Loading