Rename bridge detection/creation functions

net/bridge.go

@@ -81,7 +81,7 @@ func (bridgeImpl) IsFastdp() bool        { return false }
 func (fastdpImpl) IsFastdp() bool        { return true }
 func (bridgedFastdpImpl) IsFastdp() bool { return true }
 
-func DetectBridgeType(weaveBridgeName, datapathName string) (Bridge, error) {
+func ExistingBridgeType(weaveBridgeName, datapathName string) (Bridge, error) {
 	bridge, _ := netlink.LinkByName(weaveBridgeName)
 	datapath, _ := netlink.LinkByName(datapathName)
 
@@ -226,8 +226,8 @@ func (config *BridgeConfig) configuredBridgeType() Bridge {
 	}
 }
 
-func CreateBridge(procPath string, config *BridgeConfig) (Bridge, error) {
-	bridgeType, err := DetectBridgeType(config.WeaveBridgeName, config.DatapathName)
+func EnsureBridge(procPath string, config *BridgeConfig) (Bridge, error) {
+	bridgeType, err := ExistingBridgeType(config.WeaveBridgeName, config.DatapathName)
 	if err != nil {
 		return nil, err
 	}

net/veth.go

@@ -38,7 +38,7 @@ func CreateAndAttachVeth(name, peerName, bridgeName string, mtu int, keepTXOn bo
 		return nil, fmt.Errorf(format, a...)
 	}
 
-	bridgeType, err := DetectBridgeType(bridgeName, DatapathName)
+	bridgeType, err := ExistingBridgeType(bridgeName, DatapathName)
 	if err != nil {
 		return cleanup("detect bridge type: %s", err)
 	}

prog/weaver/main.go

@@ -261,7 +261,7 @@ func main() {
 	name := peerName(routerName, bridgeConfig.WeaveBridgeName, dbPrefix, hostRoot)
 
 	bridgeConfig.Mac = name.String()
-	bridgeType, err := weavenet.CreateBridge(procPath, &bridgeConfig)
+	bridgeType, err := weavenet.EnsureBridge(procPath, &bridgeConfig)
 	checkFatal(err)
 	Log.Println("Bridge type is", bridgeType)
 

prog/weaveutil/bridge.go

@@ -11,7 +11,7 @@ func detectBridgeType(args []string) error {
 	if len(args) != 2 {
 		cmdUsage("detect-bridge-type", "<weave-bridge-name> <datapath-name>")
 	}
-	bridgeType, err := weavenet.DetectBridgeType(args[0], args[1])
+	bridgeType, err := weavenet.ExistingBridgeType(args[0], args[1])
 	if err != nil {
 		return err
 	} else if bridgeType == nil {
@@ -47,7 +47,7 @@ func createBridge(args []string) error {
 		NPC:              args[9] == "--expect-npc",
 	}
 	procPath := args[8]
-	bridgeType, err := weavenet.CreateBridge(procPath, &config)
+	bridgeType, err := weavenet.EnsureBridge(procPath, &config)
 	if err != nil {
 		return err
 	}