Update BGP tests for the new check we do.

(cherry picked from commit 459ffc95176eac694f0f1d54091a2dadc7aaec7f)

diff --git a/tests/bgp-as-path-oobr-nossl.out b/tests/bgp-as-path-oobr-nossl.out
index d9549d6792eef4fc5610c6ad945318a77c637c77..1b15517ff3ef2a422705b45fb7d6406a5b405b92 100644 (file)
--- a/tests/bgp-as-path-oobr-nossl.out
+++ b/tests/bgp-as-path-oobr-nossl.out
@@ -96,40 +96,7 @@
        Update Message (2), length: 202
          Withdrawn routes:
            0.0.0.0/0
-           (illegal prefix length)
-         Origin (1), length: 2, Flags [+1]: invalid len
-           0x0000:  4002
-         Attribute Set (128), length: 4
-           Origin AS: 67108864
-         Unknown Attribute (64), length: 5
-           no Attribute 64 decoder
-           0x0000:  0400 0000 64
-         Extended Community (16), length: 8, Flags [OT]: 
-           target (0x0002), Flags [none]: 19338:650 (= 0.0.2.138)
-           0x0000:  0002 4b8a 0000 028a
-         Cluster List (10), length: 4, Flags [O]: 172.17.0.0
-           0x0000:  ac11 0000
-         Originator ID (9), length: 4, Flags [O]: 172.17.0.5
-           0x0000:  ac11 0005
-         Multi-Protocol Reach NLRI (14), length: 129, Flags [OE]: 
-           AFI: IPv4 (1), SAFI: labeled VPN Unicast (128)
-           nexthop: RD: 0:0 (= 0.0.0.0), 172.17.0.5, nh-length: 12, no SNPA
-             RD: 18826:650 (= 0.0.2.138), 172.17.33.0/27, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.105.0/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.105.32/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.105.48/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.192.128/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.192.144/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.30.64/26, label:1034 (bottom)
-           0x0000:  0001 800c 0000 0000 0000 0000 ac11 0005
-           0x0010:  0073 0040 5100 0049 8a00 0002 8aac 1121
-           0x0020:  0074 0040 5100 0049 8a00 0002 8aac 1169
-           0x0030:  0074 0040 5100 0049 8a00 0002 8aac 1169
-           0x0040:  2074 0040 5100 0049 8a00 0002 8aac 1169
-           0x0050:  3074 0040 5100 0049 8a00 0002 8aac 11c0
-           0x0060:  8074 0040 5100 0049 8a00 0002 8aac 11c0
-           0x0070:  9072 0040 a100 0049 8a00 0002 8aac 111e
-           0x0080:  40 [|bgp]
+           (illegal prefix length) [|bgp]
        Update Message (2), length: 106
          Origin (1), length: 1, Flags [T]: Incomplete
            0x0000:  02

diff --git a/tests/bgp-as-path-oobr-ssl.out b/tests/bgp-as-path-oobr-ssl.out
index 19d6e4fef340d345755af521bb0d27308a9ba4d1..5ac2ca0a336df5a82832568b14bbe34355856b91 100644 (file)
--- a/tests/bgp-as-path-oobr-ssl.out
+++ b/tests/bgp-as-path-oobr-ssl.out
@@ -96,40 +96,7 @@
        Update Message (2), length: 202
          Withdrawn routes:
            0.0.0.0/0
-           (illegal prefix length)
-         Origin (1), length: 2, Flags [+1]: invalid len
-           0x0000:  4002
-         Attribute Set (128), length: 4
-           Origin AS: 67108864
-         Unknown Attribute (64), length: 5
-           no Attribute 64 decoder
-           0x0000:  0400 0000 64
-         Extended Community (16), length: 8, Flags [OT]: 
-           target (0x0002), Flags [none]: 19338:650 (= 0.0.2.138)
-           0x0000:  0002 4b8a 0000 028a
-         Cluster List (10), length: 4, Flags [O]: 172.17.0.0
-           0x0000:  ac11 0000
-         Originator ID (9), length: 4, Flags [O]: 172.17.0.5
-           0x0000:  ac11 0005
-         Multi-Protocol Reach NLRI (14), length: 129, Flags [OE]: 
-           AFI: IPv4 (1), SAFI: labeled VPN Unicast (128)
-           nexthop: RD: 0:0 (= 0.0.0.0), 172.17.0.5, nh-length: 12, no SNPA
-             RD: 18826:650 (= 0.0.2.138), 172.17.33.0/27, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.105.0/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.105.32/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.105.48/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.192.128/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.192.144/28, label:1029 (bottom)
-             RD: 18826:650 (= 0.0.2.138), 172.17.30.64/26, label:1034 (bottom)
-           0x0000:  0001 800c 0000 0000 0000 0000 ac11 0005
-           0x0010:  0073 0040 5100 0049 8a00 0002 8aac 1121
-           0x0020:  0074 0040 5100 0049 8a00 0002 8aac 1169
-           0x0030:  0074 0040 5100 0049 8a00 0002 8aac 1169
-           0x0040:  2074 0040 5100 0049 8a00 0002 8aac 1169
-           0x0050:  3074 0040 5100 0049 8a00 0002 8aac 11c0
-           0x0060:  8074 0040 5100 0049 8a00 0002 8aac 11c0
-           0x0070:  9072 0040 a100 0049 8a00 0002 8aac 111e
-           0x0080:  40 [|bgp]
+           (illegal prefix length) [|bgp]
        Update Message (2), length: 106
          Origin (1), length: 1, Flags [T]: Incomplete
            0x0000:  02

diff --git a/tests/bgp_mp_reach_nlri-oobr.out b/tests/bgp_mp_reach_nlri-oobr.out
index f54b06d4506cd5fbf42fe8ca83f0b78e10dec9ee..f85516847ee5cbdf9b1b2286f4071d0a85ed323a 100644 (file)
--- a/tests/bgp_mp_reach_nlri-oobr.out
+++ b/tests/bgp_mp_reach_nlri-oobr.out
@@ -2,25 +2,19 @@
     241.0.128.39.179 > 239.0.0.1.0: Flags [none], seq 4144029695:4144095150, win 65535, options [eol], length 65455: BGP [|bgp]
        Update Message (2), length: 45
          Withdrawn routes:
-           (illegal prefix length)
-         Unknown Attribute (195), length: 45823, Flags [TPE+b]:  [|bgp] [|bgp]
+           (illegal prefix length) [|bgp] [|bgp]
        Update Message (2), length: 45
          Withdrawn routes:
-           (illegal prefix length)
-         Unknown Attribute (195), length: 45823, Flags [TPE+b]:  [|bgp] [|bgp]
+           (illegal prefix length) [|bgp] [|bgp]
        Update Message (2), length: 45
          Withdrawn routes:
-           (illegal prefix length)
-         Unknown Attribute (195), length: 45823, Flags [TPE+b]:  [|bgp] [|bgp]
+           (illegal prefix length) [|bgp] [|bgp]
        Update Message (2), length: 45
          Withdrawn routes:
-           (illegal prefix length)
-         Unknown Attribute (195), length: 45823, Flags [TPE+b]:  [|bgp] [|bgp]
+           (illegal prefix length) [|bgp] [|bgp]
        Update Message (2), length: 45
          Withdrawn routes:
-           (illegal prefix length)
-         Unknown Attribute (195), length: 45571, Flags [TPE+b]:  [|bgp] [|bgp]
+           (illegal prefix length) [|bgp] [|bgp]
        Update Message (2), length: 45
          Withdrawn routes:
-           (illegal prefix length)
-         Unknown Attribute (195), length: 45823, Flags [TPE+b]:  [|bgp]
+           (illegal prefix length) [|bgp]

diff --git a/tests/bgp_mvpn_6_and_7_oobr.out b/tests/bgp_mvpn_6_and_7_oobr.out
index ce4c29539aa97edbda0738ab08f2b73c88abe6da..e65ebf05e78cc5eea425518f5861c3315f023af6 100644 (file)
--- a/tests/bgp_mvpn_6_and_7_oobr.out
+++ b/tests/bgp_mvpn_6_and_7_oobr.out
@@ -2,8 +2,4 @@
     241.0.93.20.179 > 255.247.0.1.200: Flags [none], seq 2146691977:2146692450, win 56026, options [unknown-161,eol], length 473: BGP
        Update Message (2), length: 45
          Withdrawn routes:
-           255.123.0.0/16
-         Attribute Set (128), length: 7, Flags [OTPE+f]: 
-           Origin AS: 148
-             Multi-Protocol Reach NLRI (14), length: 71, Flags [T+6]:  [path attr too short]
-         Origin (1), length: 5invalid len [|bgp]
+           255.123.0.0/16 [|bgp]

diff --git a/tests/bgp_pmsi_tunnel-oobr.out b/tests/bgp_pmsi_tunnel-oobr.out
index 6c4f3cb3ec174b43459d0afe4017747786aecc2a..5dfec0235e5dc4f4b0b699be837f7f95150d8142 100644 (file)
--- a/tests/bgp_pmsi_tunnel-oobr.out
+++ b/tests/bgp_pmsi_tunnel-oobr.out
@@ -2,8 +2,4 @@
     241.0.32.19.179 > 239.0.0.1.0: Flags [none], seq 2146695561:2146695813, win 56026, options [unknown-161,eol], length 252: BGP
        Update Message (2), length: 45
          Withdrawn routes:
-           24.13.0.0/16
-         Attribute Set (128), length: 7, Flags [OTPE+f]: 
-           Origin AS: 4067
-             Origin (1), length: 1:  [path attr too short]
-         Origin (1), length: 19, Flags [+1]:  [|bgp]
+           24.13.0.0/16 [|bgp]

diff --git a/tests/bgp_vpn_rt-oobr.out b/tests/bgp_vpn_rt-oobr.out
index 51d42f90709a856ca81b52b3c512f265fea3939c..321b73d985d504f8b51fb21f8c47cf18bebe0215 100644 (file)
--- a/tests/bgp_vpn_rt-oobr.out
+++ b/tests/bgp_vpn_rt-oobr.out
@@ -2,16 +2,8 @@
     241.0.128.19.179 > 239.8.0.1.0: Flags [none], seq 2146695561:2146755682, win 56026, options [unknown-161,eol], length 60121: BGP
        Update Message (2), length: 45
          Withdrawn routes:
-           255.144.0.0/12
-         Attribute Set (128), length: 7, Flags [OTPE+f]: 
-           Origin AS: 0
-             Multi-Protocol Unreach NLRI (15), length: 227, Flags [T+6]:  [path attr too short]
-         AS Path (2), length: 5invalid len [|bgp] [|bgp]
+           255.144.0.0/12 [|bgp] [|bgp]
        Update Message (2), length: 45 [|bgp] [|bgp]
        Update Message (2), length: 45
          Withdrawn routes:
-           255.112.0.0/12
-         Attribute Set (128), length: 7, Flags [OTPE+f]: 
-           Origin AS: 0
-             Multi-Protocol Reach NLRI (14), length: 227, Flags [T+6]:  [path attr too short]
-         Origin (1), length: 132 [|bgp]
+           255.112.0.0/12 [|bgp]

diff --git a/tests/tok2str-oobr-1.out b/tests/tok2str-oobr-1.out
index baee3fe81ebc7f1aed2e5fb898f4fb543c541b13..9c6dbab227bed3517e78929232585a9e0ff902d2 100644 (file)
--- a/tests/tok2str-oobr-1.out
+++ b/tests/tok2str-oobr-1.out
@@ -53,7 +53,4 @@
            AFI: IPv4 (1), SAFI: labeled VPN Unicast (128)
              End-of-Rib Marker (empty NLRI)
            0x0000:  0001 80
-       Update Message (2), length: 30
-         Unknown Attribute (0), length: 3, Flags [+f]: 
-           no Attribute 0 decoder
-           0x0000:  0001 05 [|bgp]
+       Update Message (2), length: 30 [|bgp]