Include all endpoints in network inspect object

mavenugo · mavenugo · commit 2ef00ba89fc0 · 2016-03-13T16:58:53.000-07:00
Prior to this change, the "docker network inspect" contains only the
endpoints that have active local container. This excludes all the remote
and stale endpoints. By including all the endpoints, it makes debugging
much simpler and also allows the user to cleanup any stale endpoints
using "docker network disconnect -f {network} {endpoint-name}".

Signed-off-by: Madhu Venugopal &lt;madhu@docker.com&gt;
diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go
@@ -174,11 +174,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
`@@ -174,11 +174,12 @@ func buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {`
`174`	`174`	`continue`
`175`	`175`	`}`
`176`	`176`	`sb := ei.Sandbox()`
`177`		`- if sb == nil {`
`178`		`- continue`
	`177`	`+ key := "ep-" + e.ID()`
	`178`	`+ if sb != nil {`
	`179`	`+ key = sb.ContainerID()`
`179`	`180`	`}`
`180`	`181`
`181`		`- r.Containers[sb.ContainerID()] = buildEndpointResource(e)`
	`182`	`+ r.Containers[key] = buildEndpointResource(e)`
`182`	`183`	`}`
`183`	`184`	`return r`
`184`	`185`	`}`