Updated from network content collector

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

14 files changed, 200 insertions, 184 deletions

diff --git a/tests/integration/targets/vyos_lag_interfaces/defaults/main.yaml b/tests/integration/targets/vyos_lag_interfaces/defaults/main.yaml
index 164afea..852a6be 100644
--- a/tests/integration/targets/vyos_lag_interfaces/defaults/main.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/defaults/main.yaml
@@ -1,3 +1,3 @@
 ---
-testcase: "[^_].*"
+testcase: '[^_].*'
 test_items: []
diff --git a/tests/integration/targets/vyos_lag_interfaces/tasks/cli.yaml b/tests/integration/targets/vyos_lag_interfaces/tasks/cli.yaml
index 655e51e..93eb2fe 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tasks/cli.yaml
+++ b/tests/integration/targets/vyos_lag_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_lag_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml
index d4cf26f..a3db933 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lag_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_lag_interfaces/tests/cli/_add_bond.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
index adacb0c..927a6ce 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
@@ -1,8 +1,6 @@
 ---
 - name: Add Bond
-  network.cli.cli_config:
-    config: "{{ lines }}"
   vars:
-    lines: |
-      set interfaces bonding bond0
-      set interfaces bonding bond1
+    lines: "set interfaces bonding bond0\nset interfaces bonding bond1\n"
+  ansible.netcommon.cli_config:
+    config: '{{ lines }}'
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
index 6139508..f646742 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
@@ -1,16 +1,11 @@
 ---
 - name: Setup
-  network.cli.cli_config:
-    config: "{{ lines }}"
   vars:
-    lines: |
-      set interfaces bonding bond0
-      set interfaces bonding bond0 hash-policy 'layer2'
-      set interfaces bonding bond0 mode 'active-backup'
-      set interfaces ethernet eth1 bond-group bond0
-      set interfaces bonding bond1
-      set interfaces bonding bond0 primary 'eth1'
-      set interfaces bonding bond1 hash-policy 'layer2+3'
-      set interfaces bonding bond1 mode 'active-backup'
-      set interfaces ethernet eth2 bond-group bond1
-      set interfaces bonding bond1 primary 'eth2'
+    lines: "set interfaces bonding bond0\nset interfaces bonding bond0 hash-policy\
+      \ 'layer2'\nset interfaces bonding bond0 mode 'active-backup'\nset interfaces\
+      \ ethernet eth1 bond-group bond0\nset interfaces bonding bond1\nset interfaces\
+      \ bonding bond0 primary 'eth1'\nset interfaces bonding bond1 hash-policy 'layer2+3'\n\
+      set interfaces bonding bond1 mode 'active-backup'\nset interfaces ethernet\
+      \ eth2 bond-group bond1\nset interfaces bonding bond1 primary 'eth2'\n"
+  ansible.netcommon.cli_config:
+    config: '{{ lines }}'
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
index 29085bd..6679d6a 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
@@ -1,8 +1,6 @@
 ---
 - name: Remove Bond
-  network.cli.cli_config:
-    config: "{{ lines }}"
   vars:
-    lines: |
-      delete interfaces bonding bond0
-      delete interfaces bonding bond1
+    lines: "delete interfaces bonding bond0\ndelete interfaces bonding bond1\n"
+  ansible.netcommon.cli_config:
+    config: '{{ lines }}'
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml
index c5d3657..5469bf5 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml
@@ -1,14 +1,10 @@
 ---
 - name: Remove Config
-  network.cli.cli_config:
-    config: "{{ lines }}"
   vars:
-    lines: |
-      delete interfaces bonding bond0 hash-policy
-      delete interfaces ethernet eth1 bond-group bond0
-      delete interfaces bonding bond0 mode
-      delete interfaces bonding bond0 primary
-      delete interfaces bonding bond1 hash-policy
-      delete interfaces ethernet eth2 bond-group bond1
-      delete interfaces bonding bond1 mode
-      delete interfaces bonding bond1 primary
+    lines: "delete interfaces bonding bond0 hash-policy\ndelete interfaces ethernet\
+      \ eth1 bond-group bond0\ndelete interfaces bonding bond0 mode\ndelete interfaces\
+      \ bonding bond0 primary\ndelete interfaces bonding bond1 hash-policy\ndelete\
+      \ interfaces ethernet eth2 bond-group bond1\ndelete interfaces bonding bond1\
+      \ mode\ndelete interfaces bonding bond1 primary\n"
+  ansible.netcommon.cli_config:
+    config: '{{ lines }}'
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
index af6e632..ac8204f 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
@@ -1,17 +1,21 @@
 ---
 - debug:
-    msg: "Start vyos_lag_interfaces deleted integration tests ansible_connection={{ ansible_connection }}"
+    msg: Start vyos_lag_interfaces deleted integration tests ansible_connection={{
+      ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
+
     - name: Delete attributes of given LAG interfaces.
-      vyos.vyos.vyos_lag_interfaces: &deleted
+      register: result
+      vyos.vyos.vyos_lag_interfaces: &id001
         config:
+
           - name: bond0
+
           - name: bond1
         state: deleted
-      register: result
 
     - name: Assert that the before dicts were correctly generated
       assert:
@@ -21,26 +25,29 @@
     - 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_lag_interfaces: *deleted
       register: result
+      vyos.vyos.vyos_lag_interfaces: *id001
 
     - name: Assert that the previous task was idempotent
       assert:
         that:
-          - "result.changed == false"
+          - result.changed == false
 
     - 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_lag_interfaces/tests/cli/empty_config.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/empty_config.yaml
index 74d3466..3894fb5 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/empty_config.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/empty_config.yaml
@@ -1,35 +1,36 @@
 ---
 - debug:
-    msg: "START vyos_lag_interfaces empty_config integration tests on connection={{ ansible_connection }}"
+    msg: START vyos_lag_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_lag_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_lag_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_lag_interfaces:
     config:
     state: overridden
-  register: result
-  ignore_errors: true
 
 - assert:
     that:
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
index 7b1931f..35f1e35 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
@@ -1,6 +1,7 @@
 ---
 - debug:
-    msg: "START vyos_lag_interfaces merged integration tests on connection={{ ansible_connection }}"
+    msg: START vyos_lag_interfaces merged integration tests on connection={{ ansible_connection
+      }}
 
 - include_tasks: _remove_config.yaml
 
@@ -9,52 +10,61 @@
 - include_tasks: _add_bond.yaml
 
 - block:
+
     - name: Merge the provided configuration with the exisiting running configuration
-      vyos.vyos.vyos_lag_interfaces: &merged
+      register: result
+      vyos.vyos.vyos_lag_interfaces: &id001
         config:
+
           - name: bond0
-            hash_policy: "layer2"
-            mode: "active-backup"
+            hash_policy: layer2
+            mode: active-backup
             members:
+
               - member: eth1
             primary: eth1
 
           - name: bond1
-            hash_policy: "layer2+3"
-            mode: "active-backup"
+            hash_policy: layer2+3
+            mode: active-backup
             members:
+
               - member: eth2
             primary: eth2
         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_lag_interfaces: *merged
+    - name: Merge the provided configuration with the existing running configuration
+        (IDEMPOTENT)
       register: result
+      vyos.vyos.vyos_lag_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_lag_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
index c44cc33..aa6e247 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
@@ -1,6 +1,7 @@
 ---
 - debug:
-    msg: "START vyos_lag_interfaces overridden integration tests on connection={{ ansible_connection }}"
+    msg: START vyos_lag_interfaces overridden integration tests on connection={{
+      ansible_connection }}
 
 - include_tasks: _remove_config.yaml
 
@@ -9,17 +10,20 @@
 - include_tasks: _populate.yaml
 
 - block:
+
     - name: Overrides all device configuration with provided configuration
-      vyos.vyos.vyos_lag_interfaces: &overridden
+      register: result
+      vyos.vyos.vyos_lag_interfaces: &id001
         config:
+
           - name: bond1
-            mode: "active-backup"
+            mode: active-backup
             members:
+
               - member: eth2
             primary: eth2
             hash_policy: layer2
         state: overridden
-      register: result
 
     - name: Assert that before dicts were correctly generated
       assert:
@@ -29,26 +33,29 @@
     - 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_lag_interfaces: *overridden
       register: result
+      vyos.vyos.vyos_lag_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_lag_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
index 894d505..c080056 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
@@ -1,27 +1,33 @@
 ---
 - debug:
-    msg: "START vyos_lag_interfaces replaced integration tests on connection={{ ansible_connection }}"
+    msg: START vyos_lag_interfaces replaced integration tests on connection={{ ansible_connection
+      }}
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate.yaml
 
 - block:
-    - name: Replace device configurations of listed LAG interfaces with provided configurations
-      vyos.vyos.vyos_lag_interfaces: &replaced
+
+    - name: Replace device configurations of listed LAG interfaces with provided
+        configurations
+      register: result
+      vyos.vyos.vyos_lag_interfaces: &id001
         config:
+
           - name: bond1
-            mode: "802.3ad"
-            hash_policy: "layer2"
+            mode: 802.3ad
+            hash_policy: layer2
             members:
+
               - member: eth2
         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:
@@ -31,21 +37,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 LAG interfaces with provided configurarions (IDEMPOTENT)
-      vyos.vyos.vyos_lag_interfaces: *replaced
+    - name: Replace device configurations of listed LAG interfaces with provided
+        configurarions (IDEMPOTENT)
       register: result
+      vyos.vyos.vyos_lag_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_lag_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
index 3095a12..55e2bbf 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
@@ -1,31 +1,35 @@
 ---
 - debug:
-    msg: "START vyos_lag_interfaces round trip integration tests on connection={{ ansible_connection }}"
+    msg: START vyos_lag_interfaces round trip integration tests on connection={{
+      ansible_connection }}
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _remove_bond.yaml
 
 - block:
+
     - name: Apply the provided configuration (base config)
+      register: base_config
       vyos.vyos.vyos_lag_interfaces:
         config:
+
           - name: bond0
-            hash_policy: "layer2"
-            mode: "active-backup"
+            hash_policy: layer2
+            mode: active-backup
             members:
+
               - member: eth1
             primary: eth1
 
           - name: bond1
-            hash_policy: "layer2+3"
-            mode: "active-backup"
+            hash_policy: layer2+3
+            mode: active-backup
             members:
+
               - member: eth2
             primary: eth2
-
         state: merged
-      register: base_config
 
     - name: Gather lag_interfaces facts
       vyos.vyos.vyos_facts:
@@ -35,35 +39,40 @@
           - lag_interfaces
 
     - name: Apply the provided configuration (config to be reverted)
+      register: result
       vyos.vyos.vyos_lag_interfaces:
         config:
+
           - name: bond0
-            hash_policy: "layer2+3"
-            mode: "802.3ad"
+            hash_policy: layer2+3
+            mode: 802.3ad
             members:
+
               - member: eth1
 
           - name: bond1
-            hash_policy: "layer2"
-            mode: "xor-hash"
+            hash_policy: layer2
+            mode: xor-hash
             members:
+
               - member: eth2
         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_lag_interfaces:
         config: "{{ ansible_facts['network_resources']['lag_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_lag_interfaces/vars/main.yaml b/tests/integration/targets/vyos_lag_interfaces/vars/main.yaml
index 8726e39..5783693 100644
--- a/tests/integration/targets/vyos_lag_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/vars/main.yaml
@@ -1,115 +1,99 @@
 ---
 merged:
   before:
-    - name: "bond0"
-
-    - name: "bond1"
-
+    - name: bond0
+    - name: bond1
   commands:
-    - "set interfaces bonding bond0 hash-policy 'layer2'"
-    - "set interfaces bonding bond0 mode 'active-backup'"
-    - "set interfaces ethernet eth1 bond-group 'bond0'"
-    - "set interfaces bonding bond0 primary 'eth1'"
-    - "set interfaces bonding bond1 hash-policy 'layer2+3'"
-    - "set interfaces bonding bond1 mode 'active-backup'"
-    - "set interfaces ethernet eth2 bond-group 'bond1'"
-    - "set interfaces bonding bond1 primary 'eth2'"
-
+    - set interfaces bonding bond0 hash-policy 'layer2'
+    - set interfaces bonding bond0 mode 'active-backup'
+    - set interfaces ethernet eth1 bond-group 'bond0'
+    - set interfaces bonding bond0 primary 'eth1'
+    - set interfaces bonding bond1 hash-policy 'layer2+3'
+    - set interfaces bonding bond1 mode 'active-backup'
+    - set interfaces ethernet eth2 bond-group 'bond1'
+    - set interfaces bonding bond1 primary 'eth2'
   after:
-    - name: "bond0"
-      hash_policy: "layer2"
+    - name: bond0
+      hash_policy: layer2
       members:
         - member: eth1
-      mode: "active-backup"
+      mode: active-backup
       primary: eth1
-
-    - name: "bond1"
-      hash_policy: "layer2+3"
+    - name: bond1
+      hash_policy: layer2+3
       members:
         - member: eth2
-      mode: "active-backup"
+      mode: active-backup
       primary: eth2
-
 populate:
-  - name: "bond0"
-    hash_policy: "layer2"
+  - name: bond0
+    hash_policy: layer2
     members:
       - member: eth1
-    mode: "active-backup"
+    mode: active-backup
     primary: eth1
-
-  - name: "bond1"
-    hash_policy: "layer2+3"
+  - name: bond1
+    hash_policy: layer2+3
     members:
       - member: eth2
-    mode: "active-backup"
+    mode: active-backup
     primary: eth2
-
 replaced:
   commands:
-    - "delete interfaces bonding bond1 primary"
-    - "set interfaces bonding bond1 hash-policy 'layer2'"
-    - "set interfaces bonding bond1 mode '802.3ad'"
-
+    - delete interfaces bonding bond1 primary
+    - set interfaces bonding bond1 hash-policy 'layer2'
+    - set interfaces bonding bond1 mode '802.3ad'
   after:
-    - name: "bond0"
-      hash_policy: "layer2"
+    - name: bond0
+      hash_policy: layer2
       members:
         - member: eth1
-      mode: "active-backup"
+      mode: active-backup
       primary: eth1
-
-    - name: "bond1"
-      hash_policy: "layer2"
+    - name: bond1
+      hash_policy: layer2
       members:
         - member: eth2
-      mode: "802.3ad"
-
+      mode: 802.3ad
 overridden:
   commands:
-    - "delete interfaces bonding bond0 hash-policy"
-    - "delete interfaces ethernet eth1 bond-group 'bond0'"
-    - "delete interfaces bonding bond0 mode"
-    - "delete interfaces bonding bond0 primary"
-    - "set interfaces bonding bond1 hash-policy 'layer2'"
-
+    - delete interfaces bonding bond0 hash-policy
+    - delete interfaces ethernet eth1 bond-group 'bond0'
+    - delete interfaces bonding bond0 mode
+    - delete interfaces bonding bond0 primary
+    - set interfaces bonding bond1 hash-policy 'layer2'
   after:
-    - name: "bond0"
-    - name: "bond1"
-      hash_policy: "layer2"
+    - name: bond0
+    - name: bond1
+      hash_policy: layer2
       members:
         - member: eth2
-      mode: "active-backup"
+      mode: active-backup
       primary: eth2
-
 deleted:
   commands:
-    - "delete interfaces bonding bond0 hash-policy"
-    - "delete interfaces ethernet eth1 bond-group 'bond0'"
-    - "delete interfaces bonding bond0 mode"
-    - "delete interfaces bonding bond0 primary"
-    - "delete interfaces bonding bond1 hash-policy"
-    - "delete interfaces ethernet eth2 bond-group 'bond1'"
-    - "delete interfaces bonding bond1 mode"
-    - "delete interfaces bonding bond1 primary"
-
+    - delete interfaces bonding bond0 hash-policy
+    - delete interfaces ethernet eth1 bond-group 'bond0'
+    - delete interfaces bonding bond0 mode
+    - delete interfaces bonding bond0 primary
+    - delete interfaces bonding bond1 hash-policy
+    - delete interfaces ethernet eth2 bond-group 'bond1'
+    - delete interfaces bonding bond1 mode
+    - delete interfaces bonding bond1 primary
   after:
-    - name: "bond0"
-
-    - name: "bond1"
-
+    - name: bond0
+    - name: bond1
 round_trip:
   after:
-    - name: "bond0"
-      hash_policy: "layer2+3"
+    - name: bond0
+      hash_policy: layer2+3
       members:
         - member: eth1
-      mode: "802.3ad"
+      mode: 802.3ad
       primary: eth1
-
-    - name: "bond1"
-      hash_policy: "layer2"
+    - name: bond1
+      hash_policy: layer2
       members:
         - member: eth2
-      mode: "xor-hash"
+      mode: xor-hash
       primary: eth2