Fix linting errors.

tests/integration/targets/docker_network/tasks/tests/basic.yml

@@ -22,9 +22,9 @@
     command: /bin/sleep 10m
     state: started
   loop:
-  - "{{ cname_1 }}"
-  - "{{ cname_2 }}"
-  - "{{ cname_3 }}"
+    - "{{ cname_1 }}"
+    - "{{ cname_2 }}"
+    - "{{ cname_3 }}"
   loop_control:
     loop_var: container_name
 
@@ -41,7 +41,7 @@
     name: "{{ nname_1 }}"
     state: present
     connected:
-    - "{{ cname_1 }}"
+      - "{{ cname_1 }}"
   register: networks_2
 
 - name: Connect network to containers 1 (idempotency)
@@ -49,7 +49,7 @@
     name: "{{ nname_1 }}"
     state: present
     connected:
-    - "{{ cname_1 }}"
+      - "{{ cname_1 }}"
   register: networks_2_idem
 
 - name: Connect network to containers 1 and 2
@@ -57,8 +57,8 @@
     name: "{{ nname_1 }}"
     state: present
     connected:
-    - "{{ cname_1 }}"
-    - "{{ cname_2 }}"
+      - "{{ cname_1 }}"
+      - "{{ cname_2 }}"
   register: networks_3
 
 - name: Connect network to containers 1 and 2 (idempotency)
@@ -66,8 +66,8 @@
     name: "{{ nname_1 }}"
     state: present
     connected:
-    - "{{ cname_1 }}"
-    - "{{ cname_2 }}"
+      - "{{ cname_1 }}"
+      - "{{ cname_2 }}"
   register: networks_3_idem
 
 - name: Connect network to container 3
@@ -75,7 +75,7 @@
     name: "{{ nname_1 }}"
     state: present
     connected:
-    - "{{ cname_3 }}"
+      - "{{ cname_3 }}"
     appends: true
   register: networks_4
 
@@ -84,7 +84,7 @@
     name: "{{ nname_1 }}"
     state: present
     connected:
-    - "{{ cname_3 }}"
+      - "{{ cname_3 }}"
     appends: true
   register: networks_4_idem
 
@@ -93,8 +93,8 @@
     name: "{{ nname_1 }}"
     state: present
     connected:
-    - "{{ cname_2 }}"
-    - "{{ cname_3 }}"
+      - "{{ cname_2 }}"
+      - "{{ cname_3 }}"
   register: networks_5
 
 - name: Disconnect network from container 1 (idempotency)
@@ -102,8 +102,8 @@
     name: "{{ nname_1 }}"
     state: present
     connected:
-    - "{{ cname_2 }}"
-    - "{{ cname_3 }}"
+      - "{{ cname_2 }}"
+      - "{{ cname_3 }}"
   register: networks_5_idem
 
 - name: Cleanup
@@ -113,15 +113,15 @@
 
 - assert:
     that:
-    - networks_1 is changed
-    - networks_2 is changed
-    - networks_2_idem is not changed
-    - networks_3 is changed
-    - networks_3_idem is not changed
-    - networks_4 is changed
-    - networks_4_idem is not changed
-    - networks_5 is changed
-    - networks_5_idem is not changed
+      - networks_1 is changed
+      - networks_2 is changed
+      - networks_2_idem is not changed
+      - networks_3 is changed
+      - networks_3_idem is not changed
+      - networks_4 is changed
+      - networks_4_idem is not changed
+      - networks_5 is changed
+      - networks_5_idem is not changed
 
 ####################################################################
 
@@ -131,8 +131,8 @@
     state: absent
     force_kill: true
   loop:
-  - "{{ cname_1 }}"
-  - "{{ cname_2 }}"
-  - "{{ cname_3 }}"
+    - "{{ cname_1 }}"
+    - "{{ cname_2 }}"
+    - "{{ cname_3 }}"
   loop_control:
     loop_var: container_name

tests/integration/targets/docker_network/tasks/tests/ipam.yml

@@ -200,71 +200,71 @@
 #################### multiple IPv4 networks ####################
 
 - block:
-  - name: Create network with two IPv4 IPAM configs
-    docker_network:
-      name: "{{ nname_ipam_3 }}"
-      driver: "macvlan"
-      driver_options:
-        parent: "{{ ansible_default_ipv4.alias }}"
-      ipam_config:
-        - subnet: 10.26.120.0/24
-        - subnet: 10.26.121.0/24
-    register: network
+    - name: Create network with two IPv4 IPAM configs
+      docker_network:
+        name: "{{ nname_ipam_3 }}"
+        driver: "macvlan"
+        driver_options:
+          parent: "{{ ansible_default_ipv4.alias }}"
+        ipam_config:
+          - subnet: 10.26.120.0/24
+          - subnet: 10.26.121.0/24
+      register: network
 
-  - assert:
-      that:
-        - network is changed
+    - assert:
+        that:
+          - network is changed
 
-  - name: Create network with two IPv4 IPAM configs (idempotence)
-    docker_network:
-      name: "{{ nname_ipam_3 }}"
-      driver: "macvlan"
-      driver_options:
-        parent: "{{ ansible_default_ipv4.alias }}"
-      ipam_config:
-        - subnet: 10.26.121.0/24
-        - subnet: 10.26.120.0/24
-    register: network
+    - name: Create network with two IPv4 IPAM configs (idempotence)
+      docker_network:
+        name: "{{ nname_ipam_3 }}"
+        driver: "macvlan"
+        driver_options:
+          parent: "{{ ansible_default_ipv4.alias }}"
+        ipam_config:
+          - subnet: 10.26.121.0/24
+          - subnet: 10.26.120.0/24
+      register: network
 
-  - assert:
-      that:
-        - network is not changed
+    - assert:
+        that:
+          - network is not changed
 
-  - name: Create network with two IPv4 IPAM configs (change)
-    docker_network:
-      name: "{{ nname_ipam_3 }}"
-      driver: "macvlan"
-      driver_options:
-        parent: "{{ ansible_default_ipv4.alias }}"
-      ipam_config:
-        - subnet: 10.26.120.0/24
-        - subnet: 10.26.122.0/24
-    register: network
-    diff: true
+    - name: Create network with two IPv4 IPAM configs (change)
+      docker_network:
+        name: "{{ nname_ipam_3 }}"
+        driver: "macvlan"
+        driver_options:
+          parent: "{{ ansible_default_ipv4.alias }}"
+        ipam_config:
+          - subnet: 10.26.120.0/24
+          - subnet: 10.26.122.0/24
+      register: network
+      diff: true
 
-  - assert:
-      that:
-        - network is changed
-        - network.diff.differences | length == 1
+    - assert:
+        that:
+          - network is changed
+          - network.diff.differences | length == 1
 
-  - name: Create network with one IPv4 IPAM config (no change)
-    docker_network:
-      name: "{{ nname_ipam_3 }}"
-      driver: "macvlan"
-      driver_options:
-        parent: "{{ ansible_default_ipv4.alias }}"
-      ipam_config:
-        - subnet: 10.26.122.0/24
-    register: network
+    - name: Create network with one IPv4 IPAM config (no change)
+      docker_network:
+        name: "{{ nname_ipam_3 }}"
+        driver: "macvlan"
+        driver_options:
+          parent: "{{ ansible_default_ipv4.alias }}"
+        ipam_config:
+          - subnet: 10.26.122.0/24
+      register: network
 
-  - assert:
-      that:
-        - network is not changed
+    - assert:
+        that:
+          - network is not changed
 
-  - name: Cleanup network
-    docker_network:
-      name: "{{ nname_ipam_3 }}"
-      state: absent
+    - name: Cleanup network
+      docker_network:
+        name: "{{ nname_ipam_3 }}"
+        state: absent
 
   when: ansible_facts.virtualization_type != 'docker' and ansible_default_ipv4.alias is defined
 

tests/integration/targets/docker_network/tasks/tests/options.yml

@@ -40,9 +40,9 @@
 
 - assert:
     that:
-    - internal_1 is changed
-    - internal_2 is not changed
-    - internal_3 is changed
+      - internal_1 is changed
+      - internal_2 is not changed
+      - internal_3 is changed
 
 ####################################################################
 ## driver_options ##################################################
@@ -91,62 +91,62 @@
 
 - assert:
     that:
-    - driver_options_1 is changed
-    - driver_options_2 is not changed
-    - driver_options_3 is not changed
-    - driver_options_4 is changed
-    - driver_options_5 is not changed
+      - driver_options_1 is changed
+      - driver_options_2 is not changed
+      - driver_options_3 is not changed
+      - driver_options_4 is changed
+      - driver_options_5 is not changed
 
 ####################################################################
 ## scope ###########################################################
 ####################################################################
 
 - block:
-  - name: scope
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: bridge
-      scope: local
-    register: scope_1
+    - name: scope
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: bridge
+        scope: local
+      register: scope_1
 
-  - name: scope (idempotency)
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: bridge
-      scope: local
-    register: scope_2
+    - name: scope (idempotency)
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: bridge
+        scope: local
+      register: scope_2
 
-  - name: swarm
-    docker_swarm:
-      state: present
-      advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
+    - name: swarm
+      docker_swarm:
+        state: present
+        advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
 
-  # Driver change alongside scope is intentional - bridge doesn't appear to support anything but local, and overlay can't downgrade to local. Additionally, overlay reports as swarm for swarm OR global, so no change is reported in that case.
-  # Test output indicates that the scope is altered, at least, so manual inspection will be required to verify this going forward, unless we come up with a test driver that supports multiple scopes.
-  - name: scope (change)
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: overlay
-      scope: swarm
-    register: scope_3
+    # Driver change alongside scope is intentional - bridge doesn't appear to support anything but local, and overlay can't downgrade to local. Additionally, overlay reports as swarm for swarm OR global, so no change is reported in that case.
+    # Test output indicates that the scope is altered, at least, so manual inspection will be required to verify this going forward, unless we come up with a test driver that supports multiple scopes.
+    - name: scope (change)
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: overlay
+        scope: swarm
+      register: scope_3
 
-  - name: cleanup network
-    docker_network:
-      name: "{{ nname_1 }}"
-      state: absent
-      force: true
+    - name: cleanup network
+      docker_network:
+        name: "{{ nname_1 }}"
+        state: absent
+        force: true
 
-  - assert:
-      that:
-      - scope_1 is changed
-      - scope_2 is not changed
-      - scope_3 is changed
+    - assert:
+        that:
+          - scope_1 is changed
+          - scope_2 is not changed
+          - scope_3 is changed
 
   always:
-  - name: cleanup swarm
-    docker_swarm:
-      state: absent
-      force: true
+    - name: cleanup swarm
+      docker_swarm:
+        state: absent
+        force: true
 
 ####################################################################
 ## attachable ######################################################
@@ -158,21 +158,21 @@
     attachable: true
   register: attachable_1
   ignore_errors: true
-  
+
 - name: attachable (idempotency)
   docker_network:
     name: "{{ nname_1 }}"
     attachable: true
   register: attachable_2
   ignore_errors: true
-  
+
 - name: attachable (change)
   docker_network:
     name: "{{ nname_1 }}"
     attachable: false
   register: attachable_3
   ignore_errors: true
-  
+
 - name: cleanup
   docker_network:
     name: "{{ nname_1 }}"
@@ -181,9 +181,9 @@
 
 - assert:
     that:
-    - attachable_1 is changed
-    - attachable_2 is not changed
-    - attachable_3 is changed
+      - attachable_1 is changed
+      - attachable_2 is not changed
+      - attachable_3 is changed
 
 ####################################################################
 ## labels ##########################################################
@@ -228,7 +228,7 @@
 
 - assert:
     that:
-    - labels_1 is changed
-    - labels_2 is not changed
-    - labels_3 is not changed
-    - labels_4 is changed
+      - labels_1 is changed
+      - labels_2 is not changed
+      - labels_3 is not changed
+      - labels_4 is changed

tests/integration/targets/docker_network/tasks/tests/overlay.yml

@@ -11,94 +11,94 @@
     dnetworks: "{{ dnetworks + [nname_1] }}"
 
 - block:
-  # Overlay networks require swarm initialization before they'll work
-  - name: swarm
-    docker_swarm:
-      state: present
-      advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
+    # Overlay networks require swarm initialization before they'll work
+    - name: swarm
+      docker_swarm:
+        state: present
+        advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}"
 
-####################################################################
-## overlay #########################################################
-####################################################################
+  ####################################################################
+  ## overlay #########################################################
+  ####################################################################
 
-  - name: overlay
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: overlay
-      driver_options:
-        com.docker.network.driver.overlay.vxlanid_list: "257"
-    register: overlay_1
+    - name: overlay
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: overlay
+        driver_options:
+          com.docker.network.driver.overlay.vxlanid_list: "257"
+      register: overlay_1
 
-  - name: overlay (idempotency)
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: overlay
-      driver_options:
-        com.docker.network.driver.overlay.vxlanid_list: "257"
-    register: overlay_2
+    - name: overlay (idempotency)
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: overlay
+        driver_options:
+          com.docker.network.driver.overlay.vxlanid_list: "257"
+      register: overlay_2
 
-  - name: overlay (change)
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: bridge
-    register: overlay_3
+    - name: overlay (change)
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: bridge
+      register: overlay_3
 
-  - name: cleanup network
-    docker_network:
-      name: "{{ nname_1 }}"
-      state: absent
-      force: true
+    - name: cleanup network
+      docker_network:
+        name: "{{ nname_1 }}"
+        state: absent
+        force: true
 
-  - assert:
-      that:
-      - overlay_1 is changed
-      - overlay_2 is not changed
-      - overlay_3 is changed
+    - assert:
+        that:
+          - overlay_1 is changed
+          - overlay_2 is not changed
+          - overlay_3 is changed
 
-####################################################################
-## ingress #########################################################
-####################################################################
+  ####################################################################
+  ## ingress #########################################################
+  ####################################################################
 
-  - name: cleanup default swarm ingress network
-    docker_network:
-      name: ingress
-      state: absent
+    - name: cleanup default swarm ingress network
+      docker_network:
+        name: ingress
+        state: absent
 
-  - name: ingress
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: overlay
-      ingress: true
-    register: ingress_1
+    - name: ingress
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: overlay
+        ingress: true
+      register: ingress_1
 
-  - name: ingress (idempotency)
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: overlay
-      ingress: true
-    register: ingress_2
+    - name: ingress (idempotency)
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: overlay
+        ingress: true
+      register: ingress_2
 
-  - name: ingress (change)
-    docker_network:
-      name: "{{ nname_1 }}"
-      driver: overlay
-      ingress: false
-    register: ingress_3
+    - name: ingress (change)
+      docker_network:
+        name: "{{ nname_1 }}"
+        driver: overlay
+        ingress: false
+      register: ingress_3
 
-  - name: cleanup network
-    docker_network:
-      name: "{{ nname_1 }}"
-      state: absent
-      force: true
+    - name: cleanup network
+      docker_network:
+        name: "{{ nname_1 }}"
+        state: absent
+        force: true
 
-  - assert:
-      that:
-      - ingress_1 is changed
-      - ingress_2 is not changed
-      - ingress_3 is changed
+    - assert:
+        that:
+          - ingress_1 is changed
+          - ingress_2 is not changed
+          - ingress_3 is changed
 
   always:
-  - name: cleanup swarm
-    docker_swarm:
-      state: absent
-      force: true
+    - name: cleanup swarm
+      docker_swarm:
+        state: absent
+        force: true

tests/integration/targets/docker_network/tasks/tests/substring.yml

@@ -30,12 +30,12 @@
     name: "{{ network_name }}"
     state: absent
   loop:
-  - "{{ nname_1 }}"
-  - "{{ nname_2 }}"
+    - "{{ nname_1 }}"
+    - "{{ nname_2 }}"
   loop_control:
     loop_var: network_name
 
 - assert:
     that:
-    - networks_1 is changed
-    - networks_2 is changed
+      - networks_1 is changed
+      - networks_2 is changed