Move bridge-creation code from weave script into Go code
via weaveutil create-bridge function
This commit is contained in:
1 parent
6fd9f471ff
commit
8051f51d46
5 files changed
+115
-195
No files matched your search
@@ -0,0 +1,45 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
weavenet "github.com/weaveworks/weave/net"
|
||||
)
|
||||
|
||||
func detectBridgeType(args []string) error {
|
||||
if len(args) != 2 {
|
||||
cmdUsage("detect-bridge-type", "<weave-bridge-name> <datapath-name>")
|
||||
}
|
||||
bridgeType := weavenet.DetectBridgeType(args[0], args[1])
|
||||
fmt.Println(bridgeType.String())
|
||||
return nil
|
||||
}
|
||||
|
||||
func createBridge(args []string) error {
|
||||
if len(args) != 8 {
|
||||
cmdUsage("create-bridge", "<docker-bridge-name> <weave-bridge-name> <datapath-name> <mtu> <port> <mac> <no-fastdp> <no-bridged-fastdp>")
|
||||
}
|
||||
|
||||
mtu, err := strconv.Atoi(args[3])
|
||||
if err != nil && args[3] != "" {
|
||||
return err
|
||||
}
|
||||
port, err := strconv.Atoi(args[4])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
config := weavenet.BridgeConfig{
|
||||
DockerBridgeName: args[0],
|
||||
WeaveBridgeName: args[1],
|
||||
DatapathName: args[2],
|
||||
MTU: mtu,
|
||||
Port: port,
|
||||
Mac: args[5],
|
||||
NoFastdp: args[6] != "",
|
||||
NoBridgedFastdp: args[7] != "",
|
||||
}
|
||||
bridgeType, err := weavenet.CreateBridge(&config)
|
||||
fmt.Println(bridgeType.String())
|
||||
return err
|
||||
}
|
||||
@@ -31,19 +31,6 @@ func deleteDatapath(args []string) error {
|
||||
return odp.DeleteDatapath(args[0])
|
||||
}
|
||||
|
||||
// Checks whether a datapath can be created by actually creating and destroying it
|
||||
func checkDatapath(args []string) error {
|
||||
if len(args) != 1 {
|
||||
cmdUsage("check-datapath", "<datapath>")
|
||||
}
|
||||
|
||||
if err := createDatapath(args); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return odp.DeleteDatapath(args[0])
|
||||
}
|
||||
|
||||
func addDatapathInterface(args []string) error {
|
||||
if len(args) != 2 {
|
||||
cmdUsage("add-datapath-interface", "<datapath> <interface>")
|
||||
|
||||
@@ -17,9 +17,10 @@ func init() {
|
||||
"help": help,
|
||||
"netcheck": netcheck,
|
||||
"docker-tls-args": dockerTLSArgs,
|
||||
"create-bridge": createBridge,
|
||||
"detect-bridge-type": detectBridgeType,
|
||||
"create-datapath": createDatapath,
|
||||
"delete-datapath": deleteDatapath,
|
||||
"check-datapath": checkDatapath,
|
||||
"add-datapath-interface": addDatapathInterface,
|
||||
"create-plugin-network": createPluginNetwork,
|
||||
"remove-plugin-network": removePluginNetwork,
|
||||
|
||||
Reference in new issue
Block a user