From bd17edd5ed7f8da5033fdb3cbcc6b155430818da Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com>
Date: Tue, 10 Oct 2017 21:26:47 +0200
Subject: [PATCH] Run neighbors intent tests for ios_interface only if show
 lldp contains netdev (#31539)

---
 .../ios_interface/tests/cli/intent.yaml       | 133 ++++++++++--------
 1 file changed, 72 insertions(+), 61 deletions(-)

diff --git a/test/integration/targets/ios_interface/tests/cli/intent.yaml b/test/integration/targets/ios_interface/tests/cli/intent.yaml
index 493939dc6c4..b0be4d8c972 100644
--- a/test/integration/targets/ios_interface/tests/cli/intent.yaml
+++ b/test/integration/targets/ios_interface/tests/cli/intent.yaml
@@ -61,43 +61,52 @@
       - "result.failed == true"
       - "'state eq(up)' in result.failed_conditions"
 
-- name: Check neighbors intent arguments
-  ios_interface:
-    name: Gi0/0
-    neighbors:
-    - port: eth0
-      host: netdev
+- name: Register show neighbors detail
+  ios_command:
+    commands:
+      - show lldp neighbors
     authorize: yes
-    provider: "{{ cli }}"
-  register: result
+  register: show_lldp_neighbors_result
 
-- assert:
-    that:
-      - "result.failed == false"
+- block:
+    - name: Check neighbors intent arguments
+      ios_interface:
+        name: Gi0/0
+        neighbors:
+          - port: eth0
+            host: netdev
+        authorize: yes
+        provider: "{{ cli }}"
+      register: result
 
-- name: Check neighbors intent arguments (failed condition)
-  ios_interface:
-    name: Gi0/0
-    neighbors:
-    - port: dummy_port
-      host: dummy_host
-    authorize: yes
-    provider: "{{ cli }}"
-  ignore_errors: yes
-  register: result
+    - assert:
+        that:
+          - "result.failed == false"
 
-- assert:
-    that:
-      - "result.failed == true"
-      - "'host dummy_host' in result.failed_conditions"
-      - "'port dummy_port' in result.failed_conditions"
+    - name: Check neighbors intent arguments (failed condition)
+      ios_interface:
+        name: Gi0/0
+        neighbors:
+          - port: dummy_port
+            host: dummy_host
+        authorize: yes
+        provider: "{{ cli }}"
+      ignore_errors: yes
+      register: result
+
+    - assert:
+        that:
+          - "result.failed == true"
+          - "'host dummy_host' in result.failed_conditions"
+          - "'port dummy_port' in result.failed_conditions"
+  when: '"netdev" in show_lldp_neighbors_result.stdout'
 
 - name: Aggregate config + intent (pass)
   ios_interface:
     aggregate:
-    - name: GigabitEthernet0/2
-      enabled: True
-      state: up
+      - name: GigabitEthernet0/2
+        enabled: True
+        state: up
     authorize: yes
     provider: "{{ cli }}"
   ignore_errors: yes
@@ -107,38 +116,40 @@
     that:
       - "result.failed == false"
 
-- name: Aggregate neighbors intent (pass)
-  ios_interface:
-    aggregate:
-    - name: Gi0/0
-      neighbors:
-      - port: eth0
-        host: netdev
-    authorize: yes
-    provider: "{{ cli }}"
-  ignore_errors: yes
-  register: result
+- block:
+    - name: Aggregate neighbors intent (pass)
+      ios_interface:
+        aggregate:
+          - name: Gi0/0
+            neighbors:
+              - port: eth0
+                host: netdev
+        authorize: yes
+        provider: "{{ cli }}"
+      ignore_errors: yes
+      register: result
 
-- assert:
-    that:
-      - "result.failed == false"
+    - assert:
+        that:
+          - "result.failed == false"
 
-- name: Aggregate neighbors intent (fail)
-  ios_interface:
-    aggregate:
-    - name: Gi0/0
-      neighbors:
-      - port: eth0
-        host: netdev
-      - port: dummy_port
-        host: dummy_host
-    authorize: yes
-    provider: "{{ cli }}"
-  ignore_errors: yes
-  register: result
+    - name: Aggregate neighbors intent (fail)
+      ios_interface:
+        aggregate:
+          - name: Gi0/0
+        neighbors:
+          - port: eth0
+            host: netdev
+          - port: dummy_port
+            host: dummy_host
+        authorize: yes
+        provider: "{{ cli }}"
+      ignore_errors: yes
+      register: result
 
-- assert:
-    that:
-      - "result.failed == true"
-      - "'host dummy_host' in result.failed_conditions"
-      - "'port dummy_port' in result.failed_conditions"
+    - assert:
+        that:
+          - "result.failed == true"
+          - "'host dummy_host' in result.failed_conditions"
+          - "'port dummy_port' in result.failed_conditions"
+  when: "'netdev' in show_lldp_neighbors_result.stdout"