From d5d32a285c6ce9a97700d0fdd9606d91dfea3fd9 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Mon, 23 Dec 2013 23:36:58 +0000
Subject: [PATCH] Move utility package 'iptables' to pkg/iptables
 Upstream-commit: 7799ae27ca1dd85761f0595346a0dda15bbeda6c Component: engine

---
 components/engine/integration/iptables_test.go   | 2 +-
 components/engine/links.go                       | 2 +-
 components/engine/network.go                     | 2 +-
 components/engine/network_test.go                | 3 ++-
 components/engine/{ => pkg}/iptables/MAINTAINERS | 0
 components/engine/{ => pkg}/iptables/iptables.go | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename components/engine/{ => pkg}/iptables/MAINTAINERS (100%)
 rename components/engine/{ => pkg}/iptables/iptables.go (100%)

diff --git a/components/engine/integration/iptables_test.go b/components/engine/integration/iptables_test.go
index 060d0fe074..1dd4194350 100644
--- a/components/engine/integration/iptables_test.go
+++ b/components/engine/integration/iptables_test.go
@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"github.com/dotcloud/docker/iptables"
+	"github.com/dotcloud/docker/pkg/iptables"
 	"os"
 	"testing"
 )
diff --git a/components/engine/links.go b/components/engine/links.go
index 2fe255b4c5..55834b92d2 100644
--- a/components/engine/links.go
+++ b/components/engine/links.go
@@ -2,7 +2,7 @@ package docker
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/iptables"
+	"github.com/dotcloud/docker/pkg/iptables"
 	"path"
 	"strings"
 )
diff --git a/components/engine/network.go b/components/engine/network.go
index 5ee5c4bee8..f02275d37a 100644
--- a/components/engine/network.go
+++ b/components/engine/network.go
@@ -4,7 +4,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/dotcloud/docker/iptables"
+	"github.com/dotcloud/docker/pkg/iptables"
 	"github.com/dotcloud/docker/pkg/netlink"
 	"github.com/dotcloud/docker/proxy"
 	"github.com/dotcloud/docker/utils"
diff --git a/components/engine/network_test.go b/components/engine/network_test.go
index 184b497938..69fcba01a2 100644
--- a/components/engine/network_test.go
+++ b/components/engine/network_test.go
@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"github.com/dotcloud/docker/iptables"
+	"github.com/dotcloud/docker/pkg/iptables"
 	"github.com/dotcloud/docker/proxy"
 	"net"
 	"testing"
@@ -340,6 +340,7 @@ func NewStubProxy(frontendAddr, backendAddr net.Addr) (proxy.Proxy, error) {
 }
 
 func TestPortMapper(t *testing.T) {
+	// FIXME: is this iptables chain still used anywhere?
 	var chain *iptables.Chain
 	mapper := &PortMapper{
 		tcpMapping:       make(map[string]*net.TCPAddr),
diff --git a/components/engine/iptables/MAINTAINERS b/components/engine/pkg/iptables/MAINTAINERS
similarity index 100%
rename from components/engine/iptables/MAINTAINERS
rename to components/engine/pkg/iptables/MAINTAINERS
diff --git a/components/engine/iptables/iptables.go b/components/engine/pkg/iptables/iptables.go
similarity index 100%
rename from components/engine/iptables/iptables.go
rename to components/engine/pkg/iptables/iptables.go