Refactor portmapper to remove ALL global state

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 62522c9853)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

daemon/networkdriver/portmapper/mapper.go

@@ -18,14 +18,7 @@ type mapping struct {
 	container     net.Addr
 }
 
-var (
-	NewProxy = NewProxyCommand
-
-	DefaultPortMapper = NewWithPortAllocator(portallocator.DefaultPortAllocator)
-	SetIptablesChain  = DefaultPortMapper.SetIptablesChain
-	Map               = DefaultPortMapper.Map
-	Unmap             = DefaultPortMapper.Unmap
-)
+var NewProxy = NewProxyCommand
 
 var (
 	ErrUnknownBackendAddressType = errors.New("unknown container address type not supported")

daemon/networkdriver/portmapper/mapper_test.go

@@ -4,7 +4,6 @@ import (
 	"net"
 	"testing"
 
-	"github.com/docker/docker/daemon/networkdriver/portallocator"
 	"github.com/docker/docker/pkg/iptables"
 )
 
@@ -126,7 +125,7 @@ func TestMapAllPortsSingleInterface(t *testing.T) {
 	}()
 
 	for i := 0; i < 10; i++ {
-		start, end := portallocator.PortRange()
+		start, end := pm.allocator.Begin, pm.allocator.End
 		for i := start; i < end; i++ {
 			if host, err = pm.Map(srcAddr1, dstIp1, 0); err != nil {
 				t.Fatal(err)