From 4b7a6e26135aa12b026aec23650995a1679931be Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 14 Mar 2014 14:03:23 -0700 Subject: [PATCH] Move networking drivers into runtime top level pkg Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: 2230c9b9a735d731cc2fee4137633eb98b9da9d5 Component: engine --- components/engine/builtins/builtins.go | 2 +- components/engine/daemonconfig/config.go | 2 +- .../{ => runtime}/networkdriver/ipallocator/allocator.go | 2 +- .../networkdriver/ipallocator/allocator_test.go | 0 .../engine/{ => runtime}/networkdriver/lxc/driver.go | 8 ++++---- components/engine/{ => runtime}/networkdriver/network.go | 0 .../engine/{ => runtime}/networkdriver/network_test.go | 0 .../networkdriver/portallocator/portallocator.go | 0 .../networkdriver/portallocator/portallocator_test.go | 0 .../{ => runtime}/networkdriver/portmapper/mapper.go | 0 .../{ => runtime}/networkdriver/portmapper/mapper_test.go | 0 components/engine/{ => runtime}/networkdriver/utils.go | 0 components/engine/runtime/runtime.go | 4 ++-- 13 files changed, 9 insertions(+), 9 deletions(-) rename components/engine/{ => runtime}/networkdriver/ipallocator/allocator.go (98%) rename components/engine/{ => runtime}/networkdriver/ipallocator/allocator_test.go (100%) rename components/engine/{ => runtime}/networkdriver/lxc/driver.go (98%) rename components/engine/{ => runtime}/networkdriver/network.go (100%) rename components/engine/{ => runtime}/networkdriver/network_test.go (100%) rename components/engine/{ => runtime}/networkdriver/portallocator/portallocator.go (100%) rename components/engine/{ => runtime}/networkdriver/portallocator/portallocator_test.go (100%) rename components/engine/{ => runtime}/networkdriver/portmapper/mapper.go (100%) rename components/engine/{ => runtime}/networkdriver/portmapper/mapper_test.go (100%) rename components/engine/{ => runtime}/networkdriver/utils.go (100%) diff --git a/components/engine/builtins/builtins.go b/components/engine/builtins/builtins.go index eb4a0be874..86f3973c62 100644 --- a/components/engine/builtins/builtins.go +++ b/components/engine/builtins/builtins.go @@ -4,7 +4,7 @@ import ( "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/api" - "github.com/dotcloud/docker/networkdriver/lxc" + "github.com/dotcloud/docker/runtime/networkdriver/lxc" "github.com/dotcloud/docker/server" ) diff --git a/components/engine/daemonconfig/config.go b/components/engine/daemonconfig/config.go index 0aee7e78ba..b26d3eec3a 100644 --- a/components/engine/daemonconfig/config.go +++ b/components/engine/daemonconfig/config.go @@ -4,7 +4,7 @@ import ( "net" "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/networkdriver" + "github.com/dotcloud/docker/runtime/networkdriver" ) const ( diff --git a/components/engine/networkdriver/ipallocator/allocator.go b/components/engine/runtime/networkdriver/ipallocator/allocator.go similarity index 98% rename from components/engine/networkdriver/ipallocator/allocator.go rename to components/engine/runtime/networkdriver/ipallocator/allocator.go index 1c5a7b4cc2..2950e37003 100644 --- a/components/engine/networkdriver/ipallocator/allocator.go +++ b/components/engine/runtime/networkdriver/ipallocator/allocator.go @@ -3,7 +3,7 @@ package ipallocator import ( "encoding/binary" "errors" - "github.com/dotcloud/docker/networkdriver" + "github.com/dotcloud/docker/runtime/networkdriver" "github.com/dotcloud/docker/pkg/collections" "net" "sync" diff --git a/components/engine/networkdriver/ipallocator/allocator_test.go b/components/engine/runtime/networkdriver/ipallocator/allocator_test.go similarity index 100% rename from components/engine/networkdriver/ipallocator/allocator_test.go rename to components/engine/runtime/networkdriver/ipallocator/allocator_test.go diff --git a/components/engine/networkdriver/lxc/driver.go b/components/engine/runtime/networkdriver/lxc/driver.go similarity index 98% rename from components/engine/networkdriver/lxc/driver.go rename to components/engine/runtime/networkdriver/lxc/driver.go index 6185c42752..746bcfb5b0 100644 --- a/components/engine/networkdriver/lxc/driver.go +++ b/components/engine/runtime/networkdriver/lxc/driver.go @@ -3,10 +3,10 @@ package lxc import ( "fmt" "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/networkdriver" - "github.com/dotcloud/docker/networkdriver/ipallocator" - "github.com/dotcloud/docker/networkdriver/portallocator" - "github.com/dotcloud/docker/networkdriver/portmapper" + "github.com/dotcloud/docker/runtime/networkdriver" + "github.com/dotcloud/docker/runtime/networkdriver/ipallocator" + "github.com/dotcloud/docker/runtime/networkdriver/portallocator" + "github.com/dotcloud/docker/runtime/networkdriver/portmapper" "github.com/dotcloud/docker/pkg/iptables" "github.com/dotcloud/docker/pkg/netlink" "github.com/dotcloud/docker/utils" diff --git a/components/engine/networkdriver/network.go b/components/engine/runtime/networkdriver/network.go similarity index 100% rename from components/engine/networkdriver/network.go rename to components/engine/runtime/networkdriver/network.go diff --git a/components/engine/networkdriver/network_test.go b/components/engine/runtime/networkdriver/network_test.go similarity index 100% rename from components/engine/networkdriver/network_test.go rename to components/engine/runtime/networkdriver/network_test.go diff --git a/components/engine/networkdriver/portallocator/portallocator.go b/components/engine/runtime/networkdriver/portallocator/portallocator.go similarity index 100% rename from components/engine/networkdriver/portallocator/portallocator.go rename to components/engine/runtime/networkdriver/portallocator/portallocator.go diff --git a/components/engine/networkdriver/portallocator/portallocator_test.go b/components/engine/runtime/networkdriver/portallocator/portallocator_test.go similarity index 100% rename from components/engine/networkdriver/portallocator/portallocator_test.go rename to components/engine/runtime/networkdriver/portallocator/portallocator_test.go diff --git a/components/engine/networkdriver/portmapper/mapper.go b/components/engine/runtime/networkdriver/portmapper/mapper.go similarity index 100% rename from components/engine/networkdriver/portmapper/mapper.go rename to components/engine/runtime/networkdriver/portmapper/mapper.go diff --git a/components/engine/networkdriver/portmapper/mapper_test.go b/components/engine/runtime/networkdriver/portmapper/mapper_test.go similarity index 100% rename from components/engine/networkdriver/portmapper/mapper_test.go rename to components/engine/runtime/networkdriver/portmapper/mapper_test.go diff --git a/components/engine/networkdriver/utils.go b/components/engine/runtime/networkdriver/utils.go similarity index 100% rename from components/engine/networkdriver/utils.go rename to components/engine/runtime/networkdriver/utils.go diff --git a/components/engine/runtime/runtime.go b/components/engine/runtime/runtime.go index 32584cbf6e..092b5a8130 100644 --- a/components/engine/runtime/runtime.go +++ b/components/engine/runtime/runtime.go @@ -17,8 +17,8 @@ import ( _ "github.com/dotcloud/docker/graphdriver/devmapper" _ "github.com/dotcloud/docker/graphdriver/vfs" "github.com/dotcloud/docker/image" - _ "github.com/dotcloud/docker/networkdriver/lxc" - "github.com/dotcloud/docker/networkdriver/portallocator" + _ "github.com/dotcloud/docker/runtime/networkdriver/lxc" + "github.com/dotcloud/docker/runtime/networkdriver/portallocator" "github.com/dotcloud/docker/pkg/graphdb" "github.com/dotcloud/docker/pkg/sysinfo" "github.com/dotcloud/docker/runconfig"