Updated from network content collector

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

5 files changed, 77 insertions, 47 deletions

diff --git a/tests/integration/targets/vyos_logging/defaults/main.yaml b/tests/integration/targets/vyos_logging/defaults/main.yaml
index 9ef5ba5..a845c24 100644
--- a/tests/integration/targets/vyos_logging/defaults/main.yaml
+++ b/tests/integration/targets/vyos_logging/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-testcase: "*"
+testcase: '*'
 test_items: []
diff --git a/tests/integration/targets/vyos_logging/tasks/cli.yaml b/tests/integration/targets/vyos_logging/tasks/cli.yaml
index 890d3ac..90f265f 100644
--- a/tests/integration/targets/vyos_logging/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_logging/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_logging/tasks/main.yaml b/tests/integration/targets/vyos_logging/tasks/main.yaml
index d4cf26f..a3db933 100644
--- a/tests/integration/targets/vyos_logging/tasks/main.yaml
+++ b/tests/integration/targets/vyos_logging/tasks/main.yaml
@@ -1,2 +1,4 @@
 ---
-- {include: cli.yaml, tags: ['cli']}
+- include: cli.yaml
+  tags:
+    - cli
diff --git a/tests/integration/targets/vyos_logging/tests/cli/basic.yaml b/tests/integration/targets/vyos_logging/tests/cli/basic.yaml
index d588456..a025047 100644
--- a/tests/integration/targets/vyos_logging/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_logging/tests/cli/basic.yaml
@@ -2,125 +2,154 @@
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: set-up logging
+  register: result
   vyos.vyos.vyos_logging:
     dest: console
     facility: all
     level: info
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set system syslog console facility all level info" in result.commands'
 
 - name: set-up logging again (idempotent)
+  register: result
   vyos.vyos.vyos_logging:
     dest: console
     facility: all
     level: info
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: file logging
+  register: result
   vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set system syslog file test facility all level notice" in result.commands'
 
 - name: file logging again (idempotent)
+  register: result
   vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: delete logging
+  register: result
   vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete system syslog file test facility all level notice" in result.commands'
 
 - name: delete logging again (idempotent)
+  register: result
   vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: Add logging collections
+  register: result
   vyos.vyos.vyos_logging:
     aggregate:
-      - {dest: file, name: test1, facility: all, level: info}
-      - {dest: file, name: test2, facility: news, level: debug}
+
+      - dest: file
+        name: test1
+        facility: all
+        level: info
+
+      - dest: file
+        name: test2
+        facility: news
+        level: debug
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set system syslog file test1 facility all level info" in result.commands'
       - '"set system syslog file test2 facility news level debug" in result.commands'
 
 - name: Add and remove logging collections with overrides
+  register: result
   vyos.vyos.vyos_logging:
     aggregate:
-      - {dest: console, facility: all, level: info}
-      - {dest: file, name: test1, facility: all, level: info, state: absent}
-      - {dest: console, facility: daemon, level: warning}
+
+      - dest: console
+        facility: all
+        level: info
+
+      - dest: file
+        name: test1
+        facility: all
+        level: info
+        state: absent
+
+      - dest: console
+        facility: daemon
+        level: warning
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete system syslog file test1 facility all level info" in result.commands'
       - '"set system syslog console facility daemon level warning" in result.commands'
 
 - name: Remove logging collections
+  register: result
   vyos.vyos.vyos_logging:
     aggregate:
-      - {dest: console, facility: all, level: info}
-      - {dest: console, facility: daemon, level: warning}
-      - {dest: file, name: test2, facility: news, level: debug}
+
+      - dest: console
+        facility: all
+        level: info
+
+      - dest: console
+        facility: daemon
+        level: warning
+
+      - dest: file
+        name: test2
+        facility: news
+        level: debug
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete system syslog console facility all level info" in result.commands'
       - '"delete system syslog console facility daemon level warning" in result.commands'
       - '"delete system syslog file test2 facility news level debug" in result.commands'
diff --git a/tests/integration/targets/vyos_logging/tests/cli/net_logging.yaml b/tests/integration/targets/vyos_logging/tests/cli/net_logging.yaml
index 7c62d72..f8bda74 100644
--- a/tests/integration/targets/vyos_logging/tests/cli/net_logging.yaml
+++ b/tests/integration/targets/vyos_logging/tests/cli/net_logging.yaml
@@ -1,39 +1,38 @@
 ---
-- debug: msg="START vyos cli/net_logging.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_logging.yaml on connection={{ ansible_connection
+    }}"
 
 - name: delete logging - setup
-  net_logging:
+  register: result
+  ansible.netcommon.net_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: absent
-  register: result
 
 - name: file logging using platform agnostic module
-  net_logging:
+  register: result
+  ansible.netcommon.net_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set system syslog file test facility all level notice" in result.commands'
 
 - name: delete logging - teardown
-  net_logging:
+  register: result
+  ansible.netcommon.net_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: absent
-  register: result
 
-- debug: msg="END vyos cli/net_logging.yaml on connection={{ ansible_connection }}"
+- debug: msg="END vyos cli/net_logging.yaml on connection={{ ansible_connection
+    }}"