1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/api/server
Yong Tang a64c9357ca Fix incorrect Scope in network ls/inspect with duplicate network names
This fix tries to address the issue raised in 30242 where the `Scope`
field always changed to `swarm` in the ouput of `docker network ls/inspect`
when duplicate networks name exist.

The reason for the issue was that `buildNetworkResource()` use network name
(which may not be unique) to check for the scope.

This fix fixes the issue by always use network ID in `buildNetworkResource()`.

A test has been added. The test fails before the fix and passes after the fix.

This fix fixes 30242.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 05a831a775)
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-25 22:13:13 -08:00
..
httputils api/server/httputils: service unavailable for disable swarm 2016-11-18 13:44:36 -08:00
middleware Revise swarm init/update flags, add unlocking capability 2016-11-09 16:09:00 -08:00
router Fix incorrect Scope in network ls/inspect with duplicate network names 2017-01-25 22:13:13 -08:00
middleware.go change comment 2016-08-26 18:30:41 +08:00
profiler.go add trace in docker engine's pprof to show execution trace in binary form 2016-05-13 15:24:44 +08:00
router_swapper.go fix typos 2016-03-06 00:59:11 +08:00
server.go fix typo 2016-11-18 13:27:01 -08:00
server_test.go replace handleWithGlobalMiddlewares with handlerWithGlobalMiddlewares 2016-08-12 10:53:11 +08:00