Honor enableIPv6 network flag on IP allocation

aboch · aboch · commit 4b9dc647be2c · 2016-03-18T15:18:08.000-07:00
- If the flag is not set, do not query IPAM driver for
  IPv6 pool/addresses even if they are passed

Signed-off-by: Alessandro Boch &lt;aboch@docker.com&gt;
diff --git a/libnetwork/network.go b/libnetwork/network.go
@@ -469,6 +469,10 @@ func (n *network) UnmarshalJSON(b []byte) (err error) {
 	if v, ok := netMap["inDelete"]; ok {
 		n.inDelete = v.(bool)
 	}
+	// Reconcile old networks with the recently added `--ipv6` flag
+	if !n.enableIPv6 {
+		n.enableIPv6 = len(n.ipamV6Info) > 0
+	}
 	return nil
 }
 
@@ -752,7 +756,7 @@ func (n *network) CreateEndpoint(name string, options ...EndpointOption) (Endpoi
 		ep.ipamOptions[netlabel.MacAddress] = ep.iface.mac.String()
 	}
 
-	if err = ep.assignAddress(ipam.driver, true, !n.postIPv6); err != nil {
+	if err = ep.assignAddress(ipam.driver, true, n.enableIPv6 && !n.postIPv6); err != nil {
 		return nil, err
 	}
 	defer func() {
@@ -772,7 +776,7 @@ func (n *network) CreateEndpoint(name string, options ...EndpointOption) (Endpoi
 		}
 	}()
 
-	if err = ep.assignAddress(ipam.driver, false, n.postIPv6); err != nil {
+	if err = ep.assignAddress(ipam.driver, false, n.enableIPv6 && n.postIPv6); err != nil {
 		return nil, err
 	}
 
@@ -1006,6 +1010,10 @@ func (n *network) ipamAllocate() error {
 		}
 	}()
 
+	if !n.enableIPv6 {
+		return nil
+	}
+
 	return n.ipamAllocateVersion(6, ipam)
 }
 
@@ -1126,7 +1134,7 @@ func (n *network) ipamReleaseVersion(ipVer int, ipam ipamapi.Ipam) {
 		return
 	}
 
-	if *infoList == nil {
+	if len(*infoList) == 0 {
 		return
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,10 @@ func (n *network) UnmarshalJSON(b []byte) (err error) {`
`469`	`469`	`if v, ok := netMap["inDelete"]; ok {`
`470`	`470`	`n.inDelete = v.(bool)`
`471`	`471`	`}`
	`472`	+ // Reconcile old networks with the recently added `--ipv6` flag
	`473`	`+ if !n.enableIPv6 {`
	`474`	`+ n.enableIPv6 = len(n.ipamV6Info) > 0`
	`475`	`+ }`
`472`	`476`	`return nil`
`473`	`477`	`}`
`474`	`478`
`@@ -752,7 +756,7 @@ func (n *network) CreateEndpoint(name string, options ...EndpointOption) (Endpoi`
`752`	`756`	`ep.ipamOptions[netlabel.MacAddress] = ep.iface.mac.String()`
`753`	`757`	`}`
`754`	`758`
`755`		`- if err = ep.assignAddress(ipam.driver, true, !n.postIPv6); err != nil {`
	`759`	`+ if err = ep.assignAddress(ipam.driver, true, n.enableIPv6 && !n.postIPv6); err != nil {`
`756`	`760`	`return nil, err`
`757`	`761`	`}`
`758`	`762`	`defer func() {`
`@@ -772,7 +776,7 @@ func (n *network) CreateEndpoint(name string, options ...EndpointOption) (Endpoi`
`772`	`776`	`}`
`773`	`777`	`}()`
`774`	`778`
`775`		`- if err = ep.assignAddress(ipam.driver, false, n.postIPv6); err != nil {`
	`779`	`+ if err = ep.assignAddress(ipam.driver, false, n.enableIPv6 && n.postIPv6); err != nil {`
`776`	`780`	`return nil, err`
`777`	`781`	`}`
`778`	`782`
`@@ -1006,6 +1010,10 @@ func (n *network) ipamAllocate() error {`
`1006`	`1010`	`}`
`1007`	`1011`	`}()`
`1008`	`1012`
	`1013`	`+ if !n.enableIPv6 {`
	`1014`	`+ return nil`
	`1015`	`+ }`
	`1016`	`+`
`1009`	`1017`	`return n.ipamAllocateVersion(6, ipam)`
`1010`	`1018`	`}`
`1011`	`1019`
`@@ -1126,7 +1134,7 @@ func (n *network) ipamReleaseVersion(ipVer int, ipam ipamapi.Ipam) {`
`1126`	`1134`	`return`
`1127`	`1135`	`}`
`1128`	`1136`
`1129`		`- if *infoList == nil {`
	`1137`	`+ if len(*infoList) == 0 {`
`1130`	`1138`	`return`
`1131`	`1139`	`}`
`1132`	`1140`