From 55157a5dd1718ddde423888d1bf184c0b76e97d9 Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Mon, 9 Sep 2024 16:31:08 +0200 Subject: [PATCH] Align testdata with the new template Signed-off-by: Federico Paolinelli --- .../TestMultipleNeighborsOneV4AndOneV6.golden | 16 +++++----- ...ipleNeighborsOneV4AndOneV6DisableMP.golden | 16 +++++----- .../TestMultipleRoutersImportVRFs.golden | 10 +++--- .../TestMultipleRoutersMultipleNeighs.golden | 32 +++++++++---------- internal/frr/testdata/TestSingleSession | 8 ++--- .../frr/testdata/TestSingleSession.golden | 8 ++--- .../frr/testdata/TestSingleSessionBFD.golden | 10 +++--- .../TestSingleSessionWithAlwaysBlock.golden | 20 ++++++------ .../TestSingleSessionWithEBGPMultihop.golden | 8 ++--- ...gleSessionWithEBGPMultihopAndExtras.golden | 8 ++--- ...estSingleSessionWithGracefulRestart.golden | 10 +++--- .../TestSingleSessionWithIPv6SingleHop.golden | 8 ++--- .../TestTwoRoutersTwoNeighbors.golden | 16 +++++----- .../TestTwoRoutersTwoNeighborsBFD.golden | 20 ++++++------ .../testdata/TestTwoSessionsAcceptAll.golden | 20 ++++++------ .../TestTwoSessionsAcceptSomeV4.golden | 20 ++++++------ .../TestTwoSessionsAcceptV4AndV6.golden | 30 ++++++++--------- 17 files changed, 130 insertions(+), 130 deletions(-) diff --git a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden index 437fd26a..ecc0e30f 100644 --- a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden +++ b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden @@ -9,6 +9,10 @@ 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 @@ -16,10 +20,6 @@ route-map 192.168.1.2-out permit 2 -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,6 +35,10 @@ 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 @@ -42,10 +46,6 @@ route-map 2001:db8::1-out permit 2 -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 index 5f7a9bd2..a8bfca6a 100644 --- a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden +++ b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden @@ -9,6 +9,10 @@ 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 @@ -16,10 +20,6 @@ route-map 192.168.1.2-out permit 2 -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,6 +35,10 @@ 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 @@ -42,10 +46,6 @@ route-map 2001:db8::1-out permit 2 -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 index 3062eaab..0070f853 100644 --- 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 index abacb209..a941d3d4 100644 --- a/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden +++ b/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden @@ -9,6 +9,10 @@ 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 @@ -16,10 +20,6 @@ route-map 192.168.1.2-out permit 2 -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,6 +35,10 @@ 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 @@ -42,10 +46,6 @@ route-map 2001:db8::1-out permit 2 -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,6 +61,10 @@ 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 @@ -68,10 +72,6 @@ route-map 192.170.1.2-out permit 2 -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,6 +87,10 @@ 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 @@ -94,10 +98,6 @@ route-map 2001:db9::1-out permit 2 -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 index ffe56290..00abcdb3 100644 --- a/internal/frr/testdata/TestSingleSession +++ b/internal/frr/testdata/TestSingleSession @@ -13,6 +13,10 @@ 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 @@ -20,10 +24,6 @@ route-map 192.168.1.2-out permit 2 -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 index ffe56290..00abcdb3 100644 --- a/internal/frr/testdata/TestSingleSession.golden +++ b/internal/frr/testdata/TestSingleSession.golden @@ -13,6 +13,10 @@ 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 @@ -20,10 +24,6 @@ route-map 192.168.1.2-out permit 2 -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 index 9d9c0ff7..4b44b46f 100644 --- 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 index 108477d4..d8fe0c88 100644 --- 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 index 9d3f1ba6..d2a938fe 100644 --- a/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden +++ b/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden @@ -13,6 +13,10 @@ 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 @@ -20,10 +24,6 @@ route-map 192.168.1.2-out permit 2 -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 index b9d4ef26..07d7ca3d 100644 --- a/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden +++ b/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden @@ -13,6 +13,10 @@ 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 @@ -20,10 +24,6 @@ route-map 192.168.1.2-out permit 2 -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 index c9822ec6..5c814555 100644 --- 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 index a09243ae..96ae9949 100644 --- a/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden +++ b/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden @@ -9,6 +9,10 @@ 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 @@ -16,10 +20,6 @@ route-map 2001:db8::1-out permit 2 -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/TestTwoRoutersTwoNeighbors.golden b/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden index be68227b..50845c39 100644 --- a/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden +++ b/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden @@ -58,6 +58,10 @@ route-map 192.168.1.2-out permit 7 ip prefix-list 192.168.1.2-pl-ipv4 seq 3 permit 192.170.1.0/22 + + +ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 4 deny any + route-map 192.168.1.2-out permit 8 match ip address prefix-list 192.168.1.2-pl-ipv4 route-map 192.168.1.2-out permit 9 @@ -65,10 +69,6 @@ route-map 192.168.1.2-out permit 9 -ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 4 deny any - - - ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any @@ -84,6 +84,10 @@ route-map 192.168.1.2-in permit 11 ip prefix-list 192.168.1.3-pl-ipv4 seq 1 permit 192.169.1.0/24 + + +ipv6 prefix-list 192.168.1.3-pl-ipv4 seq 2 deny any + route-map 192.168.1.3-out permit 1 match ip address prefix-list 192.168.1.3-pl-ipv4 route-map 192.168.1.3-out permit 2 @@ -91,10 +95,6 @@ route-map 192.168.1.3-out permit 2 -ipv6 prefix-list 192.168.1.3-pl-ipv4 seq 2 deny any - - - ip prefix-list 192.168.1.3-inpl-ipv4 seq 1 deny any diff --git a/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden b/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden index b516915a..c92285e9 100644 --- a/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden +++ b/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.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 + @@ -28,16 +28,16 @@ route-map 192.168.1.2-in permit 4 match ipv6 address prefix-list 192.168.1.2-inpl-ipv4 -route-map 192.168.1.3-out permit 1 - match ip address prefix-list 192.168.1.3-pl-ipv4 -route-map 192.168.1.3-out permit 2 - match ipv6 address prefix-list 192.168.1.3-pl-ipv4 - ip prefix-list 192.168.1.3-pl-ipv4 seq 1 deny any ipv6 prefix-list 192.168.1.3-pl-ipv4 seq 2 deny any +route-map 192.168.1.3-out permit 1 + match ip address prefix-list 192.168.1.3-pl-ipv4 +route-map 192.168.1.3-out permit 2 + match ipv6 address prefix-list 192.168.1.3-pl-ipv4 + diff --git a/internal/frr/testdata/TestTwoSessionsAcceptAll.golden b/internal/frr/testdata/TestTwoSessionsAcceptAll.golden index fbc16f03..68ff7d4f 100644 --- a/internal/frr/testdata/TestTwoSessionsAcceptAll.golden +++ b/internal/frr/testdata/TestTwoSessionsAcceptAll.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 + @@ -27,16 +27,16 @@ route-map 192.168.1.2-in permit 4 match ipv6 address prefix-list 192.168.1.2-inpl-ipv4 -route-map 192.168.1.3-out permit 1 - match ip address prefix-list 192.168.1.3-pl-ipv4 -route-map 192.168.1.3-out permit 2 - match ipv6 address prefix-list 192.168.1.3-pl-ipv4 - ip prefix-list 192.168.1.3-pl-ipv4 seq 1 deny any ipv6 prefix-list 192.168.1.3-pl-ipv4 seq 2 deny any +route-map 192.168.1.3-out permit 1 + match ip address prefix-list 192.168.1.3-pl-ipv4 +route-map 192.168.1.3-out permit 2 + match ipv6 address prefix-list 192.168.1.3-pl-ipv4 + diff --git a/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden b/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden index a294f63b..7e65df1a 100644 --- a/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden +++ b/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.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 + @@ -28,16 +28,16 @@ route-map 192.168.1.2-in permit 4 match ipv6 address prefix-list 192.168.1.2-inpl-ipv4 -route-map 192.168.1.3-out permit 1 - match ip address prefix-list 192.168.1.3-pl-ipv4 -route-map 192.168.1.3-out permit 2 - match ipv6 address prefix-list 192.168.1.3-pl-ipv4 - ip prefix-list 192.168.1.3-pl-ipv4 seq 1 deny any ipv6 prefix-list 192.168.1.3-pl-ipv4 seq 2 deny any +route-map 192.168.1.3-out permit 1 + match ip address prefix-list 192.168.1.3-pl-ipv4 +route-map 192.168.1.3-out permit 2 + match ipv6 address prefix-list 192.168.1.3-pl-ipv4 + diff --git a/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden b/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden index f68b3572..78c20dfc 100644 --- a/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden +++ b/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.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 + @@ -32,16 +32,16 @@ route-map 192.168.1.2-in permit 4 match ipv6 address prefix-list 192.168.1.2-inpl-ipv4 -route-map 192.168.1.3-out permit 1 - match ip address prefix-list 192.168.1.3-pl-ipv4 -route-map 192.168.1.3-out permit 2 - match ipv6 address prefix-list 192.168.1.3-pl-ipv4 - ip prefix-list 192.168.1.3-pl-ipv4 seq 1 deny any ipv6 prefix-list 192.168.1.3-pl-ipv4 seq 2 deny any +route-map 192.168.1.3-out permit 1 + match ip address prefix-list 192.168.1.3-pl-ipv4 +route-map 192.168.1.3-out permit 2 + match ipv6 address prefix-list 192.168.1.3-pl-ipv4 + @@ -58,16 +58,16 @@ route-map 192.168.1.3-in permit 4 match ipv6 address prefix-list 192.168.1.3-inpl-ipv4 -route-map 192.168.1.4-out permit 1 - match ip address prefix-list 192.168.1.4-pl-ipv4 -route-map 192.168.1.4-out permit 2 - match ipv6 address prefix-list 192.168.1.4-pl-ipv4 - ip prefix-list 192.168.1.4-pl-ipv4 seq 1 deny any ipv6 prefix-list 192.168.1.4-pl-ipv4 seq 2 deny any +route-map 192.168.1.4-out permit 1 + match ip address prefix-list 192.168.1.4-pl-ipv4 +route-map 192.168.1.4-out permit 2 + match ipv6 address prefix-list 192.168.1.4-pl-ipv4 +