Merge pull request #1590 from balajiv113/usernet-default

Support for adding user-v2 network by default

Author: AkihiroSuda

pkg/networks/config.go

@@ -51,6 +51,26 @@ func defaultConfigBytes() ([]byte, error) {
 	return textutil.ExecuteTemplate(defaultConfigTemplate, args)
 }
 
+func fillDefaults(nwYaml YAML) (YAML, error) {
+	usernetFound := false
+	if nwYaml.Networks == nil {
+		nwYaml.Networks = make(map[string]Network)
+	}
+	for nw := range nwYaml.Networks {
+		if nwYaml.Networks[nw].Mode == ModeUserV2 {
+			usernetFound = true
+		}
+	}
+	if !usernetFound {
+		defaultConfig, err := DefaultConfig()
+		if err != nil {
+			return nwYaml, err
+		}
+		nwYaml.Networks[ModeUserV2] = defaultConfig.Networks[ModeUserV2]
+	}
+	return nwYaml, nil
+}
+
 func DefaultConfig() (YAML, error) {
 	var config YAML
 	defaultConfig, err := defaultConfigBytes()
@@ -116,6 +136,10 @@ func loadCache() {
 		if cache.err != nil {
 			cache.err = fmt.Errorf("cannot parse %q: %w", configFile, cache.err)
 		}
+		cache.config, cache.err = fillDefaults(cache.config)
+		if cache.err != nil {
+			cache.err = fmt.Errorf("cannot fill default %q: %w", configFile, cache.err)
+		}
 	})
 }
 

pkg/networks/config_test.go

@@ -0,0 +1,21 @@
+package networks
+
+import (
+	"net"
+	"testing"
+
+	"gotest.tools/v3/assert"
+)
+
+func TestFillDefault(t *testing.T) {
+	nwYaml := YAML{}
+	newYaml, err := fillDefaults(nwYaml)
+	assert.Check(t, err == nil)
+
+	userNet := newYaml.Networks[ModeUserV2]
+	assert.Equal(t, userNet.Mode, ModeUserV2)
+	assert.Equal(t, userNet.Interface, "")
+	assert.DeepEqual(t, userNet.NetMask, net.IP{})
+	assert.DeepEqual(t, userNet.Gateway, net.IP{})
+	assert.DeepEqual(t, userNet.DHCPEnd, net.IP{})
+}