Updated from network content collector

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

10 files changed, 235 insertions, 234 deletions

diff --git a/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml
index f88bce55..7413320e 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - prepare_vyos_tests
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
index 415c99d8..d4cf26fc 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
index e3abbdb3..d012f7bb 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
@@ -5,4 +5,4 @@
   vars:
     lines: |
       delete service lldp interface
-      delete service lldp 
+      delete service lldp
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
index bd7c713f..7b2d53a3 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
@@ -5,42 +5,42 @@
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Delete attributes of given LLDP interfaces.
-    vyos.vyos.vyos_lldp_interfaces: &deleted
-      config:
-        - name: 'eth1'
-        - name: 'eth2'
-      state: deleted
-    register: result
-
-  - name: Assert that the before dicts were correctly generated
-    assert:
-      that:
-        - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
-
-  - name: Assert that the correct set of commands were generated
-    assert:
-      that:
-        - "{{ deleted['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
-
-  - name: Assert that the after dicts were correctly generated
-    assert:
-      that:
-        - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
-
-  - name: Delete attributes of given interfaces (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_interfaces: *deleted
-    register: result
-
-  - name: Assert that the previous task was idempotent
-    assert:
-      that:
-        - "result.changed == false"
-        - "result.commands|length == 0"
-
-  - name: Assert that the before dicts were correctly generated
-    assert:
-      that:
-        - "{{ deleted['after'] | symmetric_difference(result['before']) |length == 0 }}"
+    - name: Delete attributes of given LLDP interfaces.
+      vyos.vyos.vyos_lldp_interfaces: &deleted
+        config:
+          - name: 'eth1'
+          - name: 'eth2'
+        state: deleted
+      register: result
+
+    - name: Assert that the before dicts were correctly generated
+      assert:
+        that:
+          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+
+    - name: Assert that the correct set of commands were generated
+      assert:
+        that:
+          - "{{ deleted['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+    - name: Assert that the after dicts were correctly generated
+      assert:
+        that:
+          - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Delete attributes of given interfaces (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_interfaces: *deleted
+      register: result
+
+    - name: Assert that the previous task was idempotent
+      assert:
+        that:
+          - "result.changed == false"
+          - "result.commands|length == 0"
+
+    - name: Assert that the before dicts were correctly generated
+      assert:
+        that:
+          - "{{ deleted['after'] | symmetric_difference(result['before']) |length == 0 }}"
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/empty_config.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/empty_config.yaml
index 4afb7fe2..44c0b894 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/empty_config.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/empty_config.yaml
@@ -1,13 +1,13 @@
 ---
 - debug:
-      msg: "START vyos_lldp_interfaces empty_config integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_interfaces empty_config integration tests on connection={{ ansible_connection }}"
 
 - name: Merged with empty config should give appropriate error message
   vyos.vyos.vyos_lldp_interfaces:
     config:
     state: merged
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
@@ -18,7 +18,7 @@
     config:
     state: replaced
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
@@ -29,7 +29,7 @@
     config:
     state: overridden
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
index ae5b10b2..bf968b21 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
@@ -1,58 +1,58 @@
 ---
 - debug:
-      msg: "START vyos_lldp_interfaces merged integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_interfaces merged integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
-  - name: Merge the provided configuration with the exisiting running configuration
-    vyos.vyos.vyos_lldp_interfaces: &merged
+    - name: Merge the provided configuration with the exisiting running configuration
+      vyos.vyos.vyos_lldp_interfaces: &merged
         config:
-           - name: 'eth1'
-             location:
-               civic_based: 
-                 country_code: 'US' 
-                 ca_info:
-                   - ca_type: 0 
-                     ca_value: 'ENGLISH'  
-
-           - name: 'eth2'
-             location:
-               coordinate_based: 
-                altitude: 2200 
+          - name: 'eth1'
+            location:
+              civic_based:
+                country_code: 'US'
+                ca_info:
+                  - ca_type: 0
+                    ca_value: 'ENGLISH'
+
+          - name: 'eth2'
+            location:
+              coordinate_based:
+                altitude: 2200
                 datum: 'WGS84'
                 longitude: '222.267255W'
-                latitude: '33.524449N'      
+                latitude: '33.524449N'
         state: merged
-    register: result
+      register: result
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Assert that before dicts were correctly generated
+      assert:
         that: "{{ merged['before'] | symmetric_difference(result['before']) |length == 0 }}"
 
-  - name: Assert that correct set of commands were generated
-    assert:
+    - name: Assert that correct set of commands were generated
+      assert:
         that:
-            - "{{ merged['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - "{{ merged['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
 
-  - name: Assert that after dicts was correctly generated
-    assert:
+    - name: Assert that after dicts was correctly generated
+      assert:
         that:
-            - "{{ merged['after'] | symmetric_difference(result['after']) |length == 0 }}"
+          - "{{ merged['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
-  - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_interfaces: *merged
-    register: result
+    - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_interfaces: *merged
+      register: result
 
-  - name: Assert that the previous task was idempotent
-    assert:
+    - name: Assert that the previous task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Assert that before dicts were correctly generated
+      assert:
         that:
-            - "{{ merged['after'] | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ merged['after'] | symmetric_difference(result['before']) |length == 0 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
index eedb563e..8cf038c9 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
@@ -1,49 +1,49 @@
 ---
 - debug:
-      msg: "START vyos_lldp_interfaces overridden integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_interfaces overridden integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate_intf.yaml
 
 - block:
-  - name: Overrides all device configuration with provided configuration
-    vyos.vyos.vyos_lldp_interfaces: &overridden
-       config:
-        - name: 'eth2'
-          location:
-            elin: '0000000911'
-       state: overridden
-    register: result
-
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Overrides all device configuration with provided configuration
+      vyos.vyos.vyos_lldp_interfaces: &overridden
+        config:
+          - name: 'eth2'
+            location:
+              elin: '0000000911'
+        state: overridden
+      register: result
+
+    - name: Assert that before dicts were correctly generated
+      assert:
         that:
-            - "{{ populate_intf | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ populate_intf | symmetric_difference(result['before']) |length == 0 }}"
 
-  - name: Assert that correct commands were generated
-    assert:
+    - name: Assert that correct commands were generated
+      assert:
         that:
-            - "{{ overridden['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - "{{ overridden['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
 
-  - name: Assert that after dicts were correctly generated
-    assert:
+    - name: Assert that after dicts were correctly generated
+      assert:
         that:
-            - "{{ overridden['after'] | symmetric_difference(result['after']) |length == 0 }}"
+          - "{{ overridden['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
-  - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_interfaces: *overridden
-    register: result
+    - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_interfaces: *overridden
+      register: result
 
-  - name: Assert that the previous task was idempotent
-    assert:
+    - name: Assert that the previous task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Assert that before dicts were correctly generated
+      assert:
         that:
-            - "{{ overridden['after'] | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ overridden['after'] | symmetric_difference(result['before']) |length == 0 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
index 07fec9ed..17acf065 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
@@ -1,63 +1,63 @@
 ---
 - debug:
-      msg: "START vyos_lldp_interfaces replaced integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_interfaces replaced integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Replace device configurations of listed LLDP interfaces with provided configurations
-    vyos.vyos.vyos_lldp_interfaces: &replaced
+    - name: Replace device configurations of listed LLDP interfaces with provided configurations
+      vyos.vyos.vyos_lldp_interfaces: &replaced
         config:
-           - name: 'eth2'
-             enable: false
-             location:
-               civic_based: 
-                 country_code: 'US' 
-                 ca_info:
-                   - ca_type: 0 
-                     ca_value: 'ENGLISH'
-
-           - name: 'eth1'
-             enable: false
-             location:
-               coordinate_based: 
-                altitude: 2200 
+          - name: 'eth2'
+            enable: false
+            location:
+              civic_based:
+                country_code: 'US'
+                ca_info:
+                  - ca_type: 0
+                    ca_value: 'ENGLISH'
+
+          - name: 'eth1'
+            enable: false
+            location:
+              coordinate_based:
+                altitude: 2200
                 datum: 'WGS84'
                 longitude: '222.267255W'
                 latitude: '33.524449N'
         state: replaced
-    register: result
+      register: result
 
-  - name: Assert that correct set of commands were generated
-    assert:
+    - name: Assert that correct set of commands were generated
+      assert:
         that:
-            - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
 
-  - name: Assert that before dicts are correctly generated
-    assert:
+    - name: Assert that before dicts are correctly generated
+      assert:
         that:
-            - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
 
-  - name: Assert that after dict is correctly generated
-    assert:
+    - name: Assert that after dict is correctly generated
+      assert:
         that:
-            - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
+          - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
-  - name: Replace device configurations of listed LLDP interfaces with provided configurarions (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_interfaces: *replaced
-    register: result
+    - name: Replace device configurations of listed LLDP interfaces with provided configurarions (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_interfaces: *replaced
+      register: result
 
-  - name: Assert that task was idempotent
-    assert:
+    - name: Assert that task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dict is correctly generated
-    assert:
+    - name: Assert that before dict is correctly generated
+      assert:
         that:
-            - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
index d97cf9c4..4d4cf82c 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
@@ -5,53 +5,53 @@
 - include_tasks: _remove_config.yaml
 
 - block:
-  - name: Apply the provided configuration (base config)
-    vyos.vyos.vyos_lldp_interfaces:
-      config:
-        - name: 'eth1'
-          location:
-            civic_based: 
-              country_code: 'US' 
-              ca_info:
-                - ca_type: 0 
-                  ca_value: 'ENGLISH'
-
-      state: merged
-    register: base_config
-
-  - name: Gather lldp_interfaces facts
-    vyos.vyos.vyos_facts:
-      gather_subset:
-        - default
-      gather_network_resources:
-        - lldp_interfaces
-
-  - name: Apply the provided configuration (config to be reverted)
-    vyos.vyos.vyos_lldp_interfaces:
-      config:
-        - name: 'eth2'
-          location:
-            coordinate_based: 
-             altitude: 2200 
-             datum: 'WGS84'
-             longitude: '222.267255W'
-             latitude: '33.524449N'        
-      state: merged
-    register: result
-
-  - name: Assert that changes were applied
-    assert:
-      that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
-
-  - name: Revert back to base config using facts round trip
-    vyos.vyos.vyos_lldp_interfaces:
-      config: "{{ ansible_facts['network_resources']['lldp_interfaces'] }}"
-      state: overridden
-    register: revert
-
-  - name: Assert that config was reverted
-    assert:
-      that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
+    - name: Apply the provided configuration (base config)
+      vyos.vyos.vyos_lldp_interfaces:
+        config:
+          - name: 'eth1'
+            location:
+              civic_based:
+                country_code: 'US'
+                ca_info:
+                  - ca_type: 0
+                    ca_value: 'ENGLISH'
+
+        state: merged
+      register: base_config
+
+    - name: Gather lldp_interfaces facts
+      vyos.vyos.vyos_facts:
+        gather_subset:
+          - default
+        gather_network_resources:
+          - lldp_interfaces
+
+    - name: Apply the provided configuration (config to be reverted)
+      vyos.vyos.vyos_lldp_interfaces:
+        config:
+          - name: 'eth2'
+            location:
+              coordinate_based:
+                altitude: 2200
+                datum: 'WGS84'
+                longitude: '222.267255W'
+                latitude: '33.524449N'
+        state: merged
+      register: result
+
+    - name: Assert that changes were applied
+      assert:
+        that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Revert back to base config using facts round trip
+      vyos.vyos.vyos_lldp_interfaces:
+        config: "{{ ansible_facts['network_resources']['lldp_interfaces'] }}"
+        state: overridden
+      register: revert
+
+    - name: Assert that config was reverted
+      assert:
+        that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
index 6f33343c..169b0d5d 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
@@ -20,36 +20,36 @@ merged:
   after:
     - name: 'eth1'
       location:
-        civic_based: 
-          country_code: 'US' 
+        civic_based:
+          country_code: 'US'
           ca_info:
-            - ca_type: 0 
-              ca_value: 'ENGLISH'  
+            - ca_type: 0
+              ca_value: 'ENGLISH'
 
     - name: 'eth2'
       location:
-        coordinate_based: 
-         altitude: 2200 
-         datum: 'WGS84'
-         longitude: '222.267255W'
-         latitude: '33.524449N'  
+        coordinate_based:
+          altitude: 2200
+          datum: 'WGS84'
+          longitude: '222.267255W'
+          latitude: '33.524449N'
 
 populate:
   - name: 'eth1'
     location:
-      civic_based: 
-        country_code: 'US' 
+      civic_based:
+        country_code: 'US'
         ca_info:
-          - ca_type: 0 
-            ca_value: 'ENGLISH'  
+          - ca_type: 0
+            ca_value: 'ENGLISH'
 
   - name: 'eth2'
     location:
-      coordinate_based: 
-       altitude: 2200 
-       datum: 'WGS84'
-       longitude: '222.267255W'
-       latitude: '33.524449N'  
+      coordinate_based:
+        altitude: 2200
+        datum: 'WGS84'
+        longitude: '222.267255W'
+        latitude: '33.524449N'
 
 replaced:
   commands:
@@ -68,35 +68,35 @@ replaced:
     - name: 'eth2'
       enable: false
       location:
-        civic_based: 
-          country_code: 'US' 
+        civic_based:
+          country_code: 'US'
           ca_info:
-            - ca_type: 0 
-              ca_value: 'ENGLISH'  
+            - ca_type: 0
+              ca_value: 'ENGLISH'
 
     - name: 'eth1'
       enable: false
       location:
-        coordinate_based: 
-         altitude: 2200 
-         datum: 'WGS84'
-         longitude: '222.267255W'
-         latitude: '33.524449N'  
+        coordinate_based:
+          altitude: 2200
+          datum: 'WGS84'
+          longitude: '222.267255W'
+          latitude: '33.524449N'
 
 populate_intf:
   - name: 'eth2'
     enable: false
     location:
-      civic_based: 
-        country_code: 'US' 
+      civic_based:
+        country_code: 'US'
         ca_info:
-          - ca_type: 0 
-            ca_value: 'ENGLISH'  
+          - ca_type: 0
+            ca_value: 'ENGLISH'
 
 overridden:
   commands:
-    - "delete service lldp interface eth2 location" 
-    - "delete service lldp interface eth2 'disable'" 
+    - "delete service lldp interface eth2 location"
+    - "delete service lldp interface eth2 'disable'"
     - "set service lldp interface eth2 location elin '0000000911'"
 
   after:
@@ -115,16 +115,16 @@ round_trip:
   after:
     - name: 'eth1'
       location:
-        civic_based: 
-          country_code: 'US' 
+        civic_based:
+          country_code: 'US'
           ca_info:
-            - ca_type: 0 
+            - ca_type: 0
               ca_value: 'ENGLISH'
 
     - name: 'eth2'
       location:
-        coordinate_based: 
-         altitude: 2200 
-         datum: 'WGS84'
-         longitude: '222.267255W'
-         latitude: '33.524449N'
+        coordinate_based:
+          altitude: 2200
+          datum: 'WGS84'
+          longitude: '222.267255W'
+          latitude: '33.524449N'