Swarm has difference in network inspect from docker

[dongluochen]

moby/moby#31714 adds Ingress field to Docker network. Swarm needs to support this field.

not ok 101 docker network inspect
# (in test file api/network.bats, line 84)
#   `diff <(docker_swarm network inspect node-0/bridge) <(docker -H ${HOSTS[0]} network inspect bridge)' failed
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing discovery service" name=nodes uri="127.0.0.1:5962,127.0.0.1:5963" 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing strategy" name=spread 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing filter" name=health 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing filter" name=port 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing filter" name=containerslots 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing filter" name=dependency 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing filter" name=affinity 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing filter" name=constraint 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing filter" name=whitelist 
# time="2017-03-27T18:13:13Z" level=debug msg="Initializing cluster" name=swarm 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=HEAD route="/containers/{name:.*}/archive" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/_ping" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/images/viz" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/images/{name:.*}/get" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/{name:.*}/archive" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/volumes/{volumename:.*}" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/version" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/ps" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/{name:.*}/top" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/{name:.*}/logs" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/{name:.*}/attach/ws" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/events" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/info" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/{name:.*}/changes" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/exec/{execid:.*}/json" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/{name:.*}/json" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/images/json" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/images/search" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/images/get" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/images/{name:.*}/history" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/images/{name:.*}/json" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/json" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/{name:.*}/export" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/containers/{name:.*}/stats" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/networks" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/networks/{networkid:.*}" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=GET route="/volumes" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/kill" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/rename" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/stop" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/copy" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/build" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/restart" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/exec/{execid:.*}/start" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/networks/{networkid:.*}/connect" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/images/{name:.*}/push" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/exec/{execid:.*}/resize" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/images/load" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/auth" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/networks/{networkid:.*}/disconnect" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/commit" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/images/{name:.*}/tag" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/create" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/exec" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/networks/create" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/volumes/create" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/attach" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/images/create" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/pause" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/unpause" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/start" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/update" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/wait" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=POST route="/containers/{name:.*}/resize" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=PUT route="/containers/{name:.*}/archive" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=DELETE route="/containers/{name:.*}" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=DELETE route="/images/{name:.*}" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=DELETE route="/networks/{networkid:.*}" 
# time="2017-03-27T18:13:13Z" level=debug msg="Registering HTTP route" method=DELETE route="/volumes/{name:.*}" 
# time="2017-03-27T18:13:13Z" level=debug msg="Watchdog enabled" 
# time="2017-03-27T18:13:13Z" level=info msg="Listening for HTTP" addr="127.0.0.1:6621" proto=tcp 
# time="2017-03-27T18:13:13Z" level=debug msg="Start monitoring events" id="VPT4:KYHH:GH3R:TJ7Q:TWTV:NXKD:KT4Y:FWFD:Y4YH:SLFQ:WADD:65MW" name=node-0 
# time="2017-03-27T18:13:13Z" level=info msg="Registered Engine node-0 at 127.0.0.1:5962" 
# time="2017-03-27T18:13:13Z" level=debug msg="removing duplicate containers from Node VPT4:KYHH:GH3R:TJ7Q:TWTV:NXKD:KT4Y:FWFD:Y4YH:SLFQ:WADD:65MW" 
# time="2017-03-27T18:13:13Z" level=debug msg="Start monitoring events" id="TDH5:BAB5:OP57:UMCB:WG6E:CG5O:HBQT:7MYX:NELR:JHZ3:ULQZ:ZLGJ" name=node-1 
# time="2017-03-27T18:13:13Z" level=info msg="Registered Engine node-1 at 127.0.0.1:5963" 
# time="2017-03-27T18:13:13Z" level=debug msg="removing duplicate containers from Node TDH5:BAB5:OP57:UMCB:WG6E:CG5O:HBQT:7MYX:NELR:JHZ3:ULQZ:ZLGJ" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/_ping" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/v1.24/info" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/_ping" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/v1.24/info" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/_ping" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/v1.24/info" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/_ping" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=POST uri="/v1.24/containers/create" 
# time="2017-03-27T18:13:13Z" level=debug msg="matching constraint: node==node-0 (soft=false)" 
# time="2017-03-27T18:13:13Z" level=debug msg="Scheduling container c5a164d75bad to " NodeID="VPT4:KYHH:GH3R:TJ7Q:TWTV:NXKD:KT4Y:FWFD:Y4YH:SLFQ:WADD:65MW" NodeName=node-0 
# c5a164d75bad3d044a511353653cc91b76533e9fb46f234f2f75d2720a7ccb70
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/v1.24/events?filters=%7B%22container%22%3A%7B%22c5a164d75bad3d044a511353653cc91b76533e9fb46f234f2f75d2720a7ccb70%22%3Atrue%7D%2C%22type%22%3A%7B%22container%22%3Atrue%7D%7D" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=POST uri="/v1.24/containers/c5a164d75bad3d044a511353653cc91b76533e9fb46f234f2f75d2720a7ccb70/start" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/_ping" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/v1.24/networks/bridge" 
# time="2017-03-27T18:13:13Z" level=error msg="HTTP error: No such network: bridge" status=404 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/_ping" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/v1.24/networks/node-0/bridge" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/_ping" 
# time="2017-03-27T18:13:13Z" level=debug msg="HTTP request received" method=GET uri="/v1.24/networks/node-0/bridge" 
# 20a21
# >         "Ingress": false,
# Stopping f9ac1f0f2c6cfb6a9e7d5726e71dc92aa3f062a5e1867e06835dd9c52d86414e
# /go/src/github.com/docker/swarm/test/integration/api/../helpers.bash: line 48: 19392 Terminated              "$SWARM_BINARY" -l debug -experimental manage -H "$host" --heartbeat=1s $discovery
# Stopping 2467b2694c257d5d8171f2d0f38aa30ff44bc202f5af4347c02f9cb18ba6b46c

[dongluochen]

@nishanttotla is looking at updating godep and revendor docker/docker package.

[nishanttotla]

Also related: #2566

Maybe now is a good time to move to vndr and move away from Godep issues once and for all.

[nishanttotla]

Depends on #2566.