Merge pull request #1458 from JasonYangShadow/issue/1154

Fix issue that NetworkManager marks managed interfaces "unmanaged" if they do   not have a device specified

CHANGELOG.md

@@ -69,6 +69,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix overlay permissions in /root/ and /root/.ssh/. #1452
 - Return non-zero exit code on container sub-commands #1437
 - Return non-zero exit code on profile sub-commands #1435
+- Fix issue that NetworkManager marks managed interfaces "unmanaged" if they do
+  not have a device specified. #1154
 
 ## v4.5.8, 2024-10-01
 

overlays/NetworkManager/internal/networkmanager_test.go

@@ -53,6 +53,54 @@ func Test_networkmanagerOverlay(t *testing.T) {
 	}
 }
 
+func Test_unmanaged_networkmanagerOverlay_with_empty_mac(t *testing.T) {
+	env := testenv.New(t)
+	defer env.RemoveAll(t)
+	env.ImportFile(t, "etc/warewulf/nodes.conf", "nodes_empty_mac.conf")
+	env.ImportFile(t, "var/lib/warewulf/overlays/NetworkManager/rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww", "../rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww")
+
+	tests := []struct {
+		name string
+		args []string
+		log  string
+	}{
+		{
+			name: "NetworkManager:ww4-unmanaged.ww",
+			args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/conf.d/ww4-unmanaged.ww"},
+			log:  networkmanager_unmanaged_with_empty_mac,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cmd := show.GetCommand()
+			cmd.SetArgs(tt.args)
+			stdout := bytes.NewBufferString("")
+			stderr := bytes.NewBufferString("")
+			logbuf := bytes.NewBufferString("")
+			cmd.SetOut(stdout)
+			cmd.SetErr(stderr)
+			wwlog.SetLogWriter(logbuf)
+			err := cmd.Execute()
+			assert.NoError(t, err)
+			assert.Empty(t, stdout.String())
+			assert.Empty(t, stderr.String())
+			assert.Equal(t, tt.log, logbuf.String())
+		})
+	}
+}
+
+const networkmanager_unmanaged_with_empty_mac string = `backupFile: true
+writeFile: true
+Filename: warewulf-unmanaged.conf
+# This file is autogenerated by warewulf
+[main]
+plugins=keyfile
+
+[keyfile]
+unmanaged-devices=except:interface-name:wwnet0,except:mac:9a:77:29:73:14:f1,except:interface-name:wwnet1,
+`
+
 const networkmanager_unmanaged string = `backupFile: true
 writeFile: true
 Filename: warewulf-unmanaged.conf
@@ -61,7 +109,7 @@ Filename: warewulf-unmanaged.conf
 plugins=keyfile
 
 [keyfile]
-unmanaged-devices=except:interface-name:wwnet0,except:interface-name:wwnet1,
+unmanaged-devices=except:mac:e6:92:39:49:7b:03,except:interface-name:wwnet0,except:mac:9a:77:29:73:14:f1,except:interface-name:wwnet1,
 `
 
 const networkmanager_managed string = `backupFile: true

overlays/NetworkManager/internal/nodes_empty_mac.conf

@@ -0,0 +1,21 @@
+WW_INTERNAL: 45
+nodes:
+  node1:
+    network devices:
+      default:
+        device: wwnet0
+        onboot: true
+        hwaddr: 
+        ipaddr: 192.168.3.21
+        netmask: 255.255.255.0
+        gateway: 192.168.3.1
+      secondary:
+        device: wwnet1
+        onboot: true
+        hwaddr: 9a:77:29:73:14:f1
+        ipaddr: 192.168.3.22
+        netmask: 255.255.255.0
+        gateway: 192.168.3.1
+        tags:
+          DNS1: 8.8.8.8
+          DNS2: 8.8.4.4

overlays/NetworkManager/rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww

@@ -5,4 +5,4 @@
 plugins=keyfile
 
 [keyfile]
-unmanaged-devices={{ range $connection_id, $netdev := .NetDevs }}except:interface-name:{{- $netdev.Device -}},{{ end }}
+unmanaged-devices={{ range $connection_id, $netdev := .NetDevs }}{{ if $netdev.Hwaddr }}except:mac:{{ $netdev.Hwaddr }},{{ end }}{{ if $netdev.Device }}except:interface-name:{{ $netdev.Device }},{{ end }}{{ end }}