Lxd fixes

tools/lxdclient/lxd_client.go

@@ -27,6 +27,8 @@ const (
 	StatusCancelled        = "Canceled"
 	StatusSuccess          = "Success"
 	StatusFailure          = "Failure"
+
+	DefaultLXDBridge = "lxdbr0"
 )
 
 var allStatuses = map[string]shared.StatusCode{

tools/lxdclient/utils_go12.go → tools/lxdclient/lxd_go12.go

@@ -5,7 +5,4 @@
 
 package lxdclient
 
-func GetDefaultBridgeName() (string, error) {
-	/* lxd not supported in go1.2 */
-	return "lxcbr0", nil
-}
+const DefaultLXDBridge = "INVALIDLXDBRIDGEGO12"

tools/lxdclient/remote.go

@@ -191,11 +191,7 @@ func (r Remote) UsingTCP() (Remote, error) {
 	// TODO: jam 2016-02-25 This should be updated for systems that are
 	// 	 space aware, as we may not be just using the default LXC
 	// 	 bridge.
-	netIF, err := GetDefaultBridgeName()
-	if err != nil {
-		return r, errors.Trace(err)
-	}
-	addr, err := utils.GetAddressForInterface(netIF)
+	addr, err := utils.GetAddressForInterface(DefaultLXDBridge)
 	if err != nil {
 		return r, errors.Trace(err)
 	}

tools/lxdclient/remote_test.go

@@ -6,7 +6,6 @@
 package lxdclient_test
 
 import (
-	"fmt"
 	"net"
 
 	"github.com/juju/errors"
@@ -430,11 +429,7 @@ type remoteFunctionalSuite struct {
 }
 
 func (s *remoteFunctionalSuite) TestUsingTCP(c *gc.C) {
-	netIF, err := lxdclient.GetDefaultBridgeName()
-	if err != nil {
-		c.Skip(fmt.Sprintf("could not determine default bridge: %v", err))
-	}
-	if _, err := net.InterfaceByName(netIF); err != nil {
+	if _, err := net.InterfaceByName(lxdclient.DefaultLXDBridge); err != nil {
 		c.Skip("network bridge interface not found")
 	}
 	lxdclient.PatchGenerateCertificate(&s.CleanupSuite, testingCert, testingKey)

tools/lxdclient/utils.go

@@ -7,7 +7,6 @@ package lxdclient
 
 import (
 	"bytes"
-	"os"
 
 	"github.com/juju/errors"
 	"github.com/juju/utils/series"
@@ -61,18 +60,3 @@ func IsRunningLocally() (bool, error) {
 
 	return running, nil
 }
-
-// GetDefaultBridgeName returns the name of the default bridge for lxd.
-func GetDefaultBridgeName() (string, error) {
-	_, err := os.Lstat("/sys/class/net/lxdbr0/bridge")
-	if err == nil {
-		return "lxdbr0", nil
-	}
-
-	/* if it was some unknown error, return that */
-	if !os.IsNotExist(err) {
-		return "", err
-	}
-
-	return "lxcbr0", nil
-}

worker/provisioner/lxd-broker.go

@@ -54,13 +54,9 @@ func (broker *lxdBroker) StartInstance(args environs.StartInstanceParams) (*envi
 		return nil, errors.New("starting lxd containers with networks is not supported yet")
 	}
 	machineId := args.InstanceConfig.MachineId
-	bridgeDevice := broker.agentConfig.Value(agent.LxcBridge)
+	bridgeDevice := broker.agentConfig.Value(agent.LxdBridge)
 	if bridgeDevice == "" {
-		var err error
-		bridgeDevice, err = lxdclient.GetDefaultBridgeName()
-		if err != nil {
-			return nil, errors.Trace(err)
-		}
+		bridgeDevice = lxdclient.DefaultLXDBridge
 	}
 
 	preparedInfo, err := prepareOrGetContainerInterfaceInfo(
@@ -150,11 +146,7 @@ func (broker *lxdBroker) MaintainInstance(args environs.StartInstanceParams) err
 	// Default to using the host network until we can configure.
 	bridgeDevice := broker.agentConfig.Value(agent.LxdBridge)
 	if bridgeDevice == "" {
-		var err error
-		bridgeDevice, err = lxdclient.GetDefaultBridgeName()
-		if err != nil {
-			return err
-		}
+		bridgeDevice = lxdclient.DefaultLXDBridge
 	}
 
 	// There's no InterfaceInfo we expect to get below.