Move libnetwork to daemon/libnetwork

Signed-off-by: Derek McGowan <derek@mcg.dev>

builder/builder-next/builder.go

@@ -23,9 +23,9 @@ import (
 	"github.com/docker/docker/builder/builder-next/exporter/overrides"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/images"
+	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/docker/docker/daemon/pkg/opts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/libnetwork"
 	"github.com/docker/docker/pkg/streamformatter"
 	controlapi "github.com/moby/buildkit/api/services/control"
 	"github.com/moby/buildkit/client"

builder/builder-next/executor.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/moby/buildkit/executor/oci"
 	resourcestypes "github.com/moby/buildkit/executor/resources/types"
 	"github.com/moby/buildkit/identity"

builder/builder-next/executor_linux.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/moby/buildkit/executor"
 	"github.com/moby/buildkit/executor/oci"

builder/builder-next/executor_nolinux.go

@@ -7,7 +7,7 @@ import (
 	"errors"
 	"runtime"
 
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/moby/buildkit/executor"
 	"github.com/moby/buildkit/executor/oci"
 	resourcetypes "github.com/moby/buildkit/executor/resources/types"

builder/builder-next/executor_windows.go

@@ -7,7 +7,7 @@ import (
 
 	ctd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/moby/buildkit/executor"
 	"github.com/moby/buildkit/executor/containerdexecutor"
 	"github.com/moby/buildkit/executor/oci"

daemon/cluster.go

@@ -3,7 +3,7 @@ package daemon
 import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
-	lncluster "github.com/docker/docker/libnetwork/cluster"
+	lncluster "github.com/docker/docker/daemon/libnetwork/cluster"
 )
 
 // Cluster is the interface for github.com/docker/docker/daemon/cluster.(*Cluster).

daemon/cluster/cluster.go

@@ -54,7 +54,7 @@ import (
 	types "github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/daemon/cluster/controllers/plugin"
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	lncluster "github.com/docker/docker/libnetwork/cluster"
+	lncluster "github.com/docker/docker/daemon/libnetwork/cluster"
 	"github.com/docker/docker/pkg/stack"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	swarmnode "github.com/moby/swarmkit/v2/node"

daemon/cluster/convert/network.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/docker/docker/api/types/network"
 	types "github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/libnetwork/scope"
+	"github.com/docker/docker/daemon/libnetwork/scope"
 	gogotypes "github.com/gogo/protobuf/types"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 )

daemon/cluster/executor/backend.go

@@ -17,12 +17,12 @@ import (
 	"github.com/docker/docker/api/types/system"
 	"github.com/docker/docker/api/types/volume"
 	clustertypes "github.com/docker/docker/daemon/cluster/provider"
+	"github.com/docker/docker/daemon/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork/cluster"
+	networktypes "github.com/docker/docker/daemon/libnetwork/types"
 	networkSettings "github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/plugin"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/libnetwork"
-	"github.com/docker/docker/libnetwork/cluster"
-	networktypes "github.com/docker/docker/libnetwork/types"
 	volumeopts "github.com/docker/docker/volume/service/opts"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/cluster/executor/container/adapter.go

@@ -21,8 +21,8 @@ import (
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/daemon/cluster/convert"
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
+	"github.com/docker/docker/daemon/libnetwork"
 	networkSettings "github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/libnetwork"
 	volumeopts "github.com/docker/docker/volume/service/opts"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"

daemon/cluster/executor/container/container.go

@@ -19,7 +19,7 @@ import (
 	"github.com/docker/docker/daemon/cluster/convert"
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
 	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/docker/libnetwork/scope"
+	"github.com/docker/docker/daemon/libnetwork/scope"
 	"github.com/docker/go-connections/nat"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"

daemon/cluster/executor/container/controller.go

@@ -12,7 +12,7 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/events"
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/docker/go-connections/nat"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/moby/swarmkit/v2/agent/exec"

daemon/cluster/executor/container/executor.go

@@ -15,8 +15,8 @@ import (
 	"github.com/docker/docker/daemon/cluster/convert"
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
 	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
-	networktypes "github.com/docker/docker/libnetwork/types"
+	networktypes "github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/moby/swarmkit/v2/agent"
 	"github.com/moby/swarmkit/v2/agent/exec"
 	"github.com/moby/swarmkit/v2/api"

daemon/cluster/noderunner.go

@@ -12,8 +12,8 @@ import (
 	types "github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/daemon/cluster/convert"
 	"github.com/docker/docker/daemon/cluster/executor/container"
-	lncluster "github.com/docker/docker/libnetwork/cluster"
+	lncluster "github.com/docker/docker/daemon/libnetwork/cluster"
-	"github.com/docker/docker/libnetwork/cnmallocator"
+	"github.com/docker/docker/daemon/libnetwork/cnmallocator"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
 	swarmnode "github.com/moby/swarmkit/v2/node"

daemon/command/daemon_unix.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/libnetwork/portallocator"
+	"github.com/docker/docker/daemon/libnetwork/portallocator"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"

daemon/config/config_linux.go

@@ -12,8 +12,8 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/system"
+	"github.com/docker/docker/daemon/libnetwork/drivers/bridge"
 	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/libnetwork/drivers/bridge"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/docker/docker/pkg/rootless"
 	"github.com/pkg/errors"

daemon/config/config_test.go

@@ -12,8 +12,8 @@ import (
 
 	"dario.cat/mergo"
 	"github.com/docker/docker/api"
+	"github.com/docker/docker/daemon/libnetwork/ipamutils"
 	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/libnetwork/ipamutils"
 	"github.com/docker/docker/registry"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"

daemon/container_operations.go

@@ -21,15 +21,15 @@ import (
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/internal/metrics"
+	"github.com/docker/docker/daemon/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/scope"
+	"github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/opts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/internal/multierror"
 	"github.com/docker/docker/internal/sliceutil"
-	"github.com/docker/docker/libnetwork"
-	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/docker/libnetwork/scope"
-	"github.com/docker/docker/libnetwork/types"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/runconfig"
 	"github.com/docker/go-connections/nat"

daemon/container_operations_test.go

@@ -7,7 +7,7 @@ import (
 	containertypes "github.com/docker/docker/api/types/container"
 	networktypes "github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

daemon/container_operations_unix.go

@@ -14,11 +14,11 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork/drivers/bridge"
 	"github.com/docker/docker/daemon/links"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/libnetwork"
-	"github.com/docker/docker/libnetwork/drivers/bridge"
 	"github.com/docker/docker/pkg/process"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/moby/sys/mount"

daemon/container_operations_windows.go

@@ -8,8 +8,8 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/libnetwork"
 	"github.com/docker/docker/pkg/system"
 	"github.com/pkg/errors"
 )

daemon/daemon.go

@@ -49,6 +49,11 @@ import (
 	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"
 	"github.com/docker/docker/daemon/internal/metrics"
 	pluginexec "github.com/docker/docker/daemon/internal/plugin/executor/containerd"
+	"github.com/docker/docker/daemon/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork/cluster"
+	nwconfig "github.com/docker/docker/daemon/libnetwork/config"
+	"github.com/docker/docker/daemon/libnetwork/ipamutils"
+	"github.com/docker/docker/daemon/libnetwork/ipbits"
 	dlogger "github.com/docker/docker/daemon/logger"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/plugin"
@@ -59,11 +64,6 @@ import (
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/layer"
-	"github.com/docker/docker/libnetwork"
-	"github.com/docker/docker/libnetwork/cluster"
-	nwconfig "github.com/docker/docker/libnetwork/config"
-	"github.com/docker/docker/libnetwork/ipamutils"
-	"github.com/docker/docker/libnetwork/ipbits"
 	"github.com/docker/docker/pkg/authorization"
 	"github.com/docker/docker/pkg/fileutils"
 	"github.com/docker/docker/pkg/idtools"

daemon/daemon_linux.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/libnetwork/ns"
+	"github.com/docker/docker/daemon/libnetwork/ns"
-	"github.com/docker/docker/libnetwork/resolvconf"
+	"github.com/docker/docker/daemon/libnetwork/resolvconf"
 	"github.com/moby/sys/mount"
 	"github.com/moby/sys/mountinfo"
 	"github.com/pkg/errors"

daemon/daemon_linux_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	containertypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/docker/docker/internal/testutils/netnsutils"
-	"github.com/docker/docker/libnetwork/types"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/moby/sys/mount"
 	"github.com/moby/sys/mountinfo"

daemon/daemon_test.go

@@ -10,7 +10,7 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/docker/docker/pkg/idtools"
 	volumesservice "github.com/docker/docker/volume/service"
 	"github.com/docker/go-connections/nat"

daemon/daemon_unix.go

@@ -31,16 +31,16 @@ import (
 	"github.com/docker/docker/daemon/initlayer"
 	"github.com/docker/docker/daemon/internal/libcontainerd/remote"
 	"github.com/docker/docker/daemon/internal/usergroup"
+	"github.com/docker/docker/daemon/libnetwork"
+	nwconfig "github.com/docker/docker/daemon/libnetwork/config"
+	"github.com/docker/docker/daemon/libnetwork/drivers/bridge"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/options"
+	lntypes "github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/docker/docker/daemon/pkg/opts"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/internal/nlwrap"
 	"github.com/docker/docker/internal/otelutil"
-	"github.com/docker/docker/libnetwork"
-	nwconfig "github.com/docker/docker/libnetwork/config"
-	"github.com/docker/docker/libnetwork/drivers/bridge"
-	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/docker/libnetwork/options"
-	lntypes "github.com/docker/docker/libnetwork/types"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/runconfig"
 	volumemounts "github.com/docker/docker/volume/mounts"

daemon/daemon_windows.go

@@ -18,13 +18,13 @@ import (
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/internal/libcontainerd/local"
 	"github.com/docker/docker/daemon/internal/libcontainerd/remote"
+	"github.com/docker/docker/daemon/libnetwork"
+	nwconfig "github.com/docker/docker/daemon/libnetwork/config"
+	winlibnetwork "github.com/docker/docker/daemon/libnetwork/drivers/windows"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/options"
+	"github.com/docker/docker/daemon/libnetwork/scope"
 	"github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/libnetwork"
-	nwconfig "github.com/docker/docker/libnetwork/config"
-	winlibnetwork "github.com/docker/docker/libnetwork/drivers/windows"
-	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/docker/libnetwork/options"
-	"github.com/docker/docker/libnetwork/scope"
 	"github.com/docker/docker/pkg/parsers/operatingsystem"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/pkg/system"

daemon/events.go

@@ -11,7 +11,7 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/daemon/container"
 	daemonevents "github.com/docker/docker/daemon/events"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
 	gogotypes "github.com/gogo/protobuf/types"
 	swarmapi "github.com/moby/swarmkit/v2/api"
 )

daemon/libnetwork/agent.go

@@ -12,12 +12,12 @@ import (
 	"sync"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/cluster"
+	"github.com/docker/docker/daemon/libnetwork/cluster"
-	"github.com/docker/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/daemon/libnetwork/discoverapi"
-	"github.com/docker/docker/libnetwork/driverapi"
+	"github.com/docker/docker/daemon/libnetwork/driverapi"
-	"github.com/docker/docker/libnetwork/networkdb"
+	"github.com/docker/docker/daemon/libnetwork/networkdb"
-	"github.com/docker/docker/libnetwork/scope"
+	"github.com/docker/docker/daemon/libnetwork/scope"
-	"github.com/docker/docker/libnetwork/types"
+	"github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/docker/go-events"
 	"github.com/gogo/protobuf/proto"
 )

daemon/libnetwork/cmd/diagnostic/main.go

@@ -13,9 +13,9 @@ import (
 	"strings"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/daemon/libnetwork"
-	"github.com/docker/docker/libnetwork/diagnostic"
+	"github.com/docker/docker/daemon/libnetwork/diagnostic"
-	"github.com/docker/docker/libnetwork/drivers/overlay"
+	"github.com/docker/docker/daemon/libnetwork/drivers/overlay"
 )
 
 const (

daemon/libnetwork/cmd/networkdb-test/dbserver/ndbServer.go

@@ -10,9 +10,9 @@ import (
 	"strconv"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/cmd/networkdb-test/dummyclient"
+	"github.com/docker/docker/daemon/libnetwork/cmd/networkdb-test/dummyclient"
-	"github.com/docker/docker/libnetwork/diagnostic"
+	"github.com/docker/docker/daemon/libnetwork/diagnostic"
-	"github.com/docker/docker/libnetwork/networkdb"
+	"github.com/docker/docker/daemon/libnetwork/networkdb"
 )
 
 var (

daemon/libnetwork/cmd/networkdb-test/dummyclient/dummyClient.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/diagnostic"
+	"github.com/docker/docker/daemon/libnetwork/diagnostic"
-	"github.com/docker/docker/libnetwork/networkdb"
+	"github.com/docker/docker/daemon/libnetwork/networkdb"
 	events "github.com/docker/go-events"
 )
 

daemon/libnetwork/cmd/networkdb-test/testMain.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/cmd/networkdb-test/dbclient"
+	"github.com/docker/docker/daemon/libnetwork/cmd/networkdb-test/dbclient"
-	"github.com/docker/docker/libnetwork/cmd/networkdb-test/dbserver"
+	"github.com/docker/docker/daemon/libnetwork/cmd/networkdb-test/dbserver"
 )
 
 func main() {

daemon/libnetwork/cnmallocator/drivers_darwin.go

@@ -1,8 +1,8 @@
 package cnmallocator
 
 import (
-	"github.com/docker/docker/libnetwork/driverapi"
+	"github.com/docker/docker/daemon/libnetwork/driverapi"
-	"github.com/docker/docker/libnetwork/drivers/overlay/ovmanager"
+	"github.com/docker/docker/daemon/libnetwork/drivers/overlay/ovmanager"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
 )
 

daemon/libnetwork/cnmallocator/drivers_ipam.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/daemon/libnetwork/ipamapi"
-	"github.com/docker/docker/libnetwork/ipams"
+	"github.com/docker/docker/daemon/libnetwork/ipams"
-	"github.com/docker/docker/libnetwork/ipamutils"
+	"github.com/docker/docker/daemon/libnetwork/ipamutils"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
 )
 

daemon/libnetwork/cnmallocator/drivers_network_linux.go

@@ -1,12 +1,12 @@
 package cnmallocator
 
 import (
-	"github.com/docker/docker/libnetwork/driverapi"
+	"github.com/docker/docker/daemon/libnetwork/driverapi"
-	"github.com/docker/docker/libnetwork/drivers/bridge/brmanager"
+	"github.com/docker/docker/daemon/libnetwork/drivers/bridge/brmanager"
-	"github.com/docker/docker/libnetwork/drivers/host"
+	"github.com/docker/docker/daemon/libnetwork/drivers/host"
-	"github.com/docker/docker/libnetwork/drivers/ipvlan/ivmanager"
+	"github.com/docker/docker/daemon/libnetwork/drivers/ipvlan/ivmanager"
-	"github.com/docker/docker/libnetwork/drivers/macvlan/mvmanager"
+	"github.com/docker/docker/daemon/libnetwork/drivers/macvlan/mvmanager"
-	"github.com/docker/docker/libnetwork/drivers/overlay/ovmanager"
+	"github.com/docker/docker/daemon/libnetwork/drivers/overlay/ovmanager"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
 )
 

daemon/libnetwork/cnmallocator/drivers_network_windows.go

@@ -1,8 +1,8 @@
 package cnmallocator
 
 import (
-	"github.com/docker/docker/libnetwork/driverapi"
+	"github.com/docker/docker/daemon/libnetwork/driverapi"
-	"github.com/docker/docker/libnetwork/drivers/overlay/ovmanager"
+	"github.com/docker/docker/daemon/libnetwork/drivers/overlay/ovmanager"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
 )
 

daemon/libnetwork/cnmallocator/manager.go

@@ -3,9 +3,9 @@ package cnmallocator
 import (
 	"context"
 
-	"github.com/docker/docker/libnetwork/driverapi"
+	"github.com/docker/docker/daemon/libnetwork/driverapi"
-	"github.com/docker/docker/libnetwork/scope"
+	"github.com/docker/docker/daemon/libnetwork/scope"
-	"github.com/docker/docker/libnetwork/types"
+	"github.com/docker/docker/daemon/libnetwork/types"
 )
 
 type manager struct {

daemon/libnetwork/cnmallocator/networkallocator.go

@@ -7,14 +7,14 @@ import (
 	"strings"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/driverapi"
+	"github.com/docker/docker/daemon/libnetwork/driverapi"
-	"github.com/docker/docker/libnetwork/drivers/remote"
+	"github.com/docker/docker/daemon/libnetwork/drivers/remote"
-	"github.com/docker/docker/libnetwork/drvregistry"
+	"github.com/docker/docker/daemon/libnetwork/drvregistry"
-	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/daemon/libnetwork/ipamapi"
-	"github.com/docker/docker/libnetwork/ipams/defaultipam"
+	"github.com/docker/docker/daemon/libnetwork/ipams/defaultipam"
-	remoteipam "github.com/docker/docker/libnetwork/ipams/remote"
+	remoteipam "github.com/docker/docker/daemon/libnetwork/ipams/remote"
-	"github.com/docker/docker/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
-	"github.com/docker/docker/libnetwork/scope"
+	"github.com/docker/docker/daemon/libnetwork/scope"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"

daemon/libnetwork/cnmallocator/networkallocator_test.go

@@ -6,7 +6,7 @@ import (
 	"net/netip"
 	"testing"
 
-	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/daemon/libnetwork/ipamapi"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"
 	"gotest.tools/v3/assert"

daemon/libnetwork/cnmallocator/provider.go

@@ -3,10 +3,10 @@ package cnmallocator
 import (
 	"strings"
 
-	"github.com/docker/docker/libnetwork/driverapi"
+	"github.com/docker/docker/daemon/libnetwork/driverapi"
-	"github.com/docker/docker/libnetwork/drivers/overlay/overlayutils"
+	"github.com/docker/docker/daemon/libnetwork/drivers/overlay/overlayutils"
-	"github.com/docker/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/daemon/libnetwork/ipamapi"
-	"github.com/docker/docker/libnetwork/ipams/defaultipam"
+	"github.com/docker/docker/daemon/libnetwork/ipams/defaultipam"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/moby/swarmkit/v2/api"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"

daemon/libnetwork/config/config.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/cluster"
+	"github.com/docker/docker/daemon/libnetwork/cluster"
-	"github.com/docker/docker/libnetwork/datastore"
+	"github.com/docker/docker/daemon/libnetwork/datastore"
-	"github.com/docker/docker/libnetwork/ipamutils"
+	"github.com/docker/docker/daemon/libnetwork/ipamutils"
-	"github.com/docker/docker/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
 	"github.com/docker/docker/pkg/plugingetter"
 )
 

daemon/libnetwork/config/config_linux.go

@@ -1,6 +1,6 @@
 package config
 
-import "github.com/docker/docker/libnetwork/osl"
+import "github.com/docker/docker/daemon/libnetwork/osl"
 
 // optionExecRoot on Linux sets both the controller's ExecRoot and osl.basePath.
 func optionExecRoot(execRoot string) Option {

daemon/libnetwork/config/config_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
 )
 
 func TestOptionsLabels(t *testing.T) {

daemon/libnetwork/controller.go

@@ -54,21 +54,21 @@ import (
 	"time"
 
 	"github.com/containerd/log"
+	"github.com/docker/docker/daemon/libnetwork/cluster"
+	"github.com/docker/docker/daemon/libnetwork/config"
+	"github.com/docker/docker/daemon/libnetwork/datastore"
+	"github.com/docker/docker/daemon/libnetwork/diagnostic"
+	"github.com/docker/docker/daemon/libnetwork/discoverapi"
+	"github.com/docker/docker/daemon/libnetwork/driverapi"
+	remotedriver "github.com/docker/docker/daemon/libnetwork/drivers/remote"
+	"github.com/docker/docker/daemon/libnetwork/drvregistry"
+	"github.com/docker/docker/daemon/libnetwork/ipamapi"
+	"github.com/docker/docker/daemon/libnetwork/ipams"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/osl"
+	"github.com/docker/docker/daemon/libnetwork/scope"
+	"github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/docker/docker/internal/otelutil"
-	"github.com/docker/docker/libnetwork/cluster"
-	"github.com/docker/docker/libnetwork/config"
-	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/docker/libnetwork/diagnostic"
-	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/docker/libnetwork/driverapi"
-	remotedriver "github.com/docker/docker/libnetwork/drivers/remote"
-	"github.com/docker/docker/libnetwork/drvregistry"
-	"github.com/docker/docker/libnetwork/ipamapi"
-	"github.com/docker/docker/libnetwork/ipams"
-	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/docker/libnetwork/osl"
-	"github.com/docker/docker/libnetwork/scope"
-	"github.com/docker/docker/libnetwork/types"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/docker/pkg/stringid"

daemon/libnetwork/controller_linux.go

@@ -8,11 +8,11 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/api/types/system"
-	"github.com/docker/docker/libnetwork/internal/nftables"
+	"github.com/docker/docker/daemon/libnetwork/internal/nftables"
-	"github.com/docker/docker/libnetwork/iptables"
+	"github.com/docker/docker/daemon/libnetwork/iptables"
-	"github.com/docker/docker/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
-	"github.com/docker/docker/libnetwork/options"
+	"github.com/docker/docker/daemon/libnetwork/options"
-	"github.com/docker/docker/libnetwork/osl"
+	"github.com/docker/docker/daemon/libnetwork/osl"
 )
 
 // FirewallBackend returns the name of the firewall backend for "docker info".

daemon/libnetwork/datastore/cache.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	store "github.com/docker/docker/libnetwork/internal/kvstore"
+	store "github.com/docker/docker/daemon/libnetwork/internal/kvstore"
 )
 
 type kvMap map[string]KVObject

daemon/libnetwork/datastore/datastore.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"sync"
 
-	store "github.com/docker/docker/libnetwork/internal/kvstore"
+	store "github.com/docker/docker/daemon/libnetwork/internal/kvstore"
-	"github.com/docker/docker/libnetwork/internal/kvstore/boltdb"
+	"github.com/docker/docker/daemon/libnetwork/internal/kvstore/boltdb"
-	"github.com/docker/docker/libnetwork/types"
+	"github.com/docker/docker/daemon/libnetwork/types"
 )
 
 // ErrKeyModified is raised for an atomic update when the update is working on a stale state

daemon/libnetwork/datastore/datastore_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/docker/docker/libnetwork/options"
+	"github.com/docker/docker/daemon/libnetwork/options"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

daemon/libnetwork/datastore/mockstore_test.go

@@ -3,8 +3,8 @@ package datastore
 import (
 	"strings"
 
-	store "github.com/docker/docker/libnetwork/internal/kvstore"
+	store "github.com/docker/docker/daemon/libnetwork/internal/kvstore"
-	"github.com/docker/docker/libnetwork/types"
+	"github.com/docker/docker/daemon/libnetwork/types"
 )
 
 // MockData exported

daemon/libnetwork/default_gateway.go

@@ -7,8 +7,8 @@ import (
 
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/netlabel"
-	"github.com/docker/docker/libnetwork/types"
+	"github.com/docker/docker/daemon/libnetwork/types"
 )
 
 const (

daemon/libnetwork/default_gateway_freebsd.go

@@ -1,6 +1,6 @@
 package libnetwork
 
-import "github.com/docker/docker/libnetwork/types"
+import "github.com/docker/docker/daemon/libnetwork/types"
 
 const libnGWNetwork = "docker_gwbridge"
 

daemon/libnetwork/default_gateway_linux.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/docker/docker/daemon/libnetwork/drivers/bridge"
 	"github.com/docker/docker/internal/otelutil"
-	"github.com/docker/docker/libnetwork/drivers/bridge"
 	"go.opentelemetry.io/otel/baggage"
 )
 

daemon/libnetwork/default_gateway_windows.go

@@ -1,9 +1,9 @@
 package libnetwork
 
 import (
-	windriver "github.com/docker/docker/libnetwork/drivers/windows"
+	windriver "github.com/docker/docker/daemon/libnetwork/drivers/windows"
-	"github.com/docker/docker/libnetwork/options"
+	"github.com/docker/docker/daemon/libnetwork/options"
-	"github.com/docker/docker/libnetwork/types"
+	"github.com/docker/docker/daemon/libnetwork/types"
 )
 
 const libnGWNetwork = "nat"

daemon/libnetwork/diagnostic/server.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/libnetwork/internal/caller"
+	"github.com/docker/docker/daemon/libnetwork/internal/caller"
 )
 
 // Server when the debug is enabled exposes a