all-protocol-startup/isis: Fix check for "show isis interface" to allow different...

diff --git a/tests/topotests/all-protocol-startup/r1/show_isis_interface_detail.ref b/tests/topotests/all-protocol-startup/r1/show_isis_interface_detail.ref
index ebf7ab50cd7886c27821124751c71852ffdd7e5a..0534b64d3389e99c6cc73d1e2bb2257f568075de 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/show_isis_interface_detail.ref
+++ b/tests/topotests/all-protocol-startup/r1/show_isis_interface_detail.ref
@@ -1,5 +1,5 @@
 Area test:
-  Interface: r1-eth5, State: Up, Active, Circuit Id: 0x1
+  Interface: r1-eth5, State: Up, Active, Circuit Id: 0xXX
     Type: lan, Level: L1, SNPA: XXXX.XXXX.XXXX
     Level-1 Information:
       Metric: 10, Active neighbors: 0
@@ -13,7 +13,7 @@ Area test:
     IPv6 Prefixes:
       fc00:0:0:5::1/64
 
-  Interface: r1-eth6, State: Up, Active, Circuit Id: 0x1
+  Interface: r1-eth6, State: Up, Active, Circuit Id: 0xXX
     Type: lan, Level: L2, SNPA: XXXX.XXXX.XXXX
     Level-2 Information:
       Metric: 10, Active neighbors: 0

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 a0fcf81d8a0ee33d761b35137d7d9ed5a1d45d20..fe23e8dfc0ca37e74b2093c96267c809a825f95c 100755 (executable)
--- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
+++ b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
@@ -496,6 +496,8 @@ def test_isis_interfaces():
             actual = re.sub(r"fe80::[0-9a-f:]+", "fe80::XXXX:XXXX:XXXX:XXXX", actual)
             # Mask out SNPA mac address portion. They are random...
             actual = re.sub(r"SNPA: [0-9a-f\.]+", "SNPA: XXXX.XXXX.XXXX", actual)
+            # Mask out Circuit ID number
+            actual = re.sub(r"Circuit Id: 0x[0-9]+", "Circuit Id: 0xXX", actual)
             # Fix newlines (make them all the same)
             actual = ('\n'.join(actual.splitlines()) + '\n').splitlines(1)