From cf1b5fe6011e49d19e2b27792d6f28fd6cd8984e Mon Sep 17 00:00:00 2001
From: Madhu Venugopal <madhu@docker.com>
Date: Wed, 14 Oct 2015 20:11:53 -0700
Subject: [PATCH] Vendoring libnetwork to Replace the label variable to
 DriverOpts

Signed-off-by: Madhu Venugopal <madhu@docker.com>
---
 hack/vendor.sh                                |  2 +-
 .../docker/libnetwork/controller.go           |  1 -
 .../github.com/docker/libnetwork/network.go   | 19 +++++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/hack/vendor.sh b/hack/vendor.sh
index 052303394d..63917d05d9 100755
--- a/hack/vendor.sh
+++ b/hack/vendor.sh
@@ -20,7 +20,7 @@ clone git github.com/tchap/go-patricia v2.1.0
 clone git golang.org/x/net 3cffabab72adf04f8e3b01c5baf775361837b5fe https://github.com/golang/net.git
 
 #get libnetwork packages
-clone git github.com/docker/libnetwork dd1c5f0ffe7697f75a82bd8e4bbd6f225ec5e383
+clone git github.com/docker/libnetwork 2934f6bf585fa24c86048cc85f7506a5bb626bf5
 clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
 clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
 clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4
diff --git a/vendor/src/github.com/docker/libnetwork/controller.go b/vendor/src/github.com/docker/libnetwork/controller.go
index e802825010..18fa883bf3 100644
--- a/vendor/src/github.com/docker/libnetwork/controller.go
+++ b/vendor/src/github.com/docker/libnetwork/controller.go
@@ -74,7 +74,6 @@ type NetworkController interface {
 	Config() config.Config
 
 	// Create a new network. The options parameter carries network specific options.
-	// Labels support will be added in the near future.
 	NewNetwork(networkType, name string, options ...NetworkOption) (Network, error)
 
 	// Networks returns the list of Network(s) managed by this controller.
diff --git a/vendor/src/github.com/docker/libnetwork/network.go b/vendor/src/github.com/docker/libnetwork/network.go
index b9a2d5a1b9..7b14fc830b 100644
--- a/vendor/src/github.com/docker/libnetwork/network.go
+++ b/vendor/src/github.com/docker/libnetwork/network.go
@@ -33,7 +33,6 @@ type Network interface {
 
 	// Create a new endpoint to this network symbolically identified by the
 	// specified unique name. The options parameter carry driver specific options.
-	// Labels support will be added in the near future.
 	CreateEndpoint(name string, options ...EndpointOption) (Endpoint, error)
 
 	// Delete the network.
@@ -58,7 +57,7 @@ type Network interface {
 // NetworkInfo returns some configuration and operational information about the network
 type NetworkInfo interface {
 	IpamConfig() (string, []*IpamConf, []*IpamConf)
-	Labels() map[string]string
+	DriverOptions() map[string]string
 	Scope() string
 }
 
@@ -402,7 +401,7 @@ func (n *network) UnmarshalJSON(b []byte) (err error) {
 
 	if v, ok := netMap["generic"]; ok {
 		n.generic = v.(map[string]interface{})
-		// Restore labels in their map[string]string form
+		// Restore opts in their map[string]string form
 		if v, ok := n.generic[netlabel.GenericData]; ok {
 			var lmap map[string]string
 			ba, err := json.Marshal(v)
@@ -484,19 +483,19 @@ func NetworkOptionIpam(ipamDriver string, addrSpace string, ipV4 []*IpamConf, ip
 	}
 }
 
-// NetworkOptionLabels function returns an option setter for any parameter described by a map
-func NetworkOptionLabels(labels map[string]string) NetworkOption {
+// NetworkOptionDriverOpts function returns an option setter for any parameter described by a map
+func NetworkOptionDriverOpts(opts map[string]string) NetworkOption {
 	return func(n *network) {
 		if n.generic == nil {
 			n.generic = make(map[string]interface{})
 		}
-		if labels == nil {
-			labels = make(map[string]string)
+		if opts == nil {
+			opts = make(map[string]string)
 		}
 		// Store the options
-		n.generic[netlabel.GenericData] = labels
+		n.generic[netlabel.GenericData] = opts
 		// Decode and store the endpoint options of libnetwork interest
-		if val, ok := labels[netlabel.EnableIPv6]; ok {
+		if val, ok := opts[netlabel.EnableIPv6]; ok {
 			var err error
 			if n.enableIPv6, err = strconv.ParseBool(val); err != nil {
 				log.Warnf("Failed to parse %s' value: %s (%s)", netlabel.EnableIPv6, val, err.Error())
@@ -1056,7 +1055,7 @@ func (n *network) Info() NetworkInfo {
 	return n
 }
 
-func (n *network) Labels() map[string]string {
+func (n *network) DriverOptions() map[string]string {
 	n.Lock()
 	defer n.Unlock()
 	if n.generic != nil {