From 36e8e18f4dfb1a6fe0ed307d3faee87e02e41220 Mon Sep 17 00:00:00 2001
From: Eran Ifrach <eifrach@redhat.com>
Date: Sun, 13 Oct 2024 18:08:06 +0300
Subject: [PATCH] fix issue where domain creates DHCP when DHCP is disabled

---
 libvirt/network_def.go      | 15 +++++++++++----
 libvirt/network_def_test.go | 31 +++++++++++++++++++------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/libvirt/network_def.go b/libvirt/network_def.go
index 614d51da8..0e443f2ac 100644
--- a/libvirt/network_def.go
+++ b/libvirt/network_def.go
@@ -13,13 +13,20 @@ import (
 // HasDHCP checks if the network has a DHCP server managed by libvirt.
 func HasDHCP(net libvirtxml.Network) bool {
 	if net.Forward != nil {
-		if net.Forward.Mode == "nat" || net.Forward.Mode == "route" || net.Forward.Mode == "open" || net.Forward.Mode == "" {
+		if net.Forward.Mode == "bridge" {
+			return false
+		}
+	}
+
+	for _, family := range net.IPs {
+
+		if family.DHCP == nil {
+			continue
+		} else {
 			return true
 		}
-	} else {
-		// isolated network
-		return true
 	}
+
 	return false
 }
 
diff --git a/libvirt/network_def_test.go b/libvirt/network_def_test.go
index 9fddf900a..61e3af3f1 100644
--- a/libvirt/network_def_test.go
+++ b/libvirt/network_def_test.go
@@ -100,14 +100,6 @@ func TestBrokenNetworkDefUnmarshall(t *testing.T) {
 	}
 }
 
-func TestHasDHCPNoForwardSet(t *testing.T) {
-	net := libvirtxml.Network{}
-
-	if !HasDHCP(net) {
-		t.Error("Expected to have DHCP")
-	}
-}
-
 func TestHasDHCPForwardSet(t *testing.T) {
 	createNet := func(mode string) libvirtxml.Network {
 		return libvirtxml.Network{
@@ -116,13 +108,28 @@ func TestHasDHCPForwardSet(t *testing.T) {
 			},
 		}
 	}
+	mode := "bridge"
+	if HasDHCP(createNet(mode)) {
+		t.Errorf(
+			"Expected not have DHCP running in mode: '%s'",
+			mode)
+	}
+
+	ipv4Range := libvirtxml.NetworkIP{DHCP: &libvirtxml.NetworkDHCP{Ranges: []libvirtxml.NetworkDHCPRange{libvirtxml.NetworkDHCPRange{
+		Start: "192.168.1.1",
+		End:   "192.168.1.3",
+	}}}}
 
 	for _, mode := range []string{"nat", "route", "open", ""} {
-		net := createNet(mode)
-		if !HasDHCP(net) {
+		testNetwork := createNet(mode)
+		if HasDHCP(testNetwork) {
 			t.Errorf(
-				"Expected to have forward enabled with forward set to be '%s'",
-				mode)
+				"Expected network to have not have dhcp: %v",
+				testNetwork.IPs)
+		}
+		testNetwork.IPs = append(testNetwork.IPs, ipv4Range)
+		if !HasDHCP(testNetwork) {
+			t.Errorf("Expected to have IPv4 DHCP enable in network %v", testNetwork.IPs[0].DHCP.Ranges)
 		}
 	}
 }