Merge pull request #6 from donaldsharp/mpls2

Mpls2
opensourcerouting · Apr 26, 2017 · 1930120 · 1930120
2 parents 638aeec + cc82973
commit 1930120
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 29 deletions.
diff --git a/all-protocol-startup/test_all_protocol_startup.py b/all-protocol-startup/test_all_protocol_startup.py
@@ -305,7 +305,7 @@ def test_rip_status():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing RIP status")
+    print("\n\n** Verifying RIP status")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -353,7 +353,7 @@ def test_ripng_status():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing RIPng status")
+    print("\n\n** Verifying RIPng status")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -403,7 +403,7 @@ def test_ospfv2_interfaces():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing OSPFv2 interfaces")
+    print("\n\n** Verifying OSPFv2 interfaces")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -457,7 +457,7 @@ def test_isis_interfaces():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing ISIS interfaces")
+    print("\n\n** Verifying ISIS interfaces")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -505,7 +505,7 @@ def test_bgp_summary():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing BGP Summary")
+    print("\n\n** Verifying BGP Summary")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -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()
@@ -577,7 +581,7 @@ def test_bgp_ipv6_summary():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing BGP IPv6 Summary")
+    print("\n\n** Verifying BGP IPv6 Summary")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -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()
@@ -649,7 +658,7 @@ def test_bgp_ipv4():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing BGP IPv4")
+    print("\n\n** Verifying BGP IPv4")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -697,7 +706,7 @@ def test_bgp_ipv6():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing BGP IPv6")
+    print("\n\n** Verifying BGP IPv6")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -750,7 +759,7 @@ def test_mpls_interfaces():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing MPLS Interfaces")
+    print("\n\n** Verifying MPLS Interfaces")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -797,7 +806,7 @@ def test_shutdown_check_stderr():
     if (fatal_error != ""):
         pytest.skip(fatal_error)
 
-    print("\n\n** Verifing unexpected STDERR output from daemons")
+    print("\n\n** Verifying unexpected STDERR output from daemons")
     print("******************************************\n")
 
     if os.environ.get('TOPOTESTS_CHECK_STDERR') is None:

diff --git a/bgp_multiview_topo1/README.md b/bgp_multiview_topo1/README.md
@@ -112,7 +112,7 @@ BGP is expected to converge on each view within 60s total time. Convergence is v
 
 and expecting 11 routes seen in the last column for each peer. (Each peer sends 11 routes)
 
-### Verifing BGP Routing Tables
+### Verifying BGP Routing Tables
 
 Routing table is verified by running 
 

diff --git a/bgp_multiview_topo1/test_bgp_multiview_topo1.py b/bgp_multiview_topo1/test_bgp_multiview_topo1.py
@@ -264,7 +264,7 @@ def test_bgp_routingTable():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing BGP Routing Tables")
+    print("\n\n** Verifying BGP Routing Tables")
     print("******************************************\n")
     failures = 0
     for i in range(1, 2):
@@ -323,7 +323,7 @@ def test_shutdown_check_stderr():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing unexpected STDERR output from daemons")
+    print("\n\n** Verifying unexpected STDERR output from daemons")
     print("******************************************\n")
 
     net['r1'].stopRouter()

diff --git a/ldp-topo1/test_ldp_topo1.py b/ldp-topo1/test_ldp_topo1.py
@@ -217,7 +217,7 @@ def test_mpls_interfaces():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing MPLS Interfaces")
+    print("\n\n** Verifying MPLS Interfaces")
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
@@ -326,7 +326,7 @@ def test_mpls_ldp_discovery():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing MPLS LDP discovery")
+    print("\n\n** Verifying MPLS LDP discovery")
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
@@ -376,7 +376,7 @@ def test_mpls_ldp_neighbor():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing MPLS LDP neighbor")
+    print("\n\n** Verifying MPLS LDP neighbor")
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
@@ -440,7 +440,7 @@ def test_mpls_ldp_binding():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing MPLS LDP binding")
+    print("\n\n** Verifying MPLS LDP binding")
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
@@ -512,7 +512,7 @@ def test_zebra_ipv4_routingTable():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing Zebra IPv4 Routing Table")
+    print("\n\n** Verifying Zebra IPv4 Routing Table")
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
@@ -563,7 +563,7 @@ def test_mpls_table():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing MPLS table")
+    print("\n\n** Verifying MPLS table")
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
@@ -628,7 +628,7 @@ def test_linux_mpls_routes():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing Linux Kernel MPLS routes")
+    print("\n\n** Verifying Linux Kernel MPLS routes")
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
@@ -728,7 +728,7 @@ def test_shutdown_check_stderr():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing unexpected STDERR output from daemons")
+    print("\n\n** Verifying unexpected STDERR output from daemons")
     print("******************************************\n")
 
     for i in range(1, 5):

diff --git a/ospf6-topo1/README.md b/ospf6-topo1/README.md
@@ -115,7 +115,7 @@ OSPFv3 is expected to converge on each view within 60s total time. Convergence i
 
 and checking for "Full" neighbor status in the output. An additional 15 seconds after the full converge is waited for routes to populate before the following routing table checks are executed
 
-### Verifing OSPFv3 Routing Tables
+### Verifying OSPFv3 Routing Tables
 
 Routing table is verified by running 
 

diff --git a/ospf6-topo1/test_ospf6_topo1.py b/ospf6-topo1/test_ospf6_topo1.py
@@ -270,7 +270,7 @@ def test_ospfv3_routingTable():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing OSPFv3 Routing Table")
+    print("\n\n** Verifying OSPFv3 Routing Table")
     print("******************************************\n")
     failures = 0
     for i in range(1, 5):
@@ -318,7 +318,7 @@ def test_linux_ipv6_kernel_routingTable():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify Linux Kernel Routing Table
-    print("\n\n** Verifing Linux IPv6 Kernel Routing Table")
+    print("\n\n** Verifying Linux IPv6 Kernel Routing Table")
     print("******************************************\n")
     failures = 0
 
@@ -384,7 +384,7 @@ def test_shutdown_check_stderr():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing unexpected STDERR output from daemons")
+    print("\n\n** Verifying unexpected STDERR output from daemons")
     print("******************************************\n")
 
     for i in range(1, 5):

diff --git a/ripng-topo1/test_ripng_topo1.py b/ripng-topo1/test_ripng_topo1.py
@@ -188,7 +188,7 @@ def test_ripng_status():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify RIP Status
-    print("\n\n** Verifing RIPng status")
+    print("\n\n** Verifying RIPng status")
     print("******************************************\n")
     failures = 0
     for i in range(1, 4):
@@ -239,7 +239,7 @@ def test_ripng_routes():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify RIPng Status
-    print("\n\n** Verifing RIPng routes")
+    print("\n\n** Verifying RIPng routes")
     print("******************************************\n")
     failures = 0
     for i in range(1, 4):
@@ -291,7 +291,7 @@ def test_zebra_ipv6_routingTable():
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
     # Verify OSPFv3 Routing Table
-    print("\n\n** Verifing Zebra IPv6 Routing Table")
+    print("\n\n** Verifying Zebra IPv6 Routing Table")
     print("******************************************\n")
     failures = 0
     for i in range(1, 4):
@@ -342,7 +342,7 @@ def test_shutdown_check_stderr():
 
     thisDir = os.path.dirname(os.path.realpath(__file__))
 
-    print("\n\n** Verifing unexpected STDERR output from daemons")
+    print("\n\n** Verifying unexpected STDERR output from daemons")
     print("******************************************\n")
 
     net['r1'].stopRouter()