T7011: fix: lldp global integration (#385)

* T7011: fix: lldp global integration
* T7011: Fix lldp interfaces integration

17 files changed, 78 insertions, 121 deletions

diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
index 9cf87b86..66c792c9 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
@@ -14,17 +14,17 @@
     - name: Assert that the before dicts were correctly generated
       assert:
         that:
-          - "{{ populate == result['before']}}"
+          - populate == result['before']
 
     - 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'] == result['after']}}"
+          - deleted['after'] == result['after']
 
     - name: Delete attributes of given interfaces (IDEMPOTENT)
       register: result
@@ -38,6 +38,6 @@
     - name: Assert that the before dicts were correctly generated
       assert:
         that:
-          - "{{ deleted['after'] == result['before'] }}"
+          - deleted['after'] == result['before']
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
index a2e8e6bf..915a2902 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
@@ -17,17 +17,17 @@
 
     - name: Assert that before dicts were correctly generated
       assert:
-        that: "{{ merged['before'] == result['before'] }}"
+        that: merged['before'] == result['before']
 
     - 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'] == result['after'] }}"
+          - merged['after'] == result['after']
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
       register: result
@@ -41,6 +41,6 @@
     - name: Assert that before dicts were correctly generated
       assert:
         that:
-          - "{{ merged['after'] == result['before'] }}"
+          - merged['after'] == result['before']
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
index c74aa460..ad0f53ba 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
@@ -19,17 +19,17 @@
     - 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:
         that:
-          - "{{ populate == result['before'] }}"
+          - populate == result['before']
 
     - name: Assert that after dict is correctly generated
       assert:
         that:
-          - "{{ replaced['after'] == result['after'] }}"
+          - replaced['after'] == result['after']
 
     - name: Replace device configurations of LLDP service with provided configurarions (IDEMPOTENT)
       register: result
@@ -43,6 +43,6 @@
     - name: Assert that before dict is correctly generated
       assert:
         that:
-          - "{{ replaced['after'] == result['before'] }}"
+          - replaced['after'] == result['before']
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
index 10fe4547..d4ea595b 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
@@ -35,7 +35,7 @@
 
     - name: Assert that changes were applied
       assert:
-        that: "{{ round_trip['after'] == result['after'] }}"
+        that: round_trip['after'] == result['after']
 
     - name: Revert back to base config using facts round trip
       register: revert
@@ -45,6 +45,6 @@
 
     - name: Assert that config was reverted
       assert:
-        that: "{{ base_config['after'] == revert['after'] }}"
+        that: base_config['after'] == revert['after']
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/vars/main.yaml b/tests/integration/targets/vyos_lldp_global/vars/main.yaml
index 622b8e4d..dbfe1f3f 100644
--- a/tests/integration/targets/vyos_lldp_global/vars/main.yaml
+++ b/tests/integration/targets/vyos_lldp_global/vars/main.yaml
@@ -1,7 +1,8 @@
 ---
 merged:
   before:
-    address: 192.0.2.17
+    addresses:
+      - 192.0.2.17
     enable: true
     legacy_protocols:
       - cdp
@@ -9,13 +10,16 @@ merged:
     - set service lldp management-address '192.0.2.11'
     - set service lldp legacy-protocols 'fdp'
   after:
-    address: 192.0.2.11
+    addresses:
+      - 192.0.2.17
+      - 192.0.2.11
     enable: true
     legacy_protocols:
       - cdp
       - fdp
 populate:
-  address: 192.0.2.17
+  addresses:
+    - 192.0.2.17
   enable: true
   legacy_protocols:
     - cdp
@@ -24,8 +28,10 @@ replaced:
     - set service lldp legacy-protocols 'edp'
     - set service lldp legacy-protocols 'sonmp'
     - set service lldp management-address '192.0.2.14'
+    - delete service lldp management-address '192.0.2.17'
   after:
-    address: 192.0.2.14
+    addresses:
+      - 192.0.2.14
     enable: true
     legacy_protocols:
       - cdp
@@ -33,7 +39,8 @@ replaced:
       - sonmp
 parsed:
   after:
-    address: 192.0.2.17
+    addresses:
+      - 192.0.2.17
     enable: true
     legacy_protocols:
       - fdp
@@ -45,13 +52,14 @@ rendered:
     - set service lldp management-address '192.0.2.17'
 deleted:
   commands:
-    - delete service lldp management-address
-    - delete service lldp legacy-protocols
-  after:
-    enable: true
+    - delete service lldp
+  after: []
+
 round_trip:
   after:
-    address: 192.0.2.14
+    addresses:
+      - 192.0.2.11
+      - 192.0.2.14
     enable: true
     legacy_protocols:
       - cdp
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg
index 737449c8..767daca8 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg
@@ -1,5 +1,4 @@
-set service lldp interface eth1 location civic-based ca-type 0 ca-value 'ENGLISH'
-set service lldp interface eth1 location civic-based country-code 'US'
+set service lldp interface eth1 location elin '0000000911'
 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 latitude '33.524449N'
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 5ed9e981..21f8dd2a 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
@@ -2,15 +2,12 @@
 - ansible.builtin.include_tasks: _remove_config.yaml
 
 - name: Setup
-  vars:
-    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 }}"
+    config: |-
+      set service lldp interface eth1
+      set service lldp interface eth1 location elin '0000000911'
+      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
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 c1e3a8c5..334b2057 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
   vars:
-    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"
   ansible.netcommon.cli_config:
-    config: "{{ lines }}"
+    config: |-
+      set service lldp interface eth2
+      set service lldp interface eth2 location elin '0000000911'
+      set service lldp interface eth2 disable
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 c8ab3526..abd81ed8 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,6 +1,6 @@
 ---
 - name: Remove Config
-  vars:
-    lines: "delete service lldp interface\ndelete service lldp\n"
   ansible.netcommon.cli_config:
-    config: "{{ lines }}"
+    config: |-
+      delete service lldp interface
+      delete service lldp
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/gathered.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/gathered.yaml
index 7b8e778d..17e660b2 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/gathered.yaml
@@ -14,6 +14,6 @@
     - name: Assert that gathered dicts was correctly generated
       assert:
         that:
-          - "{{ populate | symmetric_difference(result['gathered']) |length == 0 }}"
+          - populate | symmetric_difference(result['gathered']) |length == 0
   always:
     - include_tasks: _remove_config.yaml
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 ecf75974..4a8d8773 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
@@ -11,11 +11,7 @@
         config:
           - name: eth1
             location:
-              civic_based:
-                country_code: US
-                ca_info:
-                  - ca_type: 0
-                    ca_value: ENGLISH
+              elin: 0000000911
 
           - name: eth2
             location:
@@ -28,17 +24,17 @@
 
     - 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)
       register: result
@@ -52,6 +48,6 @@
     - 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 70504817..539b314b 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
@@ -19,17 +19,17 @@
     - 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)
       register: result
@@ -43,6 +43,6 @@
     - 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/parsed.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/parsed.yaml
index c3129340..0e7b4f02 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/parsed.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/parsed.yaml
@@ -11,4 +11,4 @@
 - name: Assert that config was correctly parsed
   assert:
     that:
-      - "{{ parsed['after'] | symmetric_difference(result['parsed']) |length == 0 }}"
+      - parsed['after'] | symmetric_difference(result['parsed']) |length == 0
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rendered.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rendered.yaml
index 3eb25386..1a7966f4 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rendered.yaml
@@ -11,11 +11,7 @@
         config:
           - name: eth1
             location:
-              civic_based:
-                country_code: US
-                ca_info:
-                  - ca_type: 0
-                    ca_value: ENGLISH
+              elin: 0000000911
           - name: eth2
             location:
               coordinate_based:
@@ -28,6 +24,6 @@
     - name: Assert that correct set of commands were generated
       assert:
         that:
-          - "{{ rendered['commands'] | symmetric_difference(result['rendered']) |length == 0 }}"
+          - rendered['commands'] | symmetric_difference(result['rendered']) |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 e914c990..5fe2164d 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
@@ -12,11 +12,7 @@
           - name: eth2
             enable: false
             location:
-              civic_based:
-                country_code: US
-                ca_info:
-                  - ca_type: 0
-                    ca_value: ENGLISH
+              elin: 0000000911
 
           - name: eth1
             enable: false
@@ -31,17 +27,17 @@
     - 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:
         that:
-          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+          - populate | symmetric_difference(result['before']) |length == 0
 
     - 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)
       register: result
@@ -55,6 +51,6 @@
     - 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 6cf5d699..62239854 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
@@ -11,11 +11,7 @@
         config:
           - name: eth1
             location:
-              civic_based:
-                country_code: US
-                ca_info:
-                  - ca_type: 0
-                    ca_value: ENGLISH
+              elin: 0000000911
         state: merged
 
     - name: Gather lldp_interfaces facts
@@ -40,7 +36,7 @@
 
     - 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
@@ -50,6 +46,6 @@
 
     - 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 092f653c..ce1567ef 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
@@ -2,8 +2,7 @@
 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 location elin '0000000911'
     - 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'
@@ -13,11 +12,7 @@ merged:
   after:
     - name: eth1
       location:
-        civic_based:
-          country_code: US
-          ca_info:
-            - ca_type: 0
-              ca_value: ENGLISH
+        elin: 0000000911
     - name: eth2
       location:
         coordinate_based:
@@ -28,11 +23,7 @@ merged:
 populate:
   - name: eth1
     location:
-      civic_based:
-        country_code: US
-        ca_info:
-          - ca_type: 0
-            ca_value: ENGLISH
+      elin: 0000000911
   - name: eth2
     location:
       coordinate_based:
@@ -42,8 +33,7 @@ populate:
         latitude: 33.524449N
 rendered:
   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 location elin '0000000911'
     - 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'
@@ -54,8 +44,7 @@ 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'
+    - set service lldp interface eth2 location elin '0000000911'
     - delete service lldp interface eth1 location
     - set service lldp interface eth1 'disable'
     - set service lldp interface eth1 location coordinate-based latitude '33.524449N'
@@ -66,11 +55,7 @@ replaced:
     - name: eth2
       enable: false
       location:
-        civic_based:
-          country_code: US
-          ca_info:
-            - ca_type: 0
-              ca_value: ENGLISH
+        elin: 0000000911
     - name: eth1
       enable: false
       location:
@@ -83,16 +68,10 @@ populate_intf:
   - name: eth2
     enable: false
     location:
-      civic_based:
-        country_code: US
-        ca_info:
-          - ca_type: 0
-            ca_value: ENGLISH
+      elin: "0000000911"
 overridden:
   commands:
-    - delete service lldp interface eth2 location
     - delete service lldp interface eth2 'disable'
-    - set service lldp interface eth2 location elin '0000000911'
   after:
     - name: eth2
       location:
@@ -101,11 +80,7 @@ parsed:
   after:
     - name: eth1
       location:
-        civic_based:
-          country_code: US
-          ca_info:
-            - ca_type: 0
-              ca_value: ENGLISH
+        elin: 0000000911
     - name: eth2
       location:
         coordinate_based:
@@ -122,11 +97,7 @@ round_trip:
   after:
     - name: eth1
       location:
-        civic_based:
-          country_code: US
-          ca_info:
-            - ca_type: 0
-              ca_value: ENGLISH
+        elin: 0000000911
     - name: eth2
       location:
         coordinate_based: