1. docker
  2. Commit db4f20404d2b8c4da5a15e447f52cd634445cfe3
Browse code

Remove PortMapping from container NetworkSettings

Signed-off-by: Antonio Murdaca <runcom@linux.com>

Antonio Murdaca authored on 2015/09/02 21:01:25
Showing 5 changed files
daemon/container_unix.go
History View file @ db4f204
... ... 
@@ -715,8 +715,6 @@ func (container *Container) buildCreateEndpointOptions() ([]libnetwork.EndpointO
715 715 
 		}
716 716 
 	}
717 717
718 
-	container.NetworkSettings.PortMapping = nil
719 
-
720 718 
 	ports := make([]nat.Port, len(portSpecs))
721 719 
 	var i int
722 720 
 	for p := range portSpecs {
daemon/daemon_test.go
History View file @ db4f204
... ... 
@@ -160,7 +160,7 @@ func TestLoadWithVolume(t *testing.T) {
160 160 
 "StdinOnce":false,"Env":null,"Cmd":["top"],"Image":"ubuntu:latest","Volumes":null,"WorkingDir":"","Entrypoint":null,
161 161 
 "NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":{}},"Image":"07f8e8c5e66084bef8f848877857537ffe1c47edd01a93af27e7161672ad0e95",
162 162 
 "NetworkSettings":{"IPAddress":"172.17.0.1","IPPrefixLen":16,"MacAddress":"02:42:ac:11:00:01","LinkLocalIPv6Address":"fe80::42:acff:fe11:1",
163 
-"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","PortMapping":null,"Ports":{}},
163 
+"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","Ports":{}},
164 164 
 "ResolvConfPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/resolv.conf",
165 165 
 "HostnamePath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hostname",
166 166 
 "HostsPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hosts",
... ... 
@@ -249,7 +249,7 @@ func TestLoadWithBindMount(t *testing.T) {
249 249 
 "StdinOnce":false,"Env":null,"Cmd":["top"],"Image":"ubuntu:latest","Volumes":null,"WorkingDir":"","Entrypoint":null,
250 250 
 "NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":{}},"Image":"07f8e8c5e66084bef8f848877857537ffe1c47edd01a93af27e7161672ad0e95",
251 251 
 "NetworkSettings":{"IPAddress":"172.17.0.1","IPPrefixLen":16,"MacAddress":"02:42:ac:11:00:01","LinkLocalIPv6Address":"fe80::42:acff:fe11:1",
252 
-"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","PortMapping":null,"Ports":{}},
252 
+"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","Ports":{}},
253 253 
 "ResolvConfPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/resolv.conf",
254 254 
 "HostnamePath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hostname",
255 255 
 "HostsPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hosts",
... ... 
@@ -340,7 +340,7 @@ func TestLoadWithVolume17RC(t *testing.T) {
340 340 
 "StdinOnce":false,"Env":null,"Cmd":["top"],"Image":"ubuntu:latest","Volumes":null,"WorkingDir":"","Entrypoint":null,
341 341 
 "NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":{}},"Image":"07f8e8c5e66084bef8f848877857537ffe1c47edd01a93af27e7161672ad0e95",
342 342 
 "NetworkSettings":{"IPAddress":"172.17.0.1","IPPrefixLen":16,"MacAddress":"02:42:ac:11:00:01","LinkLocalIPv6Address":"fe80::42:acff:fe11:1",
343 
-"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","PortMapping":null,"Ports":{}},
343 
+"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","Ports":{}},
344 344 
 "ResolvConfPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/resolv.conf",
345 345 
 "HostnamePath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hostname",
346 346 
 "HostsPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hosts",
... ... 
@@ -444,7 +444,7 @@ func TestRemoveLocalVolumesFollowingSymlinks(t *testing.T) {
444 444 
 "StdinOnce":false,"Env":null,"Cmd":["top"],"Image":"ubuntu:latest","Volumes":null,"WorkingDir":"","Entrypoint":null,
445 445 
 "NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":{}},"Image":"07f8e8c5e66084bef8f848877857537ffe1c47edd01a93af27e7161672ad0e95",
446 446 
 "NetworkSettings":{"IPAddress":"172.17.0.1","IPPrefixLen":16,"MacAddress":"02:42:ac:11:00:01","LinkLocalIPv6Address":"fe80::42:acff:fe11:1",
447 
-"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","PortMapping":null,"Ports":{}},
447 
+"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","Ports":{}},
448 448 
 "ResolvConfPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/resolv.conf",
449 449 
 "HostnamePath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hostname",
450 450 
 "HostsPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hosts",
daemon/network/settings.go
History View file @ db4f204
... ... 
@@ -24,7 +24,6 @@ type Settings struct {
24 24 
 	LinkLocalIPv6PrefixLen int
25 25 
 	MacAddress             string
26 26 
 	NetworkID              string
27 
-	PortMapping            map[string]map[string]string // Deprecated
28 27 
 	Ports                  nat.PortMap
29 28 
 	SandboxKey             string
30 29 
 	SecondaryIPAddresses   []Address
man/docker-inspect.1.md
History View file @ db4f204
... ... 
@@ -79,7 +79,6 @@ To get information on a container use its ID or instance name:
79 79 
         "LinkLocalIPv6PrefixLen": 0,
80 80 
         "MacAddress": "",
81 81 
         "NetworkID": "",
82 
-        "PortMapping": null,
83 82 
         "Ports": null,
84 83 
         "SandboxKey": "",
85 84 
         "SecondaryIPAddresses": null,
pkg/parsers/parsers_test.go
History View file @ db4f204
... ... 
@@ -132,29 +132,6 @@ func TestParseRepositoryTag(t *testing.T) {
132 132 
 	}
133 133 
 }
134 134
135 
-func TestParsePortMapping(t *testing.T) {
136 
-	if _, err := PartParser("ip:public:private", "192.168.1.1:80"); err == nil {
137 
-		t.Fatalf("Expected an error, got %v", err)
138 
-	}
139 
-	data, err := PartParser("ip:public:private", "192.168.1.1:80:8080")
140 
-	if err != nil {
141 
-		t.Fatal(err)
142 
-	}
143 
-
144 
-	if len(data) != 3 {
145 
-		t.FailNow()
146 
-	}
147 
-	if data["ip"] != "192.168.1.1" {
148 
-		t.Fail()
149 
-	}
150 
-	if data["public"] != "80" {
151 
-		t.Fail()
152 
-	}
153 
-	if data["private"] != "8080" {
154 
-		t.Fail()
155 
-	}
156 
-}
157 
-
158 135 
 func TestParseKeyValueOpt(t *testing.T) {
159 136 
 	invalids := map[string]string{
160 137 
 		"":    "Unable to parse key/value option: ",