Merge lp:~niedbalski/golxc/fix-1329049 into lp:golxc

[Jorge Niedbalski]

- Added function getDefaultLXCContainerDir , first executes lxc-config lxc.lxcpath if this fails, then DefaultLXCDir is used.
 - Required fix to LP:#1329049

[lp:~niedbalski/golxc/fix-1329049]

11. By Jorge Niedbalski on 2014-07-03

Small typo fix on method comment

[Tim Penhey (thumper)]

Can we please have a test?

You should be able to mock out the lxc-config executable.

review: Needs Fixing

[lp:~niedbalski/golxc/fix-1329049]

12. By Jorge Niedbalski on 2014-07-04

Added UtilsSuite, implemented TestGetDefaultLXCContainerDir test for validate changes.

[Jorge Niedbalski (niedbalski)]

Hey @thumper,

Added tests to validate this changes.

[lp:~niedbalski/golxc/fix-1329049]

13. By Jorge Niedbalski on 2014-07-04

- Minor formatting issues.

[Tim Penhey (thumper)]

Added comments inline, let's see how they look.

[lp:~niedbalski/golxc/fix-1329049]

14. By Jorge Niedbalski on 2014-07-04

- Fixes according to @thumper comments.

[Tim Penhey (thumper)]

LGTM, thanks.

review: Approve

=== modified file 'golxc.go'
--- golxc.go	2014-03-11 00:59:30 +0000
+++ golxc.go	2014-07-04 02:01:18 +0000
@@ -134,7 +134,7 @@
 
 const DefaultLXCDir = "/var/lib/lxc"
 
-var ContainerDir = DefaultLXCDir
+var ContainerDir = GetDefaultLXCContainerDir()
 
 type container struct {
 	name     string
@@ -200,6 +200,7 @@
 		"-n", c.name,
 		"-t", template,
 	}
+
 	if configFile != "" {
 		args = append(args, "-f", configFile)
 	}
@@ -499,3 +500,15 @@
 	}
 	return set
 }
+
+// GetDefaultLXCContainerDir returns the current lxc.lxcpath value otherwise
+// the const DefaultLXCDir is returned.
+func GetDefaultLXCContainerDir() string {
+	result, err := run("lxc-config", "lxc.lxcpath")
+
+	if err != nil {
+		return DefaultLXCDir
+	}
+
+	return strings.Replace(result, "\n", "", 1)
+}

=== modified file 'golxc_test.go'
--- golxc_test.go	2014-05-28 12:05:04 +0000
+++ golxc_test.go	2014-07-04 02:01:18 +0000
@@ -420,3 +420,20 @@
 		"--", "template-1", "template-2")
 	c.Assert(clone.Name(), Equals, "name")
 }
+
+type UtilsSuite struct {
+	testing.IsolationSuite
+}
+
+var _ = Suite(&UtilsSuite{})
+
+func (s *UtilsSuite) TestGetDefaultLXCContainerDirDefaultValue(c *C) {
+	testing.PatchExecutable(c, s, "lxc-config", "#!/bin/sh\nexit -1\n")
+	c.Assert(golxc.GetDefaultLXCContainerDir(), Equals, golxc.DefaultLXCDir)
+}
+
+func (s *UtilsSuite) TestGetDefaultLXCContainerDir(c *C) {
+	const path = "/var/lib/non-standard-lxc"
+	testing.PatchExecutable(c, s, "lxc-config", "#!/bin/sh\necho '"+path+"'\n")
+	c.Assert(golxc.GetDefaultLXCContainerDir(), Equals, path)
+}

=== modified file 'network.go'
--- network.go	2013-06-14 00:29:08 +0000
+++ network.go	2014-07-04 02:01:18 +0000
@@ -53,7 +53,7 @@
 	return status == "running", nil
 }
 
-// NetworkAttributes returns the lxc network attributes: 
+// NetworkAttributes returns the lxc network attributes:
 // starting IP address and bridge name.
 func NetworkAttributes() (addr, bridge string, err error) {
 	config, err := ReadConf()