Added support for a DNSSEARCH netdev tag in network configuration overlays
- Closes: #1256 Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
committed by
Christian Goll
Christian Goll
parent
428b06463f
commit
da26fa3061
@@ -11,76 +11,37 @@ import (
|
||||
)
|
||||
|
||||
func Test_networkmanagerOverlay(t *testing.T) {
|
||||
env := testenv.New(t)
|
||||
defer env.RemoveAll()
|
||||
env.ImportFile("var/lib/warewulf/overlays/NetworkManager/rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww", "../rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww")
|
||||
env.ImportFile("var/lib/warewulf/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww", "../rootfs/etc/NetworkManager/system-connections/ww4-managed.ww")
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
tests := map[string]struct {
|
||||
nodes_conf string
|
||||
args []string
|
||||
log string
|
||||
}{
|
||||
{
|
||||
name: "NetworkManager:ww4-unmanaged.ww",
|
||||
nodes_conf: "nodes.conf",
|
||||
args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/conf.d/ww4-unmanaged.ww"},
|
||||
log: networkmanager_unmanaged,
|
||||
},
|
||||
{
|
||||
name: "NetworkManager:ww4-managed.ww",
|
||||
nodes_conf: "nodes.conf",
|
||||
args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/system-connections/ww4-managed.ww"},
|
||||
log: networkmanager_managed,
|
||||
},
|
||||
{
|
||||
name: "NetworkManager:ww4-unmanaged.ww with empty mac address",
|
||||
nodes_conf: "nodes_empty_mac.conf",
|
||||
args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/conf.d/ww4-unmanaged.ww"},
|
||||
log: networkmanager_unmanaged_with_empty_mac,
|
||||
},
|
||||
{
|
||||
name: "NetworkManager:ww4-managed.ww with vlan",
|
||||
nodes_conf: "nodes.conf-vlan",
|
||||
args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/system-connections/ww4-managed.ww"},
|
||||
log: networkmanager_managed_with_vlan,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
env.ImportFile("etc/warewulf/nodes.conf", tt.nodes_conf)
|
||||
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
|
||||
"NetworkManager:ww4-unmanaged.ww": {
|
||||
nodes_conf: `
|
||||
nodes:
|
||||
node1:
|
||||
network devices:
|
||||
default:
|
||||
device: wwnet0
|
||||
onboot: true
|
||||
hwaddr: e6:92:39:49:7b:03
|
||||
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
|
||||
DNSSEARCH: "example.com;example.net;"
|
||||
`,
|
||||
args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/conf.d/ww4-unmanaged.ww"},
|
||||
log: `backupFile: true
|
||||
writeFile: true
|
||||
Filename: warewulf-unmanaged.conf
|
||||
# This file is autogenerated by warewulf
|
||||
@@ -90,9 +51,34 @@ plugins=keyfile
|
||||
|
||||
[keyfile]
|
||||
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
|
||||
`,
|
||||
},
|
||||
"NetworkManager:ww4-managed.ww": {
|
||||
nodes_conf: `
|
||||
nodes:
|
||||
node1:
|
||||
network devices:
|
||||
default:
|
||||
device: wwnet0
|
||||
onboot: true
|
||||
hwaddr: e6:92:39:49:7b:03
|
||||
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
|
||||
DNSSEARCH: "example.com;example.net;"
|
||||
`,
|
||||
args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/system-connections/ww4-managed.ww"},
|
||||
log: `backupFile: true
|
||||
writeFile: true
|
||||
Filename: warewulf-default.conf
|
||||
|
||||
@@ -131,14 +117,70 @@ method=manual
|
||||
address=192.168.3.22/24
|
||||
gateway=192.168.3.1
|
||||
dns=8.8.8.8;8.8.4.4;
|
||||
dns-search=example.com;example.net;
|
||||
|
||||
[ipv6]
|
||||
addr-gen-mode=stable-privacy
|
||||
method=ignore
|
||||
never-default=true
|
||||
`
|
||||
`,
|
||||
},
|
||||
"NetworkManager:ww4-unmanaged.ww with empty mac address": {
|
||||
nodes_conf: `
|
||||
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
|
||||
`,
|
||||
args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/conf.d/ww4-unmanaged.ww"},
|
||||
log: `backupFile: true
|
||||
writeFile: true
|
||||
Filename: warewulf-unmanaged.conf
|
||||
# This file is autogenerated by warewulf
|
||||
|
||||
const networkmanager_managed_with_vlan string = `backupFile: true
|
||||
[main]
|
||||
plugins=keyfile
|
||||
|
||||
[keyfile]
|
||||
unmanaged-devices=except:interface-name:wwnet0,except:mac:9a:77:29:73:14:f1,except:interface-name:wwnet1,
|
||||
`,
|
||||
},
|
||||
"NetworkManager:ww4-managed.ww with vlan": {
|
||||
nodes_conf: `
|
||||
nodes:
|
||||
node1:
|
||||
primary network: untagged
|
||||
network devices:
|
||||
untagged:
|
||||
onboot: true
|
||||
device: eth0
|
||||
tagged:
|
||||
onboot: true
|
||||
type: vlan
|
||||
device: eth0.902
|
||||
tags:
|
||||
vlan_id: 902
|
||||
parent_device: eth0
|
||||
route1: "192.168.1.0/24,192.168.2.254"
|
||||
`,
|
||||
args: []string{"--render", "node1", "NetworkManager", "etc/NetworkManager/system-connections/ww4-managed.ww"},
|
||||
log: `backupFile: true
|
||||
writeFile: true
|
||||
Filename: warewulf-tagged.conf
|
||||
|
||||
@@ -180,4 +222,32 @@ method=manual
|
||||
addr-gen-mode=stable-privacy
|
||||
method=ignore
|
||||
never-default=true
|
||||
`
|
||||
`,
|
||||
},
|
||||
}
|
||||
|
||||
env := testenv.New(t)
|
||||
defer env.RemoveAll()
|
||||
env.ImportFile("var/lib/warewulf/overlays/NetworkManager/rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww", "../rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww")
|
||||
env.ImportFile("var/lib/warewulf/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww", "../rootfs/etc/NetworkManager/system-connections/ww4-managed.ww")
|
||||
|
||||
for name, tt := range tests {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
env.WriteFile("etc/warewulf/nodes.conf", tt.nodes_conf)
|
||||
|
||||
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())
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
nodes:
|
||||
node1:
|
||||
network devices:
|
||||
default:
|
||||
device: wwnet0
|
||||
onboot: true
|
||||
hwaddr: e6:92:39:49:7b:03
|
||||
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
|
||||
@@ -1,15 +0,0 @@
|
||||
nodes:
|
||||
node1:
|
||||
primary network: untagged
|
||||
network devices:
|
||||
untagged:
|
||||
onboot: true
|
||||
device: eth0
|
||||
tagged:
|
||||
onboot: true
|
||||
type: vlan
|
||||
device: eth0.902
|
||||
tags:
|
||||
vlan_id: 902
|
||||
parent_device: eth0
|
||||
route1: "192.168.1.0/24,192.168.2.254"
|
||||
@@ -1,20 +0,0 @@
|
||||
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
|
||||
Reference in New Issue
Block a user