Merge lp:~mvo/snappy/15.04-network-config into lp:~snappy-dev/snappy/15.04-deprecated

[Michael Vogt]

Unblock network configuration with pass-through networking suppport

Unblock network configuration with pass-through networking suppport

[Sergio Schvezov (sergiusens)]

Looks good, you just have the same error as in the modprobe one:
var [name] [type] = "string" (type is cruft)

review: Needs Fixing

[lp:~mvo/snappy/15.04-network-config]

471. By Michael Vogt on 2015-09-11

merged lp:snappy/15.04

[Michael Vogt (mvo)]

Fixed, thanks!

review: Approve

=== modified file 'coreconfig/config.go'
--- coreconfig/config.go	2015-09-11 16:00:10 +0000
+++ coreconfig/config.go	2015-09-11 16:19:08 +0000
@@ -22,6 +22,7 @@
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"reflect"
 	"strings"
 	"syscall"
@@ -42,6 +43,7 @@
 
 var (
 	modprobePath = "/etc/modprobe.d/ubuntu-core.conf"
+	networkRoot  = "/etc/network/interfaces.d/"
 )
 
 // ErrInvalidUnitStatus signals that a unit is not returning a status
@@ -49,10 +51,16 @@
 var ErrInvalidUnitStatus = errors.New("invalid unit status")
 
 type systemConfig struct {
-	Autopilot *bool   `yaml:"autopilot,omitempty"`
-	Timezone  *string `yaml:"timezone,omitempty"`
-	Hostname  *string `yaml:"hostname,omitempty"`
-	Modprobe  *string `yaml:"modprobe,omitempty"`
+	Autopilot *bool           `yaml:"autopilot,omitempty"`
+	Timezone  *string         `yaml:"timezone,omitempty"`
+	Hostname  *string         `yaml:"hostname,omitempty"`
+	Modprobe  *string         `yaml:"modprobe,omitempty"`
+	Network   []networkConfig `yaml:"network,omitempty"`
+}
+
+type networkConfig struct {
+	Name    string `yaml:"name"`
+	Content string `yaml:"content"`
 }
 
 type coreConfig struct {
@@ -82,12 +90,17 @@
 	if err != nil {
 		return nil, err
 	}
+	network, err := getNetwork()
+	if err != nil {
+		return nil, err
+	}
 
 	config := &systemConfig{
 		Autopilot: &autopilot,
 		Timezone:  &tz,
 		Hostname:  &hostname,
 		Modprobe:  &modprobe,
+		Network:   network,
 	}
 
 	return config, nil
@@ -169,6 +182,25 @@
 			if err := setModprobe(*newConfig.Modprobe); err != nil {
 				return "", err
 			}
+		case "Network":
+			var eq = func(a, b []networkConfig) bool {
+				if len(a) != len(b) {
+					return false
+				}
+				for i, v := range a {
+					if v != b[i] {
+						return false
+					}
+				}
+				return true
+			}
+			if eq(oldConfig.Network, newConfig.Network) {
+				continue
+			}
+
+			if err := setNetwork(newConfig.Network); err != nil {
+				return "", err
+			}
 		}
 	}
 
@@ -212,6 +244,40 @@
 	return string(modprobe), nil
 }
 
+var getNetwork = func() (nc []networkConfig, err error) {
+	filepath.Walk(networkRoot, func(path string, info os.FileInfo, err error) error {
+		if info.IsDir() {
+			return nil
+		}
+		content, err := ioutil.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		nc = append(nc, networkConfig{
+			Name:    path[len(networkRoot)+1:],
+			Content: string(content),
+		})
+		return nil
+	})
+
+	return nc, nil
+}
+
+var setNetwork = func(nc []networkConfig) error {
+	for _, c := range nc {
+		path := filepath.Join(networkRoot, c.Name)
+		if c.Content == "" {
+			os.Remove(path)
+			continue
+		}
+		if err := ioutil.WriteFile(path, []byte(c.Content), 0644); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // setModprobe sets the specified modprobe config
 var setModprobe = func(modprobe string) error {
 	return ioutil.WriteFile(modprobePath, []byte(modprobe), 0644)

=== modified file 'coreconfig/config_test.go'
--- coreconfig/config_test.go	2015-09-08 14:36:11 +0000
+++ coreconfig/config_test.go	2015-09-11 16:19:08 +0000
@@ -25,6 +25,7 @@
 	"testing"
 
 	. "gopkg.in/check.v1"
+	"launchpad.net/snappy/helpers"
 )
 
 // Hook up check.v1 into the "go test" runner.
@@ -47,6 +48,7 @@
 	originalCmdSystemctl        = cmdSystemctl
 	originalHostnamePath        = hostnamePath
 	originalModprobePath        = modprobePath
+	originalNetworkRoot         = networkRoot
 )
 
 type ConfigTestSuite struct {
@@ -73,6 +75,8 @@
 		hostname = host
 		return nil
 	}
+
+	networkRoot = c.MkDir()
 }
 
 func (cts *ConfigTestSuite) TearDownTest(c *C) {
@@ -92,6 +96,7 @@
 	cmdAutopilotEnabled = originalCmdAutopilotEnabled
 	cmdSystemctl = originalCmdSystemctl
 	modprobePath = originalModprobePath
+	networkRoot = originalNetworkRoot
 }
 
 // TestGet is a broad test, close enough to be an integration test for
@@ -440,3 +445,44 @@
 	c.Assert(err, IsNil)
 	c.Assert(string(content), Equals, "blacklist floppy\nsoftdep mlx4_core post: mlx4_en\n")
 }
+
+func (cts *ConfigTestSuite) TestNetworkGet(c *C) {
+	path := filepath.Join(networkRoot, "eth0")
+	content := "auto eth0"
+	err := ioutil.WriteFile(path, []byte(content), 0644)
+	c.Assert(err, IsNil)
+
+	nc, err := getNetwork()
+	c.Assert(err, IsNil)
+	c.Assert(nc, DeepEquals, []networkConfig{
+		{Name: "eth0", Content: "auto eth0"},
+	})
+}
+
+func (cts *ConfigTestSuite) TestNetworkSet(c *C) {
+	nc := []networkConfig{
+		{Name: "eth0", Content: "auto eth0"},
+	}
+	path := filepath.Join(networkRoot, nc[0].Name)
+	err := setNetwork(nc)
+	c.Assert(err, IsNil)
+	content, err := ioutil.ReadFile(path)
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, nc[0].Content)
+}
+
+func (cts *ConfigTestSuite) TestNetworkSetEmptyRemoves(c *C) {
+	path := filepath.Join(networkRoot, "eth0")
+	content := "auto eth0"
+	err := ioutil.WriteFile(path, []byte(content), 0644)
+	c.Assert(err, IsNil)
+
+	// empty content removes
+	nc := []networkConfig{
+		{Name: "eth0", Content: ""},
+	}
+	err = setNetwork(nc)
+	c.Assert(err, IsNil)
+	_, err = ioutil.ReadFile(path)
+	c.Assert(helpers.FileExists(path), Equals, false)
+}