Merge pull request #2023 from balajiv113/default-fix

Fix for default network for user-v2

Author: AkihiroSuda

pkg/networks/config.go

@@ -57,7 +57,7 @@ func fillDefaults(nwYaml YAML) (YAML, error) {
 		nwYaml.Networks = make(map[string]Network)
 	}
 	for nw := range nwYaml.Networks {
-		if nwYaml.Networks[nw].Mode == ModeUserV2 {
+		if nwYaml.Networks[nw].Mode == ModeUserV2 && nwYaml.Networks[nw].Gateway != nil {
 			usernetFound = true
 		}
 	}

pkg/networks/config_test.go

@@ -19,3 +19,33 @@ func TestFillDefault(t *testing.T) {
 	assert.DeepEqual(t, userNet.Gateway, net.ParseIP("192.168.104.1"))
 	assert.DeepEqual(t, userNet.DHCPEnd, net.IP{})
 }
+
+func TestFillDefaultWithV2(t *testing.T) {
+	nwYaml := YAML{Networks: map[string]Network{
+		"user-v2": {Mode: ModeUserV2},
+	}}
+	newYaml, err := fillDefaults(nwYaml)
+	assert.NilError(t, err)
+
+	userNet := newYaml.Networks[ModeUserV2]
+	assert.Equal(t, userNet.Mode, ModeUserV2)
+	assert.Equal(t, userNet.Interface, "")
+	assert.DeepEqual(t, userNet.NetMask, net.ParseIP("255.255.255.0"))
+	assert.DeepEqual(t, userNet.Gateway, net.ParseIP("192.168.104.1"))
+	assert.DeepEqual(t, userNet.DHCPEnd, net.IP{})
+}
+
+func TestFillDefaultWithV2AndGateway(t *testing.T) {
+	nwYaml := YAML{Networks: map[string]Network{
+		"user-v2": {Mode: ModeUserV2, Gateway: net.ParseIP("192.168.105.1")},
+	}}
+	newYaml, err := fillDefaults(nwYaml)
+	assert.NilError(t, err)
+
+	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.ParseIP("192.168.105.1"))
+	assert.DeepEqual(t, userNet.DHCPEnd, net.IP{})
+}