Updated from network content collector

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

4 files changed, 18 insertions, 20 deletions

diff --git a/tests/integration/targets/vyos_facts/defaults/main.yaml b/tests/integration/targets/vyos_facts/defaults/main.yaml
index 9ef5ba5..a845c24 100644
--- a/tests/integration/targets/vyos_facts/defaults/main.yaml
+++ b/tests/integration/targets/vyos_facts/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-testcase: "*"
+testcase: '*'
 test_items: []
diff --git a/tests/integration/targets/vyos_facts/tasks/cli.yaml b/tests/integration/targets/vyos_facts/tasks/cli.yaml
index 890d3ac..90f265f 100644
--- a/tests/integration/targets/vyos_facts/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_facts/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_facts/tasks/main.yaml b/tests/integration/targets/vyos_facts/tasks/main.yaml
index d4cf26f..a3db933 100644
--- a/tests/integration/targets/vyos_facts/tasks/main.yaml
+++ b/tests/integration/targets/vyos_facts/tasks/main.yaml
@@ -1,2 +1,4 @@
 ---
-- {include: cli.yaml, tags: ['cli']}
+- include: cli.yaml
+  tags:
+    - cli
diff --git a/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml b/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
index 33382ea..5802f73 100644
--- a/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
+++ b/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
@@ -1,46 +1,42 @@
 ---
 - name: get host name
+  register: vyos_host
   vyos.vyos.vyos_command:
     commands:
       - show host name
-  register: vyos_host
 
 - name: get version info
+  register: vyos_version
   vyos.vyos.vyos_command:
     commands:
       - show version
-  register: vyos_version
 
 - name: collect all facts from the device
+  register: result
   vyos.vyos.vyos_facts:
     gather_subset: all
-  register: result
 
-- name: "check that hostname is present"
+- name: check that hostname is present
   assert:
     that:
-      # hostname
       - result.ansible_facts.ansible_net_hostname == vyos_host.stdout[0]
 
-- name: "check that subsets are present"
+- name: check that subsets are present
   assert:
     that:
-      # subsets
       - "'neighbors' in result.ansible_facts.ansible_net_gather_subset"
       - "'default' in result.ansible_facts.ansible_net_gather_subset"
       - "'config' in result.ansible_facts.ansible_net_gather_subset"
 
-- name: "check that version info is present"
+- name: check that version info is present
   assert:
     that:
-      # version info
       - result.ansible_facts.ansible_net_version in vyos_version.stdout_lines[0][0]
       - result.ansible_facts.ansible_net_model in vyos_version.stdout_lines[0][9]
       - result.ansible_facts.ansible_net_serialnum in vyos_version.stdout_lines[0][10]
 
-- name: "check that config info is present"
+- name: check that config info is present
   assert:
     that:
-      # config info
       - result.ansible_facts.ansible_net_commits is defined
       - result.ansible_facts.ansible_net_config is defined