libnet/ipams/defaultipam: add a Register fn

All drivers except the default have a Register function. Before this
change, default's registration was handled by another package. Move
this logic into the driver pkg.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>

libnetwork/ipams/defaultipam/allocator.go

@@ -10,6 +10,7 @@ import (
 	"github.com/docker/docker/libnetwork/bitmap"
 	"github.com/docker/docker/libnetwork/internal/netiputil"
 	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipamutils"
 	"github.com/docker/docker/libnetwork/ipbits"
 	"github.com/docker/docker/libnetwork/types"
 )
@@ -19,6 +20,29 @@ const (
 	globalAddressSpace = "GlobalDefault"
 )
 
+// Register registers the default ipam driver with libnetwork. It takes
+// an optional addressPools containing the list of user-defined address pools
+// used by the local address space (ie. daemon's default-address-pools parameter).
+func Register(ic ipamapi.Registerer, addressPools []*ipamutils.NetworkToSplit) error {
+	localAddressPools := ipamutils.GetLocalScopeDefaultNetworks()
+	if len(addressPools) > 0 {
+		var err error
+		localAddressPools, err = ipamutils.SplitNetworks(addressPools)
+		if err != nil {
+			return err
+		}
+	}
+
+	a, err := NewAllocator(localAddressPools, ipamutils.GetGlobalScopeDefaultNetworks())
+	if err != nil {
+		return err
+	}
+
+	cps := &ipamapi.Capability{RequiresRequestReplay: true}
+
+	return ic.RegisterIpamDriverWithCapabilities(ipamapi.DefaultIPAM, a, cps)
+}
+
 // Allocator provides per address space ipv4/ipv6 book keeping
 type Allocator struct {
 	// The address spaces

libnetwork/ipams/drivers_unix.go

@@ -4,10 +4,11 @@ package ipams
 
 import (
 	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipams/defaultipam"
 	"github.com/docker/docker/libnetwork/ipamutils"
 )
 
 // Register registers the built-in ipam service with libnetwork.
 func Register(r ipamapi.Registerer, addressPools []*ipamutils.NetworkToSplit) error {
-	return registerBuiltin(r, addressPools)
+	return defaultipam.Register(r, addressPools)
 }

libnetwork/ipams/drivers_windows.go

@@ -4,13 +4,14 @@ package ipams
 
 import (
 	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipams/defaultipam"
 	"github.com/docker/docker/libnetwork/ipams/windowsipam"
 	"github.com/docker/docker/libnetwork/ipamutils"
 )
 
 // Register registers the built-in ipam services with libnetwork.
 func Register(r ipamapi.Registerer, addressPools []*ipamutils.NetworkToSplit) error {
-	if err := registerBuiltin(r, addressPools); err != nil {
+	if err := defaultipam.Register(r, addressPools); err != nil {
 		return err
 	}