Fix junos integration zuul CI failures (#57309)

test/integration/targets/junos_lldp_interface/tests/netconf/basic.yaml

@@ -1,106 +1,124 @@
 ---
 - debug: msg="START junos_lldp_interface netconf/basic.yaml on connection={{ ansible_connection }}"
 
-- name: setup - Remove lldp interface configuration
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: absent
-    provider: "{{ netconf }}"
-
-- name: lldp interface configuration
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: present
-    provider: "{{ netconf }}"
+- name: get supported protocols
+  junos_command:
+    commands: show lldp
   register: result
+  ignore_errors: yes
 
-- assert:
-    that:
-      - "result.changed == true"
-      - result.diff.prepared is search("\+ *interface ge-0/0/5")
+- name: lldp supported
+  set_fact:
+    lldp_supported: True
+  when: not result.failed
 
-- name: lldp interface configuration (idempotent)
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: present
-    provider: "{{ netconf }}"
-  register: result
+- name: lldp not supported
+  set_fact:
+    lldp_supported: False
+  when: result.failed
 
-- assert:
-    that:
-      - "result.changed == false"
+- block:
+  - name: setup - Remove lldp interface configuration
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: absent
+      provider: "{{ netconf }}"
 
-- name: Deactivate lldp interface configuration
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: present
-    active: False
-    provider: "{{ netconf }}"
-  register: result
+  - name: lldp interface configuration
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: present
+      provider: "{{ netconf }}"
+    register: result
 
-- assert:
-    that:
-      - "result.changed == true"
-      - result.diff.prepared is search("! *inactive[:] interface ge-0/0/5")
+  - assert:
+      that:
+        - "result.changed == true"
+        - result.diff.prepared is search("\+ *interface ge-0/0/5")
 
-- name: Activate lldp interface configuration
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: present
-    active: True
-    provider: "{{ netconf }}"
-  register: result
+  - name: lldp interface configuration (idempotent)
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: present
+      provider: "{{ netconf }}"
+    register: result
 
-- assert:
-    that:
-      - "result.changed == true"
-      - result.diff.prepared is search("! *active[:] interface ge-0/0/5")
+  - assert:
+      that:
+        - "result.changed == false"
 
-- name: Disable lldp on particular interface
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: disabled
-    provider: "{{ netconf }}"
-  register: result
+  - name: Deactivate lldp interface configuration
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: present
+      active: False
+      provider: "{{ netconf }}"
+    register: result
 
-- assert:
-    that:
-      - "result.changed == true"
-      - result.diff.prepared is search("\+ *disable")
+  - assert:
+      that:
+        - "result.changed == true"
+        - result.diff.prepared is search("! *inactive[:] interface ge-0/0/5")
 
-- name: Enable lldp on particular interface
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: enabled
-    provider: "{{ netconf }}"
-  register: result
+  - name: Activate lldp interface configuration
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: present
+      active: True
+      provider: "{{ netconf }}"
+    register: result
 
-- assert:
-    that:
-      - "result.changed == true"
-      - result.diff.prepared is search("\- *disable")
+  - assert:
+      that:
+        - "result.changed == true"
+        - result.diff.prepared is search("! *active[:] interface ge-0/0/5")
 
-- name: Delete lldp on particular interface
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: absent
-    provider: "{{ netconf }}"
-  register: result
+  - name: Disable lldp on particular interface
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: disabled
+      provider: "{{ netconf }}"
+    register: result
 
-- assert:
-    that:
-      - "result.changed == true"
-      - result.diff.prepared is search("\- *interface ge-0/0/5")
+  - assert:
+      that:
+        - "result.changed == true"
+        - result.diff.prepared is search("\+ *disable")
 
-- name: Delete lldp on particular interface (idempotent)
-  junos_lldp_interface:
-    name: ge-0/0/5
-    state: absent
-    provider: "{{ netconf }}"
-  register: result
+  - name: Enable lldp on particular interface
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: enabled
+      provider: "{{ netconf }}"
+    register: result
 
-- assert:
-    that:
-      - "result.changed == false"
+  - assert:
+      that:
+        - "result.changed == true"
+        - result.diff.prepared is search("\- *disable")
+
+  - name: Delete lldp on particular interface
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: absent
+      provider: "{{ netconf }}"
+    register: result
+
+  - assert:
+      that:
+        - "result.changed == true"
+        - result.diff.prepared is search("\- *interface ge-0/0/5")
+
+  - name: Delete lldp on particular interface (idempotent)
+    junos_lldp_interface:
+      name: ge-0/0/5
+      state: absent
+      provider: "{{ netconf }}"
+    register: result
+
+  - assert:
+      that:
+        - "result.changed == false"
+  when: lldp_supported
 
 - debug: msg="END junos_lldp_interface netconf/basic.yaml on connection={{ ansible_connection }}"

test/integration/targets/junos_lldp_interface/tests/netconf/net_lldp_interface.yaml

@@ -4,28 +4,46 @@
 # Add minimal testcase to check args are passed correctly to
 # implementation module and module run is successful.
 
-- name: setup - Remove lldp interface configuration
-  net_lldp_interface:
-    name: ge-0/0/5
-    state: absent
-    provider: "{{ netconf }}"
-
-- name: lldp interface configuration using platform agnostic module
-  net_lldp_interface:
-    name: ge-0/0/5
-    state: present
-    provider: "{{ netconf }}"
+- name: get supported protocols
+  junos_command:
+    commands: show lldp
   register: result
+  ignore_errors: yes
 
-- assert:
-    that:
-      - "result.changed == true"
-      - result.diff.prepared is search("\+ *interface ge-0/0/5")
+- name: lldp supported
+  set_fact:
+    lldp_supported: True
+  when: not result.failed
 
-- name: teardown - Remove lldp interface configuration
-  net_lldp_interface:
-    name: ge-0/0/5
-    state: absent
-    provider: "{{ netconf }}"
+- name: lldp not supported
+  set_fact:
+    lldp_supported: False
+  when: result.failed
+
+- block:
+  - name: setup - Remove lldp interface configuration
+    net_lldp_interface:
+      name: ge-0/0/5
+      state: absent
+      provider: "{{ netconf }}"
+
+  - name: lldp interface configuration using platform agnostic module
+    net_lldp_interface:
+      name: ge-0/0/5
+      state: present
+      provider: "{{ netconf }}"
+    register: result
+
+  - assert:
+      that:
+        - "result.changed == true"
+        - result.diff.prepared is search("\+ *interface ge-0/0/5")
+
+  - name: teardown - Remove lldp interface configuration
+    net_lldp_interface:
+      name: ge-0/0/5
+      state: absent
+      provider: "{{ netconf }}"
+  when: lldp_supported
 
 - debug: msg="END junos netconf/net_lldp_interface.yaml on connection={{ ansible_connection }}"