Include container names in network inspect

[WeiZhang555]

Fixes #17404

This commit makes docker network inspect print container names as
service discovery is based on container name.

Signed-off-by: Zhang Wei zhangwei555@huawei.com

Test cases are still on working. :)

[cpuguy83]

+1 to the container name here.

[WeiZhang555]

And the final look of network inspect output:

$ docker network inspect bridge
[
    {
        "Name": "bridge",
        "Id": "e3a9b89b976b56bedf7c75fbbd704702e7f74779af6982b7b5f561666c27cb28",
        "Scope": "local",
        "Driver": "bridge",
        "IPAM": {
            "Driver": "default",
            "Config": [
                {
                    "Subnet": "172.17.0.1/16",
                    "Gateway": "172.17.0.1"
                }
            ]
        },
        "Containers": {
            "0b84bd9c71eade6dd1c4cc6513975e0b361fa10fe4fccd0d071c0a3de49d5521": {
                "Name": "amazing_bhabha",
                "EndpointID": "614560e0fd66aa7012eb38bd840d80fd7f0e8c94b80919466bb175539be28ddb",
                "MacAddress": "02:42:ac:11:00:02",
                "IPv4Address": "172.17.0.2/16",
                "IPv6Address": ""
            },
            "421a41f7402fe55cc327bc24a7686b5a8b29e13421dac07741436abdf26d7e44": {
                "Name": "mad_mclean",
                "EndpointID": "29a20fa20c5cd066e72d0db1b5c6f835cbd74ab90bfb50cc3aac63edf60fab4f",
                "MacAddress": "02:42:ac:11:00:03",
                "IPv4Address": "172.17.0.3/16",
                "IPv6Address": ""
            }
        },
        "Options": {
            "com.docker.network.bridge.default_bridge": "true",
            "com.docker.network.bridge.enable_icc": "true",
            "com.docker.network.bridge.enable_ip_masquerade": "true",
            "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
            "com.docker.network.bridge.name": "docker0",
            "com.docker.network.driver.mtu": "1500"
        }
    }
]

[cpuguy83]

The one thing to think about is how aliasing will be handled on networks, and how it might be displayed in the inspect output in addition to the name.

ping @mavenugo

[thaJeztah]

Nice! Thanks for picking this up. If this is agreed upon, do we need an integration test to check if it follows container rename? (Having a test may also prevent regressions)

[WeiZhang555]

@thaJeztah @cpuguy83
Yep, integration test to check container rename is absolutely needed, I'm working on it.
For now it works fine for docker rename as I can see.
Thank you for help reviewing. :)

[WeiZhang555]

Test cases are updated. 😄

[albers]

Yes, please!
This feature would be very helpful for the bash completion of docker network disconnect (WIP), where I need a list of container names and their IDs that are connected to a specific network.
This would save me an additional per container lookup for the name.

[thaJeztah]

Test cases are updated. 😄

Awesome!

@albers yes, I can definitely see that will make it easier. Unfortunately, this won't make it into 1.9.0 (too late for that)

[thaJeztah]

ping @tiborvass do you think this can be considered for 1.9.1? I don't think this breaks backward compatibility, but it is a change in the API, so not sure we want to introduce that in a x.x.1 update

[calavera]

We don't want to add this in a X.X.1 release, since it's an improvement.

LGTM though. Maybe we should hear from @mavenugo, @mrjana and @aboch to make sure there are no further implications we've not considered.

[WeiZhang555]

Refresh and rebased. 😄

[thaJeztah]

ping @mrjana @aboch could you give this a quick look?

(thanks for rebasing @WeiZhang555 !)

[LK4D4]

LGTM

[thaJeztah]

Looks like this went through without docs review. I think this needs a mention in the API changelog; https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api.md#v122-api-changes.

Also the response example in https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md#inspect-network and https://github.com/docker/docker/blob/master/docs/reference/commandline/network_inspect.md

@WeiZhang555 can you make those changes in a follow-up PR?

[WeiZhang555]

@thaJeztah
No problem, I'll do it ASAP :)

[thaJeztah]

Thanks!

On 14 Nov 2015, at 13:47, zhangwei_cs notifications@github.com wrote:

@thaJeztah
No problem, I'll do it ASAP :)

—
Reply to this email directly or view it on GitHub.

[albers]

@WeiZhang555 Thanks for the feature, I just used it in #17997.

[WeiZhang555]

@albers I'm happy to hear that the feature is useful and meaningful, and glad to help! :)