From 08476cc0d0b9f89b840a1f16bde6001d64c7429a Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Fri, 28 Jun 2024 23:00:39 +0200 Subject: [PATCH 01/10] WIP bump 10.0.1 Signed-off-by: Federico Paolinelli --- charts/frr-k8s/README.md | 2 +- charts/frr-k8s/values.yaml | 2 +- config/all-in-one/frr-k8s-prometheus.yaml | 8 ++++---- config/all-in-one/frr-k8s.yaml | 8 ++++---- config/frr-k8s/frr-k8s.yaml | 8 ++++---- e2etests/e2etest_suite_test.go | 2 +- internal/frr/docker_test.go | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/charts/frr-k8s/README.md b/charts/frr-k8s/README.md index afb6fbe7..be5733d8 100644 --- a/charts/frr-k8s/README.md +++ b/charts/frr-k8s/README.md @@ -29,7 +29,7 @@ Kubernetes: `>= 1.19.0-0` | frrk8s.disableCertRotation | bool | `false` | | | frrk8s.frr.image.pullPolicy | string | `nil` | | | frrk8s.frr.image.repository | string | `"quay.io/frrouting/frr"` | | -| frrk8s.frr.image.tag | string | `"9.1.0"` | | +| frrk8s.frr.image.tag | string | `"10.1.0"` | | | frrk8s.frr.metricsBindAddress | string | `"127.0.0.1"` | | | frrk8s.frr.metricsPort | int | `7573` | | | frrk8s.frr.resources | object | `{}` | | diff --git a/charts/frr-k8s/values.yaml b/charts/frr-k8s/values.yaml index 2cefcaa2..97bc2ed7 100644 --- a/charts/frr-k8s/values.yaml +++ b/charts/frr-k8s/values.yaml @@ -158,7 +158,7 @@ frrk8s: frr: image: repository: quay.io/frrouting/frr - tag: 9.1.0 + tag: 10.0.1 pullPolicy: metricsBindAddress: 127.0.0.1 metricsPort: 7573 diff --git a/config/all-in-one/frr-k8s-prometheus.yaml b/config/all-in-one/frr-k8s-prometheus.yaml index e413c48c..837d7861 100644 --- a/config/all-in-one/frr-k8s-prometheus.yaml +++ b/config/all-in-one/frr-k8s-prometheus.yaml @@ -1166,7 +1166,7 @@ spec: env: - name: TINI_SUBREAPER value: "true" - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 livenessProbe: failureThreshold: 3 httpGet: @@ -1199,7 +1199,7 @@ spec: - --metrics-bind-address=127.0.0.1 command: - /etc/frr_metrics/frr-metrics - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 name: frr-metrics ports: - containerPort: 7573 @@ -1213,7 +1213,7 @@ spec: name: metrics - command: - /etc/frr_reloader/frr-reloader.sh - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 name: reloader volumeMounts: - mountPath: /var/run/frr @@ -1228,7 +1228,7 @@ spec: - /bin/sh - -c - cp -rLf /tmp/frr/* /etc/frr/ - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 name: cp-frr-files securityContext: runAsGroup: 101 diff --git a/config/all-in-one/frr-k8s.yaml b/config/all-in-one/frr-k8s.yaml index 2885da9f..ed12c4ab 100644 --- a/config/all-in-one/frr-k8s.yaml +++ b/config/all-in-one/frr-k8s.yaml @@ -1135,7 +1135,7 @@ spec: env: - name: TINI_SUBREAPER value: "true" - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 livenessProbe: failureThreshold: 3 httpGet: @@ -1168,7 +1168,7 @@ spec: - --metrics-bind-address=127.0.0.1 command: - /etc/frr_metrics/frr-metrics - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 name: frr-metrics ports: - containerPort: 7573 @@ -1182,7 +1182,7 @@ spec: name: metrics - command: - /etc/frr_reloader/frr-reloader.sh - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 name: reloader volumeMounts: - mountPath: /var/run/frr @@ -1197,7 +1197,7 @@ spec: - /bin/sh - -c - cp -rLf /tmp/frr/* /etc/frr/ - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 name: cp-frr-files securityContext: runAsGroup: 101 diff --git a/config/frr-k8s/frr-k8s.yaml b/config/frr-k8s/frr-k8s.yaml index b1dddd84..df595b50 100644 --- a/config/frr-k8s/frr-k8s.yaml +++ b/config/frr-k8s/frr-k8s.yaml @@ -98,7 +98,7 @@ spec: securityContext: capabilities: add: ["NET_ADMIN", "NET_RAW", "SYS_ADMIN", "NET_BIND_SERVICE"] - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 env: - name: TINI_SUBREAPER value: "true" @@ -136,7 +136,7 @@ spec: failureThreshold: 30 periodSeconds: 5 - name: frr-metrics - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 command: ["/etc/frr_metrics/frr-metrics"] args: - --metrics-port=7573 @@ -152,7 +152,7 @@ spec: - name: metrics mountPath: /etc/frr_metrics - name: reloader - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 command: ["/etc/frr_reloader/frr-reloader.sh"] volumeMounts: - name: frr-sockets @@ -186,7 +186,7 @@ spec: securityContext: runAsUser: 100 runAsGroup: 101 - image: quay.io/frrouting/frr:9.1.0 + image: quay.io/frrouting/frr:10.0.1 command: ["/bin/sh", "-c", "cp -rLf /tmp/frr/* /etc/frr/"] volumeMounts: - name: frr-startup diff --git a/e2etests/e2etest_suite_test.go b/e2etests/e2etest_suite_test.go index 5865f366..4a59bbf3 100644 --- a/e2etests/e2etest_suite_test.go +++ b/e2etests/e2etest_suite_test.go @@ -38,7 +38,7 @@ func handleFlags() { flag.StringVar(&prometheusNamespace, "prometheus-namespace", "monitoring", "the namespace prometheus is running in (if running)") flag.StringVar(&externalContainers, "external-containers", "", "a comma separated list of external containers names to use for the test. (valid parameters are: ibgp-single-hop / ibgp-multi-hop / ebgp-single-hop / ebgp-multi-hop)") flag.StringVar(&executor.Kubectl, "kubectl", "kubectl", "the path for the kubectl binary") - flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:9.1.0", "the image to use for the external frr containers") + flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:10.0.1", "the image to use for the external frr containers") flag.StringVar(&k8s.FRRK8sNamespace, "frr-k8s-namespace", "frr-k8s-system", "the namespace frr-k8s is running in") flag.Parse() diff --git a/internal/frr/docker_test.go b/internal/frr/docker_test.go index 9b616cdc..f073af7c 100644 --- a/internal/frr/docker_test.go +++ b/internal/frr/docker_test.go @@ -24,7 +24,7 @@ var ( ) const ( - frrImageTag = "9.1.0" + frrImageTag = "10.0.1" ) func TestMain(m *testing.M) { From 28e36792488a894d475d82fad1d50564cabc6750 Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Sat, 29 Jun 2024 22:19:00 +0200 Subject: [PATCH 02/10] WIP test fix Signed-off-by: Federico Paolinelli --- internal/frr/templates/filters.tmpl | 12 +++++------ .../TestMultipleNeighborsOneV4AndOneV6.golden | 2 -- ...ipleNeighborsOneV4AndOneV6DisableMP.golden | 2 -- .../TestMultipleRoutersMultipleNeighs.golden | 4 ---- internal/frr/testdata/TestSingleSession | 1 - .../frr/testdata/TestSingleSession.golden | 1 - .../frr/testdata/TestSingleSessionBFD.golden | 1 - .../TestSingleSessionWithAlwaysBlock.golden | 11 +++++----- .../TestSingleSessionWithEBGPMultihop.golden | 1 - ...gleSessionWithEBGPMultihopAndExtras.golden | 1 - .../TestSingleSessionWithIPv6SingleHop.golden | 1 - .../TestTwoRoutersTwoNeighbors.golden | 2 -- .../TestTwoRoutersTwoNeighborsBFD.golden | 2 -- .../testdata/TestTwoSessionsAcceptAll.golden | 20 +++++++++---------- .../TestTwoSessionsAcceptSomeV4.golden | 2 -- .../TestTwoSessionsAcceptV4AndV6.golden | 3 --- 16 files changed, 21 insertions(+), 45 deletions(-) diff --git a/internal/frr/templates/filters.tmpl b/internal/frr/templates/filters.tmpl index 3d8b944e..3831a8e5 100644 --- a/internal/frr/templates/filters.tmpl +++ b/internal/frr/templates/filters.tmpl @@ -70,12 +70,17 @@ ipv6 prefix-list {{$plistName}} seq {{counter $plistName}} deny any {{frrIPFamily $i.IPFamily}} prefix-list {{$plistName}} seq {{counter $plistName}} permit {{$i.Prefix}}{{$i.Matcher}} {{- end }} +{{- if .neighbor.Incoming.All }} +ip prefix-list {{$plistName}} seq {{counter $plistName}} permit any +ipv6 prefix-list {{$plistName}} seq {{counter $plistName}} permit any +{{ else}} {{ if not .neighbor.Incoming.PrefixesV4 }} ip prefix-list {{$plistName}} seq {{counter $plistName}} deny any {{- end }} {{ if not .neighbor.Incoming.PrefixesV6 }} ipv6 prefix-list {{$plistName}} seq {{counter $plistName}} deny any {{- end }} +{{- end}} {{- if .neighbor.AlwaysBlock}} @@ -88,15 +93,10 @@ route-map {{$.neighbor.ID}}-in deny {{counter $.neighbor.ID}} match ip address prefix-list {{deniedIncomingList $.neighbor}} route-map {{$.neighbor.ID}}-in deny {{counter $.neighbor.ID}} match ipv6 address prefix-list {{deniedIncomingList $.neighbor}} -{{- end -}} - -{{- if .neighbor.Incoming.All }} -route-map {{$.neighbor.ID}}-in permit {{counter $.neighbor.ID}} -{{ else }} +{{- end }} route-map {{$.neighbor.ID}}-in permit {{counter $.neighbor.ID}} match ip address prefix-list {{allowedIncomingList $.neighbor}} route-map {{$.neighbor.ID}}-in permit {{counter $.neighbor.ID}} match ipv6 address prefix-list {{allowedIncomingList $.neighbor}} -{{- end }} {{- end -}} diff --git a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden index 3a51b1ef..437fd26a 100644 --- a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden +++ b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden @@ -22,7 +22,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any @@ -49,7 +48,6 @@ ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any - ip prefix-list 2001:db8::1-inpl-ipv6 seq 1 deny any ipv6 prefix-list 2001:db8::1-inpl-ipv6 seq 2 deny any diff --git a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden index afa9a5b0..5f7a9bd2 100644 --- a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden +++ b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden @@ -22,7 +22,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any @@ -49,7 +48,6 @@ ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any - ip prefix-list 2001:db8::1-inpl-ipv6 seq 1 deny any ipv6 prefix-list 2001:db8::1-inpl-ipv6 seq 2 deny any diff --git a/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden b/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden index 2eac7cc2..abacb209 100644 --- a/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden +++ b/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden @@ -22,7 +22,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any @@ -49,7 +48,6 @@ ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any - ip prefix-list 2001:db8::1-inpl-ipv6 seq 1 deny any ipv6 prefix-list 2001:db8::1-inpl-ipv6 seq 2 deny any @@ -76,7 +74,6 @@ 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 ipv6 prefix-list 192.170.1.2-inpl-ipv4 seq 2 deny any @@ -103,7 +100,6 @@ ip prefix-list 2001:db9::1-pl-ipv6 seq 2 deny any - ip prefix-list 2001:db9::1-inpl-ipv6 seq 1 deny any ipv6 prefix-list 2001:db9::1-inpl-ipv6 seq 2 deny any diff --git a/internal/frr/testdata/TestSingleSession b/internal/frr/testdata/TestSingleSession index 00900d80..ffe56290 100644 --- a/internal/frr/testdata/TestSingleSession +++ b/internal/frr/testdata/TestSingleSession @@ -26,7 +26,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestSingleSession.golden b/internal/frr/testdata/TestSingleSession.golden index 00900d80..ffe56290 100644 --- a/internal/frr/testdata/TestSingleSession.golden +++ b/internal/frr/testdata/TestSingleSession.golden @@ -26,7 +26,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestSingleSessionBFD.golden b/internal/frr/testdata/TestSingleSessionBFD.golden index 7cb4e446..9d9c0ff7 100644 --- a/internal/frr/testdata/TestSingleSessionBFD.golden +++ b/internal/frr/testdata/TestSingleSessionBFD.golden @@ -19,7 +19,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestSingleSessionWithAlwaysBlock.golden b/internal/frr/testdata/TestSingleSessionWithAlwaysBlock.golden index b9812d15..108477d4 100644 --- a/internal/frr/testdata/TestSingleSessionWithAlwaysBlock.golden +++ b/internal/frr/testdata/TestSingleSessionWithAlwaysBlock.golden @@ -18,12 +18,10 @@ ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any +ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 permit any +ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 permit any -ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any - -ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any - ip prefix-list 192.168.1.2-denied-inpl-ipv4 seq 1 permit 192.168.1.0/24 le 24 ipv6 prefix-list 192.168.1.2-denied-inpl-ipv4 seq 2 permit fc00:f853:ccd:e800::/64 le 64 @@ -33,7 +31,9 @@ route-map 192.168.1.2-in deny 3 route-map 192.168.1.2-in deny 4 match ipv6 address prefix-list 192.168.1.2-denied-inpl-ipv4 route-map 192.168.1.2-in permit 5 - + match ip address prefix-list 192.168.1.2-inpl-ipv4 +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 @@ -52,7 +52,6 @@ ipv6 prefix-list 192.168.1.6-pl-ipv4 seq 2 deny any ip prefix-list 192.168.1.6-inpl-ipv4 seq 1 permit 192.168.2.0/24 - ipv6 prefix-list 192.168.1.6-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden b/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden index 8a63064d..9d3f1ba6 100644 --- a/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden +++ b/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden @@ -26,7 +26,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden b/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden index c6005c0c..b9d4ef26 100644 --- a/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden +++ b/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden @@ -26,7 +26,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden b/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden index 775843a1..a09243ae 100644 --- a/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden +++ b/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden @@ -22,7 +22,6 @@ ip prefix-list 2001:db8::1-pl-ipv6 seq 2 deny any - ip prefix-list 2001:db8::1-inpl-ipv6 seq 1 deny any ipv6 prefix-list 2001:db8::1-inpl-ipv6 seq 2 deny any diff --git a/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden b/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden index 747db855..be68227b 100644 --- a/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden +++ b/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden @@ -71,7 +71,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any @@ -98,7 +97,6 @@ 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 ipv6 prefix-list 192.168.1.3-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden b/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden index 3deb4473..b516915a 100644 --- a/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden +++ b/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden @@ -19,7 +19,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any @@ -43,7 +42,6 @@ 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 ipv6 prefix-list 192.168.1.3-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestTwoSessionsAcceptAll.golden b/internal/frr/testdata/TestTwoSessionsAcceptAll.golden index 2ec0fb48..fbc16f03 100644 --- a/internal/frr/testdata/TestTwoSessionsAcceptAll.golden +++ b/internal/frr/testdata/TestTwoSessionsAcceptAll.golden @@ -18,13 +18,13 @@ ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any +ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 permit any +ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 permit any - -ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 deny any - -ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any route-map 192.168.1.2-in permit 3 - + match ip address prefix-list 192.168.1.2-inpl-ipv4 +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 @@ -40,13 +40,13 @@ ipv6 prefix-list 192.168.1.3-pl-ipv4 seq 2 deny any +ip prefix-list 192.168.1.3-inpl-ipv4 seq 1 permit any +ipv6 prefix-list 192.168.1.3-inpl-ipv4 seq 2 permit any - -ip prefix-list 192.168.1.3-inpl-ipv4 seq 1 deny any - -ipv6 prefix-list 192.168.1.3-inpl-ipv4 seq 2 deny any route-map 192.168.1.3-in permit 3 - + match ip address prefix-list 192.168.1.3-inpl-ipv4 +route-map 192.168.1.3-in permit 4 + match ipv6 address prefix-list 192.168.1.3-inpl-ipv4 router bgp 65000 no bgp ebgp-requires-policy diff --git a/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden b/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden index b15edbd6..a294f63b 100644 --- a/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden +++ b/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden @@ -21,7 +21,6 @@ ipv6 prefix-list 192.168.1.2-pl-ipv4 seq 2 deny any ip prefix-list 192.168.1.2-inpl-ipv4 seq 1 permit 192.168.1.0/24 - ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any route-map 192.168.1.2-in permit 3 match ip address prefix-list 192.168.1.2-inpl-ipv4 @@ -46,7 +45,6 @@ ip prefix-list 192.168.1.3-inpl-ipv4 seq 1 permit 192.170.1.0/24 ip prefix-list 192.168.1.3-inpl-ipv4 seq 2 permit 192.169.1.0/24 - ipv6 prefix-list 192.168.1.3-inpl-ipv4 seq 3 deny any route-map 192.168.1.3-in permit 3 match ip address prefix-list 192.168.1.3-inpl-ipv4 diff --git a/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden b/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden index 811776b7..f68b3572 100644 --- a/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden +++ b/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden @@ -25,7 +25,6 @@ ip prefix-list 192.168.1.2-inpl-ipv4 seq 4 permit 192.168.3.0/24 le 32 ip prefix-list 192.168.1.2-inpl-ipv4 seq 5 permit 192.168.3.0/24 ge 16 - ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 6 deny any route-map 192.168.1.2-in permit 3 match ip address prefix-list 192.168.1.2-inpl-ipv4 @@ -52,7 +51,6 @@ ip prefix-list 192.168.1.3-inpl-ipv4 seq 3 permit 192.168.2.0/24 le 26 ge 24 ip prefix-list 192.168.1.3-inpl-ipv4 seq 4 permit 192.168.3.0/24 le 32 ge 27 - ipv6 prefix-list 192.168.1.3-inpl-ipv4 seq 5 deny any route-map 192.168.1.3-in permit 3 match ip address prefix-list 192.168.1.3-inpl-ipv4 @@ -80,7 +78,6 @@ ipv6 prefix-list 192.168.1.4-inpl-ipv4 seq 4 permit fc00:f853:ccd:e801::/64 ge 2 ipv6 prefix-list 192.168.1.4-inpl-ipv4 seq 5 permit fc00:f853:ccd:e802::/64 le 32 - ipv6 prefix-list 192.168.1.4-inpl-ipv4 seq 6 deny any route-map 192.168.1.4-in permit 3 match ip address prefix-list 192.168.1.4-inpl-ipv4 From bebee965300a31016bfc0eb805f602674cc1339f Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Mon, 1 Jul 2024 16:30:36 +0200 Subject: [PATCH 03/10] Dump bgp ip Signed-off-by: Federico Paolinelli --- e2etests/pkg/dump/frr.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/e2etests/pkg/dump/frr.go b/e2etests/pkg/dump/frr.go index d236fa49..05d55687 100644 --- a/e2etests/pkg/dump/frr.go +++ b/e2etests/pkg/dump/frr.go @@ -49,6 +49,15 @@ func BGPInfo(testName string, FRRContainers []*frrcontainer.FRR, cs clientset.In ginkgo.GinkgoWriter.Printf("External frr dump for container %s, failed to write to file %v", c.Name, err) continue } + + fmt.Fprintf(f, "Dumping show bgp ip for %s, local addresses: ipv4 - %s, ipv6 - %s\n", c.Name, c.Ipv4, c.Ipv6) + ipall, err := c.Exec("vtysh", "-c", "show bgp vrf all ipv4") + _, err = fmt.Fprint(f, ipall) + if err != nil { + ginkgo.GinkgoWriter.Printf("External frr ipall for container %s, failed to write to file %v", c.Name, err) + continue + } + } frrk8sPods, err := k8s.FRRK8sPods(cs) @@ -71,6 +80,14 @@ func BGPInfo(testName string, FRRContainers []*frrcontainer.FRR, cs clientset.In ginkgo.GinkgoWriter.Printf("External frr dump for pod %s, failed to write to file %v", pod.Name, err) continue } + + fmt.Fprintf(f, "Dumping show bgp ip for %s, local addresses: %s\n", pod.Name, pod.Status.PodIPs) + ipall, err := podExec.Exec("vtysh", "-c", "show bgp vrf all ipv4") + _, err = fmt.Fprint(f, ipall) + if err != nil { + ginkgo.GinkgoWriter.Printf("External frr ipall for pod %s, failed to write to file %v", pod.Name, err) + continue + } } } From 8da62aee3d6998b66aea5f62bf93bcbb4723b86b Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Fri, 12 Jul 2024 17:31:03 +0200 Subject: [PATCH 04/10] Dump route-map detail Signed-off-by: Federico Paolinelli --- internal/frr/templates/frr.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/frr/templates/frr.tmpl b/internal/frr/templates/frr.tmpl index c64701e8..00546c32 100644 --- a/internal/frr/templates/frr.tmpl +++ b/internal/frr/templates/frr.tmpl @@ -14,6 +14,7 @@ debug bgp zebra debug bfd network debug bfd peer debug bfd zebra +debug route-map detail {{- end }} hostname {{.Hostname}} ip nht resolve-via-default From 0fd91dc289eeee062c73773b460f22a98df3ebfe Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Tue, 23 Jul 2024 10:55:48 -0400 Subject: [PATCH 05/10] Add debug logs to reloader Signed-off-by: Federico Paolinelli --- frr-tools/reloader/frr-reloader.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frr-tools/reloader/frr-reloader.sh b/frr-tools/reloader/frr-reloader.sh index 2bb56e1f..50185575 100755 --- a/frr-tools/reloader/frr-reloader.sh +++ b/frr-tools/reloader/frr-reloader.sh @@ -17,7 +17,7 @@ reload_frr() { kill_sleep echo "Checking the configuration file syntax" - if ! python3 /usr/lib/frr/frr-reload.py --test --stdout "$FILE_TO_RELOAD" 2>"$LAST_ERROR_FILE" | sed 's/password.*/password /g'; then + if ! python3 /usr/lib/frr/frr-reload.py --debug --test --stdout "$FILE_TO_RELOAD" 2>"$LAST_ERROR_FILE" | sed 's/password.*/password /g'; then echo "Syntax error spotted: aborting.. $SECONDS seconds" cat "$LAST_ERROR_FILE" | sed 's/password.*/password /g' echo -n "$(date +%s) failure" > "$STATUSFILE" @@ -26,7 +26,7 @@ reload_frr() { fi echo "Applying the configuration file" - if ! python3 /usr/lib/frr/frr-reload.py --reload --overwrite --stdout "$FILE_TO_RELOAD" 2>&1 | sed 's/password.*/password /g'; then + if ! python3 /usr/lib/frr/frr-reload.py --debug --reload --overwrite --stdout "$FILE_TO_RELOAD" 2>&1 | sed 's/password.*/password /g'; then echo "Failed to fully apply configuration file $SECONDS seconds" echo -n "$(date +%s) failure" > "$STATUSFILE" save_status From 9f89893ab1f3026de7b0f5e211eeb96b1905650a Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Tue, 23 Jul 2024 11:14:03 -0400 Subject: [PATCH 06/10] Refreshing golden files Signed-off-by: Federico Paolinelli --- internal/frr/testdata/TestMultipleRoutersImportVRFs.golden | 1 - .../frr/testdata/TestSingleSessionWithGracefulRestart.golden | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/frr/testdata/TestMultipleRoutersImportVRFs.golden b/internal/frr/testdata/TestMultipleRoutersImportVRFs.golden index 63089ad7..3062eaab 100644 --- a/internal/frr/testdata/TestMultipleRoutersImportVRFs.golden +++ b/internal/frr/testdata/TestMultipleRoutersImportVRFs.golden @@ -19,7 +19,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any diff --git a/internal/frr/testdata/TestSingleSessionWithGracefulRestart.golden b/internal/frr/testdata/TestSingleSessionWithGracefulRestart.golden index 9c957ad9..c9822ec6 100644 --- a/internal/frr/testdata/TestSingleSessionWithGracefulRestart.golden +++ b/internal/frr/testdata/TestSingleSessionWithGracefulRestart.golden @@ -19,7 +19,6 @@ 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 ipv6 prefix-list 192.168.1.2-inpl-ipv4 seq 2 deny any From 3ec5cddb83dd2fba88f6d02476271f90618bfcad Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Fri, 30 Aug 2024 13:28:53 +0200 Subject: [PATCH 07/10] Wip latest fixes Fix templates, log commands Signed-off-by: Federico Paolinelli --- internal/frr/templates/filters.tmpl | 10 +++++----- internal/frr/templates/frr.tmpl | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/frr/templates/filters.tmpl b/internal/frr/templates/filters.tmpl index 3831a8e5..d2945f2b 100644 --- a/internal/frr/templates/filters.tmpl +++ b/internal/frr/templates/filters.tmpl @@ -49,11 +49,6 @@ route-map {{.neighbor.ID}}-out permit {{counter .neighbor.ID}} {{frrIPFamily $a.IPFamily}} prefix-list {{$plistName}} seq {{counter $plistName}} permit {{$a.Prefix}} {{- end }} -route-map {{$.neighbor.ID}}-out permit {{counter $.neighbor.ID}} - match ip address prefix-list {{allowedPrefixList $.neighbor}} -route-map {{$.neighbor.ID}}-out permit {{counter $.neighbor.ID}} - match ipv6 address prefix-list {{allowedPrefixList $.neighbor}} - {{/* If the neighbor does not have an advertisement, we need to add a prefix to deny for when we have a prefix but a given peer is not selected for any prefixes */}} {{$plistName:=allowedPrefixList $.neighbor}} @@ -64,6 +59,11 @@ ip prefix-list {{$plistName}} seq {{counter $plistName}} deny any ipv6 prefix-list {{$plistName}} seq {{counter $plistName}} deny any {{- end }} +route-map {{$.neighbor.ID}}-out permit {{counter $.neighbor.ID}} + match ip address prefix-list {{allowedPrefixList $.neighbor}} +route-map {{$.neighbor.ID}}-out permit {{counter $.neighbor.ID}} + match ipv6 address prefix-list {{allowedPrefixList $.neighbor}} + {{/* filtering incoming prefixes */}} {{$plistName:=allowedIncomingList $.neighbor}} {{ range $i := .neighbor.Incoming.AllPrefixes }} diff --git a/internal/frr/templates/frr.tmpl b/internal/frr/templates/frr.tmpl index 00546c32..fe5c6c62 100644 --- a/internal/frr/templates/frr.tmpl +++ b/internal/frr/templates/frr.tmpl @@ -15,6 +15,7 @@ debug bfd network debug bfd peer debug bfd zebra debug route-map detail +log commands {{- end }} hostname {{.Hostname}} ip nht resolve-via-default From 2afa4faa4b9dfbe0bb5afdd2cb990d73842cea81 Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Fri, 30 Aug 2024 13:47:31 +0200 Subject: [PATCH 08/10] E2E: dump the raw file too in case of failure Signed-off-by: Federico Paolinelli --- e2etests/pkg/dump/frr.go | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/e2etests/pkg/dump/frr.go b/e2etests/pkg/dump/frr.go index 05d55687..742b3e32 100644 --- a/e2etests/pkg/dump/frr.go +++ b/e2etests/pkg/dump/frr.go @@ -57,7 +57,7 @@ func BGPInfo(testName string, FRRContainers []*frrcontainer.FRR, cs clientset.In ginkgo.GinkgoWriter.Printf("External frr ipall for container %s, failed to write to file %v", c.Name, err) continue } - + f.Close() } frrk8sPods, err := k8s.FRRK8sPods(cs) @@ -88,6 +88,21 @@ func BGPInfo(testName string, FRRContainers []*frrcontainer.FRR, cs clientset.In ginkgo.GinkgoWriter.Printf("External frr ipall for pod %s, failed to write to file %v", pod.Name, err) continue } + + fmt.Fprintf(f, "Dumping information for %s - reloader, local addresses: %s\n", pod.Name, pod.Status.PodIPs) + + reloaderExec := executor.ForPod(pod.Namespace, pod.Name, "reloader") + dump, err = frr.RawDump(reloaderExec, "/etc/frr_reloader/frr.conf") + if err != nil { + ginkgo.GinkgoWriter.Printf("External frr dump for pod %s - reloader failed %v", pod.Name, err) + continue + } + _, err = fmt.Fprint(f, dump) + if err != nil { + ginkgo.GinkgoWriter.Printf("External frr dump for pod %s reloader, failed to write to file %v", pod.Name, err) + continue + } + f.Close() } } From 55157a5dd1718ddde423888d1bf184c0b76e97d9 Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Mon, 9 Sep 2024 16:31:08 +0200 Subject: [PATCH 09/10] 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 + From 3f85f124cc8c6a0692eeb2dbde416454b892b97c Mon Sep 17 00:00:00 2001 From: Federico Paolinelli Date: Thu, 12 Sep 2024 11:15:17 -0400 Subject: [PATCH 10/10] bump collect logs action to v4 Signed-off-by: Federico Paolinelli --- .github/workflows/composite/collectlogs/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composite/collectlogs/action.yaml b/.github/workflows/composite/collectlogs/action.yaml index 3b41660a..d094944e 100644 --- a/.github/workflows/composite/collectlogs/action.yaml +++ b/.github/workflows/composite/collectlogs/action.yaml @@ -15,7 +15,7 @@ runs: sudo chmod -R o+r /tmp/kind_logs - name: Upload logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ inputs.artifact-name }} path: /tmp/kind_logs/