@@ -139,7 +139,7 @@ func InitContainer(c *Command) *configs.Config {

 	container.Hostname = getEnv("HOSTNAME", c.ProcessConfig.Env)

 	container.Cgroups.Name = c.ID

-	container.Cgroups.AllowedDevices = c.AllowedDevices

+	container.Cgroups.Resources.AllowedDevices = c.AllowedDevices

 	container.Devices = c.AutoCreatedDevices

 	container.Rootfs = c.Rootfs

 	container.Readonlyfs = c.ReadonlyRootfs

@@ -170,23 +170,23 @@ func getEnv(key string, env []string) string {

 // SetupCgroups setups cgroup resources for a container.

 func SetupCgroups(container *configs.Config, c *Command) error {

 	if c.Resources != nil {

-		container.Cgroups.CpuShares = c.Resources.CPUShares

-		container.Cgroups.Memory = c.Resources.Memory

-		container.Cgroups.MemoryReservation = c.Resources.MemoryReservation

-		container.Cgroups.MemorySwap = c.Resources.MemorySwap

-		container.Cgroups.KernelMemory = c.Resources.KernelMemory

-		container.Cgroups.CpusetCpus = c.Resources.CpusetCpus

-		container.Cgroups.CpusetMems = c.Resources.CpusetMems

-		container.Cgroups.CpuPeriod = c.Resources.CPUPeriod

-		container.Cgroups.CpuQuota = c.Resources.CPUQuota

-		container.Cgroups.BlkioWeight = c.Resources.BlkioWeight

-		container.Cgroups.BlkioWeightDevice = c.Resources.BlkioWeightDevice

-		container.Cgroups.BlkioThrottleReadBpsDevice = c.Resources.BlkioThrottleReadBpsDevice

-		container.Cgroups.BlkioThrottleWriteBpsDevice = c.Resources.BlkioThrottleWriteBpsDevice

-		container.Cgroups.BlkioThrottleReadIOPSDevice = c.Resources.BlkioThrottleReadIOpsDevice

-		container.Cgroups.BlkioThrottleWriteIOPSDevice = c.Resources.BlkioThrottleWriteIOpsDevice

-		container.Cgroups.OomKillDisable = c.Resources.OomKillDisable

-		container.Cgroups.MemorySwappiness = c.Resources.MemorySwappiness

+		container.Cgroups.Resources.CpuShares = c.Resources.CPUShares

+		container.Cgroups.Resources.Memory = c.Resources.Memory

+		container.Cgroups.Resources.MemoryReservation = c.Resources.MemoryReservation

+		container.Cgroups.Resources.MemorySwap = c.Resources.MemorySwap

+		container.Cgroups.Resources.KernelMemory = c.Resources.KernelMemory

+		container.Cgroups.Resources.CpusetCpus = c.Resources.CpusetCpus

+		container.Cgroups.Resources.CpusetMems = c.Resources.CpusetMems

+		container.Cgroups.Resources.CpuPeriod = c.Resources.CPUPeriod

+		container.Cgroups.Resources.CpuQuota = c.Resources.CPUQuota

+		container.Cgroups.Resources.BlkioWeight = c.Resources.BlkioWeight

+		container.Cgroups.Resources.BlkioWeightDevice = c.Resources.BlkioWeightDevice

+		container.Cgroups.Resources.BlkioThrottleReadBpsDevice = c.Resources.BlkioThrottleReadBpsDevice

+		container.Cgroups.Resources.BlkioThrottleWriteBpsDevice = c.Resources.BlkioThrottleWriteBpsDevice

+		container.Cgroups.Resources.BlkioThrottleReadIOPSDevice = c.Resources.BlkioThrottleReadIOpsDevice

+		container.Cgroups.Resources.BlkioThrottleWriteIOPSDevice = c.Resources.BlkioThrottleWriteIOpsDevice

+		container.Cgroups.Resources.OomKillDisable = c.Resources.OomKillDisable

+		container.Cgroups.Resources.MemorySwappiness = c.Resources.MemorySwappiness

 	}

 	return nil

@@ -251,7 +251,7 @@ func (d *Driver) setupRemappedRoot(container *configs.Config, c *execdriver.Comm

 func (d *Driver) setPrivileged(container *configs.Config) (err error) {

 	container.Capabilities = execdriver.GetAllCapabilities()

-	container.Cgroups.AllowAllDevices = true

+	container.Cgroups.Resources.AllowAllDevices = true

 	hostDevices, err := devices.HostDevices()

 	if err != nil {

@@ -385,7 +385,7 @@ func (d *Driver) Stats(id string) (*execdriver.ResourceStats, error) {

 	if err != nil {

 		return nil, err

 	}

-	memoryLimit := c.Config().Cgroups.Memory

+	memoryLimit := c.Config().Cgroups.Resources.Memory

 	// if the container does not have any memory limit specified set the

 	// limit to the machines memory

 	if memoryLimit == 0 {

@@ -40,9 +40,11 @@ func New() *configs.Config {

 			{Type: "NEWUSER"},

 		}),

 		Cgroups: &configs.Cgroup{

-			Parent:           "/docker",

-			AllowAllDevices:  false,

-			MemorySwappiness: -1,

+			Parent: "/docker",

+			Resources: &configs.Resources{

+				AllowAllDevices:  false,

+				MemorySwappiness: -1,

+			},

 		},

 		Mounts: []*configs.Mount{

 			{

@@ -51,7 +51,7 @@ clone git github.com/miekg/pkcs11 80f102b5cac759de406949c47f0928b99bd64cdf

 clone git github.com/jfrazelle/go v1.5.1-1

 clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c

-clone git github.com/opencontainers/runc ba1568de399395774ad84c2ace65937814c542ed # libcontainer

+clone git github.com/opencontainers/runc d97d5e8b007e4657316eed76ea30bc0f690230cf # libcontainer

 clone git github.com/opencontainers/specs 46d949ea81080c5f60dfb72ee91468b1e9fb2998 # specs

 clone git github.com/seccomp/libseccomp-golang 1b506fc7c24eec5a3693cdcbed40d9c226cfc6a1

 # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)

deleted file mode 100644

@@ -1,55 +0,0 @@

-# Contributing to Docker

-

-### Sign your work

-

-The sign-off is a simple line at the end of the explanation for the patch. Your

-signature certifies that you wrote the patch or otherwise have the right to pass

-it on as an open-source patch. The rules are pretty simple: if you can certify

-the below (from [developercertificate.org](http://developercertificate.org/)):

-

-```

-Developer Certificate of Origin

-Version 1.1

-

-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.

-660 York Street, Suite 102,

-San Francisco, CA 94110 USA

-

-Everyone is permitted to copy and distribute verbatim copies of this

-license document, but changing it is not allowed.

-

-Developer's Certificate of Origin 1.1

-

-By making a contribution to this project, I certify that:

-

-(a) The contribution was created in whole or in part by me and I

-    have the right to submit it under the open source license

-    indicated in the file; or

-

-(b) The contribution is based upon previous work that, to the best

-    of my knowledge, is covered under an appropriate open source

-    license and I have the right under that license to submit that

-    work with modifications, whether created in whole or in part

-    by me, under the same open source license (unless I am

-    permitted to submit under a different license), as indicated

-    in the file; or

-

-(c) The contribution was provided directly to me by some other

-    person who certified (a), (b) or (c) and I have not modified

-    it.

-

-(d) I understand and agree that this project and the contribution

-    are public and that a record of the contribution (including all

-    personal information I submit with it, including my sign-off) is

-    maintained indefinitely and may be redistributed consistent with

-    this project or the open source license(s) involved.

-```

-

-Then you just add a line to every git commit message:

-

-    Signed-off-by: Joe Smith <joe.smith@email.com>

-

-Use your real name (sorry, no pseudonyms or anonymous contributions.)

-

-If you set your `user.name` and `user.email` git configs, you can sign your

-commit automatically with `git commit -s`.

deleted file mode 100644

@@ -1,27 +0,0 @@

-# go-connections maintainers file

-#

-# This file describes who runs the docker/go-connections project and how.

-# This is a living document - if you see something out of date or missing, speak up!

-#

-# It is structured to be consumable by both humans and programs.

-# To extract its contents programmatically, use any TOML-compliant parser.

-#

-# This file is compiled into the MAINTAINERS file in docker/opensource.

-#

-[Org]

-	[Org."Core maintainers"]

-		people = [

-			"calavera",

-		]

-

-[people]

-

-# A reference list of all people associated with the project.

-# All other sections should refer to people by their canonical key

-# in the people section.

-

-	# ADD YOURSELF HERE IN ALPHABETICAL ORDER

-	[people.calavera]

-	Name = "David Calavera"

-	Email = "david.calavera@gmail.com"

-	GitHub = "calavera"

deleted file mode 100644

@@ -1,13 +0,0 @@

-[![GoDoc](https://godoc.org/github.com/docker/go-connections?status.svg)](https://godoc.org/github.com/docker/go-connections)

-

-# Introduction

-

-go-connections provides common package to work with network connections.

-

-## Usage

-

-See the [docs in godoc](https://godoc.org/github.com/docker/go-connections) for examples and documentation.

-

-## License

-

-go-connections is licensed under the Apache License, Version 2.0. See [LICENSE](LICENSE) for the full license text.

deleted file mode 100644

@@ -1,14 +0,0 @@

-dependencies:

-  pre:

-    # setup ipv6

-    - sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0 net.ipv6.conf.default.disable_ipv6=0 net.ipv6.conf.all.disable_ipv6=0

-  post:

-    # install golint

-    - go get github.com/golang/lint/golint

-

-test:

-  pre:

-    # run analysis before tests

-    - go vet ./...

-    - test -z "$(golint ./... | tee /dev/stderr)"

-    - test -z "$(gofmt -s -l . | tee /dev/stderr)"

deleted file mode 100644

@@ -1,3 +0,0 @@

-// Package connections provides libraries to work with network connections.

-// This library is divided in several components for specific usage.

-package connections

deleted file mode 100644

@@ -1,525 +0,0 @@

-package nat

-

-import (

-	"testing"

-)

-

-func TestParsePort(t *testing.T) {

-	var (

-		p   int

-		err error

-	)

-

-	p, err = ParsePort("1234")

-

-	if err != nil || p != 1234 {

-		t.Fatal("Parsing '1234' did not succeed")

-	}

-

-	// FIXME currently this is a valid port. I don't think it should be.

-	// I'm leaving this test commented out until we make a decision.

-	// - erikh

-

-	/*

-		p, err = ParsePort("0123")

-

-		if err != nil {

-		    t.Fatal("Successfully parsed port '0123' to '123'")

-		}

-	*/

-

-	p, err = ParsePort("asdf")

-

-	if err == nil || p != 0 {

-		t.Fatal("Parsing port 'asdf' succeeded")

-	}

-

-	p, err = ParsePort("1asdf")

-

-	if err == nil || p != 0 {

-		t.Fatal("Parsing port '1asdf' succeeded")

-	}

-}

-

-func TestParsePortRangeToInt(t *testing.T) {

-	var (

-		begin int

-		end   int

-		err   error

-	)

-

-	type TestRange struct {

-		Range string

-		Begin int

-		End   int

-	}

-	validRanges := []TestRange{

-		{"1234", 1234, 1234},

-		{"1234-1234", 1234, 1234},

-		{"1234-1235", 1234, 1235},

-		{"8000-9000", 8000, 9000},

-		{"0", 0, 0},

-		{"0-0", 0, 0},

-	}

-

-	for _, r := range validRanges {

-		begin, end, err = ParsePortRangeToInt(r.Range)

-

-		if err != nil || begin != r.Begin {

-			t.Fatalf("Parsing port range '%s' did not succeed. Expected begin %d, got %d", r.Range, r.Begin, begin)

-		}

-		if err != nil || end != r.End {

-			t.Fatalf("Parsing port range '%s' did not succeed. Expected end %d, got %d", r.Range, r.End, end)

-		}

-	}

-

-	invalidRanges := []string{

-		"asdf",

-		"1asdf",

-		"9000-8000",

-		"9000-",

-		"-8000",

-		"-8000-",

-	}

-

-	for _, r := range invalidRanges {

-		begin, end, err = ParsePortRangeToInt(r)

-

-		if err == nil || begin != 0 || end != 0 {

-			t.Fatalf("Parsing port range '%s' succeeded", r)

-		}

-	}

-}

-

-func TestPort(t *testing.T) {

-	p, err := NewPort("tcp", "1234")

-

-	if err != nil {

-		t.Fatalf("tcp, 1234 had a parsing issue: %v", err)

-	}

-

-	if string(p) != "1234/tcp" {

-		t.Fatal("tcp, 1234 did not result in the string 1234/tcp")

-	}

-

-	if p.Proto() != "tcp" {

-		t.Fatal("protocol was not tcp")

-	}

-

-	if p.Port() != "1234" {

-		t.Fatal("port string value was not 1234")

-	}

-

-	if p.Int() != 1234 {

-		t.Fatal("port int value was not 1234")

-	}

-

-	p, err = NewPort("tcp", "asd1234")

-	if err == nil {

-		t.Fatal("tcp, asd1234 was supposed to fail")

-	}

-

-	p, err = NewPort("tcp", "1234-1230")

-	if err == nil {

-		t.Fatal("tcp, 1234-1230 was supposed to fail")

-	}

-

-	p, err = NewPort("tcp", "1234-1242")

-	if err != nil {

-		t.Fatalf("tcp, 1234-1242 had a parsing issue: %v", err)

-	}

-

-	if string(p) != "1234-1242/tcp" {

-		t.Fatal("tcp, 1234-1242 did not result in the string 1234-1242/tcp")

-	}

-}

-

-func TestSplitProtoPort(t *testing.T) {

-	var (

-		proto string

-		port  string

-	)

-

-	proto, port = SplitProtoPort("1234/tcp")

-

-	if proto != "tcp" || port != "1234" {

-		t.Fatal("Could not split 1234/tcp properly")

-	}

-

-	proto, port = SplitProtoPort("")

-

-	if proto != "" || port != "" {

-		t.Fatal("parsing an empty string yielded surprising results", proto, port)

-	}

-

-	proto, port = SplitProtoPort("1234")

-

-	if proto != "tcp" || port != "1234" {

-		t.Fatal("tcp is not the default protocol for portspec '1234'", proto, port)

-	}

-

-	proto, port = SplitProtoPort("1234/")

-

-	if proto != "tcp" || port != "1234" {

-		t.Fatal("parsing '1234/' yielded:" + port + "/" + proto)

-	}

-

-	proto, port = SplitProtoPort("/tcp")

-

-	if proto != "" || port != "" {

-		t.Fatal("parsing '/tcp' yielded:" + port + "/" + proto)

-	}

-}

-

-func TestParsePortSpecs(t *testing.T) {

-	var (

-		portMap    map[Port]struct{}

-		bindingMap map[Port][]PortBinding

-		err        error

-	)

-

-	portMap, bindingMap, err = ParsePortSpecs([]string{"1234/tcp", "2345/udp"})

-

-	if err != nil {

-		t.Fatalf("Error while processing ParsePortSpecs: %s", err)

-	}

-

-	if _, ok := portMap[Port("1234/tcp")]; !ok {

-		t.Fatal("1234/tcp was not parsed properly")

-	}

-

-	if _, ok := portMap[Port("2345/udp")]; !ok {

-		t.Fatal("2345/udp was not parsed properly")

-	}

-

-	for portspec, bindings := range bindingMap {

-		if len(bindings) != 1 {

-			t.Fatalf("%s should have exactly one binding", portspec)

-		}

-

-		if bindings[0].HostIP != "" {

-			t.Fatalf("HostIP should not be set for %s", portspec)

-		}

-

-		if bindings[0].HostPort != "" {

-			t.Fatalf("HostPort should not be set for %s", portspec)

-		}

-	}

-

-	portMap, bindingMap, err = ParsePortSpecs([]string{"1234:1234/tcp", "2345:2345/udp"})

-

-	if err != nil {

-		t.Fatalf("Error while processing ParsePortSpecs: %s", err)

-	}

-

-	if _, ok := portMap[Port("1234/tcp")]; !ok {

-		t.Fatal("1234/tcp was not parsed properly")

-	}

-

-	if _, ok := portMap[Port("2345/udp")]; !ok {

-		t.Fatal("2345/udp was not parsed properly")

-	}

-

-	for portspec, bindings := range bindingMap {

-		_, port := SplitProtoPort(string(portspec))

-

-		if len(bindings) != 1 {

-			t.Fatalf("%s should have exactly one binding", portspec)

-		}

-

-		if bindings[0].HostIP != "" {

-			t.Fatalf("HostIP should not be set for %s", portspec)

-		}

-

-		if bindings[0].HostPort != port {

-			t.Fatalf("HostPort should be %s for %s", port, portspec)

-		}

-	}

-

-	portMap, bindingMap, err = ParsePortSpecs([]string{"0.0.0.0:1234:1234/tcp", "0.0.0.0:2345:2345/udp"})

-

-	if err != nil {

-		t.Fatalf("Error while processing ParsePortSpecs: %s", err)

-	}

-

-	if _, ok := portMap[Port("1234/tcp")]; !ok {

-		t.Fatal("1234/tcp was not parsed properly")

-	}

-

-	if _, ok := portMap[Port("2345/udp")]; !ok {

-		t.Fatal("2345/udp was not parsed properly")

-	}

-

-	for portspec, bindings := range bindingMap {

-		_, port := SplitProtoPort(string(portspec))

-

-		if len(bindings) != 1 {

-			t.Fatalf("%s should have exactly one binding", portspec)

-		}

-

-		if bindings[0].HostIP != "0.0.0.0" {

-			t.Fatalf("HostIP is not 0.0.0.0 for %s", portspec)

-		}

-

-		if bindings[0].HostPort != port {

-			t.Fatalf("HostPort should be %s for %s", port, portspec)

-		}

-	}

-

-	_, _, err = ParsePortSpecs([]string{"localhost:1234:1234/tcp"})

-

-	if err == nil {

-		t.Fatal("Received no error while trying to parse a hostname instead of ip")

-	}

-}

-

-func TestParsePortSpecsWithRange(t *testing.T) {

-	var (

-		portMap    map[Port]struct{}

-		bindingMap map[Port][]PortBinding

-		err        error

-	)

-

-	portMap, bindingMap, err = ParsePortSpecs([]string{"1234-1236/tcp", "2345-2347/udp"})

-

-	if err != nil {

-		t.Fatalf("Error while processing ParsePortSpecs: %s", err)

-	}

-

-	if _, ok := portMap[Port("1235/tcp")]; !ok {

-		t.Fatal("1234/tcp was not parsed properly")

-	}

-

-	if _, ok := portMap[Port("2346/udp")]; !ok {

-		t.Fatal("2345/udp was not parsed properly")

-	}

-

-	for portspec, bindings := range bindingMap {

-		if len(bindings) != 1 {

-			t.Fatalf("%s should have exactly one binding", portspec)

-		}

-

-		if bindings[0].HostIP != "" {

-			t.Fatalf("HostIP should not be set for %s", portspec)

-		}

-

-		if bindings[0].HostPort != "" {

-			t.Fatalf("HostPort should not be set for %s", portspec)

-		}

-	}

-

-	portMap, bindingMap, err = ParsePortSpecs([]string{"1234-1236:1234-1236/tcp", "2345-2347:2345-2347/udp"})

-

-	if err != nil {

-		t.Fatalf("Error while processing ParsePortSpecs: %s", err)

-	}

-

-	if _, ok := portMap[Port("1235/tcp")]; !ok {

-		t.Fatal("1234/tcp was not parsed properly")

-	}

-

-	if _, ok := portMap[Port("2346/udp")]; !ok {

-		t.Fatal("2345/udp was not parsed properly")

-	}

-

-	for portspec, bindings := range bindingMap {

-		_, port := SplitProtoPort(string(portspec))

-		if len(bindings) != 1 {

-			t.Fatalf("%s should have exactly one binding", portspec)

-		}

-

-		if bindings[0].HostIP != "" {

-			t.Fatalf("HostIP should not be set for %s", portspec)

-		}

-

-		if bindings[0].HostPort != port {

-			t.Fatalf("HostPort should be %s for %s", port, portspec)

-		}

-	}

-

-	portMap, bindingMap, err = ParsePortSpecs([]string{"0.0.0.0:1234-1236:1234-1236/tcp", "0.0.0.0:2345-2347:2345-2347/udp"})

-

-	if err != nil {

-		t.Fatalf("Error while processing ParsePortSpecs: %s", err)

-	}

-

-	if _, ok := portMap[Port("1235/tcp")]; !ok {

-		t.Fatal("1234/tcp was not parsed properly")

-	}

-

-	if _, ok := portMap[Port("2346/udp")]; !ok {

-		t.Fatal("2345/udp was not parsed properly")

-	}

-

-	for portspec, bindings := range bindingMap {

-		_, port := SplitProtoPort(string(portspec))

-		if len(bindings) != 1 || bindings[0].HostIP != "0.0.0.0" || bindings[0].HostPort != port {

-			t.Fatalf("Expect single binding to port %s but found %s", port, bindings)

-		}

-	}

-

-	_, _, err = ParsePortSpecs([]string{"localhost:1234-1236:1234-1236/tcp"})

-

-	if err == nil {

-		t.Fatal("Received no error while trying to parse a hostname instead of ip")

-	}

-}

-

-func TestParseNetworkOptsPrivateOnly(t *testing.T) {

-	ports, bindings, err := ParsePortSpecs([]string{"192.168.1.100::80"})

-	if err != nil {

-		t.Fatal(err)

-	}

-	if len(ports) != 1 {

-		t.Logf("Expected 1 got %d", len(ports))

-		t.FailNow()

-	}

-	if len(bindings) != 1 {

-		t.Logf("Expected 1 got %d", len(bindings))

-		t.FailNow()

-	}

-	for k := range ports {

-		if k.Proto() != "tcp" {

-			t.Logf("Expected tcp got %s", k.Proto())

-			t.Fail()

-		}

-		if k.Port() != "80" {

-			t.Logf("Expected 80 got %s", k.Port())

-			t.Fail()

-		}

-		b, exists := bindings[k]

-		if !exists {

-			t.Log("Binding does not exist")

-			t.FailNow()

-		}

-		if len(b) != 1 {

-			t.Logf("Expected 1 got %d", len(b))

-			t.FailNow()

-		}

-		s := b[0]

-		if s.HostPort != "" {

-			t.Logf("Expected \"\" got %s", s.HostPort)

-			t.Fail()

-		}

-		if s.HostIP != "192.168.1.100" {

-			t.Fail()

-		}

-	}

-}

-

-func TestParseNetworkOptsPublic(t *testing.T) {

-	ports, bindings, err := ParsePortSpecs([]string{"192.168.1.100:8080:80"})

-	if err != nil {

-		t.Fatal(err)

-	}

-	if len(ports) != 1 {

-		t.Logf("Expected 1 got %d", len(ports))

-		t.FailNow()

-	}

-	if len(bindings) != 1 {

-		t.Logf("Expected 1 got %d", len(bindings))

-		t.FailNow()

-	}

-	for k := range ports {

-		if k.Proto() != "tcp" {

-			t.Logf("Expected tcp got %s", k.Proto())

-			t.Fail()

-		}

-		if k.Port() != "80" {

-			t.Logf("Expected 80 got %s", k.Port())

-			t.Fail()

-		}

-		b, exists := bindings[k]

-		if !exists {

-			t.Log("Binding does not exist")

-			t.FailNow()

-		}

-		if len(b) != 1 {

-			t.Logf("Expected 1 got %d", len(b))

-			t.FailNow()

-		}

-		s := b[0]

-		if s.HostPort != "8080" {

-			t.Logf("Expected 8080 got %s", s.HostPort)

-			t.Fail()

-		}

-		if s.HostIP != "192.168.1.100" {

-			t.Fail()

-		}

-	}

-}

-

-func TestParseNetworkOptsPublicNoPort(t *testing.T) {

-	ports, bindings, err := ParsePortSpecs([]string{"192.168.1.100"})

-

-	if err == nil {

-		t.Logf("Expected error Invalid containerPort")

-		t.Fail()

-	}

-	if ports != nil {

-		t.Logf("Expected nil got %s", ports)

-		t.Fail()

-	}

-	if bindings != nil {

-		t.Logf("Expected nil got %s", bindings)

-		t.Fail()

-	}

-}

-

-func TestParseNetworkOptsNegativePorts(t *testing.T) {

-	ports, bindings, err := ParsePortSpecs([]string{"192.168.1.100:-1:-1"})

-

-	if err == nil {

-		t.Fail()

-	}

-	if len(ports) != 0 {

-		t.Logf("Expected nil got %d", len(ports))

-		t.Fail()

-	}

-	if len(bindings) != 0 {

-		t.Logf("Expected 0 got %d", len(bindings))

-		t.Fail()

-	}

-}

-

-func TestParseNetworkOptsUdp(t *testing.T) {

-	ports, bindings, err := ParsePortSpecs([]string{"192.168.1.100::6000/udp"})

-	if err != nil {

-		t.Fatal(err)

-	}

-	if len(ports) != 1 {

-		t.Logf("Expected 1 got %d", len(ports))

-		t.FailNow()

-	}

-	if len(bindings) != 1 {

-		t.Logf("Expected 1 got %d", len(bindings))

-		t.FailNow()

-	}

-	for k := range ports {

-		if k.Proto() != "udp" {

-			t.Logf("Expected udp got %s", k.Proto())

-			t.Fail()

-		}

-		if k.Port() != "6000" {

-			t.Logf("Expected 6000 got %s", k.Port())

-			t.Fail()

-		}

-		b, exists := bindings[k]

-		if !exists {

-			t.Log("Binding does not exist")

-			t.FailNow()

-		}

-		if len(b) != 1 {

-			t.Logf("Expected 1 got %d", len(b))

-			t.FailNow()

-		}

-		s := b[0]

-		if s.HostPort != "" {

-			t.Logf("Expected \"\" got %s", s.HostPort)

-			t.Fail()

-		}

-		if s.HostIP != "192.168.1.100" {

-			t.Fail()

-		}

-	}

-}

deleted file mode 100644

@@ -1,54 +0,0 @@

-package nat

-

-import (

-	"strings"

-	"testing"

-)

-

-func TestParsePortRange(t *testing.T) {

-	if start, end, err := ParsePortRange("8000-8080"); err != nil || start != 8000 || end != 8080 {

-		t.Fatalf("Error: %s or Expecting {start,end} values {8000,8080} but found {%d,%d}.", err, start, end)

-	}

-}

-

-func TestParsePortRangeEmpty(t *testing.T) {

-	if _, _, err := ParsePortRange(""); err == nil || err.Error() != "Empty string specified for ports." {

-		t.Fatalf("Expected error 'Empty string specified for ports.', got %v", err)

-	}

-}

-

-func TestParsePortRangeWithNoRange(t *testing.T) {

-	start, end, err := ParsePortRange("8080")

-	if err != nil {

-		t.Fatal(err)

-	}

-	if start != 8080 || end != 8080 {

-		t.Fatalf("Expected start and end to be the same and equal to 8080, but were %v and %v", start, end)

-	}

-}

-

-func TestParsePortRangeIncorrectRange(t *testing.T) {

-	if _, _, err := ParsePortRange("9000-8080"); err == nil || !strings.Contains(err.Error(), "Invalid range specified for the Port") {

-		t.Fatalf("Expecting error 'Invalid range specified for the Port' but received %s.", err)

-	}

-}

-

-func TestParsePortRangeIncorrectEndRange(t *testing.T) {

-	if _, _, err := ParsePortRange("8000-a"); err == nil || !strings.Contains(err.Error(), "invalid syntax") {

-		t.Fatalf("Expecting error 'Invalid range specified for the Port' but received %s.", err)

-	}

-

-	if _, _, err := ParsePortRange("8000-30a"); err == nil || !strings.Contains(err.Error(), "invalid syntax") {

-		t.Fatalf("Expecting error 'Invalid range specified for the Port' but received %s.", err)

-	}

-}

-

-func TestParsePortRangeIncorrectStartRange(t *testing.T) {

-	if _, _, err := ParsePortRange("a-8000"); err == nil || !strings.Contains(err.Error(), "invalid syntax") {

-		t.Fatalf("Expecting error 'Invalid range specified for the Port' but received %s.", err)

-	}

-

-	if _, _, err := ParsePortRange("30a-8000"); err == nil || !strings.Contains(err.Error(), "invalid syntax") {

-		t.Fatalf("Expecting error 'Invalid range specified for the Port' but received %s.", err)

-	}

-}

deleted file mode 100644

@@ -1,85 +0,0 @@

-package nat

-

-import (

-	"fmt"

-	"reflect"

-	"testing"

-)

-

-func TestSortUniquePorts(t *testing.T) {

-	ports := []Port{

-		Port("6379/tcp"),

-		Port("22/tcp"),

-	}

-

-	Sort(ports, func(ip, jp Port) bool {

-		return ip.Int() < jp.Int() || (ip.Int() == jp.Int() && ip.Proto() == "tcp")

-	})

-

-	first := ports[0]

-	if fmt.Sprint(first) != "22/tcp" {

-		t.Log(fmt.Sprint(first))

-		t.Fail()

-	}

-}

-

-func TestSortSamePortWithDifferentProto(t *testing.T) {

-	ports := []Port{

-		Port("8888/tcp"),

-		Port("8888/udp"),

-		Port("6379/tcp"),

-		Port("6379/udp"),

-	}

-

-	Sort(ports, func(ip, jp Port) bool {

-		return ip.Int() < jp.Int() || (ip.Int() == jp.Int() && ip.Proto() == "tcp")

-	})

-

-	first := ports[0]

-	if fmt.Sprint(first) != "6379/tcp" {

-		t.Fail()

-	}

-}

-

-func TestSortPortMap(t *testing.T) {

-	ports := []Port{

-		Port("22/tcp"),

-		Port("22/udp"),

-		Port("8000/tcp"),

-		Port("6379/tcp"),

-		Port("9999/tcp"),

-	}

-

-	portMap := PortMap{

-		Port("22/tcp"): []PortBinding{

-			{},

-		},

-		Port("8000/tcp"): []PortBinding{