Переглянути джерело

libnet: move ipam pkg to ipam/defaultipam

All drivers except the default ipam driver are stored in ipams/.
Since `default` isn't a valid Go pkg name, this package is
renamed to `defaultipam`, following `windowsipam` example.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Albin Kerouanton 1 рік тому
батько
коміт
cf516e17de

+ 2 - 2
libnetwork/ipams/builtin/builtin.go

@@ -1,8 +1,8 @@
 package builtin
 
 import (
-	"github.com/docker/docker/libnetwork/ipam"
 	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipams/defaultipam"
 	"github.com/docker/docker/libnetwork/ipamutils"
 )
 
@@ -19,7 +19,7 @@ func registerBuiltin(ic ipamapi.Registerer, addressPools []*ipamutils.NetworkToS
 		}
 	}
 
-	a, err := ipam.NewAllocator(localAddressPools, ipamutils.GetGlobalScopeDefaultNetworks())
+	a, err := defaultipam.NewAllocator(localAddressPools, ipamutils.GetGlobalScopeDefaultNetworks())
 	if err != nil {
 		return err
 	}

+ 1 - 1
libnetwork/ipam/address_space.go → libnetwork/ipams/defaultipam/address_space.go

@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"context"

+ 1 - 1
libnetwork/ipam/allocator.go → libnetwork/ipams/defaultipam/allocator.go

@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"context"

+ 1 - 1
libnetwork/ipam/allocator_test.go → libnetwork/ipams/defaultipam/allocator_test.go

@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"context"

+ 1 - 1
libnetwork/ipam/parallel_test.go → libnetwork/ipams/defaultipam/parallel_test.go

@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"context"

+ 1 - 1
libnetwork/ipam/structures.go → libnetwork/ipams/defaultipam/structures.go

@@ -1,4 +1,4 @@
-package ipam
+package defaultipam
 
 import (
 	"fmt"