Updated from network content collector

Signed-off-by: CaptTrews <capttrews@gmail.com>

5 files changed, 65 insertions, 47 deletions

diff --git a/tests/integration/targets/vyos_static_route/defaults/main.yaml b/tests/integration/targets/vyos_static_route/defaults/main.yaml
index 9ef5ba5..a845c24 100644
--- a/tests/integration/targets/vyos_static_route/defaults/main.yaml
+++ b/tests/integration/targets/vyos_static_route/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-testcase: "*"
+testcase: '*'
 test_items: []
diff --git a/tests/integration/targets/vyos_static_route/tasks/cli.yaml b/tests/integration/targets/vyos_static_route/tasks/cli.yaml
index 890d3ac..90f265f 100644
--- a/tests/integration/targets/vyos_static_route/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_static_route/tasks/cli.yaml
@@ -1,22 +1,22 @@
 ---
 - name: collect all cli test cases
   find:
-    paths: "{{ role_path }}/tests/cli"
-    patterns: "{{ testcase }}.yaml"
+    paths: '{{ role_path }}/tests/cli'
+    patterns: '{{ testcase }}.yaml'
   register: test_cases
   delegate_to: localhost
 
 - name: set test_items
   set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
 
-- name: run test case (connection=network_cli)
-  include: "{{ test_case_to_run }} ansible_connection=network_cli"
-  with_items: "{{ test_items }}"
+- name: run test case (connection=ansible.netcommon.network_cli)
+  include: '{{ test_case_to_run }} ansible_connection=ansible.netcommon.network_cli'
+  with_items: '{{ test_items }}'
   loop_control:
     loop_var: test_case_to_run
 
 - name: run test case (connection=local)
-  include: "{{ test_case_to_run }} ansible_connection=local"
-  with_first_found: "{{ test_items }}"
+  include: '{{ test_case_to_run }} ansible_connection=local'
+  with_first_found: '{{ test_items }}'
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_static_route/tasks/main.yaml b/tests/integration/targets/vyos_static_route/tasks/main.yaml
index d4cf26f..a3db933 100644
--- a/tests/integration/targets/vyos_static_route/tasks/main.yaml
+++ b/tests/integration/targets/vyos_static_route/tasks/main.yaml
@@ -1,2 +1,4 @@
 ---
-- {include: cli.yaml, tags: ['cli']}
+- include: cli.yaml
+  tags:
+    - cli
diff --git a/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml b/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml
index 4b1ef1c..be93e89 100644
--- a/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml
@@ -2,119 +2,136 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: create static route
+  register: result
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: create static route again (idempotent)
+  register: result
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0
     mask: 24
     next_hop: 192.168.42.64
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: modify admin distance of static route
+  register: result
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
-      - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64 distance 1" in result.commands'
+      - result.changed == true
+      - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64 distance
+        1" in result.commands'
 
 - name: modify admin distance of static route again (idempotent)
+  register: result
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0
     mask: 24
     next_hop: 192.168.42.64
     admin_distance: 1
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: delete static route
+  register: result
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete protocols static route 172.24.0.0/24" in result.commands'
 
 - name: delete static route again (idempotent)
+  register: result
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: Add static route collections
+  register: result
   vyos.vyos.vyos_static_route:
     aggregate:
-      - {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
-      - {prefix: 172.24.2.0, mask: 24, next_hop: 192.168.42.64}
+
+      - prefix: 172.24.1.0/24
+        next_hop: 192.168.42.64
+
+      - prefix: 172.24.2.0
+        mask: 24
+        next_hop: 192.168.42.64
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set protocols static route 172.24.1.0/24 next-hop 192.168.42.64" in result.commands'
       - '"set protocols static route 172.24.2.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: Add and remove static route collections with overrides
+  register: result
   vyos.vyos.vyos_static_route:
     aggregate:
-      - {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
-      - {prefix: 172.24.2.0/24, next_hop: 192.168.42.64, state: absent}
-      - {prefix: 172.24.3.0/24, next_hop: 192.168.42.64}
+
+      - prefix: 172.24.1.0/24
+        next_hop: 192.168.42.64
+
+      - prefix: 172.24.2.0/24
+        next_hop: 192.168.42.64
+        state: absent
+
+      - prefix: 172.24.3.0/24
+        next_hop: 192.168.42.64
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete protocols static route 172.24.2.0/24" in result.commands'
       - '"set protocols static route 172.24.3.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: Remove static route collections
+  register: result
   vyos.vyos.vyos_static_route:
     aggregate:
-      - {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
-      - {prefix: 172.24.3.0/24, next_hop: 192.168.42.64}
+
+      - prefix: 172.24.1.0/24
+        next_hop: 192.168.42.64
+
+      - prefix: 172.24.3.0/24
+        next_hop: 192.168.42.64
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete protocols static route 172.24.1.0/24" in result.commands'
       - '"delete protocols static route 172.24.3.0/24" in result.commands'
diff --git a/tests/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml b/tests/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml
index e2529eb..c53c838 100644
--- a/tests/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml
+++ b/tests/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml
@@ -1,33 +1,32 @@
 ---
-- debug: msg="START vyos cli/net_static_route.yaml on connection={{ ansible_connection }}"
-
-# Add minimal testcase to check args are passed correctly to
-# implementation module and module run is successful.
+- debug: msg="START vyos cli/net_static_route.yaml on connection={{ ansible_connection
+    }}"
 
 - name: delete static route - setup
-  net_static_route:
+  register: result
+  ansible.netcommon.net_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     state: absent
-  register: result
 
 - name: create static route using platform agnostic module
-  net_static_route:
+  register: result
+  ansible.netcommon.net_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: delete static route - teardown
-  net_static_route:
+  register: result
+  ansible.netcommon.net_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     state: absent
-  register: result
 
-- debug: msg="END vyos cli/net_static_route.yaml on connection={{ ansible_connection }}"
+- debug: msg="END vyos cli/net_static_route.yaml on connection={{ ansible_connection
+    }}"