From 8ca185e2eeb4add10f396a052f8698fd0f8e1051 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Tue, 24 Feb 2015 11:29:06 -0800 Subject: [PATCH] Move bridge to drivers/ Signed-off-by: Arnaud Porterie --- libnetwork/cmd/test/main.go | 2 +- libnetwork/{ => drivers}/bridge/bridge.go | 0 libnetwork/{ => drivers}/bridge/interface.go | 0 libnetwork/{ => drivers}/bridge/network.go | 0 libnetwork/{ => drivers}/bridge/resolvconf.go | 0 libnetwork/{ => drivers}/bridge/setup.go | 0 libnetwork/{ => drivers}/bridge/setup_device.go | 0 libnetwork/{ => drivers}/bridge/setup_device_test.go | 0 libnetwork/{ => drivers}/bridge/setup_fixedcidrv4.go | 0 libnetwork/{ => drivers}/bridge/setup_fixedcidrv6.go | 0 libnetwork/{ => drivers}/bridge/setup_ipv4.go | 0 libnetwork/{ => drivers}/bridge/setup_ipv4_test.go | 0 libnetwork/{ => drivers}/bridge/setup_ipv6.go | 0 libnetwork/{ => drivers}/bridge/setup_verify.go | 0 14 files changed, 1 insertion(+), 1 deletion(-) rename libnetwork/{ => drivers}/bridge/bridge.go (100%) rename libnetwork/{ => drivers}/bridge/interface.go (100%) rename libnetwork/{ => drivers}/bridge/network.go (100%) rename libnetwork/{ => drivers}/bridge/resolvconf.go (100%) rename libnetwork/{ => drivers}/bridge/setup.go (100%) rename libnetwork/{ => drivers}/bridge/setup_device.go (100%) rename libnetwork/{ => drivers}/bridge/setup_device_test.go (100%) rename libnetwork/{ => drivers}/bridge/setup_fixedcidrv4.go (100%) rename libnetwork/{ => drivers}/bridge/setup_fixedcidrv6.go (100%) rename libnetwork/{ => drivers}/bridge/setup_ipv4.go (100%) rename libnetwork/{ => drivers}/bridge/setup_ipv4_test.go (100%) rename libnetwork/{ => drivers}/bridge/setup_ipv6.go (100%) rename libnetwork/{ => drivers}/bridge/setup_verify.go (100%) diff --git a/libnetwork/cmd/test/main.go b/libnetwork/cmd/test/main.go index bb2d041068..2acb395451 100644 --- a/libnetwork/cmd/test/main.go +++ b/libnetwork/cmd/test/main.go @@ -6,7 +6,7 @@ import ( "net" "github.com/docker/libnetwork" - _ "github.com/docker/libnetwork/bridge" + _ "github.com/docker/libnetwork/drivers/bridge" ) func main() { diff --git a/libnetwork/bridge/bridge.go b/libnetwork/drivers/bridge/bridge.go similarity index 100% rename from libnetwork/bridge/bridge.go rename to libnetwork/drivers/bridge/bridge.go diff --git a/libnetwork/bridge/interface.go b/libnetwork/drivers/bridge/interface.go similarity index 100% rename from libnetwork/bridge/interface.go rename to libnetwork/drivers/bridge/interface.go diff --git a/libnetwork/bridge/network.go b/libnetwork/drivers/bridge/network.go similarity index 100% rename from libnetwork/bridge/network.go rename to libnetwork/drivers/bridge/network.go diff --git a/libnetwork/bridge/resolvconf.go b/libnetwork/drivers/bridge/resolvconf.go similarity index 100% rename from libnetwork/bridge/resolvconf.go rename to libnetwork/drivers/bridge/resolvconf.go diff --git a/libnetwork/bridge/setup.go b/libnetwork/drivers/bridge/setup.go similarity index 100% rename from libnetwork/bridge/setup.go rename to libnetwork/drivers/bridge/setup.go diff --git a/libnetwork/bridge/setup_device.go b/libnetwork/drivers/bridge/setup_device.go similarity index 100% rename from libnetwork/bridge/setup_device.go rename to libnetwork/drivers/bridge/setup_device.go diff --git a/libnetwork/bridge/setup_device_test.go b/libnetwork/drivers/bridge/setup_device_test.go similarity index 100% rename from libnetwork/bridge/setup_device_test.go rename to libnetwork/drivers/bridge/setup_device_test.go diff --git a/libnetwork/bridge/setup_fixedcidrv4.go b/libnetwork/drivers/bridge/setup_fixedcidrv4.go similarity index 100% rename from libnetwork/bridge/setup_fixedcidrv4.go rename to libnetwork/drivers/bridge/setup_fixedcidrv4.go diff --git a/libnetwork/bridge/setup_fixedcidrv6.go b/libnetwork/drivers/bridge/setup_fixedcidrv6.go similarity index 100% rename from libnetwork/bridge/setup_fixedcidrv6.go rename to libnetwork/drivers/bridge/setup_fixedcidrv6.go diff --git a/libnetwork/bridge/setup_ipv4.go b/libnetwork/drivers/bridge/setup_ipv4.go similarity index 100% rename from libnetwork/bridge/setup_ipv4.go rename to libnetwork/drivers/bridge/setup_ipv4.go diff --git a/libnetwork/bridge/setup_ipv4_test.go b/libnetwork/drivers/bridge/setup_ipv4_test.go similarity index 100% rename from libnetwork/bridge/setup_ipv4_test.go rename to libnetwork/drivers/bridge/setup_ipv4_test.go diff --git a/libnetwork/bridge/setup_ipv6.go b/libnetwork/drivers/bridge/setup_ipv6.go similarity index 100% rename from libnetwork/bridge/setup_ipv6.go rename to libnetwork/drivers/bridge/setup_ipv6.go diff --git a/libnetwork/bridge/setup_verify.go b/libnetwork/drivers/bridge/setup_verify.go similarity index 100% rename from libnetwork/bridge/setup_verify.go rename to libnetwork/drivers/bridge/setup_verify.go