p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
618fd96ae81a91bebf8bb17984f98de028bc4699
docker-cli/components/engine/integration-cli
History
Yong Tang 832ffce833 Improve error message for removing pre-defined (e.g., ingress) network 
This fix tries to address the issue raised in 24538

where the error message is unclear when removing pre-defined networks:
```
docker network rm ingress
Error response from daemon: rpc error: code = 7 desc = 4vlxuzpk8bxdsxpyvkxluol5g is a pre-defined network and cannot be removed
```

This fix improve the error message so that if network's name is specified
in the `RemoveNetwork`, then error message will contain the name and the ID
(instead of just an ID):
```
docker network rm ingress
Error response from daemon: rpc error: code = 7 desc = ingress (4vlxuzpk8bxdsxpyvkxluol5g) is a pre-defined network and cannot be removed
```

An integration test has been added to cover the changes.

This fix fixes 24538.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: de4871165b43ec813940858a1c96ab6bb1fbd776
Component: engine
2016-09-24 11:59:26 -07:00
..
fixtures
Fix already loaded detection for frozen images
2016-09-12 12:55:26 -07:00
benchmark_test.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
check_test.go
Merge pull request #26119 from cpuguy83/lazily_load_fixtures
2016-09-08 11:16:27 -07:00
daemon_swarm_hack.go
Remove unnecessary CmdWithArgs
2016-07-28 20:14:14 -04:00
daemon_swarm.go
Always check err before http status
2016-09-12 12:45:08 -05:00
daemon_unix.go
Add support for docker run in swarm mode overlay
2016-09-07 21:20:41 -07:00
daemon_windows.go
Add support for docker run in swarm mode overlay
2016-09-07 21:20:41 -07:00
daemon.go
Move some test fixtures to go
2016-09-07 17:30:35 -04:00
docker_api_attach_test.go
Swarm integration tests
2016-06-13 22:16:18 -07:00
docker_api_auth_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_api_build_test.go
Fix TestBuildApiDockerFileRemote
2016-09-20 14:15:37 +00:00
docker_api_containers_test.go
Windows: stats support
2016-09-16 11:56:15 -07:00
docker_api_create_test.go
Return remote API errors as JSON
2016-06-07 18:45:27 -07:00
docker_api_events_test.go
…
docker_api_exec_resize_test.go
Windows: Enable a couple of exec tests
2016-08-30 15:03:18 -07:00
docker_api_exec_test.go
Return remote API errors as JSON
2016-06-07 18:45:27 -07:00
docker_api_images_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_api_info_test.go
Remove execution driver
2016-07-11 14:52:27 +08:00
docker_api_inspect_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_api_inspect_unix_test.go
…
docker_api_logs_test.go
Return remote API errors as JSON
2016-06-07 18:45:27 -07:00
docker_api_network_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_api_resize_test.go
Return remote API errors as JSON
2016-06-07 18:45:27 -07:00
docker_api_service_update_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_api_stats_test.go
Windows: stats support
2016-09-16 11:56:15 -07:00
docker_api_stats_unix_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_api_swarm_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_api_test.go
Change to use c.Assert() instead of result.Assert()
2016-08-23 15:12:36 -04:00
docker_api_update_unix_test.go
…
docker_api_version_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_api_volumes_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_cli_attach_test.go
Windows: Enable 2 TestAttach* tests
2016-08-29 15:57:27 -07:00
docker_cli_attach_unix_test.go
Create a unified RunCommand function with Assert()
2016-08-23 15:11:46 -04:00
docker_cli_authz_unix_test.go
Fix AuthZ plugins headers change issue
2016-08-23 21:08:23 -07:00
docker_cli_build_test.go
Merge pull request #26516 from yongtang/26453-build-bad-syntax
2016-09-23 12:24:20 +02:00
docker_cli_build_unix_test.go
Create a unified RunCommand function with Assert()
2016-08-23 15:11:46 -04:00
docker_cli_by_digest_test.go
Use opts.FilterOpt for filter flags.
2016-09-13 16:20:10 -04:00
docker_cli_commit_test.go
Windows: Enable some commit tests
2016-08-30 09:48:18 -07:00
docker_cli_config_test.go
…
docker_cli_cp_from_container_test.go
Windows: Enable some cp integration tests
2016-08-30 14:32:10 -07:00
docker_cli_cp_test.go
Windows: Enable some cp integration tests
2016-08-30 14:32:10 -07:00
docker_cli_cp_to_container_test.go
Windows: Enable some cp integration tests
2016-08-30 14:32:10 -07:00
docker_cli_cp_to_container_unix_test.go
…
docker_cli_cp_utils.go
…
docker_cli_create_test.go
Windows: Enable some create CI tests
2016-08-30 14:38:19 -07:00
docker_cli_daemon_experimental_test.go
Add option to specify name without --name in volume create
2016-08-25 14:20:06 -07:00
docker_cli_daemon_test.go
client: don't hide context errors
2016-09-08 17:47:43 -07:00
docker_cli_diff_test.go
Do not create /dev/fuse by default
2016-08-12 12:33:42 +01:00
docker_cli_events_test.go
Add init process for zombie fighting
2016-09-19 17:33:50 -07:00
docker_cli_events_unix_test.go
Merge pull request #26020 from tonistiigi/fix-eventsbefore-test
2016-08-30 22:24:52 +02:00
docker_cli_exec_test.go
Windows: Enable a couple of exec tests
2016-08-30 15:03:18 -07:00
docker_cli_exec_unix_test.go
Add TERM env var to exec
2016-09-12 09:20:27 -07:00
docker_cli_experimental_test.go
…
docker_cli_export_import_test.go
…
docker_cli_external_graphdriver_unix_test.go
Ignore 'not a swarm error' when inspecting a task.
2016-08-03 12:22:07 -04:00
docker_cli_external_volume_driver_unix_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_cli_health_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_cli_help_test.go
Deprecate "daemon" subcommand
2016-09-23 00:26:27 +02:00
docker_cli_history_test.go
Windows: Enable docker_cli_history_test
2016-08-30 09:31:33 -07:00
docker_cli_images_test.go
Windows: Enable TestImage and TestImport tests
2016-08-30 15:20:55 -07:00
docker_cli_import_test.go
Fix issue in docker import -c with quoted flags
2016-09-01 16:28:22 -07:00
docker_cli_info_test.go
Only output security options if there are any
2016-09-16 10:05:21 -07:00
docker_cli_info_unix_test.go
Add security info to docker info
2016-06-14 12:23:45 -07:00
docker_cli_inspect_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_cli_kill_test.go
…
docker_cli_links_test.go
Remove unnecessary json.Unmarshal wrapper.
2016-08-23 15:11:46 -04:00
docker_cli_links_unix_test.go
…
docker_cli_login_test.go
…
docker_cli_logout_test.go
support legacy registries in exernal stores
2016-09-07 09:45:42 +02:00
docker_cli_logs_bench_test.go
…
docker_cli_logs_test.go
Add support for reading logs extra attrs
2016-05-06 20:42:20 -04:00
docker_cli_nat_test.go
…
docker_cli_netmode_test.go
fix typos
2016-06-02 17:17:22 +08:00
docker_cli_network_unix_test.go
Fix improper use of --rm in test case
2016-09-14 13:14:30 -04:00
docker_cli_oom_killed_test.go
Add the swapMemorySupport requirement to OOM tests
2016-05-10 11:28:00 -07:00
docker_cli_pause_test.go
Get events until a time in the past.
2016-04-14 16:22:16 -07:00
docker_cli_plugins_test.go
add check plugin is not used before rm
2016-09-15 13:50:57 -07:00
docker_cli_port_test.go
…
docker_cli_proxy_test.go
…
docker_cli_ps_test.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
docker_cli_pull_local_test.go
support legacy registries in exernal stores
2016-09-07 09:45:42 +02:00
docker_cli_pull_test.go
Windows: Fix regression pulling linux images
2016-09-09 11:40:34 -07:00
docker_cli_pull_trusted_test.go
…
docker_cli_push_test.go
add defer file.Close to avoid potential fd leak
2016-08-10 08:36:09 +08:00
docker_cli_registry_user_agent_test.go
modify func namt from TestUserAgentPassThroughOnPull to TestUserAgentPassThrough
2016-08-08 11:40:20 +08:00
docker_cli_rename_test.go
Refactor docker inspect to work on all types
2016-08-25 16:29:08 -07:00
docker_cli_restart_test.go
Fix typo
2016-08-09 09:42:23 +08:00
docker_cli_rm_test.go
…
docker_cli_rmi_test.go
Move some test fixtures to go
2016-09-07 17:30:35 -04:00
docker_cli_run_test.go
Windows: Remove interim build hacks from tests
2016-09-21 11:11:13 -07:00
docker_cli_run_unix_test.go
Add init process for zombie fighting
2016-09-19 17:33:50 -07:00
docker_cli_save_load_test.go
add defer file.Close to avoid potential fd leak
2016-08-10 08:36:09 +08:00
docker_cli_save_load_unix_test.go
add defer file.Close to avoid potential fd leak
2016-08-10 08:36:09 +08:00
docker_cli_search_test.go
Use spf13/cobra for docker search
2016-06-03 19:50:01 +02:00
docker_cli_service_create_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_cli_service_health_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_cli_service_update_test.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
docker_cli_sni_test.go
…
docker_cli_stack_test.go
Remove unnecessary CmdWithArgs
2016-07-28 20:14:14 -04:00
docker_cli_start_test.go
Using waitExitOrRemoved for docker start
2016-08-26 00:16:49 +08:00
docker_cli_stats_test.go
Do not remove containers from stats list on err
2016-04-13 16:36:34 -04:00
docker_cli_stop_test.go
…
docker_cli_swarm_test.go
Improve error message for removing pre-defined (e.g., ingress) network
2016-09-24 11:59:26 -07:00
docker_cli_tag_test.go
Remove deprecated -f flag on docker tag
2016-06-01 09:44:25 -07:00
docker_cli_top_test.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
docker_cli_update_test.go
Forbid update restart policy of container with AutoRemove flag
2016-08-16 15:36:13 +08:00
docker_cli_update_unix_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
docker_cli_userns_test.go
Add test for checking created directories on remapped root
2016-09-05 13:02:13 +03:00
docker_cli_v2_only_test.go
…
docker_cli_version_test.go
…
docker_cli_volume_test.go
Add option to specify name without --name in volume create
2016-08-25 14:20:06 -07:00
docker_cli_wait_test.go
…
docker_deprecated_api_v124_test.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
docker_deprecated_api_v124_unix_test.go
remove deprecated feature of passing HostConfig at API container start
2016-06-01 22:25:17 +08:00
docker_experimental_network_test.go
Change to use c.Assert() instead of result.Assert()
2016-08-23 15:12:36 -04:00
docker_hub_pull_suite_test.go
Remove unnecessary CmdWithArgs
2016-07-28 20:14:14 -04:00
docker_test_vars.go
It is better to add "\n" in printf
2016-08-23 09:01:25 +08:00
docker_utils.go
Merge pull request #26119 from cpuguy83/lazily_load_fixtures
2016-09-08 11:16:27 -07:00
events_utils.go
test: fix trivial code convention noncompliance
2016-09-12 07:36:52 +00:00
fixtures_linux_daemon.go
Fix already loaded detection for frozen images
2016-09-12 12:55:26 -07:00
fixtures.go
Move some test fixtures to go
2016-09-07 17:30:35 -04:00
npipe_windows.go
…
npipe.go
…
registry_mock.go
…
registry.go
add defer file.Close to avoid potential fd leak
2016-08-10 08:36:09 +08:00
requirements_unix.go
TestRunSeccompUnconfinedCloneUserns: Check for unprivileged_userns_clone
2016-07-29 12:16:03 -04:00
requirements.go
Remove --read-only restriction when user ns enabled
2016-09-09 13:23:41 -04:00
test_vars_exec.go
…
test_vars_noexec.go
…
test_vars_noseccomp.go
…
test_vars_seccomp.go
…
test_vars_unix.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
test_vars_windows.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
test_vars.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
trust_server.go
Fix govet for go1.7
2016-09-02 19:07:54 -07:00
utils.go
Create a unified RunCommand function with Assert()
2016-08-23 15:11:46 -04:00