Use state-based routing instead of sentinel strings, so whitespace-trimming
syntax (e.g. `{{- file "name" -}}`) correctly creates all named files and
symlinks.
Fixes: #2118
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
Co-authored-by: Christian Goll <cgoll@suse.com>
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
88 lines
2.3 KiB
Go
88 lines
2.3 KiB
Go
package ifupdown
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/warewulf/warewulf/internal/app/wwctl/overlay/show"
|
|
"github.com/warewulf/warewulf/internal/pkg/testenv"
|
|
"github.com/warewulf/warewulf/internal/pkg/wwlog"
|
|
)
|
|
|
|
func Test_wickedOverlay(t *testing.T) {
|
|
env := testenv.New(t)
|
|
defer env.RemoveAll()
|
|
|
|
env.ImportFile("var/lib/warewulf/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww", "../rootfs/etc/network/interfaces.d/default.ww")
|
|
env.ImportFile("var/lib/warewulf/overlays/ifupdown/rootfs/etc/network/interfaces.d/default.ww", "../rootfs/etc/network/interfaces.d/default.ww")
|
|
|
|
tests := []struct {
|
|
name string
|
|
nodes_conf string
|
|
args []string
|
|
log string
|
|
}{
|
|
{
|
|
name: "debian.interfaces",
|
|
nodes_conf: "nodes.conf",
|
|
args: []string{"--render", "node1", "debian.interfaces", "etc/network/interfaces.d/default.ww"},
|
|
log: expected_log,
|
|
},
|
|
{
|
|
name: "ifupdown",
|
|
nodes_conf: "nodes.conf",
|
|
args: []string{"--render", "node1", "ifupdown", "etc/network/interfaces.d/default.ww"},
|
|
log: expected_log,
|
|
},
|
|
}
|
|
|
|
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 expected_log string = `backupFile: true
|
|
writeFile: true
|
|
Filename: default
|
|
# This file is autogenerated by warewulf
|
|
auto wwnet0
|
|
allow-hotplug wwnet0
|
|
iface wwnet0 inet static
|
|
address 192.168.3.21
|
|
netmask 255.255.255.0
|
|
gateway 192.168.3.1
|
|
mtu 1500
|
|
backupFile: true
|
|
writeFile: true
|
|
Filename: secondary
|
|
# This file is autogenerated by warewulf
|
|
auto wwnet1
|
|
allow-hotplug wwnet1
|
|
iface wwnet1 inet static
|
|
address 192.168.3.22
|
|
netmask 255.255.255.0
|
|
gateway 192.168.3.1
|
|
mtu 9000
|
|
up ip route add 192.168.1.0/24 via 192.168.3.254 dev wwnet1
|
|
iface wwnet1 inet6 static
|
|
address 2001:db8::23/64
|
|
gateway 2001:db8::1
|
|
mtu 9000
|
|
`
|