Merge pull request moby#21160 from mavenugo/staleep

vdemeester · vdemeester · commit 901c67a8eeab · 2016-03-14T11:36:04.000+01:00
Include all endpoints in network inspect object
diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go
@@ -181,11 +181,12 @@ func buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {
 			continue
 		}
 		sb := ei.Sandbox()
-		if sb == nil {
-			continue
+		key := "ep-" + e.ID()
+		if sb != nil {
+			key = sb.ContainerID()
 		}
 
-		r.Containers[sb.ContainerID()] = buildEndpointResource(e)
+		r.Containers[key] = buildEndpointResource(e)
 	}
 	return r
 }
diff --git a/docs/reference/commandline/network_inspect.md b/docs/reference/commandline/network_inspect.md
@@ -28,7 +28,10 @@ bda12f8922785d1f160be70736f26c1e331ab8aaf8ed8d56728508f2e2fd4727
 ```
 
 The `network inspect` command shows the containers, by id, in its
-results. You can specify an alternate format to execute a given
+results. For networks backed by multi-host network driver, such as Overlay,
+this command also shows the container endpoints in other hosts in the
+cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.
+You can specify an alternate format to execute a given
 template for each result. Go's
 [text/template](http://golang.org/pkg/text/template/) package describes all the
 details of the format.

Original file line number	Diff line number	Diff line change
`@@ -181,11 +181,12 @@ func buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {`
`181`	`181`	`continue`
`182`	`182`	`}`
`183`	`183`	`sb := ei.Sandbox()`
`184`		`- if sb == nil {`
`185`		`- continue`
	`184`	`+ key := "ep-" + e.ID()`
	`185`	`+ if sb != nil {`
	`186`	`+ key = sb.ContainerID()`
`186`	`187`	`}`
`187`	`188`
`188`		`- r.Containers[sb.ContainerID()] = buildEndpointResource(e)`
	`189`	`+ r.Containers[key] = buildEndpointResource(e)`
`189`	`190`	`}`
`190`	`191`	`return r`
`191`	`192`	`}`