mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
e797f80ad4
- Added api enhancement to pass driver specific config
- Refactored simple bridge driver code for driver specific config
- Added an undocumented option to add non-default bridges without
manual pre-provisioning to help libnetwork testing
- Reenabled libnetwork test to do api testing
- Updated README.md
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
52 lines
1.5 KiB
Go
52 lines
1.5 KiB
Go
package bridge
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
log "github.com/Sirupsen/logrus"
|
|
"github.com/docker/docker/pkg/parsers/kernel"
|
|
"github.com/docker/libnetwork/netutils"
|
|
"github.com/vishvananda/netlink"
|
|
)
|
|
|
|
// SetupDevice create a new bridge interface/
|
|
func setupDevice(config *Configuration, i *bridgeInterface) error {
|
|
// We only attempt to create the bridge when the requested device name is
|
|
// the default one.
|
|
if config.BridgeName != DefaultBridgeName && !config.AllowNonDefaultBridge {
|
|
return fmt.Errorf("bridge device with non default name %q must be created manually", config.BridgeName)
|
|
}
|
|
|
|
// Set the bridgeInterface netlink.Bridge.
|
|
i.Link = &netlink.Bridge{
|
|
LinkAttrs: netlink.LinkAttrs{
|
|
Name: config.BridgeName,
|
|
},
|
|
}
|
|
|
|
// Only set the bridge's MAC address if the kernel version is > 3.3, as it
|
|
// was not supported before that.
|
|
kv, err := kernel.GetKernelVersion()
|
|
if err == nil && (kv.Kernel >= 3 && kv.Major >= 3) {
|
|
i.Link.Attrs().HardwareAddr = netutils.GenerateRandomMAC()
|
|
log.Debugf("Setting bridge mac address to %s", i.Link.Attrs().HardwareAddr)
|
|
}
|
|
|
|
// Call out to netlink to create the device.
|
|
return netlink.LinkAdd(i.Link)
|
|
}
|
|
|
|
// SetupDeviceUp ups the given bridge interface.
|
|
func setupDeviceUp(config *Configuration, i *bridgeInterface) error {
|
|
err := netlink.LinkSetUp(i.Link)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Attempt to update the bridge interface to refresh the flags status,
|
|
// ignoring any failure to do so.
|
|
if lnk, err := netlink.LinkByName(config.BridgeName); err == nil {
|
|
i.Link = lnk
|
|
}
|
|
return nil
|
|
}
|