p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
99aad7f08b601284352e85287083f047cad888ba
docker-cli/components/engine/integration-cli
History
Yong Tang 99aad7f08b Add scope filter in /networks/<id> 
This fix tries to add a `scope` in the query of `/networks/<id>`
(`NetworkInspect`) so that in case of duplicate network names,
it is possible to locate the network ID based on the network
scope (`local`, 'swarm', or `global`).

Multiple networks might exist in different scopes, which is a legitimate case.
For example, a network name `foo` might exists locally and in swarm network.

However, before this PR it was not possible to query a network name `foo`
in a specific scope like swarm.

This fix fixes the issue by allowing a `scope` query in `/networks/<id>`.

Additional test cases have been added to unit tests and integration tests.

This fix is related to docker/cli#167, moby/moby#30897, moby/moby#33561, moby/moby#30242

This fix fixes docker/cli#167

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 158b2a1875cf33f3560dedaeb0149e1fbe54c1ef
Component: engine
2017-06-12 09:54:25 -07:00
..
checker
Remove pkg/integration and move it to testutil or integration-cli
2016-12-30 18:26:34 +01:00
cli
Fix ONBUILD COPY
2017-06-02 17:47:03 -04:00
daemon
Add integration test coverage for configs
2017-05-11 10:18:44 -07:00
environment
Remove cmd/docker and other directories in cli/ in accordance with the new Moby project scope
2017-05-05 12:14:29 -07:00
fixtures
Fix flaky TestStackRemove test.
2017-03-24 15:31:08 -04:00
registry
Revert "Planned 1.13 deprecation: email from login"
2017-03-15 10:43:18 -07:00
request
Fix Cache with ONBUILD
2017-06-06 10:52:29 -04: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
Remove cli/flags package
2017-06-01 13:34:31 -07:00
daemon_swarm_hack_test.go
Small cleanups on integration cli
2017-01-12 16:57:59 +01:00
docker_api_attach_test.go
Fix Cache with ONBUILD
2017-06-06 10:52:29 -04: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
Fix Cache with ONBUILD
2017-06-06 10:52:29 -04:00
docker_api_containers_test.go
Check signal is unset before using user stopsignal
2017-05-30 13:04:36 -04:00
docker_api_create_test.go
set 1ms as container duration minimum value
2017-04-12 15:45:29 -07:00
docker_api_events_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_api_exec_resize_test.go
Update request.* signature to remove the host
2017-03-06 16:41:33 +01:00
docker_api_exec_test.go
Update request.* signature to remove the host
2017-03-06 16:41:33 +01:00
docker_api_images_test.go
Avoid using "example.com" in integration test
2017-04-14 16:01:56 -07: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
Update request.* signature to remove the host
2017-03-06 16:41:33 +01:00
docker_api_network_test.go
Update request.* signature to remove the host
2017-03-06 16:41:33 +01:00
docker_api_resize_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_api_stats_test.go
Fix flaky TestAPIStatsNoStreamGetCpu
2017-05-10 13:26:04 -07:00
docker_api_stats_unix_test.go
Update request.* signature to remove the host
2017-03-06 16:41:33 +01:00
docker_api_swarm_config_test.go
choose rpc code to determine status code
2017-06-06 10:08:50 +08:00
docker_api_swarm_node_test.go
split docker_api_swarm_test.go into multiple files
2017-02-11 00:18:01 +08:00
docker_api_swarm_secret_test.go
choose rpc code to determine status code
2017-06-06 10:08:50 +08:00
docker_api_swarm_service_test.go
TestAPISwarmServicesUpdateStartFirst: Increase timeout on health check command
2017-05-12 10:42:29 -07:00
docker_api_swarm_test.go
Add scope filter in /networks/<id>
2017-06-12 09:54:25 -07:00
docker_api_test.go
Fix TestAPIDockerAPIVersion on windows
2017-03-29 10:28:51 +02: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 CreatedAt filed to volume. Display when volume is inspected.
2017-05-26 11:47:02 -07:00
docker_cli_attach_test.go
Introduce cli.Wait* fuctions
2017-04-14 19:27:33 +02: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
When authz plugin is disabled, remove from authz middleware chain.
2017-03-22 12:07:39 -07: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
Fix resetting image metadata between stages for scratch case
2017-05-12 12:00:55 -07:00
docker_cli_build_unix_test.go
Move FakeContext to integration-cli/cli/build/context package…
2017-04-11 18:25:49 +02:00
docker_cli_by_digest_test.go
Clean some function in docker_utils_test.go
2017-04-12 11:22:32 +02:00
docker_cli_commit_test.go
Clean some function in docker_utils_test.go
2017-04-12 11:22:32 +02:00
docker_cli_config_create_test.go
Add integration test coverage for configs
2017-05-11 10:18:44 -07:00
docker_cli_config_inspect_test.go
Add integration test coverage for configs
2017-05-11 10:18:44 -07:00
docker_cli_config_ls_test.go
Add integration test coverage for configs
2017-05-11 10:18:44 -07:00
docker_cli_config_test.go
Use actual cli version for TestConfigHTTPHeader
2017-06-01 09:35:30 -07:00
docker_cli_cp_from_container_test.go
daemon/archive.go: Fix copy routines to preserve UID.
2017-04-12 10:33:19 +00:00
docker_cli_cp_test.go
daemon/archive.go: Fix copy routines to preserve UID.
2017-04-12 10:33:19 +00:00
docker_cli_cp_to_container_test.go
daemon/archive.go: Fix copy routines to preserve UID.
2017-04-12 10:33:19 +00:00
docker_cli_cp_to_container_unix_test.go
daemon/archive.go: Fix copy routines to preserve UID.
2017-04-12 10:33:19 +00:00
docker_cli_cp_utils_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_cli_create_test.go
Use cli for trusted relate command
2017-04-19 14:04:39 +02: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 missing test for daemon kill with plugins running.
2017-03-22 14:38:55 -07:00
docker_cli_daemon_test.go
Use exclusive root pools if a CA cert file is specified in the daemon
2017-05-12 14:43:34 -07:00
docker_cli_diff_test.go
Introduce cli.Wait* fuctions
2017-04-14 19:27:33 +02:00
docker_cli_events_test.go
support cluster events
2017-05-17 11:46:30 -07:00
docker_cli_events_unix_test.go
Add daemon option to push foreign layers
2017-05-16 14:36:36 -07:00
docker_cli_exec_test.go
fix tests after CLI update
2017-05-10 20:09:50 -04: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
Add refcount for MountPoint
2017-04-28 16:01:25 -04:00
docker_cli_health_test.go
Add container environment variables correctly to the health check
2017-05-21 21:39:00 +03:00
docker_cli_help_test.go
[test-integration] Migrate some more tests to cli package
2017-03-28 15:17:31 +02:00
docker_cli_history_test.go
Introduce a cli package for test-integration
2017-03-23 18:35:22 +01:00
docker_cli_images_test.go
Extract imageProber and ContainerBackend from Builder
2017-05-23 15:12:58 -04:00
docker_cli_import_test.go
[test-integration] Migrate some more tests to cli package
2017-03-28 15:17:31 +02:00
docker_cli_info_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02: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
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_cli_kill_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02: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
Remove "-e" / "--email" from integration tests
2017-06-12 13:32:47 +02: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
[test-integration] Migrate some more tests to cli package
2017-03-28 15:17:31 +02:00
docker_cli_nat_test.go
Introduce cli.Wait* fuctions
2017-04-14 19:27:33 +02:00
docker_cli_netmode_test.go
Stop referring CLI flags in error messages if API client is unknown
2017-05-22 18:50:49 -04:00
docker_cli_network_unix_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02: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
Clean some function in docker_utils_test.go
2017-04-12 11:22:32 +02:00
docker_cli_plugins_logdriver_test.go
Add logdrivers to /info
2017-04-11 18:07:15 -04:00
docker_cli_plugins_test.go
Add support for metrics plugins
2017-05-12 00:30:09 -04: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
Update CLI commit hash
2017-05-18 12:23:28 -07:00
docker_cli_ps_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_cli_pull_local_test.go
Introduce a cli package for test-integration
2017-03-23 18:35:22 +01:00
docker_cli_pull_test.go
Block Windows images on Linux
2017-02-02 11:07:30 -08:00
docker_cli_pull_trusted_test.go
Use cli for trusted relate command
2017-04-19 14:04:39 +02:00
docker_cli_push_test.go
Remove cli/flags package
2017-06-01 13:34:31 -07:00
docker_cli_registry_user_agent_test.go
Remove "-e" / "--email" from integration tests
2017-06-12 13:32:47 +02:00
docker_cli_rename_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_cli_restart_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_cli_rm_test.go
create unit tests for rm (running, paused, restarting) errormessages
2017-04-03 21:58:05 +02:00
docker_cli_rmi_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_cli_run_test.go
Use cli for trusted relate command
2017-04-19 14:04:39 +02:00
docker_cli_run_unix_test.go
Revert "Block obsolete socket families in the default seccomp profile"
2017-05-09 14:26:00 +01:00
docker_cli_save_load_test.go
Introduce a cli package for test-integration
2017-03-23 18:35:22 +01:00
docker_cli_save_load_unix_test.go
fix expected output in tests
2017-05-05 12:14:30 -07:00
docker_cli_search_test.go
fix some ineffectual assignments
2017-01-24 11:16:19 +01:00
docker_cli_secret_create_test.go
fixed:go vetting warning unkeyed fields
2017-03-20 16:30:01 +08:00
docker_cli_secret_inspect_test.go
fixed:go vetting warning unkeyed fields
2017-03-20 16:30:01 +08:00
docker_cli_secret_ls_test.go
make secret ls support filters in CLI
2017-03-27 10:16:45 +08:00
docker_cli_service_create_test.go
Service alias should not be copied to task alias
2017-06-07 13:05:15 -07:00
docker_cli_service_health_test.go
Update CLI commit hash
2017-05-18 12:23:28 -07:00
docker_cli_service_logs_test.go
Revert ONCLR and OPOST changes
2017-06-07 13:14:52 -07:00
docker_cli_service_scale_test.go
Update CLI commit hash
2017-05-18 12:23:28 -07:00
docker_cli_service_update_test.go
Update CLI commit hash
2017-05-18 12:23:28 -07:00
docker_cli_sni_test.go
Disable flakey TestClientSetsTLSServerName
2016-02-02 19:56:31 -08:00
docker_cli_stack_test.go
Add format to docker stack ls
2017-04-25 16:45:30 +03:00
docker_cli_start_test.go
fix expected output in tests
2017-05-05 12:14:30 -07:00
docker_cli_stats_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02: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
Fix Typos: continer,contianer -> container
2017-06-01 19:21:01 +08:00
docker_cli_swarm_unix_test.go
Update CLI commit hash
2017-05-18 12:23:28 -07:00
docker_cli_tag_test.go
Introduce a cli package for test-integration
2017-03-23 18:35:22 +01:00
docker_cli_top_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_cli_update_test.go
[integration] make runSleepingContainer use cli package
2017-04-16 23:39:30 +02:00
docker_cli_update_unix_test.go
Add --cpus support for docker update
2017-04-06 15:40:12 -07: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
Remove "-e" / "--email" from integration tests
2017-06-12 13:32:47 +02: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
Introduce a cli package for test-integration
2017-03-23 18:35:22 +01: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
Update request.* signature to remove the host
2017-03-06 16:41:33 +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
[test-integration] Migrate some more tests to cli package
2017-03-28 15:17:31 +02: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
[integration] Move fakegit to its own package in cli
2017-04-19 15:52:03 +02: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
Revert "Block obsolete socket families in the default seccomp profile"
2017-05-09 14:26:00 +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
Remove cli/flags package
2017-06-01 13:34:31 -07:00
utils_test.go
Use testEnv methods and remove most of the global variables
2017-01-17 12:39:08 +01:00