From e4e77353c932e39e5b0a1467b5af6de3fec04080 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 24 Sep 2015 03:47:25 -0700 Subject: [PATCH] Setting bridgename to be network-id[:12] if bridgename option is empty Signed-off-by: Madhu Venugopal --- libnetwork/drivers/bridge/bridge.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libnetwork/drivers/bridge/bridge.go b/libnetwork/drivers/bridge/bridge.go index 31c6469abf..a8d86c844c 100644 --- a/libnetwork/drivers/bridge/bridge.go +++ b/libnetwork/drivers/bridge/bridge.go @@ -516,7 +516,7 @@ func parseNetworkGenericOptions(data interface{}) (*networkConfiguration, error) return config, err } -func parseNetworkOptions(option options.Generic) (*networkConfiguration, error) { +func parseNetworkOptions(id string, option options.Generic) (*networkConfiguration, error) { var err error config := &networkConfiguration{} @@ -537,6 +537,9 @@ func parseNetworkOptions(option options.Generic) (*networkConfiguration, error) return nil, err } + if config.BridgeName == "" && config.DisableBridgeCreation == false { + config.BridgeName = "br-" + id[:12] + } return config, nil } @@ -580,7 +583,7 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}) error { d.Unlock() // Parse and validate the config. It should not conflict with existing networks' config - config, err := parseNetworkOptions(option) + config, err := parseNetworkOptions(id, option) if err != nil { return err }