From dd9944aa644c717009a85ab85e00894ef3d3b20f Mon Sep 17 00:00:00 2001 From: Santhosh Manohar Date: Fri, 4 Nov 2016 12:27:36 -0700 Subject: [PATCH] Show peer nodes in network inspect for swarm overlay networks Signed-off-by: Santhosh Manohar --- api/server/router/network/network_routes.go | 17 ++++++ api/types/network/network.go | 6 ++ api/types/types.go | 1 + docs/reference/api/docker_remote_api.md | 1 + docs/reference/commandline/network_inspect.md | 57 +++++++++++++++++++ 5 files changed, 82 insertions(+) diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index 2d9c786689..3feb2d8a44 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -11,6 +11,7 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/network" "github.com/docker/libnetwork" + "github.com/docker/libnetwork/networkdb" ) func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error { @@ -177,6 +178,11 @@ func (n *networkRouter) buildNetworkResource(nw libnetwork.Network) *types.Netwo r.Internal = info.Internal() r.Labels = info.Labels() + peers := info.Peers() + if len(peers) != 0 { + r.Peers = buildPeerInfoResources(peers) + } + epl := nw.Endpoints() for _, e := range epl { ei := e.Info() @@ -195,6 +201,17 @@ func (n *networkRouter) buildNetworkResource(nw libnetwork.Network) *types.Netwo return r } +func buildPeerInfoResources(peers []networkdb.PeerInfo) []network.PeerInfo { + peerInfo := make([]network.PeerInfo, 0, len(peers)) + for _, peer := range peers { + peerInfo = append(peerInfo, network.PeerInfo{ + Name: peer.Name, + IP: peer.IP, + }) + } + return peerInfo +} + func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo) { id, opts, ipv4conf, ipv6conf := nwInfo.IpamConfig() diff --git a/api/types/network/network.go b/api/types/network/network.go index 47080b652e..832b3edb9f 100644 --- a/api/types/network/network.go +++ b/api/types/network/network.go @@ -28,6 +28,12 @@ type EndpointIPAMConfig struct { LinkLocalIPs []string `json:",omitempty"` } +// PeerInfo represents one peer of a overlay network +type PeerInfo struct { + Name string + IP string +} + // EndpointSettings stores the network endpoint details type EndpointSettings struct { // Configurations diff --git a/api/types/types.go b/api/types/types.go index 5591646b69..43eaec36d6 100644 --- a/api/types/types.go +++ b/api/types/types.go @@ -395,6 +395,7 @@ type NetworkResource struct { Containers map[string]EndpointResource // Containers contains endpoints belonging to the network Options map[string]string // Options holds the network specific options to use for when creating the network Labels map[string]string // Labels holds metadata specific to the network being created + Peers []network.PeerInfo `json:",omitempty"` // List of peer nodes for an overlay network } // EndpointResource contains network resources allocated and used for a container in a network diff --git a/docs/reference/api/docker_remote_api.md b/docs/reference/api/docker_remote_api.md index 8c0954420c..85f9a59b06 100644 --- a/docs/reference/api/docker_remote_api.md +++ b/docs/reference/api/docker_remote_api.md @@ -171,6 +171,7 @@ This section lists each version from latest to oldest. Each listing includes a * The `HostConfig` field now includes `CpuCount` that represents the number of CPUs available for execution by the container. Windows daemon only. * `POST /services/create` and `POST /services/(id or name)/update` now accept the `TTY` parameter, which allocate a pseudo-TTY in container. * `POST /services/create` and `POST /services/(id or name)/update` now accept the `DNSConfig` parameter, which specifies DNS related configurations in resolver configuration file (resolv.conf) through `Nameservers`, `Search`, and `Options`. +* `GET /networks/(id or name)` now includes IP and name of all peers nodes for swarm mode overlay networks. ### v1.24 API changes diff --git a/docs/reference/commandline/network_inspect.md b/docs/reference/commandline/network_inspect.md index 9f4a3203a5..bc0005e38e 100644 --- a/docs/reference/commandline/network_inspect.md +++ b/docs/reference/commandline/network_inspect.md @@ -124,6 +124,63 @@ $ docker network inspect simple-network ] ``` +For swarm mode overlay networks `network inspect` also shows the IP address and node name +of the peers. Peers are the nodes in the swarm cluster which have at least one task attached +to the network. Node name is of the format `-`. + +```bash +$ docker network inspect ingress +[ + { + "Name": "ingress", + "Id": "j0izitrut30h975vk4m1u5kk3", + "Created": "2016-11-08T06:49:59.803387552Z", + "Scope": "swarm", + "Driver": "overlay", + "EnableIPv6": false, + "IPAM": { + "Driver": "default", + "Options": null, + "Config": [ + { + "Subnet": "10.255.0.0/16", + "Gateway": "10.255.0.1" + } + ] + }, + "Internal": false, + "Attachable": false, + "Containers": { + "ingress-sbox": { + "Name": "ingress-endpoint", + "EndpointID": "40e002d27b7e5d75f60bc72199d8cae3344e1896abec5eddae9743755fe09115", + "MacAddress": "02:42:0a:ff:00:03", + "IPv4Address": "10.255.0.3/16", + "IPv6Address": "" + } + }, + "Options": { + "com.docker.network.driver.overlay.vxlanid_list": "256" + }, + "Labels": {}, + "Peers": [ + { + "Name": "net-1-1d22adfe4d5c", + "IP": "192.168.33.11" + }, + { + "Name": "net-2-d55d838b34af", + "IP": "192.168.33.12" + }, + { + "Name": "net-3-8473f8140bd9", + "IP": "192.168.33.13" + } + ] + } +] +``` + ## Related information * [network disconnect ](network_disconnect.md)