@@ -23,7 +23,7 @@ github.com/RackSec/srslog 365bf33cd9acc21ae1c355209865f17228ca534e

 github.com/imdario/mergo 0.2.1

 #get libnetwork packages

-github.com/docker/libnetwork a98901aebe7ce920b6fbf02ebe5c3afc9ca975b8

+github.com/docker/libnetwork 3ab699ea36573d98f481d233c30c742ade737565

 github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894

 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80

 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

@@ -100,7 +100,7 @@ github.com/docker/containerd 8517738ba4b82aff5662c97ca4627e7e4d03b531

 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4

 # cluster

-github.com/docker/swarmkit bddd3f0fb45491987d3dec5fb48311d289d21393

+github.com/docker/swarmkit ce07d9f69c9b4a1b1eb508e777c44eeacca87065

 github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9

 github.com/gogo/protobuf v0.3

 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a

@@ -9,7 +9,7 @@ import (

 	"fmt"

 	"sync"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/libnetwork/datastore"

 	"github.com/docker/libnetwork/types"

 )

@@ -286,7 +286,7 @@ func (h *Handle) CheckConsistency() error {

 			continue

 		}

-		log.Infof("Fixed inconsistent bit sequence in datastore:\n%s\n%s", h, nh)

+		logrus.Infof("Fixed inconsistent bit sequence in datastore:\n%s\n%s", h, nh)

 		h.Lock()

 		h.head = nh.head

@@ -6,7 +6,7 @@ import (

 	"strings"

 	"github.com/BurntSushi/toml"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/pkg/discovery"

 	"github.com/docker/docker/pkg/plugingetter"

 	"github.com/docker/go-connections/tlsconfig"

@@ -100,7 +100,7 @@ type Option func(c *Config)

 // OptionDefaultNetwork function returns an option setter for a default network

 func OptionDefaultNetwork(dn string) Option {

 	return func(c *Config) {

-		log.Debugf("Option DefaultNetwork: %s", dn)

+		logrus.Debugf("Option DefaultNetwork: %s", dn)

 		c.Daemon.DefaultNetwork = strings.TrimSpace(dn)

 	}

 }

@@ -108,7 +108,7 @@ func OptionDefaultNetwork(dn string) Option {

 // OptionDefaultDriver function returns an option setter for default driver

 func OptionDefaultDriver(dd string) Option {

 	return func(c *Config) {

-		log.Debugf("Option DefaultDriver: %s", dd)

+		logrus.Debugf("Option DefaultDriver: %s", dd)

 		c.Daemon.DefaultDriver = strings.TrimSpace(dd)

 	}

 }

@@ -134,7 +134,7 @@ func OptionLabels(labels []string) Option {

 // OptionKVProvider function returns an option setter for kvstore provider

 func OptionKVProvider(provider string) Option {

 	return func(c *Config) {

-		log.Debugf("Option OptionKVProvider: %s", provider)

+		logrus.Debugf("Option OptionKVProvider: %s", provider)

 		if _, ok := c.Scopes[datastore.GlobalScope]; !ok {

 			c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{}

 		}

@@ -145,7 +145,7 @@ func OptionKVProvider(provider string) Option {

 // OptionKVProviderURL function returns an option setter for kvstore url

 func OptionKVProviderURL(url string) Option {

 	return func(c *Config) {

-		log.Debugf("Option OptionKVProviderURL: %s", url)

+		logrus.Debugf("Option OptionKVProviderURL: %s", url)

 		if _, ok := c.Scopes[datastore.GlobalScope]; !ok {

 			c.Scopes[datastore.GlobalScope] = &datastore.ScopeCfg{}

 		}

@@ -157,14 +157,14 @@ func OptionKVProviderURL(url string) Option {

 func OptionKVOpts(opts map[string]string) Option {

 	return func(c *Config) {

 		if opts["kv.cacertfile"] != "" && opts["kv.certfile"] != "" && opts["kv.keyfile"] != "" {

-			log.Info("Option Initializing KV with TLS")

+			logrus.Info("Option Initializing KV with TLS")

 			tlsConfig, err := tlsconfig.Client(tlsconfig.Options{

 				CAFile:   opts["kv.cacertfile"],

 				CertFile: opts["kv.certfile"],

 				KeyFile:  opts["kv.keyfile"],

 			})

 			if err != nil {

-				log.Errorf("Unable to set up TLS: %s", err)

+				logrus.Errorf("Unable to set up TLS: %s", err)

 				return

 			}

 			if _, ok := c.Scopes[datastore.GlobalScope]; !ok {

@@ -182,7 +182,7 @@ func OptionKVOpts(opts map[string]string) Option {

 				KeyFile:    opts["kv.keyfile"],

 			}

 		} else {

-			log.Info("Option Initializing KV without TLS")

+			logrus.Info("Option Initializing KV without TLS")

 		}

 	}

 }

@@ -242,7 +242,7 @@ func ValidateName(name string) error {

 // OptionLocalKVProvider function returns an option setter for kvstore provider

 func OptionLocalKVProvider(provider string) Option {

 	return func(c *Config) {

-		log.Debugf("Option OptionLocalKVProvider: %s", provider)

+		logrus.Debugf("Option OptionLocalKVProvider: %s", provider)

 		if _, ok := c.Scopes[datastore.LocalScope]; !ok {

 			c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}

 		}

@@ -253,7 +253,7 @@ func OptionLocalKVProvider(provider string) Option {

 // OptionLocalKVProviderURL function returns an option setter for kvstore url

 func OptionLocalKVProviderURL(url string) Option {

 	return func(c *Config) {

-		log.Debugf("Option OptionLocalKVProviderURL: %s", url)

+		logrus.Debugf("Option OptionLocalKVProviderURL: %s", url)

 		if _, ok := c.Scopes[datastore.LocalScope]; !ok {

 			c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}

 		}

@@ -264,7 +264,7 @@ func OptionLocalKVProviderURL(url string) Option {

 // OptionLocalKVProviderConfig function returns an option setter for kvstore config

 func OptionLocalKVProviderConfig(config *store.Config) Option {

 	return func(c *Config) {

-		log.Debugf("Option OptionLocalKVProviderConfig: %v", config)

+		logrus.Debugf("Option OptionLocalKVProviderConfig: %v", config)

 		if _, ok := c.Scopes[datastore.LocalScope]; !ok {

 			c.Scopes[datastore.LocalScope] = &datastore.ScopeCfg{}

 		}

@@ -51,7 +51,7 @@ import (

 	"sync"

 	"time"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/pkg/discovery"

 	"github.com/docker/docker/pkg/locker"

 	"github.com/docker/docker/pkg/plugingetter"

@@ -212,7 +212,7 @@ func New(cfgOptions ...config.Option) (NetworkController, error) {

 		if err := c.initDiscovery(c.cfg.Cluster.Watcher); err != nil {

 			// Failing to initialize discovery is a bad situation to be in.

 			// But it cannot fail creating the Controller

-			log.Errorf("Failed to Initialize Discovery : %v", err)

+			logrus.Errorf("Failed to Initialize Discovery : %v", err)

 		}

 	}

@@ -283,7 +283,7 @@ func (c *controller) SetKeys(keys []*types.EncryptionKey) error {

 		if clusterConfigAvailable {

 			return c.agentSetup()

 		}

-		log.Debugf("received encryption keys before cluster config")

+		logrus.Debug("received encryption keys before cluster config")

 		return nil

 	}

 	if agent == nil {

@@ -441,7 +441,7 @@ func (c *controller) ReloadConfiguration(cfgOptions ...config.Option) error {

 	c.drvRegistry.WalkIPAMs(func(name string, driver ipamapi.Ipam, cap *ipamapi.Capability) bool {

 		err := driver.DiscoverNew(discoverapi.DatastoreConfig, *dsConfig)

 		if err != nil {

-			log.Errorf("Failed to set datastore in driver %s: %v", name, err)

+			logrus.Errorf("Failed to set datastore in driver %s: %v", name, err)

 		}

 		return false

 	})

@@ -449,14 +449,14 @@ func (c *controller) ReloadConfiguration(cfgOptions ...config.Option) error {

 	c.drvRegistry.WalkDrivers(func(name string, driver driverapi.Driver, capability driverapi.Capability) bool {

 		err := driver.DiscoverNew(discoverapi.DatastoreConfig, *dsConfig)

 		if err != nil {

-			log.Errorf("Failed to set datastore in driver %s: %v", name, err)

+			logrus.Errorf("Failed to set datastore in driver %s: %v", name, err)

 		}

 		return false

 	})

 	if c.discovery == nil && c.cfg.Cluster.Watcher != nil {

 		if err := c.initDiscovery(c.cfg.Cluster.Watcher); err != nil {

-			log.Errorf("Failed to Initialize Discovery after configuration update: %v", err)

+			logrus.Errorf("Failed to Initialize Discovery after configuration update: %v", err)

 		}

 	}

@@ -561,7 +561,7 @@ func (c *controller) pushNodeDiscovery(d driverapi.Driver, cap driverapi.Capabil

 			err = d.DiscoverDelete(discoverapi.NodeDiscovery, nodeData)

 		}

 		if err != nil {

-			log.Debugf("discovery notification error : %v", err)

+			logrus.Debugf("discovery notification error : %v", err)

 		}

 	}

 }

@@ -634,12 +634,13 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...

 		id = stringid.GenerateRandomID()

 	}

+	defaultIpam := defaultIpamForNetworkType(networkType)

 	// Construct the network object

 	network := &network{

 		name:        name,

 		networkType: networkType,

 		generic:     map[string]interface{}{netlabel.GenericData: make(map[string]string)},

-		ipamType:    ipamapi.DefaultIPAM,

+		ipamType:    defaultIpam,

 		id:          id,

 		created:     time.Now(),

 		ctrlr:       c,

@@ -686,7 +687,7 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...

 	defer func() {

 		if err != nil {

 			if e := network.deleteNetwork(); e != nil {

-				log.Warnf("couldn't roll back driver network on network %s creation failure: %v", network.name, err)

+				logrus.Warnf("couldn't roll back driver network on network %s creation failure: %v", network.name, err)

 			}

 		}

 	}()

@@ -701,7 +702,7 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...

 	defer func() {

 		if err != nil {

 			if e := c.deleteFromStore(epCnt); e != nil {

-				log.Warnf("couldnt rollback from store, epCnt %v on failure (%v): %v", epCnt, err, e)

+				logrus.Warnf("could not rollback from store, epCnt %v on failure (%v): %v", epCnt, err, e)

 			}

 		}

 	}()

@@ -722,7 +723,7 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...

 var joinCluster NetworkWalker = func(nw Network) bool {

 	n := nw.(*network)

 	if err := n.joinCluster(); err != nil {

-		log.Errorf("Failed to join network %s (%s) into agent cluster: %v", n.Name(), n.ID(), err)

+		logrus.Errorf("Failed to join network %s (%s) into agent cluster: %v", n.Name(), n.ID(), err)

 	}

 	n.addDriverWatches()

 	return false

@@ -731,7 +732,7 @@ var joinCluster NetworkWalker = func(nw Network) bool {

 func (c *controller) reservePools() {

 	networks, err := c.getNetworksForScope(datastore.LocalScope)

 	if err != nil {

-		log.Warnf("Could not retrieve networks from local store during ipam allocation for existing networks: %v", err)

+		logrus.Warnf("Could not retrieve networks from local store during ipam allocation for existing networks: %v", err)

 		return

 	}

@@ -763,22 +764,22 @@ func (c *controller) reservePools() {

 		}

 		// Reserve pools

 		if err := n.ipamAllocate(); err != nil {

-			log.Warnf("Failed to allocate ipam pool(s) for network %q (%s): %v", n.Name(), n.ID(), err)

+			logrus.Warnf("Failed to allocate ipam pool(s) for network %q (%s): %v", n.Name(), n.ID(), err)

 		}

 		// Reserve existing endpoints' addresses

 		ipam, _, err := n.getController().getIPAMDriver(n.ipamType)

 		if err != nil {

-			log.Warnf("Failed to retrieve ipam driver for network %q (%s) during address reservation", n.Name(), n.ID())

+			logrus.Warnf("Failed to retrieve ipam driver for network %q (%s) during address reservation", n.Name(), n.ID())

 			continue

 		}

 		epl, err := n.getEndpointsFromStore()

 		if err != nil {

-			log.Warnf("Failed to retrieve list of current endpoints on network %q (%s)", n.Name(), n.ID())

+			logrus.Warnf("Failed to retrieve list of current endpoints on network %q (%s)", n.Name(), n.ID())

 			continue

 		}

 		for _, ep := range epl {

 			if err := ep.assignAddress(ipam, true, ep.Iface().AddressIPv6() != nil); err != nil {

-				log.Warnf("Failed to reserve current adress for endpoint %q (%s) on network %q (%s)",

+				logrus.Warnf("Failed to reserve current adress for endpoint %q (%s) on network %q (%s)",

 					ep.Name(), ep.ID(), n.Name(), n.ID())

 			}

 		}

@@ -788,7 +789,7 @@ func (c *controller) reservePools() {

 func doReplayPoolReserve(n *network) bool {

 	_, caps, err := n.getController().getIPAMDriver(n.ipamType)

 	if err != nil {

-		log.Warnf("Failed to retrieve ipam driver for network %q (%s): %v", n.Name(), n.ID(), err)

+		logrus.Warnf("Failed to retrieve ipam driver for network %q (%s): %v", n.Name(), n.ID(), err)

 		return false

 	}

 	return caps.RequiresRequestReplay

@@ -815,7 +816,7 @@ func (c *controller) Networks() []Network {

 	networks, err := c.getNetworksFromStore()

 	if err != nil {

-		log.Error(err)

+		logrus.Error(err)

 	}

 	for _, n := range networks {

@@ -1132,18 +1133,18 @@ func (c *controller) clearIngress(clusterLeave bool) {

 	if ingressSandbox != nil {

 		if err := ingressSandbox.Delete(); err != nil {

-			log.Warnf("Could not delete ingress sandbox while leaving: %v", err)

+			logrus.Warnf("Could not delete ingress sandbox while leaving: %v", err)

 		}

 	}

 	n, err := c.NetworkByName("ingress")

 	if err != nil && clusterLeave {

-		log.Warnf("Could not find ingress network while leaving: %v", err)

+		logrus.Warnf("Could not find ingress network while leaving: %v", err)

 	}

 	if n != nil {

 		if err := n.Delete(); err != nil {

-			log.Warnf("Could not delete ingress network while leaving: %v", err)

+			logrus.Warnf("Could not delete ingress network while leaving: %v", err)

 		}

 	}

 }

@@ -6,6 +6,7 @@ import (

 	"reflect"

 	"strings"

 	"sync"

+	"time"

 	"github.com/docker/libkv"

 	"github.com/docker/libkv/store"

@@ -134,7 +135,8 @@ func makeDefaultScopes() map[string]*ScopeCfg {

 			Provider: string(store.BOLTDB),

 			Address:  defaultPrefix + "/local-kv.db",

 			Config: &store.Config{

-				Bucket: "libnetwork",

+				Bucket:            "libnetwork",

+				ConnectionTimeout: time.Minute,

 			},

 		},

 	}

@@ -2,13 +2,14 @@ package libnetwork

 import (

 	"fmt"

+	"strings"

+	"github.com/docker/libnetwork/netlabel"

 	"github.com/docker/libnetwork/types"

 )

 const (

-	libnGWNetwork = "docker_gwbridge"

-	gwEPlen       = 12

+	gwEPlen = 12

 )

 var procGwNetwork = make(chan (bool), 1)

@@ -52,6 +53,21 @@ func (sb *sandbox) setupDefaultGW() error {

 		eplen = len(sb.containerID)

 	}

+	sbLabels := sb.Labels()

+

+	if sbLabels[netlabel.PortMap] != nil {

+		createOptions = append(createOptions, CreateOptionPortMapping(sbLabels[netlabel.PortMap].([]types.PortBinding)))

+	}

+

+	if sbLabels[netlabel.ExposedPorts] != nil {

+		createOptions = append(createOptions, CreateOptionExposedPorts(sbLabels[netlabel.ExposedPorts].([]types.TransportPort)))

+	}

+

+	epOption := getPlatformOption()

+	if epOption != nil {

+		createOptions = append(createOptions, epOption)

+	}

+

 	newEp, err := n.CreateEndpoint("gateway_"+sb.containerID[0:eplen], createOptions...)

 	if err != nil {

 		return fmt.Errorf("container %s: endpoint create on GW Network failed: %v", sb.containerID, err)

@@ -119,7 +135,7 @@ func (sb *sandbox) needDefaultGW() bool {

 func (sb *sandbox) getEndpointInGWNetwork() *endpoint {

 	for _, ep := range sb.getConnectedEndpoints() {

-		if ep.getNetwork().name == libnGWNetwork {

+		if ep.getNetwork().name == libnGWNetwork && strings.HasPrefix(ep.Name(), "gateway_") {

 			return ep

 		}

 	}

@@ -127,7 +143,7 @@ func (sb *sandbox) getEndpointInGWNetwork() *endpoint {

 }

 func (ep *endpoint) endpointInGWNetwork() bool {

-	if ep.getNetwork().name == libnGWNetwork {

+	if ep.getNetwork().name == libnGWNetwork && strings.HasPrefix(ep.Name(), "gateway_") {

 		return true

 	}

 	return false

@@ -2,6 +2,12 @@ package libnetwork

 import "github.com/docker/libnetwork/types"

+const libnGWNetwork = "docker_gwbridge"

+

+func getPlatformOption() EndpointOption {

+	return nil

+}

+

 func (c *controller) createGWNetwork() (Network, error) {

 	return nil, types.NotImplementedErrorf("default gateway functionality is not implemented in freebsd")

 }

@@ -7,6 +7,12 @@ import (

 	"github.com/docker/libnetwork/drivers/bridge"

 )

+const libnGWNetwork = "docker_gwbridge"

+

+func getPlatformOption() EndpointOption {

+	return nil

+}

+

 func (c *controller) createGWNetwork() (Network, error) {

 	netOption := map[string]string{

 		bridge.BridgeName:         libnGWNetwork,

@@ -1,7 +1,32 @@

 package libnetwork

-import "github.com/docker/libnetwork/types"

+import (

+	"fmt"

+	"strconv"

+

+	"github.com/docker/libnetwork/drivers/solaris/bridge"

+)

+

+const libnGWNetwork = "docker_gwbridge"

+

+func getPlatformOption() EndpointOption {

+	return nil

+}

 func (c *controller) createGWNetwork() (Network, error) {

-	return nil, types.NotImplementedErrorf("default gateway functionality is not implemented in solaris")

+	netOption := map[string]string{

+		bridge.BridgeName:         libnGWNetwork,

+		bridge.EnableICC:          strconv.FormatBool(false),

+		bridge.EnableIPMasquerade: strconv.FormatBool(true),

+	}

+

+	n, err := c.NewNetwork("bridge", libnGWNetwork, "",

+		NetworkOptionDriverOpts(netOption),

+		NetworkOptionEnableIPv6(false),

+	)

+

+	if err != nil {

+		return nil, fmt.Errorf("error creating external connectivity network: %v", err)

+	}

+	return n, err

 }

@@ -1,6 +1,21 @@

 package libnetwork

-import "github.com/docker/libnetwork/types"

+import (

+	windriver "github.com/docker/libnetwork/drivers/windows"

+	"github.com/docker/libnetwork/options"

+	"github.com/docker/libnetwork/types"

+)

+

+const libnGWNetwork = "nat"

+

+func getPlatformOption() EndpointOption {

+

+	epOption := options.Generic{

+		windriver.DisableICC: true,

+		windriver.DisableDNS: true,

+	}

+	return EndpointOptionGeneric(epOption)

+}

 func (c *controller) createGWNetwork() (Network, error) {

 	return nil, types.NotImplementedErrorf("default gateway functionality is not implemented in windows")

@@ -4,7 +4,7 @@ import (

 	"fmt"

 	"net"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/libnetwork/iptables"

 	"github.com/docker/libnetwork/types"

 )

@@ -44,7 +44,7 @@ func (l *link) Disable() {

 	// -D == iptables delete flag

 	err := linkContainers("-D", l.parentIP, l.childIP, l.ports, l.bridge, true)

 	if err != nil {

-		log.Errorf("Error removing IPTables rules for a link %s due to %s", l.String(), err.Error())

+		logrus.Errorf("Error removing IPTables rules for a link %s due to %s", l.String(), err.Error())

 	}

 	// Return proper error once we move to use a proper iptables package

 	// that returns typed errors

@@ -6,7 +6,7 @@ import (

 	"net"

 	"path/filepath"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/libnetwork/types"

 	"github.com/vishvananda/netlink"

 )

@@ -39,7 +39,7 @@ func setupBridgeIPv4(config *networkConfiguration, i *bridgeInterface) error {

 				return fmt.Errorf("failed to remove current ip address from bridge: %v", err)

 			}

 		}

-		log.Debugf("Assigning address to bridge interface %s: %s", config.BridgeName, config.AddressIPv4)

+		logrus.Debugf("Assigning address to bridge interface %s: %s", config.BridgeName, config.AddressIPv4)

 		if err := i.nlh.AddrAdd(i.Link, &netlink.Addr{IPNet: config.AddressIPv4}); err != nil {

 			return &IPv4AddrAddError{IP: config.AddressIPv4, Err: err}

 		}

@@ -4,7 +4,7 @@ import (

 	"fmt"

 	"strings"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/libnetwork/ns"

 	"github.com/docker/libnetwork/types"

 	"github.com/vishvananda/netlink"

@@ -39,7 +39,7 @@ func setupVerifyAndReconcile(config *networkConfiguration, i *bridgeInterface) e

 	for _, addrv6 := range addrsv6 {

 		if addrv6.IP.IsGlobalUnicast() && !types.CompareIPNet(addrv6.IPNet, i.bridgeIPv6) {

 			if err := i.nlh.AddrDel(i.Link, &addrv6); err != nil {

-				log.Warnf("Failed to remove residual IPv6 address %s from bridge: %v", addrv6.IPNet, err)

+				logrus.Warnf("Failed to remove residual IPv6 address %s from bridge: %v", addrv6.IPNet, err)

 			}

 		}

 	}

@@ -12,7 +12,7 @@ import (

 	"strconv"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/libnetwork/iptables"

 	"github.com/docker/libnetwork/ns"

 	"github.com/docker/libnetwork/types"

@@ -77,7 +77,7 @@ func (e *encrMap) String() string {

 }

 func (d *driver) checkEncryption(nid string, rIP net.IP, vxlanID uint32, isLocal, add bool) error {

-	log.Debugf("checkEncryption(%s, %v, %d, %t)", nid[0:7], rIP, vxlanID, isLocal)

+	logrus.Debugf("checkEncryption(%s, %v, %d, %t)", nid[0:7], rIP, vxlanID, isLocal)

 	n := d.network(nid)

 	if n == nil || !n.secure {

@@ -100,7 +100,7 @@ func (d *driver) checkEncryption(nid string, rIP net.IP, vxlanID uint32, isLocal

 			}

 			return false

 		}); err != nil {

-			log.Warnf("Failed to retrieve list of participating nodes in overlay network %s: %v", nid[0:5], err)

+			logrus.Warnf("Failed to retrieve list of participating nodes in overlay network %s: %v", nid[0:5], err)

 		}

 	default:

 		if len(d.network(nid).endpoints) > 0 {

@@ -108,18 +108,18 @@ func (d *driver) checkEncryption(nid string, rIP net.IP, vxlanID uint32, isLocal

 		}

 	}

-	log.Debugf("List of nodes: %s", nodes)

+	logrus.Debugf("List of nodes: %s", nodes)

 	if add {

 		for _, rIP := range nodes {

 			if err := setupEncryption(lIP, aIP, rIP, vxlanID, d.secMap, d.keys); err != nil {

-				log.Warnf("Failed to program network encryption between %s and %s: %v", lIP, rIP, err)

+				logrus.Warnf("Failed to program network encryption between %s and %s: %v", lIP, rIP, err)

 			}

 		}

 	} else {

 		if len(nodes) == 0 {

 			if err := removeEncryption(lIP, rIP, d.secMap); err != nil {

-				log.Warnf("Failed to remove network encryption between %s and %s: %v", lIP, rIP, err)

+				logrus.Warnf("Failed to remove network encryption between %s and %s: %v", lIP, rIP, err)

 			}

 		}

 	}

@@ -128,14 +128,14 @@ func (d *driver) checkEncryption(nid string, rIP net.IP, vxlanID uint32, isLocal

 }

 func setupEncryption(localIP, advIP, remoteIP net.IP, vni uint32, em *encrMap, keys []*key) error {

-	log.Debugf("Programming encryption for vxlan %d between %s and %s", vni, localIP, remoteIP)

+	logrus.Debugf("Programming encryption for vxlan %d between %s and %s", vni, localIP, remoteIP)

 	rIPs := remoteIP.String()

 	indices := make([]*spi, 0, len(keys))

 	err := programMangle(vni, true)

 	if err != nil {

-		log.Warn(err)

+		logrus.Warn(err)

 	}

 	for i, k := range keys {

@@ -146,7 +146,7 @@ func setupEncryption(localIP, advIP, remoteIP net.IP, vni uint32, em *encrMap, k

 		}

 		fSA, rSA, err := programSA(localIP, remoteIP, spis, k, dir, true)

 		if err != nil {

-			log.Warn(err)

+			logrus.Warn(err)

 		}

 		indices = append(indices, spis)

 		if i != 0 {

@@ -154,7 +154,7 @@ func setupEncryption(localIP, advIP, remoteIP net.IP, vni uint32, em *encrMap, k

 		}

 		err = programSP(fSA, rSA, true)

 		if err != nil {

-			log.Warn(err)

+			logrus.Warn(err)

 		}

 	}

@@ -179,14 +179,14 @@ func removeEncryption(localIP, remoteIP net.IP, em *encrMap) error {

 		}

 		fSA, rSA, err := programSA(localIP, remoteIP, idxs, nil, dir, false)

 		if err != nil {

-			log.Warn(err)

+			logrus.Warn(err)

 		}

 		if i != 0 {

 			continue

 		}

 		err = programSP(fSA, rSA, false)

 		if err != nil {

-			log.Warn(err)

+			logrus.Warn(err)

 		}

 	}

 	return nil

@@ -213,7 +213,7 @@ func programMangle(vni uint32, add bool) (err error) {

 	}

 	if err = iptables.RawCombinedOutput(append([]string{"-t", string(iptables.Mangle), a, chain}, rule...)...); err != nil {

-		log.Warnf("could not %s mangle rule: %v", action, err)

+		logrus.Warnf("could not %s mangle rule: %v", action, err)

 	}

 	return

@@ -248,9 +248,9 @@ func programSA(localIP, remoteIP net.IP, spi *spi, k *key, dir int, add bool) (f

 		}

 		if add != exists {

-			log.Debugf("%s: rSA{%s}", action, rSA)

+			logrus.Debugf("%s: rSA{%s}", action, rSA)

 			if err := xfrmProgram(rSA); err != nil {

-				log.Warnf("Failed %s rSA{%s}: %v", action, rSA, err)

+				logrus.Warnf("Failed %s rSA{%s}: %v", action, rSA, err)

 			}

 		}

 	}

@@ -273,9 +273,9 @@ func programSA(localIP, remoteIP net.IP, spi *spi, k *key, dir int, add bool) (f

 		}

 		if add != exists {

-			log.Debugf("%s fSA{%s}", action, fSA)

+			logrus.Debugf("%s fSA{%s}", action, fSA)

 			if err := xfrmProgram(fSA); err != nil {

-				log.Warnf("Failed %s fSA{%s}: %v.", action, fSA, err)

+				logrus.Warnf("Failed %s fSA{%s}: %v.", action, fSA, err)

 			}

 		}

 	}

@@ -319,9 +319,9 @@ func programSP(fSA *netlink.XfrmState, rSA *netlink.XfrmState, add bool) error {

 	}

 	if add != exists {

-		log.Debugf("%s fSP{%s}", action, fPol)

+		logrus.Debugf("%s fSP{%s}", action, fPol)

 		if err := xfrmProgram(fPol); err != nil {

-			log.Warnf("%s fSP{%s}: %v", action, fPol, err)

+			logrus.Warnf("%s fSP{%s}: %v", action, fPol, err)

 		}

 	}

@@ -337,7 +337,7 @@ func saExists(sa *netlink.XfrmState) (bool, error) {

 		return false, nil

 	default:

 		err = fmt.Errorf("Error while checking for SA existence: %v", err)

-		log.Warn(err)

+		logrus.Warn(err)

 		return false, err

 	}

 }

@@ -351,7 +351,7 @@ func spExists(sp *netlink.XfrmPolicy) (bool, error) {

 		return false, nil

 	default:

 		err = fmt.Errorf("Error while checking for SP existence: %v", err)

-		log.Warn(err)

+		logrus.Warn(err)

 		return false, err

 	}

 }

@@ -397,16 +397,16 @@ func (d *driver) setKeys(keys []*key) error {

 	d.keys = keys

 	d.secMap = &encrMap{nodes: map[string][]*spi{}}

 	d.Unlock()

-	log.Debugf("Initial encryption keys: %v", d.keys)

+	logrus.Debugf("Initial encryption keys: %v", d.keys)

 	return nil

 }

 // updateKeys allows to add a new key and/or change the primary key and/or prune an existing key

 // The primary key is the key used in transmission and will go in first position in the list.

 func (d *driver) updateKeys(newKey, primary, pruneKey *key) error {

-	log.Debugf("Updating Keys. New: %v, Primary: %v, Pruned: %v", newKey, primary, pruneKey)

+	logrus.Debugf("Updating Keys. New: %v, Primary: %v, Pruned: %v", newKey, primary, pruneKey)

-	log.Debugf("Current: %v", d.keys)

+	logrus.Debugf("Current: %v", d.keys)

 	var (

 		newIdx = -1

@@ -459,7 +459,7 @@ func (d *driver) updateKeys(newKey, primary, pruneKey *key) error {

 	}

 	d.Unlock()

-	log.Debugf("Updated: %v", d.keys)

+	logrus.Debugf("Updated: %v", d.keys)

 	return nil

 }

@@ -472,10 +472,10 @@ func (d *driver) updateKeys(newKey, primary, pruneKey *key) error {

 // Spis and keys are sorted in such away the one in position 0 is the primary

 func updateNodeKey(lIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, priIdx, delIdx int) []*spi {

-	log.Debugf("Updating keys for node: %s (%d,%d,%d)", rIP, newIdx, priIdx, delIdx)

+	logrus.Debugf("Updating keys for node: %s (%d,%d,%d)", rIP, newIdx, priIdx, delIdx)

 	spis := idxs

-	log.Debugf("Current: %v", spis)

+	logrus.Debugf("Current: %v", spis)

 	// add new

 	if newIdx != -1 {

@@ -520,9 +520,9 @@ func updateNodeKey(lIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, priIdx,

 				},

 			},

 		}

-		log.Debugf("Updating fSP{%s}", fSP1)

+		logrus.Debugf("Updating fSP{%s}", fSP1)

 		if err := ns.NlHandle().XfrmPolicyUpdate(fSP1); err != nil {

-			log.Warnf("Failed to update fSP{%s}: %v", fSP1, err)

+			logrus.Warnf("Failed to update fSP{%s}: %v", fSP1, err)

 		}

 		// -fSA1

@@ -543,7 +543,7 @@ func updateNodeKey(lIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, priIdx,

 		spis = append(spis[:delIdx], spis[delIdx+1:]...)

 	}

-	log.Debugf("Updated: %v", spis)

+	logrus.Debugf("Updated: %v", spis)

 	return spis

 }

@@ -5,7 +5,7 @@ import (

 	"net"

 	"syscall"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/libnetwork/driverapi"

 	"github.com/docker/libnetwork/ns"

 	"github.com/docker/libnetwork/types"

@@ -109,7 +109,7 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,

 			continue

 		}

 		if err := jinfo.AddStaticRoute(sub.subnetIP, types.NEXTHOP, s.gwIP.IP); err != nil {

-			log.Errorf("Adding subnet %s static route in network %q failed\n", s.subnetIP, n.id)

+			logrus.Errorf("Adding subnet %s static route in network %q failed\n", s.subnetIP, n.id)

 		}

 	}

@@ -124,7 +124,7 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,

 		net.ParseIP(d.advertiseAddress), true)

 	if err := d.checkEncryption(nid, nil, n.vxlanID(s), true, true); err != nil {

-		log.Warn(err)

+		logrus.Warn(err)

 	}

 	buf, err := proto.Marshal(&PeerRecord{

@@ -137,7 +137,7 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,

 	}

 	if err := jinfo.AddTableEntry(ovPeerTable, eid, buf); err != nil {

-		log.Errorf("overlay: Failed adding table entry to joininfo: %v", err)

+		logrus.Errorf("overlay: Failed adding table entry to joininfo: %v", err)

 	}

 	d.pushLocalEndpointEvent("join", nid, eid)

@@ -147,7 +147,7 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,

 func (d *driver) EventNotify(etype driverapi.EventType, nid, tableName, key string, value []byte) {

 	if tableName != ovPeerTable {

-		log.Errorf("Unexpected table notification for table %s received", tableName)

+		logrus.Errorf("Unexpected table notification for table %s received", tableName)

 		return

 	}

@@ -155,7 +155,7 @@ func (d *driver) EventNotify(etype driverapi.EventType, nid, tableName, key stri

 	var peer PeerRecord

 	if err := proto.Unmarshal(value, &peer); err != nil {

-		log.Errorf("Failed to unmarshal peer record: %v", err)

+		logrus.Errorf("Failed to unmarshal peer record: %v", err)

 		return

 	}

@@ -167,19 +167,19 @@ func (d *driver) EventNotify(etype driverapi.EventType, nid, tableName, key stri

 	addr, err := types.ParseCIDR(peer.EndpointIP)

 	if err != nil {

-		log.Errorf("Invalid peer IP %s received in event notify", peer.EndpointIP)

+		logrus.Errorf("Invalid peer IP %s received in event notify", peer.EndpointIP)

 		return

 	}

 	mac, err := net.ParseMAC(peer.EndpointMAC)

 	if err != nil {

-		log.Errorf("Invalid mac %s received in event notify", peer.EndpointMAC)

+		logrus.Errorf("Invalid mac %s received in event notify", peer.EndpointMAC)

 		return

 	}

 	vtep := net.ParseIP(peer.TunnelEndpointIP)

 	if vtep == nil {

-		log.Errorf("Invalid VTEP %s received in event notify", peer.TunnelEndpointIP)

+		logrus.Errorf("Invalid VTEP %s received in event notify", peer.TunnelEndpointIP)

 		return

 	}

@@ -219,7 +219,7 @@ func (d *driver) Leave(nid, eid string) error {

 	n.leaveSandbox()

 	if err := d.checkEncryption(nid, nil, 0, true, false); err != nil {

-		log.Warn(err)

+		logrus.Warn(err)

 	}

 	return nil

@@ -5,7 +5,7 @@ import (

 	"fmt"

 	"net"

-	log "github.com/Sirupsen/logrus"

+	"github.com/Sirupsen/logrus"

 	"github.com/docker/libnetwork/datastore"

 	"github.com/docker/libnetwork/driverapi"

 	"github.com/docker/libnetwork/netutils"

@@ -116,7 +116,7 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {

 	n.deleteEndpoint(eid)

 	if err := d.deleteEndpointFromStore(ep); err != nil {

-		log.Warnf("Failed to delete overlay endpoint %s from local store: %v", ep.id[0:7], err)

+		logrus.Warnf("Failed to delete overlay endpoint %s from local store: %v", ep.id[0:7], err)

 	}

 	if ep.ifName == "" {