p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
c9ee5a3f479eadb7fcb371c69a8ffebf54c1bbfb
docker-cli/components/engine/integration-cli
History
Yong Tang c9ee5a3f47 Return error in case docker network inspect is ambiguous 
This fix is partially based on comment
https://github.com/docker/docker/issues/30242#issuecomment-273517205

Currently, `docker network inspect` relies on `FindNetwork()` which
does not take into consideration that multiple networks with the same
name might exist.

This fix propose to return `docker network inspect` in a similiar
fashion like other commands:
1. Lookup full ID
2. Lookup full name
3. Lookup partial ID
If multiple networks exist, an error will be returned.

NOTE: this fix is not a complete fix for the issue raised in
https://github.com/docker/docker/issues/30242#issuecomment-273517205
where SwarmKit is unable to update when multiple networks with the same
name exit.
To fix that issue requires multiple places when `FindNetwork()` is called.
Because of the impact of changing `FindNetwork()`, this fix focus on
the issue in `docker network inspect`.

A separate PR will be created to address
https://github.com/docker/docker/issues/30242#issuecomment-273517205

An integration test has been added.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: abf31ee0837ff80638f10b77df9025b6b6470253
Component: engine
2017-02-07 18:05:29 -08:00
..
checker
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
daemon
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
environment
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
fixtures
Remove secrets as part of stack remove.
2017-01-26 11:33:15 -05:00
registry
Avoid defunct registry/notary processes during tests
2017-01-13 17:45:14 -08:00
request
Fix leaked connections in integration tests
2017-01-11 14:48:48 -08:00
requirement
Display only the name of the requirement…
2016-12-26 21:29:17 +01:00
benchmark_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
check_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
daemon_swarm_hack_test.go
Small cleanups on integration cli
2017-01-12 16:57:59 +01:00
docker_api_attach_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_auth_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_build_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_api_containers_test.go
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
docker_api_create_test.go
validate healthcheck params in daemon side
2017-01-29 13:35:32 +08:00
docker_api_events_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_exec_resize_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_exec_test.go
fix typo
2017-01-19 15:52:28 +08:00
docker_api_images_test.go
Merge pull request #28409 from dnephin/swagger-gen-more
2017-01-26 10:35:34 -08:00
docker_api_info_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_inspect_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_api_inspect_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_logs_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_network_test.go
Fix leaked connections in integration tests
2017-01-11 14:48:48 -08:00
docker_api_resize_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_service_update_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_api_stats_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_api_stats_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_swarm_test.go
Fix issue where service healthcheck is {} in remote API
2017-01-27 15:43:44 -08:00
docker_api_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_api_update_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_version_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_api_volumes_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_cli_attach_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_attach_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_authz_plugin_v2_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_authz_unix_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_build_test.go
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
docker_cli_build_unix_test.go
fix some ineffectual assignments
2017-01-24 11:16:19 +01:00
docker_cli_by_digest_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_commit_test.go
fix some ineffectual assignments
2017-01-24 11:16:19 +01:00
docker_cli_config_test.go
Update trustedCmd to be compatible with testutil/cmd
2017-01-09 11:07:05 +01:00
docker_cli_cp_from_container_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_cp_test.go
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
docker_cli_cp_to_container_test.go
fix some ineffectual assignments
2017-01-24 11:16:19 +01:00
docker_cli_cp_to_container_unix_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_cp_utils.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_create_test.go
Remove use of forked reference package for cli
2017-01-19 16:04:50 -08:00
docker_cli_create_unix_test.go
validate mount path for tmpfs
2017-01-20 06:01:48 +00:00
docker_cli_daemon_plugins_test.go
Add capability filter to docker plugin ls
2017-01-27 07:32:22 -08:00
docker_cli_daemon_test.go
Merge pull request #29552 from dnephin/fix-build-with-log-driver
2017-02-07 15:47:41 -05:00
docker_cli_diff_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_events_test.go
Limit TestEventsLimit to 4 concurrent containers on Windows
2017-01-30 11:04:52 -08:00
docker_cli_events_unix_test.go
Update opts.MemBytes to disable default, and move docker run/create/build to use opts.MemBytes
2017-01-27 12:17:06 -08:00
docker_cli_exec_test.go
Merge pull request #30537 from DiSiqueira/asserting_error
2017-02-01 16:08:20 +01:00
docker_cli_exec_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_experimental_test.go
Small cleanups on integration cli
2017-01-12 16:57:59 +01:00
docker_cli_export_import_test.go
Update trustedCmd to be compatible with testutil/cmd
2017-01-09 11:07:05 +01:00
docker_cli_external_graphdriver_unix_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_external_volume_driver_unix_test.go
fix some ineffectual assignments
2017-01-24 11:16:19 +01:00
docker_cli_health_test.go
validate healthcheck params in daemon side
2017-01-29 13:35:32 +08:00
docker_cli_help_test.go
Wrap output of docker cli --help
2017-02-03 11:05:49 +00:00
docker_cli_history_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_images_test.go
Use distribution reference
2017-02-07 11:08:37 -08:00
docker_cli_import_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_info_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_info_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_inspect_test.go
Merge pull request #30165 from xulike666/fix-typo-6/36
2017-01-19 17:21:22 +01:00
docker_cli_kill_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_cli_links_test.go
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
docker_cli_links_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_login_test.go
Merge pull request #29799 from vdemeester/integration-registry-package
2017-01-02 15:37:09 +01:00
docker_cli_logout_test.go
Merge pull request #29799 from vdemeester/integration-registry-package
2017-01-02 15:37:09 +01:00
docker_cli_logs_bench_test.go
Fixes some issues with jsonfile write/read
2016-03-21 11:05:58 -04:00
docker_cli_logs_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_nat_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_netmode_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_network_unix_test.go
Revert "Fix IT case for network name validation"
2017-02-02 15:38:12 -08:00
docker_cli_oom_killed_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_pause_test.go
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
docker_cli_plugins_test.go
Make propagated mount persist outside rootfs
2017-02-03 16:22:58 -05:00
docker_cli_port_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_proxy_test.go
Update trustedCmd to be compatible with testutil/cmd
2017-01-09 11:07:05 +01:00
docker_cli_prune_unix_test.go
Add --filter until=<timestamp> for docker container/image prune
2017-01-04 14:16:42 -08:00
docker_cli_ps_test.go
Merge pull request #27557 from yongtang/27178-ps-filter-publish-expose
2017-02-01 16:32:28 +01:00
docker_cli_pull_local_test.go
fix some ineffectual assignments
2017-01-24 11:16:19 +01:00
docker_cli_pull_test.go
*: use opencontainers/go-digest package
2017-01-06 18:48:41 -08:00
docker_cli_pull_trusted_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_push_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_registry_user_agent_test.go
fix typo
2017-01-19 15:52:28 +08:00
docker_cli_rename_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_restart_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_rm_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_rmi_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_run_test.go
Merge pull request #30654 from Microsoft/jjh/unifyworkdir
2017-02-03 00:37:54 -08:00
docker_cli_run_unix_test.go
Merge pull request #30185 from vdemeester/integration-build-cmd-cleanup-take2
2017-01-18 15:12:03 +01:00
docker_cli_save_load_test.go
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
docker_cli_save_load_unix_test.go
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
docker_cli_search_test.go
fix some ineffectual assignments
2017-01-24 11:16:19 +01:00
docker_cli_secret_create_test.go
Move secret name or ID prefix resolving from client to daemon
2017-01-27 10:40:05 -08:00
docker_cli_secret_inspect_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_create_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_health_test.go
Small cleanups on integration cli
2017-01-12 16:57:59 +01:00
docker_cli_service_logs_experimental_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_scale_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_service_update_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_sni_test.go
Disable flakey TestClientSetsTLSServerName
2016-02-02 19:56:31 -08:00
docker_cli_stack_test.go
Add missing build tag for stack tests.
2017-02-01 13:25:37 -05:00
docker_cli_start_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_stats_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_stop_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_swarm_test.go
Return error in case docker network inspect is ambiguous
2017-02-07 18:05:29 -08:00
docker_cli_swarm_unix_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_tag_test.go
Clean more build utils in integration cli
2017-01-17 15:42:38 +01:00
docker_cli_top_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_update_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_cli_update_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_cli_userns_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_v2_only_test.go
Fix leaked connections in integration tests
2017-01-11 14:48:48 -08:00
docker_cli_version_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
docker_cli_volume_test.go
Fix duplicate mount point for --volumes-from in docker run
2017-02-07 08:30:56 -08:00
docker_cli_wait_test.go
Update trustedCmd to be compatible with testutil/cmd
2017-01-09 11:07:05 +01:00
docker_deprecated_api_v124_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_deprecated_api_v124_unix_test.go
Add a new request package in integration-cli
2017-01-03 11:49:30 +01:00
docker_experimental_network_test.go
Small cleanups on integration cli
2017-01-12 16:57:59 +01:00
docker_hub_pull_suite_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
docker_utils_test.go
Remove most of the runCommandWithOutput from integration tests
2017-01-30 10:54:06 +01:00
events_utils_test.go
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
fixtures_linux_daemon_test.go
Block obsolete socket families in the default seccomp profile
2017-01-17 17:50:44 +00:00
fixtures_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
requirements_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
requirements_unix_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
test_vars_exec_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_noexec_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_noseccomp_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_seccomp_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00
test_vars_unix_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
test_vars_windows_test.go
Introduce a environment package in integration-cli
2016-12-29 11:00:50 +01:00
trust_server_test.go
Merge pull request #30151 from tonistiigi/fix-defunct
2017-01-16 08:55:16 +01:00
utils_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00