internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify docker_*_facts return names (#51939)

Browse Source 
* Simplify docker_*_facts return names.

* Adjust regular return values of modules to match style of docker_*_facts modules.
This commit is contained in:
Felix Fontein
2019-03-05 17:09:00 +01:00
committed by John R Barker
parent 1510435577
commit 8c628c9b2c
21 changed files with 208 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/integration/targets/docker_container/tasks/tests/options.yml
View File

@@ -543,15 +543,15 @@
# of hello-world. We don't know why this happens, but it happens
# often enough to be annoying. That's why we disable this for now,
# and simply test that 'Output' is contained in the result.
- "'Output' in detach_no_cleanup.docker_container"
# - "'Hello from Docker!' in detach_no_cleanup.docker_container.Output"
- "'Output' in detach_no_cleanup.container"
# - "'Hello from Docker!' in detach_no_cleanup.container.Output"
- detach_no_cleanup_cleanup is changed
- "'Output' in detach_cleanup.docker_container"
# - "'Hello from Docker!' in detach_cleanup.docker_container.Output"
- "'Output' in detach_cleanup.container"
# - "'Hello from Docker!' in detach_cleanup.container.Output"
- detach_cleanup_cleanup is not changed
- assert:
that:
- "'Cannot retrieve result as auto_remove is enabled' == detach_auto_remove.docker_container.Output"
- "'Cannot retrieve result as auto_remove is enabled' == detach_auto_remove.container.Output"
- detach_auto_remove_cleanup is not changed
when: docker_py_version is version('2.1.0', '>=')
@@ -2378,7 +2378,7 @@
- memory_swap_1 is changed
# Sometimes (in particular during integration tests, maybe when not running
# on a proper VM), memory_swap cannot be set and will be -1 afterwards.
- memory_swap_2 is not changed or memory_swap_2.docker_container.HostConfig.MemorySwap == -1
- memory_swap_2 is not changed or memory_swap_2.container.HostConfig.MemorySwap == -1
- memory_swap_3 is changed
- debug: var=memory_swap_1
@@ -2780,7 +2780,7 @@
command: '/bin/sh -c "sleep 10m"'
name: "{{ cname }}"
state: started
pid_mode: "container:{{ pid_mode_helper.docker_container.Id }}"
pid_mode: "container:{{ pid_mode_helper.container.Id }}"
register: pid_mode_1
ignore_errors: yes
# docker-py < 2.0 does not support "arbitrary" pid_mode values
@@ -3103,9 +3103,9 @@
- recreate_2 is changed
- recreate_3 is changed
- recreate_4 is changed
- recreate_1.docker_container.Id != recreate_2.docker_container.Id
- recreate_2.docker_container.Id == recreate_3.docker_container.Id
- recreate_3.docker_container.Id != recreate_4.docker_container.Id
- recreate_1.container.Id != recreate_2.container.Id
- recreate_2.container.Id == recreate_3.container.Id
- recreate_3.container.Id != recreate_4.container.Id
####################################################################
## restart #########################################################
@@ -3144,7 +3144,7 @@
that:
- restart_1 is changed
- restart_2 is changed
- restart_1.docker_container.Id == restart_2.docker_container.Id
- restart_1.container.Id == restart_2.container.Id
####################################################################
## restart_policy ##################################################

10
test/integration/targets/docker_container_facts/tasks/main.yml
View File

@@ -18,8 +18,8 @@
- assert:
that:
- "not result.exists"
- "'docker_container' in result"
- "result.docker_container is none"
- "'container' in result"
- "result.container is none"
- name: Make sure container exists
docker_container:
@@ -54,9 +54,9 @@
- assert:
that:
- result.exists
- "'docker_container' in result"
- "result.docker_container"
- "result.docker_container == docker_inspect_result[0]"
- "'container' in result"
- "result.container"
- "result.container == docker_inspect_result[0]"
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')

196
test/integration/targets/docker_host_facts/tasks/test_host_facts.yml
View File

@@ -15,12 +15,12 @@
- name: assert reading docker host facts when docker is running
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage is not defined'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks is not defined'
- 'output.volumes is not defined'
- 'output.images is not defined'
- 'output.disk_usage is not defined'
# Container and volume are created so that all lists are non-empty:
# * container and volume lists are non-emtpy because of the created objects;
@@ -55,13 +55,13 @@
- name: assert reading docker host facts when docker is running and list containers
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage is not defined'
- 'output.docker_containers_list[0].Image is string'
- 'output.docker_containers_list[0].ImageID is not defined'
- 'output.host_facts.Name is string'
- 'output.networks is not defined'
- 'output.volumes is not defined'
- 'output.images is not defined'
- 'output.disk_usage is not defined'
- 'output.containers[0].Image is string'
- 'output.containers[0].ImageID is not defined'
- name: Get info on Docker host and list containers with verbose output
docker_host_facts:
@@ -72,13 +72,13 @@
- name: assert reading docker host facts when docker is running and list containers with verbose output
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage is not defined'
- 'output.docker_containers_list[0].Image is string'
- 'output.docker_containers_list[0].ImageID is string'
- 'output.host_facts.Name is string'
- 'output.networks is not defined'
- 'output.volumes is not defined'
- 'output.images is not defined'
- 'output.disk_usage is not defined'
- 'output.containers[0].Image is string'
- 'output.containers[0].ImageID is string'
- name: Get info on Docker host and list images
docker_host_facts:
@@ -88,13 +88,13 @@
- name: assert reading docker host facts when docker is running and list images
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list[0].Id is string'
- 'output.docker_images_list[0].ParentId is not defined'
- 'output.docker_disk_usage is not defined'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks is not defined'
- 'output.volumes is not defined'
- 'output.images[0].Id is string'
- 'output.images[0].ParentId is not defined'
- 'output.disk_usage is not defined'
- name: Get info on Docker host and list images with verbose output
docker_host_facts:
@@ -105,13 +105,13 @@
- name: assert reading docker host facts when docker is running and list images with verbose output
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list[0].Id is string'
- 'output.docker_images_list[0].ParentId is string'
- 'output.docker_disk_usage is not defined'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks is not defined'
- 'output.volumes is not defined'
- 'output.images[0].Id is string'
- 'output.images[0].ParentId is string'
- 'output.disk_usage is not defined'
- name: Get info on Docker host and list networks
docker_host_facts:
@@ -121,13 +121,13 @@
- name: assert reading docker host facts when docker is running and list networks
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list[0].Id is string'
- 'output.docker_networks_list[0].Created is not defined'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage is not defined'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks[0].Id is string'
- 'output.networks[0].Created is not defined'
- 'output.volumes is not defined'
- 'output.images is not defined'
- 'output.disk_usage is not defined'
- name: Get info on Docker host and list networks with verbose output
docker_host_facts:
@@ -138,13 +138,13 @@
- name: assert reading docker host facts when docker is running and list networks with verbose output
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list[0].Id is string'
- 'output.docker_networks_list[0].Created is string'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage is not defined'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks[0].Id is string'
- 'output.networks[0].Created is string'
- 'output.volumes is not defined'
- 'output.images is not defined'
- 'output.disk_usage is not defined'
- name: Get info on Docker host and list volumes
docker_host_facts:
@@ -154,13 +154,13 @@
- name: assert reading docker host facts when docker is running and list volumes
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list[0].Name is string'
- 'output.docker_volumes_list[0].Mountpoint is not defined'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage is not defined'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks is not defined'
- 'output.volumes[0].Name is string'
- 'output.volumes[0].Mountpoint is not defined'
- 'output.images is not defined'
- 'output.disk_usage is not defined'
- name: Get info on Docker host and list volumes with verbose output
docker_host_facts:
@@ -171,13 +171,13 @@
- name: assert reading docker host facts when docker is running and list volumes with verbose output
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list[0].Name is string'
- 'output.docker_volumes_list[0].Mountpoint is string'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage is not defined'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks is not defined'
- 'output.volumes[0].Name is string'
- 'output.volumes[0].Mountpoint is string'
- 'output.images is not defined'
- 'output.disk_usage is not defined'
- name: Get info on Docker host and get disk usage
docker_host_facts:
@@ -187,13 +187,13 @@
- name: assert reading docker host facts when docker is running and get disk usage
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage.LayersSize is number'
- 'output.docker_disk_usage.BuilderSize is not defined'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks is not defined'
- 'output.volumes is not defined'
- 'output.images is not defined'
- 'output.disk_usage.LayersSize is number'
- 'output.disk_usage.BuilderSize is not defined'
- name: Get info on Docker host and get disk usage with verbose output
docker_host_facts:
@@ -204,13 +204,13 @@
- name: assert reading docker host facts when docker is running and get disk usage with verbose output
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list is not defined'
- 'output.docker_networks_list is not defined'
- 'output.docker_volumes_list is not defined'
- 'output.docker_images_list is not defined'
- 'output.docker_disk_usage.LayersSize is number'
- 'output.docker_disk_usage.BuilderSize is number'
- 'output.host_facts.Name is string'
- 'output.containers is not defined'
- 'output.networks is not defined'
- 'output.volumes is not defined'
- 'output.images is not defined'
- 'output.disk_usage.LayersSize is number'
- 'output.disk_usage.BuilderSize is number'
- name: Get info on Docker host, disk usage and get all lists together
docker_host_facts:
@@ -224,17 +224,17 @@
- name: assert reading docker host facts when docker is running, disk usage and get lists together
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list[0].Image is string'
- 'output.docker_containers_list[0].ImageID is not defined'
- 'output.docker_networks_list[0].Id is string'
- 'output.docker_networks_list[0].Created is not defined'
- 'output.docker_volumes_list[0].Name is string'
- 'output.docker_volumes_list[0].Mountpoint is not defined'
- 'output.docker_images_list[0].Id is string'
- 'output.docker_images_list[0].ParentId is not defined'
- 'output.docker_disk_usage.LayersSize is number'
- 'output.docker_disk_usage.BuilderSize is not defined'
- 'output.host_facts.Name is string'
- 'output.containers[0].Image is string'
- 'output.containers[0].ImageID is not defined'
- 'output.networks[0].Id is string'
- 'output.networks[0].Created is not defined'
- 'output.volumes[0].Name is string'
- 'output.volumes[0].Mountpoint is not defined'
- 'output.images[0].Id is string'
- 'output.images[0].ParentId is not defined'
- 'output.disk_usage.LayersSize is number'
- 'output.disk_usage.BuilderSize is not defined'
- name: Get info on Docker host, disk usage and get all lists together with verbose output
docker_host_facts:
@@ -249,17 +249,17 @@
- name: assert reading docker host facts when docker is running and get disk usage with verbose output
assert:
that:
- 'output.docker_host_facts.Name is string'
- 'output.docker_containers_list[0].Image is string'
- 'output.docker_containers_list[0].ImageID is string'
- 'output.docker_networks_list[0].Id is string'
- 'output.docker_networks_list[0].Created is string'
- 'output.docker_volumes_list[0].Name is string'
- 'output.docker_volumes_list[0].Mountpoint is string'
- 'output.docker_images_list[0].Id is string'
- 'output.docker_images_list[0].ParentId is string'
- 'output.docker_disk_usage.LayersSize is number'
- 'output.docker_disk_usage.BuilderSize is number'
- 'output.host_facts.Name is string'
- 'output.containers[0].Image is string'
- 'output.containers[0].ImageID is string'
- 'output.networks[0].Id is string'
- 'output.networks[0].Created is string'
- 'output.volumes[0].Name is string'
- 'output.volumes[0].Mountpoint is string'
- 'output.images[0].Id is string'
- 'output.images[0].ParentId is string'
- 'output.disk_usage.LayersSize is number'
- 'output.disk_usage.BuilderSize is number'
always:
- name: Delete container

10
test/integration/targets/docker_network_facts/tasks/main.yml
View File

@@ -18,8 +18,8 @@
- assert:
that:
- "not result.exists"
- "'docker_network' in result"
- "result.docker_network is none"
- "'network' in result"
- "result.network is none"
- name: Make sure network exists
docker_network:
@@ -50,9 +50,9 @@
- assert:
that:
- result.exists
- "'docker_network' in result"
- "result.docker_network"
- "result.docker_network == docker_inspect_result[0]"
- "'network' in result"
- "result.network"
- "result.network == docker_inspect_result[0]"
when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.21', '>=')

16
test/integration/targets/docker_node_facts/tasks/test_node_facts.yml
View File

@@ -36,8 +36,8 @@
- name: assert reading docker swarm node facts
assert:
that:
- 'output.nodes_facts | length > 0'
- 'output.nodes_facts[0].ID is string'
- 'output.nodes | length > 0'
- 'output.nodes[0].ID is string'
- name: Try to get docker_node_facts using the self parameter
docker_node_facts:
@@ -47,12 +47,12 @@
- name: assert reading swarm facts with list of nodes option
assert:
that:
- 'output.nodes_facts | length == 1'
- 'output.nodes_facts[0].ID is string'
- 'output.nodes | length == 1'
- 'output.nodes[0].ID is string'
- name: Get local docker node name
set_fact:
localnodename: "{{ output.nodes_facts[0].Description.Hostname }}"
localnodename: "{{ output.nodes[0].Description.Hostname }}"
- name: Try to get docker_node_facts using the local node name as parameter
@@ -63,8 +63,8 @@
- name: assert reading reading swarm facts and using node filter (random node name)
assert:
that:
- 'output.nodes_facts | length == 1'
- 'output.nodes_facts[0].ID is string'
- 'output.nodes | length == 1'
- 'output.nodes[0].ID is string'
- name: Create random name
set_fact:
@@ -78,7 +78,7 @@
- name: assert reading reading swarm facts and using node filter (random node name)
assert:
that:
- 'output.nodes_facts | length == 0'
- 'output.nodes | length == 0'
always:
- name: Cleanup

6
test/integration/targets/docker_prune/tasks/main.yml
View File

@@ -35,14 +35,14 @@
- assert:
that:
# containers
- container.docker_container.Id in result.containers
- container.container.Id in result.containers
- "'containers_space_reclaimed' in result"
# images
- "'images_space_reclaimed' in result"
# networks
- network.docker_network.Name in result.networks
- network.network.Name in result.networks
# volumes
- volume.docker_volume.Name in result.volumes
- volume.volume.Name in result.volumes
- "'volumes_space_reclaimed' in result"
# builder_cache
- "'builder_cache_space_reclaimed' in result"

2
test/integration/targets/docker_stack/tasks/test_stack.yml
View File

@@ -80,7 +80,7 @@
# assert:
# that:
# - output is changed
# - output.docker_stack_spec_diff == stack_update_expected_diff
# - output.stack_spec_diff == stack_update_expected_diff
- name: Delete stack
register: output

42
test/integration/targets/docker_swarm_facts/tasks/test_swarm_facts.yml
View File

@@ -39,9 +39,9 @@
- name: assert creding docker swarm facts
assert:
that:
- 'output.docker_swarm_facts.JoinTokens.Manager'
- 'output.docker_swarm_facts.JoinTokens.Worker'
- 'output.docker_swarm_facts.ID'
- 'output.swarm_facts.JoinTokens.Manager'
- 'output.swarm_facts.JoinTokens.Worker'
- 'output.swarm_facts.ID'
- 'output.can_talk_to_docker == true'
- 'output.docker_swarm_active == true'
- 'output.docker_swarm_manager == true'
@@ -54,17 +54,17 @@
- name: assert reding swarm facts with list of nodes option
assert:
that:
- 'output.docker_swarm_facts.JoinTokens.Manager'
- 'output.docker_swarm_facts.JoinTokens.Worker'
- 'output.docker_swarm_facts.ID'
- 'output.docker_nodes_list[0].ID is string'
- 'output.swarm_facts.JoinTokens.Manager'
- 'output.swarm_facts.JoinTokens.Worker'
- 'output.swarm_facts.ID'
- 'output.nodes[0].ID is string'
- 'output.can_talk_to_docker == true'
- 'output.docker_swarm_active == true'
- 'output.docker_swarm_manager == true'
- name: Get local docker node name
set_fact:
localnodename: "{{ output.docker_nodes_list[0].Hostname }}"
localnodename: "{{ output.nodes[0].Hostname }}"
- name: Try to get docker_swarm_facts and verbose list of nodes when docker is running in swarm mode and as manager
@@ -76,11 +76,11 @@
- name: assert reading swarm facts with list of nodes and versbose output options
assert:
that:
- 'output.docker_swarm_facts.JoinTokens.Manager'
- 'output.docker_swarm_facts.JoinTokens.Worker'
- 'output.docker_swarm_facts.ID'
- 'output.docker_nodes_list[0].ID is string'
- 'output.docker_nodes_list[0].CreatedAt'
- 'output.swarm_facts.JoinTokens.Manager'
- 'output.swarm_facts.JoinTokens.Worker'
- 'output.swarm_facts.ID'
- 'output.nodes[0].ID is string'
- 'output.nodes[0].CreatedAt'
- 'output.can_talk_to_docker == true'
- 'output.docker_swarm_active == true'
- 'output.docker_swarm_manager == true'
@@ -95,10 +95,10 @@
- name: assert reading reading swarm facts and using node filter (random node name)
assert:
that:
- 'output.docker_swarm_facts.JoinTokens.Manager'
- 'output.docker_swarm_facts.JoinTokens.Worker'
- 'output.docker_swarm_facts.ID'
- 'output.docker_nodes_list | length == 1'
- 'output.swarm_facts.JoinTokens.Manager'
- 'output.swarm_facts.JoinTokens.Worker'
- 'output.swarm_facts.ID'
- 'output.nodes | length == 1'
- 'output.can_talk_to_docker == true'
- 'output.docker_swarm_active == true'
- 'output.docker_swarm_manager == true'
@@ -117,10 +117,10 @@
- name: assert reading reading swarm facts and using node filter (random node name)
assert:
that:
- 'output.docker_swarm_facts.JoinTokens.Manager'
- 'output.docker_swarm_facts.JoinTokens.Worker'
- 'output.docker_swarm_facts.ID'
- 'output.docker_nodes_list | length == 0'
- 'output.swarm_facts.JoinTokens.Manager'
- 'output.swarm_facts.JoinTokens.Worker'
- 'output.swarm_facts.ID'
- 'output.nodes | length == 0'
- 'output.can_talk_to_docker == true'
- 'output.docker_swarm_active == true'
- 'output.docker_swarm_manager == true'

10
test/integration/targets/docker_volume_facts/tasks/main.yml
View File

@@ -17,8 +17,8 @@
- assert:
that:
- "not result.exists"
- "'docker_volume' in result"
- "result.docker_volume is none"
- "'volume' in result"
- "result.volume is none"
- name: Make sure volume exists
docker_volume:
@@ -47,9 +47,9 @@
- assert:
that:
- result.exists
- "'docker_volume' in result"
- "result.docker_volume"
- "result.docker_volume == docker_volume_inspect_result[0]"
- "'volume' in result"
- "result.volume"
- "result.volume == docker_volume_inspect_result[0]"
# Requirements for docker_volume
when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.24', '>=')