Updated from network content collector

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

13 files changed, 207 insertions, 187 deletions

diff --git a/tests/integration/targets/vyos_lldp_interfaces/defaults/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/defaults/main.yaml
index 164afea..852a6be 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/defaults/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-testcase: "[^_].*"
+testcase: '[^_].*'
 test_items: []
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml b/tests/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml
index 655e51e..93eb2fe 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml
@@ -1,8 +1,8 @@
 ---
 - name: Collect all cli test cases
   find:
-    paths: "{{ role_path }}/tests/cli"
-    patterns: "{{ testcase }}.yaml"
+    paths: '{{ role_path }}/tests/cli'
+    patterns: '{{ testcase }}.yaml'
     use_regex: true
   register: test_cases
   delegate_to: localhost
@@ -10,10 +10,10 @@
 - 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 }}"
+- name: Run test case (connection=ansible.netcommon.network_cli)
+  include: '{{ test_case_to_run }}'
   vars:
-    ansible_connection: network_cli
-  with_items: "{{ test_items }}"
+    ansible_connection: ansible.netcommon.network_cli
+  with_items: '{{ test_items }}'
   loop_control:
     loop_var: test_case_to_run
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
index d4cf26f..a3db933 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/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_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
index 80f7d1a..4353cec 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
@@ -1,14 +1,12 @@
 ---
 - name: Setup
-  network.cli.cli_config:
-    config: "{{ lines }}"
   vars:
-    lines: |
-      set service lldp interface eth1
-      set service lldp interface eth1 location civic-based country-code US
-      set service lldp interface eth1 location civic-based ca-type 0 ca-value ENGLISH
-      set service lldp interface eth2
-      set service lldp interface eth2 location coordinate-based latitude 33.524449N
-      set service lldp interface eth2 location coordinate-based altitude 2200
-      set service lldp interface eth2 location coordinate-based datum WGS84
-      set service lldp interface eth2 location coordinate-based longitude 222.267255W
+    lines: "set service lldp interface eth1\nset service lldp interface eth1 location\
+      \ civic-based country-code US\nset service lldp interface eth1 location civic-based\
+      \ ca-type 0 ca-value ENGLISH\nset service lldp interface eth2\nset service\
+      \ lldp interface eth2 location coordinate-based latitude 33.524449N\nset service\
+      \ lldp interface eth2 location coordinate-based altitude 2200\nset service\
+      \ lldp interface eth2 location coordinate-based datum WGS84\nset service lldp\
+      \ interface eth2 location coordinate-based longitude 222.267255W\n"
+  ansible.netcommon.cli_config:
+    config: '{{ lines }}'
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml
index ee9a9bd..11e2940 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml
@@ -1,10 +1,8 @@
 ---
 - name: Setup
-  network.cli.cli_config:
-    config: "{{ lines }}"
   vars:
-    lines: |
-      set service lldp interface eth2
-      set service lldp interface eth2 location civic-based country-code US
-      set service lldp interface eth2 location civic-based ca-type 0 ca-value ENGLISH
-      set service lldp interface eth2 disable
+    lines: "set service lldp interface eth2\nset service lldp interface eth2 location\
+      \ civic-based country-code US\nset service lldp interface eth2 location civic-based\
+      \ ca-type 0 ca-value ENGLISH\nset service lldp interface eth2 disable\n"
+  ansible.netcommon.cli_config:
+    config: '{{ lines }}'
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 d012f7b..a885f01 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
@@ -1,8 +1,6 @@
 ---
 - name: Remove Config
-  network.cli.cli_config:
-    config: "{{ lines }}"
   vars:
-    lines: |
-      delete service lldp interface
-      delete service lldp
+    lines: "delete service lldp interface\ndelete service lldp\n"
+  ansible.netcommon.cli_config:
+    config: '{{ lines }}'
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 7b2d53a..21bf96d 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
@@ -1,17 +1,21 @@
 ---
 - debug:
-    msg: "Start vyos_lldp_interfaces deleted integration tests ansible_connection={{ ansible_connection }}"
+    msg: Start vyos_lldp_interfaces deleted integration tests ansible_connection={{
+      ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
+
     - name: Delete attributes of given LLDP interfaces.
-      vyos.vyos.vyos_lldp_interfaces: &deleted
+      register: result
+      vyos.vyos.vyos_lldp_interfaces: &id001
         config:
-          - name: 'eth1'
-          - name: 'eth2'
+
+          - name: eth1
+
+          - name: eth2
         state: deleted
-      register: result
 
     - name: Assert that the before dicts were correctly generated
       assert:
@@ -21,26 +25,30 @@
     - name: Assert that the correct set of commands were generated
       assert:
         that:
-          - "{{ deleted['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - "{{ 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 }}"
+          - "{{ deleted['after'] | symmetric_difference(result['after']) |length\
+            \ == 0 }}"
 
     - name: Delete attributes of given interfaces (IDEMPOTENT)
-      vyos.vyos.vyos_lldp_interfaces: *deleted
       register: result
+      vyos.vyos.vyos_lldp_interfaces: *id001
 
     - name: Assert that the previous task was idempotent
       assert:
         that:
-          - "result.changed == false"
-          - "result.commands|length == 0"
+          - 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 }}"
+          - "{{ deleted['after'] | symmetric_difference(result['before']) |length\
+            \ == 0 }}"
   always:
+
     - 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 44c0b89..a5ff0a8 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,35 +1,36 @@
 ---
 - 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
+  register: result
+  ignore_errors: true
   vyos.vyos.vyos_lldp_interfaces:
     config:
     state: merged
-  register: result
-  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state merged'
 
 - name: Replaced with empty config should give appropriate error message
+  register: result
+  ignore_errors: true
   vyos.vyos.vyos_lldp_interfaces:
     config:
     state: replaced
-  register: result
-  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state replaced'
 
 - name: Overridden with empty config should give appropriate error message
+  register: result
+  ignore_errors: true
   vyos.vyos.vyos_lldp_interfaces:
     config:
     state: overridden
-  register: result
-  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 bf968b2..657961f 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,67 @@
 ---
 - 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
+      register: result
+      vyos.vyos.vyos_lldp_interfaces: &id001
         config:
-          - name: 'eth1'
+
+          - name: eth1
             location:
               civic_based:
-                country_code: 'US'
+                country_code: US
                 ca_info:
+
                   - ca_type: 0
-                    ca_value: 'ENGLISH'
+                    ca_value: ENGLISH
 
-          - name: 'eth2'
+          - name: eth2
             location:
               coordinate_based:
                 altitude: 2200
-                datum: 'WGS84'
-                longitude: '222.267255W'
-                latitude: '33.524449N'
+                datum: WGS84
+                longitude: 222.267255W
+                latitude: 33.524449N
         state: merged
-      register: result
 
     - name: Assert that before dicts were correctly generated
       assert:
-        that: "{{ merged['before'] | symmetric_difference(result['before']) |length == 0 }}"
+        that: "{{ merged['before'] | symmetric_difference(result['before']) |length\
+          \ == 0 }}"
 
     - 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:
         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
+    - name: Merge the provided configuration with the existing running configuration
+        (IDEMPOTENT)
       register: result
+      vyos.vyos.vyos_lldp_interfaces: *id001
 
     - 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:
         that:
-          - "{{ merged['after'] | symmetric_difference(result['before']) |length == 0 }}"
-
+          - "{{ merged['after'] | symmetric_difference(result['before']) |length\
+            \ == 0 }}"
   always:
+
     - 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 8cf038c..3e6ce40 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,56 @@
 ---
 - 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
+      register: result
+      vyos.vyos.vyos_lldp_interfaces: &id001
         config:
-          - name: 'eth2'
+
+          - name: eth2
             location:
-              elin: '0000000911'
+              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:
         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:
         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
+      vyos.vyos.vyos_lldp_interfaces: *id001
 
     - 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:
         that:
-          - "{{ overridden['after'] | symmetric_difference(result['before']) |length == 0 }}"
-
+          - "{{ overridden['after'] | symmetric_difference(result['before']) |length\
+            \ == 0 }}"
   always:
+
     - 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 17acf06..3218e80 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
@@ -1,39 +1,45 @@
 ---
 - 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
+      register: result
+      vyos.vyos.vyos_lldp_interfaces: &id001
         config:
-          - name: 'eth2'
+
+          - name: eth2
             enable: false
             location:
               civic_based:
-                country_code: 'US'
+                country_code: US
                 ca_info:
+
                   - ca_type: 0
-                    ca_value: 'ENGLISH'
+                    ca_value: ENGLISH
 
-          - name: 'eth1'
+          - name: eth1
             enable: false
             location:
               coordinate_based:
                 altitude: 2200
-                datum: 'WGS84'
-                longitude: '222.267255W'
-                latitude: '33.524449N'
+                datum: WGS84
+                longitude: 222.267255W
+                latitude: 33.524449N
         state: replaced
-      register: result
 
     - 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:
@@ -43,21 +49,24 @@
     - 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
+    - name: Replace device configurations of listed LLDP interfaces with provided
+        configurarions (IDEMPOTENT)
       register: result
+      vyos.vyos.vyos_lldp_interfaces: *id001
 
     - name: Assert that task was idempotent
       assert:
         that:
-          - "result['changed'] == false"
+          - result['changed'] == false
 
     - 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
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 4d4cf82..e6189a3 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
@@ -1,23 +1,26 @@
 ---
 - debug:
-    msg: "START vyos_lldp_interfaces round trip integration tests on connection={{ ansible_connection }}"
+    msg: START vyos_lldp_interfaces round trip integration tests on connection={{
+      ansible_connection }}
 
 - include_tasks: _remove_config.yaml
 
 - block:
+
     - name: Apply the provided configuration (base config)
+      register: base_config
       vyos.vyos.vyos_lldp_interfaces:
         config:
-          - name: 'eth1'
+
+          - name: eth1
             location:
               civic_based:
-                country_code: 'US'
+                country_code: US
                 ca_info:
-                  - ca_type: 0
-                    ca_value: 'ENGLISH'
 
+                  - ca_type: 0
+                    ca_value: ENGLISH
         state: merged
-      register: base_config
 
     - name: Gather lldp_interfaces facts
       vyos.vyos.vyos_facts:
@@ -27,31 +30,34 @@
           - lldp_interfaces
 
     - name: Apply the provided configuration (config to be reverted)
+      register: result
       vyos.vyos.vyos_lldp_interfaces:
         config:
-          - name: 'eth2'
+
+          - name: eth2
             location:
               coordinate_based:
                 altitude: 2200
-                datum: 'WGS84'
-                longitude: '222.267255W'
-                latitude: '33.524449N'
+                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 }}"
+        that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length\
+          \ == 0 }}"
 
     - name: Revert back to base config using facts round trip
+      register: revert
       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 }}"
-
+        that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length\
+          \ == 0 }}"
   always:
+
     - 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 169b0d5..3cb684e 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
@@ -1,130 +1,114 @@
 ---
 merged:
   before: []
-
-
   commands:
-    - "set service lldp interface eth1 location civic-based country-code 'US'"
-    - "set service lldp interface eth1 location civic-based ca-type 0 ca-value 'ENGLISH'"
-    - "set service lldp interface eth1"
-    - "set service lldp interface eth2 location coordinate-based latitude '33.524449N'"
-    - "set service lldp interface eth2 location coordinate-based altitude '2200'"
-    - "set service lldp interface eth2 location coordinate-based datum 'WGS84'"
-    - "set service lldp interface eth2 location coordinate-based longitude '222.267255W'"
-    - "set service lldp interface eth2 location coordinate-based latitude '33.524449N'"
-    - "set service lldp interface eth2 location coordinate-based altitude '2200'"
-    - "set service lldp interface eth2 location coordinate-based datum 'WGS84'"
-    - "set service lldp interface eth2 location coordinate-based longitude '222.267255W'"
-    - "set service lldp interface eth2"
-
+    - set service lldp interface eth1 location civic-based country-code 'US'
+    - set service lldp interface eth1 location civic-based ca-type 0 ca-value 'ENGLISH'
+    - set service lldp interface eth1
+    - set service lldp interface eth2 location coordinate-based latitude '33.524449N'
+    - set service lldp interface eth2 location coordinate-based altitude '2200'
+    - set service lldp interface eth2 location coordinate-based datum 'WGS84'
+    - set service lldp interface eth2 location coordinate-based longitude '222.267255W'
+    - set service lldp interface eth2 location coordinate-based latitude '33.524449N'
+    - set service lldp interface eth2 location coordinate-based altitude '2200'
+    - set service lldp interface eth2 location coordinate-based datum 'WGS84'
+    - set service lldp interface eth2 location coordinate-based longitude '222.267255W'
+    - set service lldp interface eth2
   after:
-    - name: 'eth1'
+    - name: eth1
       location:
         civic_based:
-          country_code: 'US'
+          country_code: US
           ca_info:
             - ca_type: 0
-              ca_value: 'ENGLISH'
-
-    - name: 'eth2'
+              ca_value: ENGLISH
+    - name: eth2
       location:
         coordinate_based:
           altitude: 2200
-          datum: 'WGS84'
-          longitude: '222.267255W'
-          latitude: '33.524449N'
-
+          datum: WGS84
+          longitude: 222.267255W
+          latitude: 33.524449N
 populate:
-  - name: 'eth1'
+  - name: eth1
     location:
       civic_based:
-        country_code: 'US'
+        country_code: US
         ca_info:
           - ca_type: 0
-            ca_value: 'ENGLISH'
-
-  - name: 'eth2'
+            ca_value: ENGLISH
+  - name: eth2
     location:
       coordinate_based:
         altitude: 2200
-        datum: 'WGS84'
-        longitude: '222.267255W'
-        latitude: '33.524449N'
-
+        datum: WGS84
+        longitude: 222.267255W
+        latitude: 33.524449N
 replaced:
   commands:
-    - "delete service lldp interface eth2 location"
-    - "set service lldp interface eth2 'disable'"
-    - "set service lldp interface eth2 location civic-based country-code 'US'"
-    - "set service lldp interface eth2 location civic-based ca-type 0 ca-value 'ENGLISH'"
-    - "delete service lldp interface eth1 location"
-    - "set service lldp interface eth1 'disable'"
-    - "set service lldp interface eth1 location coordinate-based latitude '33.524449N'"
-    - "set service lldp interface eth1 location coordinate-based altitude '2200'"
-    - "set service lldp interface eth1 location coordinate-based datum 'WGS84'"
-    - "set service lldp interface eth1 location coordinate-based longitude '222.267255W'"
-
+    - delete service lldp interface eth2 location
+    - set service lldp interface eth2 'disable'
+    - set service lldp interface eth2 location civic-based country-code 'US'
+    - set service lldp interface eth2 location civic-based ca-type 0 ca-value 'ENGLISH'
+    - delete service lldp interface eth1 location
+    - set service lldp interface eth1 'disable'
+    - set service lldp interface eth1 location coordinate-based latitude '33.524449N'
+    - set service lldp interface eth1 location coordinate-based altitude '2200'
+    - set service lldp interface eth1 location coordinate-based datum 'WGS84'
+    - set service lldp interface eth1 location coordinate-based longitude '222.267255W'
   after:
-    - name: 'eth2'
+    - name: eth2
       enable: false
       location:
         civic_based:
-          country_code: 'US'
+          country_code: US
           ca_info:
             - ca_type: 0
-              ca_value: 'ENGLISH'
-
-    - name: 'eth1'
+              ca_value: ENGLISH
+    - name: eth1
       enable: false
       location:
         coordinate_based:
           altitude: 2200
-          datum: 'WGS84'
-          longitude: '222.267255W'
-          latitude: '33.524449N'
-
+          datum: WGS84
+          longitude: 222.267255W
+          latitude: 33.524449N
 populate_intf:
-  - name: 'eth2'
+  - name: eth2
     enable: false
     location:
       civic_based:
-        country_code: 'US'
+        country_code: US
         ca_info:
           - ca_type: 0
-            ca_value: 'ENGLISH'
-
+            ca_value: ENGLISH
 overridden:
   commands:
-    - "delete service lldp interface eth2 location"
-    - "delete service lldp interface eth2 'disable'"
-    - "set service lldp interface eth2 location elin '0000000911'"
-
+    - delete service lldp interface eth2 location
+    - delete service lldp interface eth2 'disable'
+    - set service lldp interface eth2 location elin '0000000911'
   after:
-    - name: 'eth2'
+    - name: eth2
       location:
         elin: 0000000911
-
 deleted:
   commands:
-    - "delete service lldp interface eth1"
-    - "delete service lldp interface eth2"
-
+    - delete service lldp interface eth1
+    - delete service lldp interface eth2
   after: []
-
 round_trip:
   after:
-    - name: 'eth1'
+    - name: eth1
       location:
         civic_based:
-          country_code: 'US'
+          country_code: US
           ca_info:
             - ca_type: 0
-              ca_value: 'ENGLISH'
-
-    - name: 'eth2'
+              ca_value: ENGLISH
+    - name: eth2
       location:
         coordinate_based:
           altitude: 2200
-          datum: 'WGS84'
-          longitude: '222.267255W'
-          latitude: '33.524449N'
+          datum: WGS84
+          longitude: 222.267255W
+          latitude: 33.524449N