From 5a198e1e6a64c6dd362f659950e309f296133892 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Sat, 3 Feb 2018 00:07:10 -0500
Subject: [PATCH] Add minor conditional checks to nxos_bgp sanity test (#35476)
* Add minor conditional checks to nxos_bgp sanity test
* Make ansibot happy
---
.../targets/nxos_bgp/tests/common/sanity.yaml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/test/integration/targets/nxos_bgp/tests/common/sanity.yaml b/test/integration/targets/nxos_bgp/tests/common/sanity.yaml
index 585820a6eb6..55049b02f15 100644
--- a/test/integration/targets/nxos_bgp/tests/common/sanity.yaml
+++ b/test/integration/targets/nxos_bgp/tests/common/sanity.yaml
@@ -4,10 +4,13 @@
when: ansible_connection == "local"
- set_fact: neighbor_down_fib_accelerate="true"
- when: not titanium
+ when: (not titanium) and ((imagetag != 'N1') and (imagetag != 'D1'))
- set_fact: reconnect_interval="55"
- when: not titanium
+ when: (not titanium) and ((imagetag != 'N1') and (imagetag != 'D1'))
+
+- set_fact: isolate="false"
+ when: platform is not match("N35")
- name: "Enable feature BGP"
nxos_feature:
@@ -77,7 +80,7 @@
graceful_restart_helper: true
graceful_restart_timers_restart: 130
graceful_restart_timers_stalepath_time: 310
- isolate: false
+ isolate: "{{isolate|default(omit)}}"
log_neighbor_changes: true
maxas_limit: 50
neighbor_down_fib_accelerate: "{{neighbor_down_fib_accelerate|default(omit)}}"