Fix libnetwork imports

After moving libnetwork to this repo, we need to update all the import
paths for libnetwork to point to docker/docker/libnetwork instead of
docker/libnetwork.
This change implements that.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

api/server/router/network/backend.go

@@ -6,7 +6,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 )
 
 // Backend is all the methods that need to be implemented

api/server/router/network/network_routes.go

@@ -14,8 +14,8 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	netconst "github.com/docker/libnetwork/datastore"
+	netconst "github.com/docker/docker/libnetwork/datastore"
 	"github.com/pkg/errors"
 )
 

builder/builder-next/builder.go

@@ -20,7 +20,7 @@ import (
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/system"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	controlapi "github.com/moby/buildkit/api/services/control"
 	"github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/control"

builder/builder-next/executor_unix.go

@@ -12,7 +12,7 @@ import (
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/moby/buildkit/executor"
 	"github.com/moby/buildkit/executor/oci"
 	"github.com/moby/buildkit/executor/runcexecutor"

builder/builder-next/executor_windows.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/moby/buildkit/executor"
 	"github.com/moby/buildkit/executor/oci"
 )

cmd/dockerd/daemon_unix.go

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

daemon/cluster.go

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

daemon/cluster/cluster.go

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

daemon/cluster/convert/network.go

@@ -6,7 +6,7 @@ import (
 	basictypes "github.com/docker/docker/api/types"
 	networktypes "github.com/docker/docker/api/types/network"
 	types "github.com/docker/docker/api/types/swarm"
-	netconst "github.com/docker/libnetwork/datastore"
+	netconst "github.com/docker/docker/libnetwork/datastore"
 	swarmapi "github.com/docker/swarmkit/api"
 	gogotypes "github.com/gogo/protobuf/types"
 )

daemon/cluster/executor/backend.go

@@ -19,9 +19,9 @@ import (
 	networkSettings "github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/plugin"
 	volumeopts "github.com/docker/docker/volume/service/opts"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	"github.com/docker/libnetwork/cluster"
+	"github.com/docker/docker/libnetwork/cluster"
-	networktypes "github.com/docker/libnetwork/types"
+	networktypes "github.com/docker/docker/libnetwork/types"
 	"github.com/docker/swarmkit/agent/exec"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 )

daemon/cluster/executor/container/adapter.go

@@ -21,7 +21,7 @@ import (
 	"github.com/docker/docker/daemon/cluster/convert"
 	executorpkg "github.com/docker/docker/daemon/cluster/executor"
 	volumeopts "github.com/docker/docker/volume/service/opts"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/docker/swarmkit/agent/exec"
 	"github.com/docker/swarmkit/api"
 	"github.com/docker/swarmkit/log"

daemon/cluster/executor/container/container.go

@@ -22,7 +22,7 @@ import (
 	clustertypes "github.com/docker/docker/daemon/cluster/provider"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
-	netconst "github.com/docker/libnetwork/datastore"
+	netconst "github.com/docker/docker/libnetwork/datastore"
 	"github.com/docker/swarmkit/agent/exec"
 	"github.com/docker/swarmkit/api"
 	"github.com/docker/swarmkit/api/genericresource"

daemon/cluster/executor/container/controller.go

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

daemon/cluster/executor/container/executor.go

@@ -15,7 +15,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"
-	networktypes "github.com/docker/libnetwork/types"
+	networktypes "github.com/docker/docker/libnetwork/types"
 	"github.com/docker/swarmkit/agent"
 	"github.com/docker/swarmkit/agent/exec"
 	"github.com/docker/swarmkit/api"

daemon/cluster/noderunner.go

@@ -10,7 +10,7 @@ import (
 
 	types "github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/daemon/cluster/executor/container"
-	lncluster "github.com/docker/libnetwork/cluster"
+	lncluster "github.com/docker/docker/libnetwork/cluster"
 	swarmapi "github.com/docker/swarmkit/api"
 	swarmallocator "github.com/docker/swarmkit/manager/allocator/cnmallocator"
 	swarmnode "github.com/docker/swarmkit/node"

daemon/config/config_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/docker/docker/daemon/discovery"
 	"github.com/docker/docker/opts"
-	"github.com/docker/libnetwork/ipamutils"
+	"github.com/docker/docker/libnetwork/ipamutils"
 	"github.com/spf13/pflag"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/container_operations.go

@@ -18,11 +18,11 @@ import (
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/runconfig"
 	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	netconst "github.com/docker/libnetwork/datastore"
+	netconst "github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 )
 

daemon/container_operations_unix.go

@@ -16,7 +16,7 @@ import (
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/runconfig"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/moby/sys/mount"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"

daemon/container_operations_windows.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/pkg/system"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

daemon/daemon.go

@@ -65,9 +65,9 @@ import (
 	"github.com/docker/docker/registry"
 	"github.com/docker/docker/runconfig"
 	volumesservice "github.com/docker/docker/volume/service"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	"github.com/docker/libnetwork/cluster"
+	"github.com/docker/docker/libnetwork/cluster"
-	nwconfig "github.com/docker/libnetwork/config"
+	nwconfig "github.com/docker/docker/libnetwork/config"
 	"github.com/moby/locker"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/semaphore"

daemon/daemon_linux.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/docker/docker/daemon/config"
-	"github.com/docker/libnetwork/resolvconf"
+	"github.com/docker/docker/libnetwork/resolvconf"
 	"github.com/moby/sys/mount"
 	"github.com/moby/sys/mountinfo"
 	"github.com/pkg/errors"

daemon/daemon_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/docker/docker/pkg/truncindex"
 	volumesservice "github.com/docker/docker/volume/service"
 	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/pkg/errors"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/daemon_unix.go

@@ -36,13 +36,13 @@ import (
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/runconfig"
 	volumemounts "github.com/docker/docker/volume/mounts"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	nwconfig "github.com/docker/libnetwork/config"
+	nwconfig "github.com/docker/docker/libnetwork/config"
-	"github.com/docker/libnetwork/drivers/bridge"
+	"github.com/docker/docker/libnetwork/drivers/bridge"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	lntypes "github.com/docker/libnetwork/types"
+	lntypes "github.com/docker/docker/libnetwork/types"
 	"github.com/moby/sys/mount"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/selinux/go-selinux"

daemon/daemon_windows.go

@@ -21,12 +21,12 @@ import (
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/runconfig"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	nwconfig "github.com/docker/libnetwork/config"
+	nwconfig "github.com/docker/docker/libnetwork/config"
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	winlibnetwork "github.com/docker/libnetwork/drivers/windows"
+	winlibnetwork "github.com/docker/docker/libnetwork/drivers/windows"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/windows"

daemon/events.go

@@ -10,7 +10,7 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/container"
 	daemonevents "github.com/docker/docker/daemon/events"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	swarmapi "github.com/docker/swarmkit/api"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/sirupsen/logrus"

daemon/network.go

@@ -21,14 +21,14 @@ import (
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/runconfig"
 	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	lncluster "github.com/docker/libnetwork/cluster"
+	lncluster "github.com/docker/docker/libnetwork/cluster"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipamapi"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/networkdb"
+	"github.com/docker/docker/libnetwork/networkdb"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	networktypes "github.com/docker/libnetwork/types"
+	networktypes "github.com/docker/docker/libnetwork/types"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

daemon/network_windows.go

@@ -3,7 +3,7 @@ package daemon
 import (
 	"strings"
 
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 )
 
 // getEndpointInNetwork returns the container's endpoint to the provided network.

daemon/oci_linux_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/pkg/containerfs"
 	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 	"gotest.tools/v3/skip"

daemon/prune.go

@@ -14,7 +14,7 @@ import (
 	timetypes "github.com/docker/docker/api/types/time"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/runconfig"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

daemon/reload_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/docker/docker/pkg/discovery"
 	_ "github.com/docker/docker/pkg/discovery/memory"
 	"github.com/docker/docker/registry"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/sirupsen/logrus"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"

daemon/rename.go

@@ -5,7 +5,7 @@ import (
 
 	dockercontainer "github.com/docker/docker/container"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

integration-cli/docker_cli_daemon_test.go

@@ -34,7 +34,7 @@ import (
 	"github.com/docker/docker/opts"
 	testdaemon "github.com/docker/docker/testutil/daemon"
 	units "github.com/docker/go-units"
-	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/docker/libnetwork/iptables"
 	"github.com/docker/libtrust"
 	"github.com/moby/sys/mount"
 	"golang.org/x/sys/unix"

integration-cli/docker_cli_network_unix_test.go

@@ -21,11 +21,11 @@ import (
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/runconfig"
 	testdaemon "github.com/docker/docker/testutil/daemon"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	remoteapi "github.com/docker/libnetwork/drivers/remote/api"
+	remoteapi "github.com/docker/docker/libnetwork/drivers/remote/api"
-	"github.com/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipamapi"
-	remoteipam "github.com/docker/libnetwork/ipams/remote/api"
+	remoteipam "github.com/docker/docker/libnetwork/ipams/remote/api"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
 	"github.com/vishvananda/netlink"
 	"golang.org/x/sys/unix"
 	"gotest.tools/v3/assert"

integration-cli/docker_cli_run_test.go

@@ -32,8 +32,8 @@ import (
 	"github.com/docker/docker/testutil"
 	"github.com/docker/docker/testutil/fakecontext"
 	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork/resolvconf"
+	"github.com/docker/docker/libnetwork/resolvconf"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/moby/sys/mountinfo"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/icmd"

integration-cli/docker_cli_swarm_test.go

@@ -24,9 +24,9 @@ import (
 	"github.com/docker/docker/integration-cli/checker"
 	"github.com/docker/docker/integration-cli/cli"
 	"github.com/docker/docker/integration-cli/daemon"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipamapi"
-	remoteipam "github.com/docker/libnetwork/ipams/remote/api"
+	remoteipam "github.com/docker/docker/libnetwork/ipams/remote/api"
 	"github.com/docker/swarmkit/ca/keyutils"
 	"github.com/vishvananda/netlink"
 	"gotest.tools/v3/assert"

libnetwork/agent.go

@@ -1,6 +1,6 @@
 package libnetwork
 
-//go:generate protoc -I.:Godeps/_workspace/src/github.com/gogo/protobuf  --gogo_out=import_path=github.com/docker/libnetwork,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. agent.proto
+//go:generate protoc -I.:Godeps/_workspace/src/github.com/gogo/protobuf  --gogo_out=import_path=github.com/docker/docker/libnetwork,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. agent.proto
 
 import (
 	"encoding/json"
@@ -10,12 +10,12 @@ import (
 	"sync"
 
 	"github.com/docker/go-events"
-	"github.com/docker/libnetwork/cluster"
+	"github.com/docker/docker/libnetwork/cluster"
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/networkdb"
+	"github.com/docker/docker/libnetwork/networkdb"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/gogo/protobuf/proto"
 	"github.com/sirupsen/logrus"
 )

libnetwork/api/api.go

@@ -8,10 +8,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/gorilla/mux"
 )
 

libnetwork/api/api_linux_test.go

@@ -1,8 +1,8 @@
 package api
 
 import (
-	"github.com/docker/libnetwork/drivers/bridge"
+	"github.com/docker/docker/libnetwork/drivers/bridge"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
 )
 
 func GetOpsMap(bridgeName, defaultMTU string) map[string]string {

libnetwork/api/api_test.go

@@ -13,12 +13,12 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 const (

libnetwork/api/types.go

@@ -1,6 +1,6 @@
 package api
 
-import "github.com/docker/libnetwork/types"
+import "github.com/docker/docker/libnetwork/types"
 
 /***********
  Resources

libnetwork/bitseq/sequence.go

@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/bitseq/sequence_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/docker/libkv/store"
 	"github.com/docker/libkv/store/boltdb"
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 const (

libnetwork/bitseq/store.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 // Key provides the Key to be used in KV Store

libnetwork/client/client.go

@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"strings"
 
-	flag "github.com/docker/libnetwork/client/mflag"
+	flag "github.com/docker/docker/libnetwork/client/mflag"
 )
 
 // CallFunc provides environment specific call utility to invoke backend functions from UI

libnetwork/client/client_service_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 func TestClientServiceInvalidCommand(t *testing.T) {

libnetwork/client/client_test.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 // nopCloser is used to provide a dummy CallFunc for Cmd()

libnetwork/client/mflag/example/example.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	flag "github.com/docker/libnetwork/client/mflag"
+	flag "github.com/docker/docker/libnetwork/client/mflag"
 )
 
 var (

libnetwork/client/mflag/flag_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 // ResetForTesting clears all flag state and sets the usage function as directed.

libnetwork/client/network.go

@@ -9,8 +9,8 @@ import (
 	"text/tabwriter"
 
 	"github.com/docker/docker/pkg/stringid"
-	flag "github.com/docker/libnetwork/client/mflag"
+	flag "github.com/docker/docker/libnetwork/client/mflag"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
 )
 
 type command struct {

libnetwork/client/service.go

@@ -10,8 +10,8 @@ import (
 	"text/tabwriter"
 
 	"github.com/docker/docker/pkg/stringid"
-	flag "github.com/docker/libnetwork/client/mflag"
+	flag "github.com/docker/docker/libnetwork/client/mflag"
-	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/docker/libnetwork/netutils"
 )
 
 var (

libnetwork/client/types.go

@@ -1,6 +1,6 @@
 package client
 
-import "github.com/docker/libnetwork/types"
+import "github.com/docker/docker/libnetwork/types"
 
 /***********
  Resources

libnetwork/cmd/diagnostic/main.go

@@ -12,9 +12,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	"github.com/docker/libnetwork/diagnostic"
+	"github.com/docker/docker/libnetwork/diagnostic"
-	"github.com/docker/libnetwork/drivers/overlay"
+	"github.com/docker/docker/libnetwork/drivers/overlay"
 	"github.com/sirupsen/logrus"
 )
 
@@ -56,7 +56,7 @@ func main() {
 
 	if _, ok := os.LookupEnv("DIND_CLIENT"); !ok && *joinPtr {
 		logrus.Fatal("you are not using the client in docker in docker mode, the use of the -a flag can be disruptive, " +
-			"please remove it (doc:https://github.com/docker/libnetwork/blob/master/cmd/diagnostic/README.md)")
+			"please remove it (doc:https://github.com/docker/docker/libnetwork/blob/master/cmd/diagnostic/README.md)")
 	}
 
 	logrus.Infof("Connecting to %s:%d checking ready", *ipPtr, *portPtr)

libnetwork/cmd/dnet/cmd.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/docker/libnetwork/client"
+	"github.com/docker/docker/libnetwork/client"
 	"github.com/moby/term"
 	"github.com/urfave/cli"
 )

libnetwork/cmd/dnet/dnet.go

@@ -23,16 +23,16 @@ import (
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/pkg/discovery"
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	"github.com/docker/libnetwork/api"
+	"github.com/docker/docker/libnetwork/api"
-	"github.com/docker/libnetwork/cluster"
+	"github.com/docker/docker/libnetwork/cluster"
-	"github.com/docker/libnetwork/config"
+	"github.com/docker/docker/libnetwork/config"
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/gorilla/mux"
 	"github.com/moby/term"
 	"github.com/sirupsen/logrus"

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

@@ -9,9 +9,9 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/docker/libnetwork/cmd/networkdb-test/dummyclient"
+	"github.com/docker/docker/libnetwork/cmd/networkdb-test/dummyclient"
-	"github.com/docker/libnetwork/diagnostic"
+	"github.com/docker/docker/libnetwork/diagnostic"
-	"github.com/docker/libnetwork/networkdb"
+	"github.com/docker/docker/libnetwork/networkdb"
 	"github.com/sirupsen/logrus"
 )
 

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

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

libnetwork/cmd/networkdb-test/testMain.go

@@ -4,8 +4,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/docker/libnetwork/cmd/networkdb-test/dbclient"
+	"github.com/docker/docker/libnetwork/cmd/networkdb-test/dbclient"
-	"github.com/docker/libnetwork/cmd/networkdb-test/dbserver"
+	"github.com/docker/docker/libnetwork/cmd/networkdb-test/dbserver"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/cmd/ovrouter/ovrouter.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/drivers/overlay"
+	"github.com/docker/docker/libnetwork/drivers/overlay"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/cmd/proxy/network_proxy_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/ishidawataru/sctp"
 	// this takes care of the incontainer flag
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 var testBuf = []byte("Buffalo buffalo Buffalo buffalo buffalo buffalo Buffalo buffalo")

libnetwork/cmd/readme_test/readme.go

@@ -5,10 +5,10 @@ import (
 	"log"
 
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/libnetwork"
+	"github.com/docker/docker/libnetwork"
-	"github.com/docker/libnetwork/config"
+	"github.com/docker/docker/libnetwork/config"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
 )
 
 func main() {

libnetwork/config/config.go

@@ -9,12 +9,12 @@ import (
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/docker/libkv/store"
-	"github.com/docker/libnetwork/cluster"
+	"github.com/docker/docker/libnetwork/cluster"
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/ipamutils"
+	"github.com/docker/docker/libnetwork/ipamutils"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/osl"
+	"github.com/docker/docker/libnetwork/osl"
-	"github.com/docker/libnetwork/portallocator"
+	"github.com/docker/docker/libnetwork/portallocator"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/config/config_test.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
 )
 
 func TestInvalidConfig(t *testing.T) {

libnetwork/controller.go

@@ -56,19 +56,19 @@ import (
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/plugins"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/libnetwork/cluster"
+	"github.com/docker/docker/libnetwork/cluster"
-	"github.com/docker/libnetwork/config"
+	"github.com/docker/docker/libnetwork/config"
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/diagnostic"
+	"github.com/docker/docker/libnetwork/diagnostic"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/drvregistry"
+	"github.com/docker/docker/libnetwork/drvregistry"
-	"github.com/docker/libnetwork/hostdiscovery"
+	"github.com/docker/docker/libnetwork/hostdiscovery"
-	"github.com/docker/libnetwork/ipamapi"
+	"github.com/docker/docker/libnetwork/ipamapi"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	"github.com/docker/libnetwork/osl"
+	"github.com/docker/docker/libnetwork/osl"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/moby/locker"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

libnetwork/datastore/datastore.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/docker/libkv"
 	"github.com/docker/libkv/store"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 //DataStore exported

libnetwork/datastore/datastore_test.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
 	"gotest.tools/v3/assert"
 )
 

libnetwork/datastore/mock_store.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/docker/libkv/store"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 var (

libnetwork/default_gateway.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/default_gateway_freebsd.go

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

libnetwork/default_gateway_linux.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/docker/libnetwork/drivers/bridge"
+	"github.com/docker/docker/libnetwork/drivers/bridge"
 )
 
 const libnGWNetwork = "docker_gwbridge"

libnetwork/default_gateway_windows.go

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

libnetwork/diagnostic/server.go

@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 
 	stackdump "github.com/docker/docker/pkg/signal"
-	"github.com/docker/libnetwork/internal/caller"
+	"github.com/docker/docker/libnetwork/internal/caller"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/driverapi/driverapi.go

@@ -4,7 +4,7 @@ import (
 	"net"
 
 	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
 )
 
 // NetworkPluginEndpointType represents the Endpoint Type used by Plugin system

libnetwork/driverapi/driverapi_test.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"testing"
 
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 func TestIPDataMarshalling(t *testing.T) {

libnetwork/driverapi/ipamdata.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 // MarshalJSON encodes IPAMData into json message

libnetwork/drivers/bridge/bridge.go

@@ -12,17 +12,17 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/docker/libnetwork/iptables"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/ns"
+	"github.com/docker/docker/libnetwork/ns"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	"github.com/docker/libnetwork/osl"
+	"github.com/docker/docker/libnetwork/osl"
-	"github.com/docker/libnetwork/portmapper"
+	"github.com/docker/docker/libnetwork/portmapper"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )

libnetwork/drivers/bridge/bridge_store.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/drivers/bridge/bridge_test.go

@@ -9,13 +9,13 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/docker/libnetwork/iptables"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork/options"
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/brmanager/brmanager.go

@@ -1,10 +1,10 @@
 package brmanager
 
 import (
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 const networkType = "bridge"

libnetwork/drivers/bridge/interface_test.go

@@ -3,7 +3,7 @@ package bridge
 import (
 	"testing"
 
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/link.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/docker/libnetwork/iptables"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/drivers/bridge/link_test.go

@@ -3,7 +3,7 @@ package bridge
 import (
 	"testing"
 
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 func getPorts() []types.TransportPort {

libnetwork/drivers/bridge/network_test.go

@@ -3,9 +3,9 @@ package bridge
 import (
 	"testing"
 
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/port_mapping.go

@@ -7,7 +7,7 @@ import (
 	"net"
 	"sync"
 
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/ishidawataru/sctp"
 	"github.com/sirupsen/logrus"
 )

libnetwork/drivers/bridge/port_mapping_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 func TestMain(m *testing.M) {

libnetwork/drivers/bridge/setup_device.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/docker/libnetwork/netutils"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )

libnetwork/drivers/bridge/setup_device_test.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"testing"
 
-	"github.com/docker/libnetwork/netutils"
+	"github.com/docker/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/setup_firewalld.go

@@ -1,6 +1,6 @@
 package bridge
 
-import "github.com/docker/libnetwork/iptables"
+import "github.com/docker/docker/libnetwork/iptables"
 
 func (n *bridgeNetwork) setupFirewalld(config *networkConfiguration, i *bridgeInterface) error {
 	d := n.driver

libnetwork/drivers/bridge/setup_ip_forwarding.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/docker/libnetwork/iptables"
 	"github.com/sirupsen/logrus"
 )
 

libnetwork/drivers/bridge/setup_ip_tables.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/docker/libnetwork/iptables"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )

libnetwork/drivers/bridge/setup_ip_tables_test.go

@@ -4,9 +4,9 @@ import (
 	"net"
 	"testing"
 
-	"github.com/docker/libnetwork/iptables"
+	"github.com/docker/docker/libnetwork/iptables"
-	"github.com/docker/libnetwork/portmapper"
+	"github.com/docker/docker/libnetwork/portmapper"
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/setup_ipv4.go

@@ -7,7 +7,7 @@ import (
 	"net"
 	"path/filepath"
 
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )

libnetwork/drivers/bridge/setup_ipv4_test.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/setup_ipv6.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"os"
 
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )

libnetwork/drivers/bridge/setup_ipv6_test.go

@@ -7,7 +7,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/bridge/setup_verify.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/libnetwork/ns"
+	"github.com/docker/docker/libnetwork/ns"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )

libnetwork/drivers/bridge/setup_verify_test.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/docker/libnetwork/testutils"
+	"github.com/docker/docker/libnetwork/testutils"
 	"github.com/vishvananda/netlink"
 )
 

libnetwork/drivers/host/host.go

@@ -3,10 +3,10 @@ package host
 import (
 	"sync"
 
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 const networkType = "host"

libnetwork/drivers/host/host_test.go

@@ -3,8 +3,8 @@ package host
 import (
 	"testing"
 
-	_ "github.com/docker/libnetwork/testutils"
+	_ "github.com/docker/docker/libnetwork/testutils"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 func TestDriver(t *testing.T) {

libnetwork/drivers/ipvlan/ipvlan.go

@@ -4,11 +4,11 @@ import (
 	"net"
 	"sync"
 
-	"github.com/docker/libnetwork/datastore"
+	"github.com/docker/docker/libnetwork/datastore"
-	"github.com/docker/libnetwork/discoverapi"
+	"github.com/docker/docker/libnetwork/discoverapi"
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/osl"
+	"github.com/docker/docker/libnetwork/osl"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 )
 
 const (

libnetwork/drivers/ipvlan/ipvlan_endpoint.go

@@ -3,11 +3,11 @@ package ipvlan
 import (
 	"fmt"
 
-	"github.com/docker/libnetwork/driverapi"
+	"github.com/docker/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/ns"
+	"github.com/docker/docker/libnetwork/ns"
-	"github.com/docker/libnetwork/osl"
+	"github.com/docker/docker/libnetwork/osl"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 )