Replace switch statements with Bridge polymorphism
This commit is contained in:
1 parent
fddb3ee06e
commit
a7feb41e62
5 files changed
+94
-106
No files matched your search
+7
-7
@@ -491,32 +491,32 @@ func (nopPacketLogging) LogPacket(string, weave.PacketKey) {
|
||||
func (nopPacketLogging) LogForwardPacket(string, weave.ForwardPacketKey) {
|
||||
}
|
||||
|
||||
func createOverlay(bridgeType weavenet.BridgeType, config weavenet.BridgeConfig, host string, port int, bufSzMB int, enableEncryption bool) (weave.NetworkOverlay, weave.Bridge) {
|
||||
func createOverlay(bridgeType weavenet.Bridge, config weavenet.BridgeConfig, host string, port int, bufSzMB int, enableEncryption bool) (weave.NetworkOverlay, weave.Bridge) {
|
||||
overlay := weave.NewOverlaySwitch()
|
||||
var bridge weave.Bridge
|
||||
var ignoreSleeve bool
|
||||
|
||||
switch bridgeType {
|
||||
case weavenet.AWSVPC:
|
||||
switch {
|
||||
case config.AWSVPC:
|
||||
vpc := weave.NewAWSVPC()
|
||||
overlay.Add("awsvpc", vpc)
|
||||
bridge = weave.NullBridge{}
|
||||
// Currently, we do not support any overlay with AWSVPC
|
||||
ignoreSleeve = true
|
||||
case weavenet.Fastdp, weavenet.BridgedFastdp:
|
||||
case bridgeType == nil:
|
||||
bridge = weave.NullBridge{}
|
||||
case bridgeType.IsFastdp():
|
||||
iface, err := weavenet.EnsureInterface(config.DatapathName)
|
||||
checkFatal(err)
|
||||
fastdp, err := weave.NewFastDatapath(iface, port, enableEncryption)
|
||||
checkFatal(err)
|
||||
bridge = fastdp.Bridge()
|
||||
overlay.Add("fastdp", fastdp.Overlay())
|
||||
case weavenet.Bridge:
|
||||
case !bridgeType.IsFastdp():
|
||||
iface, err := weavenet.EnsureInterface(weavenet.PcapIfName)
|
||||
checkFatal(err)
|
||||
bridge, err = weave.NewPcap(iface, bufSzMB*1024*1024) // bufsz flag is in MB
|
||||
checkFatal(err)
|
||||
default:
|
||||
bridge = weave.NullBridge{}
|
||||
}
|
||||
|
||||
if !ignoreSleeve {
|
||||
|
||||
@@ -11,8 +11,14 @@ 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())
|
||||
bridgeType, err := weavenet.DetectBridgeType(args[0], args[1])
|
||||
if err != nil {
|
||||
return err
|
||||
} else if bridgeType == nil {
|
||||
fmt.Println("none")
|
||||
} else {
|
||||
fmt.Println(bridgeType.String())
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user