From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 26 Apr 2017 16:15:39 +0000 (-0400)
Subject: Fix tests to handle new output
X-Git-Tag: frr-7.1-dev~151^2~332
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8b2e59e94317d1834f6da66665a8de5378381256;p=mirror%2Ffrr.git

Fix tests to handle new output

The show commands for bgp now have a bit more
data associated with labeled unicast routes.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
index ca6cac4b61..4ec1bf2df7 100755
--- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
+++ b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
@@ -542,6 +542,10 @@ def test_bgp_summary():
             # Remove Unknown Summary (all of it)
             actual = re.sub(r'Unknown Summary:', '', actual)
             actual = re.sub(r'No Unknown neighbor is configured', '', actual)
+
+            actual = re.sub(r'IPv4 labeled-unicast Summary:', '', actual)
+            actual = re.sub(r'No IPv4 labeled-unicast neighbor is configured', '', actual)
+
             # Strip empty lines
             actual = actual.lstrip()
             actual = actual.rstrip()
@@ -614,6 +618,11 @@ def test_bgp_ipv6_summary():
             # Remove Unknown Summary (all of it)
             actual = re.sub(r'Unknown Summary:', '', actual)
             actual = re.sub(r'No Unknown neighbor is configured', '', actual)
+
+            # Remove Labeled Unicast Summary (all of it)
+            actual = re.sub(r'IPv6 labeled-unicast Summary:', '', actual)
+            actual = re.sub(r'No IPv6 labeled-unicast neighbor is configured', '', actual)
+
             # Strip empty lines
             actual = actual.lstrip()
             actual = actual.rstrip()