libnet/ipams/null: move driver name to its pkg

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

libnetwork/ipamapi/contract.go

@@ -10,8 +10,6 @@ import (
 
 // IPAM plugin types
 const (
-	// NullIPAM is the name of the built-in null ipam driver
-	NullIPAM = "null"
 	// PluginEndpointType represents the Endpoint Type used by Plugin system
 	PluginEndpointType = "IpamDriver"
 	// RequestAddressType represents the Address Type used when requesting an address

libnetwork/ipams/null/null.go

@@ -11,6 +11,9 @@ import (
 )
 
 const (
+	// DriverName is the name of the built-in null ipam driver
+	DriverName = "null"
+
 	defaultAddressSpace = "null"
 	defaultPoolCIDR     = "0.0.0.0/0"
 	defaultPoolID       = defaultAddressSpace + "/" + defaultPoolCIDR
@@ -67,5 +70,5 @@ func (a *allocator) IsBuiltIn() bool {
 
 // Register registers the null ipam driver with r.
 func Register(r ipamapi.Registerer) error {
-	return r.RegisterIpamDriver(ipamapi.NullIPAM, &allocator{})
+	return r.RegisterIpamDriver(DriverName, &allocator{})
 }

libnetwork/libnetwork_linux_test.go

@@ -22,8 +22,8 @@ import (
 	"github.com/docker/docker/libnetwork/config"
 	"github.com/docker/docker/libnetwork/datastore"
 	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/docker/libnetwork/ipamapi"
 	"github.com/docker/docker/libnetwork/ipams/defaultipam"
+	"github.com/docker/docker/libnetwork/ipams/null"
 	"github.com/docker/docker/libnetwork/netlabel"
 	"github.com/docker/docker/libnetwork/options"
 	"github.com/docker/docker/libnetwork/osl"
@@ -2119,7 +2119,7 @@ func TestNullIpam(t *testing.T) {
 	defer netnsutils.SetupTestOSContext(t)()
 	controller := newController(t)
 
-	_, err := controller.NewNetwork(bridgeNetType, "testnetworkinternal", "", libnetwork.NetworkOptionIpam(ipamapi.NullIPAM, "", nil, nil, nil))
+	_, err := controller.NewNetwork(bridgeNetType, "testnetworkinternal", "", libnetwork.NetworkOptionIpam(null.DriverName, "", nil, nil, nil))
 	if err == nil || err.Error() != "ipv4 pool is empty" {
 		t.Fatal("bridge network should complain empty pool")
 	}