Align testdata with the new template

Signed-off-by: Federico Paolinelli <[email protected]>
metallb · Sep 12, 2024 · 55157a5 · 55157a5
1 parent 2afa4fa
commit 55157a5
Show file tree

Hide file tree

Showing 17 changed files with 130 additions and 130 deletions.
diff --git a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden
@@ -9,17 +9,17 @@ ipv6 nht resolve-via-default
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 1 permit 192.169.1.0/24
 
+
+
+ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
+
 route-map 192.168.1.2-out permit 1
   match ip address prefix-list 192.168.1.2-pl-ipv4
 route-map 192.168.1.2-out permit 2
   match ipv6 address prefix-list 192.168.1.2-pl-ipv4
 
 
 
-ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
-
-
-
 
 
 ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any
@@ -35,17 +35,17 @@ route-map 192.168.1.2-in permit 4
 
 ipv6 prefix-list 2001:db8::1-pl-ipv6 seq 1 permit 2001:db8:abcd::/48
 
+
+
+ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any
+
 route-map 2001:db8::1-out permit 1
   match ip address prefix-list 2001:db8::1-pl-ipv6
 route-map 2001:db8::1-out permit 2
   match ipv6 address prefix-list 2001:db8::1-pl-ipv6
 
 
 
-ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any
-
-
-
 
 
 ip prefix-list 2001:db8::1-inpl-ipv6 seq 1 deny any

diff --git a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden
@@ -9,17 +9,17 @@ ipv6 nht resolve-via-default
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 1 permit 192.169.1.0/24
 
+
+
+ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
+
 route-map 192.168.1.2-out permit 1
   match ip address prefix-list 192.168.1.2-pl-ipv4
 route-map 192.168.1.2-out permit 2
   match ipv6 address prefix-list 192.168.1.2-pl-ipv4
 
 
 
-ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
-
-
-
 
 
 ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any
@@ -35,17 +35,17 @@ route-map 192.168.1.2-in permit 4
 
 ipv6 prefix-list 2001:db8::1-pl-ipv6 seq 1 permit 2001:db8:abcd::/48
 
+
+
+ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any
+
 route-map 2001:db8::1-out permit 1
   match ip address prefix-list 2001:db8::1-pl-ipv6
 route-map 2001:db8::1-out permit 2
   match ipv6 address prefix-list 2001:db8::1-pl-ipv6
 
 
 
-ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any
-
-
-
 
 
 ip prefix-list 2001:db8::1-inpl-ipv6 seq 1 deny any

diff --git a/internal/frr/testdata/TestMultipleRoutersImportVRFs.golden b/internal/frr/testdata/TestMultipleRoutersImportVRFs.golden
@@ -5,16 +5,16 @@ ip nht resolve-via-default
 ipv6 nht resolve-via-default
 
 
-route-map 192.168.1.2-out permit 1
-  match ip address prefix-list 192.168.1.2-pl-ipv4
-route-map 192.168.1.2-out permit 2
-  match ipv6 address prefix-list 192.168.1.2-pl-ipv4
-
 
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 1 deny any
 ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
 
+route-map 192.168.1.2-out permit 1
+  match ip address prefix-list 192.168.1.2-pl-ipv4
+route-map 192.168.1.2-out permit 2
+  match ipv6 address prefix-list 192.168.1.2-pl-ipv4
+
 
 
 

diff --git a/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden b/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden
@@ -9,17 +9,17 @@ ipv6 nht resolve-via-default
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 1 permit 192.169.1.0/24
 
+
+
+ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
+
 route-map 192.168.1.2-out permit 1
   match ip address prefix-list 192.168.1.2-pl-ipv4
 route-map 192.168.1.2-out permit 2
   match ipv6 address prefix-list 192.168.1.2-pl-ipv4
 
 
 
-ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
-
-
-
 
 
 ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any
@@ -35,17 +35,17 @@ route-map 192.168.1.2-in permit 4
 
 ipv6 prefix-list 2001:db8::1-pl-ipv6 seq 1 permit 2001:db8:abcd::/48
 
+
+
+ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any
+
 route-map 2001:db8::1-out permit 1
   match ip address prefix-list 2001:db8::1-pl-ipv6
 route-map 2001:db8::1-out permit 2
   match ipv6 address prefix-list 2001:db8::1-pl-ipv6
 
 
 
-ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any
-
-
-
 
 
 ip prefix-list 2001:db8::1-inpl-ipv6 seq 1 deny any
@@ -61,17 +61,17 @@ route-map 2001:db8::1-in permit 4
 
 ip prefix-list 192.170.1.2-pl-ipv4 seq 1 permit 192.171.1.0/24
 
+
+
+ipv6 prefix-list 192.170.1.2-pl-ipv4 seq 2 deny any
+
 route-map 192.170.1.2-out permit 1
   match ip address prefix-list 192.170.1.2-pl-ipv4
 route-map 192.170.1.2-out permit 2
   match ipv6 address prefix-list 192.170.1.2-pl-ipv4
 
 
 
-ipv6 prefix-list 192.170.1.2-pl-ipv4 seq 2 deny any
-
-
-
 
 
 ip prefix-list 192.170.1.2-inpl-ipv4 seq 1 deny any
@@ -87,17 +87,17 @@ route-map 192.170.1.2-in permit 4
 
 ipv6 prefix-list 2001:db9::1-pl-ipv6 seq 1 permit 2001:db9:abcd::/48
 
+
+
+ip prefix-list 2001:db9::1-pl-ipv6 seq 2 deny any
+
 route-map 2001:db9::1-out permit 1
   match ip address prefix-list 2001:db9::1-pl-ipv6
 route-map 2001:db9::1-out permit 2
   match ipv6 address prefix-list 2001:db9::1-pl-ipv6
 
 
 
-ip prefix-list 2001:db9::1-pl-ipv6 seq 2 deny any
-
-
-
 
 
 ip prefix-list 2001:db9::1-inpl-ipv6 seq 1 deny any

diff --git a/internal/frr/testdata/TestSingleSession b/internal/frr/testdata/TestSingleSession
@@ -13,17 +13,17 @@ ip prefix-list 192.168.1.2-pl-ipv4 seq 1 permit 192.169.1.0/24
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 2 permit 192.170.1.0/22
 
+
+
+ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 3 deny any
+
 route-map 192.168.1.2-out permit 1
   match ip address prefix-list 192.168.1.2-pl-ipv4
 route-map 192.168.1.2-out permit 2
   match ipv6 address prefix-list 192.168.1.2-pl-ipv4
 
 
 
-ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 3 deny any
-
-
-
 
 
 ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any

diff --git a/internal/frr/testdata/TestSingleSession.golden b/internal/frr/testdata/TestSingleSession.golden
@@ -13,17 +13,17 @@ ip prefix-list 192.168.1.2-pl-ipv4 seq 1 permit 192.169.1.0/24
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 2 permit 192.170.1.0/22
 
+
+
+ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 3 deny any
+
 route-map 192.168.1.2-out permit 1
   match ip address prefix-list 192.168.1.2-pl-ipv4
 route-map 192.168.1.2-out permit 2
   match ipv6 address prefix-list 192.168.1.2-pl-ipv4
 
 
 
-ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 3 deny any
-
-
-
 
 
 ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any

diff --git a/internal/frr/testdata/TestSingleSessionBFD.golden b/internal/frr/testdata/TestSingleSessionBFD.golden
@@ -5,16 +5,16 @@ ip nht resolve-via-default
 ipv6 nht resolve-via-default
 
 
-route-map 192.168.1.2-out permit 1
-  match ip address prefix-list 192.168.1.2-pl-ipv4
-route-map 192.168.1.2-out permit 2
-  match ipv6 address prefix-list 192.168.1.2-pl-ipv4
-
 
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 1 deny any
 ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
 
+route-map 192.168.1.2-out permit 1
+  match ip address prefix-list 192.168.1.2-pl-ipv4
+route-map 192.168.1.2-out permit 2
+  match ipv6 address prefix-list 192.168.1.2-pl-ipv4
+
 
 
 

diff --git a/internal/frr/testdata/TestSingleSessionWithAlwaysBlock.golden b/internal/frr/testdata/TestSingleSessionWithAlwaysBlock.golden
@@ -5,16 +5,16 @@ ip nht resolve-via-default
 ipv6 nht resolve-via-default
 
 
-route-map 192.168.1.2-out permit 1
-  match ip address prefix-list 192.168.1.2-pl-ipv4
-route-map 192.168.1.2-out permit 2
-  match ipv6 address prefix-list 192.168.1.2-pl-ipv4
-
 
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 1 deny any
 ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
 
+route-map 192.168.1.2-out permit 1
+  match ip address prefix-list 192.168.1.2-pl-ipv4
+route-map 192.168.1.2-out permit 2
+  match ipv6 address prefix-list 192.168.1.2-pl-ipv4
+
 
 
 
@@ -36,16 +36,16 @@ route-map 192.168.1.2-in permit 6
   match ipv6 address prefix-list 192.168.1.2-inpl-ipv4
 
 
-route-map 192.168.1.6-out permit 1
-  match ip address prefix-list 192.168.1.6-pl-ipv4
-route-map 192.168.1.6-out permit 2
-  match ipv6 address prefix-list 192.168.1.6-pl-ipv4
-
 
 
 ip prefix-list 192.168.1.6-pl-ipv4 seq 1 deny any
 ipv6 prefix-list 192.168.1.6-pl-ipv4 seq 2 deny any
 
+route-map 192.168.1.6-out permit 1
+  match ip address prefix-list 192.168.1.6-pl-ipv4
+route-map 192.168.1.6-out permit 2
+  match ipv6 address prefix-list 192.168.1.6-pl-ipv4
+
 
 
 

diff --git a/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden b/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden
@@ -13,17 +13,17 @@ ip prefix-list 192.168.1.2-pl-ipv4 seq 1 permit 192.169.1.0/24
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 2 permit 192.170.1.0/22
 
+
+
+ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 3 deny any
+
 route-map 192.168.1.2-out permit 1
   match ip address prefix-list 192.168.1.2-pl-ipv4
 route-map 192.168.1.2-out permit 2
   match ipv6 address prefix-list 192.168.1.2-pl-ipv4
 
 
 
-ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 3 deny any
-
-
-
 
 
 ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any

diff --git a/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden b/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden
@@ -13,17 +13,17 @@ ip prefix-list 192.168.1.2-pl-ipv4 seq 1 permit 192.169.1.0/24
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 2 permit 192.170.1.0/22
 
+
+
+ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 3 deny any
+
 route-map 192.168.1.2-out permit 1
   match ip address prefix-list 192.168.1.2-pl-ipv4
 route-map 192.168.1.2-out permit 2
   match ipv6 address prefix-list 192.168.1.2-pl-ipv4
 
 
 
-ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 3 deny any
-
-
-
 
 
 ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any

diff --git a/internal/frr/testdata/TestSingleSessionWithGracefulRestart.golden b/internal/frr/testdata/TestSingleSessionWithGracefulRestart.golden
@@ -5,16 +5,16 @@ ip nht resolve-via-default
 ipv6 nht resolve-via-default
 
 
-route-map 192.168.1.2-out permit 1
-  match ip address prefix-list 192.168.1.2-pl-ipv4
-route-map 192.168.1.2-out permit 2
-  match ipv6 address prefix-list 192.168.1.2-pl-ipv4
-
 
 
 ip prefix-list 192.168.1.2-pl-ipv4 seq 1 deny any
 ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any
 
+route-map 192.168.1.2-out permit 1
+  match ip address prefix-list 192.168.1.2-pl-ipv4
+route-map 192.168.1.2-out permit 2
+  match ipv6 address prefix-list 192.168.1.2-pl-ipv4
+
 
 
 

diff --git a/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden b/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden
@@ -9,17 +9,17 @@ ipv6 nht resolve-via-default
 
 ipv6 prefix-list 2001:db8::1-pl-ipv6 seq 1 permit 2001:db8:abcd::/48
 
+
+
+ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any
+
 route-map 2001:db8::1-out permit 1
   match ip address prefix-list 2001:db8::1-pl-ipv6
 route-map 2001:db8::1-out permit 2
   match ipv6 address prefix-list 2001:db8::1-pl-ipv6
 
 
 
-ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any
-
-
-
 
 
 ip prefix-list 2001:db8::1-inpl-ipv6 seq 1 deny any