Merge pull request #59 from CaptTrews/master

Updated from network content collector

Reviewed-by: https://github.com/apps/ansible-zuul

5 files changed, 62 insertions, 47 deletions

diff --git a/tests/integration/targets/vyos_lldp_interface/defaults/main.yaml b/tests/integration/targets/vyos_lldp_interface/defaults/main.yaml
index 9ef5ba5..a845c24 100644
--- a/tests/integration/targets/vyos_lldp_interface/defaults/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interface/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-testcase: "*"
+testcase: '*'
 test_items: []
diff --git a/tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml b/tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml
index 890d3ac..90f265f 100644
--- a/tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_lldp_interface/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_lldp_interface/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml
index d4cf26f..a3db933 100644
--- a/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml
@@ -1,2 +1,4 @@
 ---
-- {include: cli.yaml, tags: ['cli']}
+- include: cli.yaml
+  tags:
+    - cli
diff --git a/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml b/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
index 0690e9e..2697f48 100644
--- a/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
@@ -6,162 +6,176 @@
     lines: delete service lldp
 
 - name: Create LLDP configuration
+  register: result
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set service lldp interface eth1" in result.commands'
 
 - name: Create LLDP configuration again (idempotent)
+  register: result
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: Disable LLDP configuration
+  register: result
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: disabled
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set service lldp interface eth1 disable" in result.commands'
 
 - name: Disable LLDP configuration again (idempotent)
+  register: result
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: disabled
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: Enable LLDP configuration
+  register: result
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: enabled
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete service lldp interface eth1 disable" in result.commands'
 
 - name: Enable LLDP configuration again (idempotent)
+  register: result
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: enabled
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: Delete LLDP configuration
+  register: result
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete service lldp interface eth1" in result.commands'
 
 - name: Delete LLDP configuration again (idempotent)
+  register: result
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: Create aggregate of LLDP interface configurations
+  register: result
   vyos.vyos.vyos_lldp_interface:
     aggregate:
+
       - name: eth1
+
       - name: eth2
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set service lldp interface eth1" in result.commands'
       - '"set service lldp interface eth2" in result.commands'
 
 - name: Create aggregate of LLDP interface configurations again (idempotent)
+  register: result
   vyos.vyos.vyos_lldp_interface:
     aggregate:
+
       - name: eth1
+
       - name: eth2
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: Override LLDP interface configuration on aggregate
+  register: result
   vyos.vyos.vyos_lldp_interface:
     aggregate:
+
       - name: eth1
-      - {name: eth2, state: disabled}
+
+      - name: eth2
+        state: disabled
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set service lldp interface eth2 disable" in result.commands'
 
 - name: Override LLDP interface configuration on aggregate again (idempotent)
+  register: result
   vyos.vyos.vyos_lldp_interface:
     aggregate:
+
       - name: eth1
-      - {name: eth2, state: disabled}
+
+      - name: eth2
+        state: disabled
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
 
 - name: Delete aggregate of LLDP interface configurations
+  register: result
   vyos.vyos.vyos_lldp_interface:
     aggregate:
+
       - name: eth1
+
       - name: eth2
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"delete service lldp interface eth1" in result.commands'
       - '"delete service lldp interface eth2" in result.commands'
 
 - name: Delete aggregate of LLDP interface configurations (idempotent)
+  register: result
   vyos.vyos.vyos_lldp_interface:
     aggregate:
+
       - name: eth1
+
       - name: eth2
     state: absent
-  register: result
 
 - assert:
     that:
-      - 'result.changed == false'
+      - result.changed == false
diff --git a/tests/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml b/tests/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
index 1710b7e..98fc93a 100644
--- a/tests/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
+++ b/tests/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
@@ -1,26 +1,25 @@
 ---
-- debug: msg="START vyos cli/net_lldp_interface.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_lldp_interface.yaml on connection={{ ansible_connection
+    }}"
 
 - name: Make sure LLDP is not running - setup
   vyos.vyos.vyos_config:
     lines: delete service lldp
 
 - name: Create LLDP configuration using platform agnostic module
-  net_lldp_interface:
+  register: result
+  ansible.netcommon.net_lldp_interface:
     name: eth1
     state: present
-  register: result
 
 - assert:
     that:
-      - 'result.changed == true'
+      - result.changed == true
       - '"set service lldp interface eth1" in result.commands'
 
 - name: Make sure LLDP is not running - teardown
   vyos.vyos.vyos_config:
     lines: delete service lldp
 
-- debug: msg="END vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection }}"
+- debug: msg="END vyos cli/net_lldp_interface.yaml on connection={{ ansible_connection
+    }}"