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

[Michael Vogt]

Add configuration for ppp via ubuntu-core-config

This branch adds configuration for ppp via ubuntu-core-config

[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

[Sergio Schvezov (sergiusens)]

one nitpick

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

472. By Michael Vogt on 2015-09-11

address review comments

473. By Michael Vogt on 2015-09-11

merged partent

[Michael Vogt (mvo)]

Thanks, fixed!

review: Approve

=== modified file 'coreconfig/config.go'
--- coreconfig/config.go	2015-09-11 16:20:51 +0000
+++ coreconfig/config.go	2015-09-11 16:20:51 +0000
@@ -44,6 +44,7 @@
 var (
 	modprobePath = "/etc/modprobe.d/ubuntu-core.conf"
 	networkRoot  = "/etc/network/interfaces.d/"
+	pppRoot      = "/etc/ppp/"
 )
 
 // ErrInvalidUnitStatus signals that a unit is not returning a status
@@ -51,14 +52,15 @@
 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"`
-	Network   []networkConfig `yaml:"network,omitempty"`
+	Autopilot *bool               `yaml:"autopilot,omitempty"`
+	Timezone  *string             `yaml:"timezone,omitempty"`
+	Hostname  *string             `yaml:"hostname,omitempty"`
+	Modprobe  *string             `yaml:"modprobe,omitempty"`
+	Network   []passthroughConfig `yaml:"network,omitempty"`
+	PPP       []passthroughConfig `yaml:"ppp,omitempty"`
 }
 
-type networkConfig struct {
+type passthroughConfig struct {
 	Name    string `yaml:"name"`
 	Content string `yaml:"content"`
 }
@@ -94,6 +96,10 @@
 	if err != nil {
 		return nil, err
 	}
+	ppp, err := getPPP()
+	if err != nil {
+		return nil, err
+	}
 
 	config := &systemConfig{
 		Autopilot: &autopilot,
@@ -101,6 +107,7 @@
 		Hostname:  &hostname,
 		Modprobe:  &modprobe,
 		Network:   network,
+		PPP:       ppp,
 	}
 
 	return config, nil
@@ -126,6 +133,19 @@
 	return string(out), nil
 }
 
+func passthroughEqual(a, b []passthroughConfig) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i, v := range a {
+		if v != b[i] {
+			return false
+		}
+	}
+
+	return true
+}
+
 // Set is used to configure settings for the system, this is meant to
 // be used as an interface for snappy config to satisfy the ubuntu-core
 // hook.
@@ -183,24 +203,21 @@
 				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) {
+			if passthroughEqual(oldConfig.Network, newConfig.Network) {
 				continue
 			}
 
 			if err := setNetwork(newConfig.Network); err != nil {
 				return "", err
 			}
+		case "PPP":
+			if passthroughEqual(oldConfig.PPP, newConfig.PPP) {
+				continue
+			}
+
+			if err := setPPP(newConfig.PPP); err != nil {
+				return "", err
+			}
 		}
 	}
 
@@ -244,8 +261,8 @@
 	return string(modprobe), nil
 }
 
-var getNetwork = func() (nc []networkConfig, err error) {
-	filepath.Walk(networkRoot, func(path string, info os.FileInfo, err error) error {
+func getPassthrough(rootDir string) (pc []passthroughConfig, err error) {
+	filepath.Walk(rootDir, func(path string, info os.FileInfo, err error) error {
 		if info.IsDir() {
 			return nil
 		}
@@ -253,23 +270,24 @@
 		if err != nil {
 			return err
 		}
-		nc = append(nc, networkConfig{
-			Name:    path[len(networkRoot)+1:],
+		pc = append(pc, passthroughConfig{
+			Name:    path[len(rootDir)+1:],
 			Content: string(content),
 		})
 		return nil
 	})
 
-	return nc, nil
+	return pc, nil
+
 }
-
-var setNetwork = func(nc []networkConfig) error {
-	for _, c := range nc {
-		path := filepath.Join(networkRoot, c.Name)
+func setPassthrough(rootDir string, pc []passthroughConfig) error {
+	for _, c := range pc {
+		path := filepath.Join(rootDir, c.Name)
 		if c.Content == "" {
 			os.Remove(path)
 			continue
 		}
+
 		if err := ioutil.WriteFile(path, []byte(c.Content), 0644); err != nil {
 			return err
 		}
@@ -278,6 +296,22 @@
 	return nil
 }
 
+var getNetwork = func() (pc []passthroughConfig, err error) {
+	return getPassthrough(networkRoot)
+}
+
+var setNetwork = func(pc []passthroughConfig) error {
+	return setPassthrough(networkRoot, pc)
+}
+
+var getPPP = func() (pc []passthroughConfig, err error) {
+	return getPassthrough(pppRoot)
+}
+
+var setPPP = func(pc []passthroughConfig) error {
+	return setPassthrough(pppRoot, pc)
+}
+
 // 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-11 16:20:51 +0000
+++ coreconfig/config_test.go	2015-09-11 16:20:51 +0000
@@ -49,6 +49,7 @@
 	originalHostnamePath        = hostnamePath
 	originalModprobePath        = modprobePath
 	originalNetworkRoot         = networkRoot
+	originalPppRoot             = pppRoot
 )
 
 type ConfigTestSuite struct {
@@ -77,6 +78,7 @@
 	}
 
 	networkRoot = c.MkDir()
+	pppRoot = c.MkDir()
 }
 
 func (cts *ConfigTestSuite) TearDownTest(c *C) {
@@ -97,6 +99,7 @@
 	cmdSystemctl = originalCmdSystemctl
 	modprobePath = originalModprobePath
 	networkRoot = originalNetworkRoot
+	pppRoot = originalPppRoot
 }
 
 // TestGet is a broad test, close enough to be an integration test for
@@ -454,13 +457,13 @@
 
 	nc, err := getNetwork()
 	c.Assert(err, IsNil)
-	c.Assert(nc, DeepEquals, []networkConfig{
+	c.Assert(nc, DeepEquals, []passthroughConfig{
 		{Name: "eth0", Content: "auto eth0"},
 	})
 }
 
 func (cts *ConfigTestSuite) TestNetworkSet(c *C) {
-	nc := []networkConfig{
+	nc := []passthroughConfig{
 		{Name: "eth0", Content: "auto eth0"},
 	}
 	path := filepath.Join(networkRoot, nc[0].Name)
@@ -478,7 +481,7 @@
 	c.Assert(err, IsNil)
 
 	// empty content removes
-	nc := []networkConfig{
+	nc := []passthroughConfig{
 		{Name: "eth0", Content: ""},
 	}
 	err = setNetwork(nc)
@@ -486,3 +489,94 @@
 	_, err = ioutil.ReadFile(path)
 	c.Assert(helpers.FileExists(path), Equals, false)
 }
+
+func (cts *ConfigTestSuite) TestPppGet(c *C) {
+	path := filepath.Join(pppRoot, "chap-secrets")
+	content := "password"
+	err := ioutil.WriteFile(path, []byte(content), 0644)
+	c.Assert(err, IsNil)
+
+	nc, err := getPPP()
+	c.Assert(err, IsNil)
+	c.Assert(nc, DeepEquals, []passthroughConfig{
+		{Name: "chap-secrets", Content: "password"},
+	})
+}
+
+func (cts *ConfigTestSuite) TestPppSet(c *C) {
+	nc := []passthroughConfig{
+		{Name: "chap-secrets", Content: "another secret"},
+	}
+	path := filepath.Join(pppRoot, nc[0].Name)
+	err := setPPP(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) TestNetworkSetViaYaml(c *C) {
+	modprobePath = filepath.Join(c.MkDir(), "test.conf")
+
+	input := `
+config:
+  ubuntu-core:
+    network:
+      - name: eth0
+        content: auto dhcp
+`
+	_, err := Set(input)
+	c.Assert(err, IsNil)
+
+	// ensure its really there
+	content, err := ioutil.ReadFile(filepath.Join(networkRoot, "eth0"))
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, "auto dhcp")
+}
+
+func (cts *ConfigTestSuite) TestPPPSetViaYaml(c *C) {
+	modprobePath = filepath.Join(c.MkDir(), "test.conf")
+
+	input := `
+config:
+  ubuntu-core:
+    ppp:
+      - name: chap-secret
+        content: password
+`
+	_, err := Set(input)
+	c.Assert(err, IsNil)
+
+	// ensure its really there
+	content, err := ioutil.ReadFile(filepath.Join(pppRoot, "chap-secret"))
+	c.Assert(err, IsNil)
+	c.Assert(string(content), Equals, "password")
+}
+
+func (cts *ConfigTestSuite) TestPassthroughConfigEqual(c *C) {
+	a := []passthroughConfig{
+		{Name: "key", Content: "value"},
+	}
+	b := []passthroughConfig{
+		{Name: "key", Content: "value"},
+	}
+	c.Assert(passthroughEqual(a, b), Equals, true)
+}
+
+func (cts *ConfigTestSuite) TestPassthroughConfigNotEqualDifferentSize(c *C) {
+	a := []passthroughConfig{}
+	b := []passthroughConfig{
+		{Name: "key", Content: "value"},
+	}
+	c.Assert(passthroughEqual(a, b), Equals, false)
+}
+
+func (cts *ConfigTestSuite) TestPassthroughConfigNotEqualDifferentKeys(c *C) {
+	a := []passthroughConfig{
+		{Name: "key", Content: "value"},
+	}
+	b := []passthroughConfig{
+		{Name: "other-key", Content: "value"},
+	}
+	c.Assert(passthroughEqual(a, b), Equals, false)
+}