From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-network v4 8/9] test: adjust frr_local_merge test for new template generation
Date: Fri, 6 Mar 2026 13:53:11 +0100 [thread overview]
Message-ID: <20260306125315.190298-18-g.goller@proxmox.com> (raw)
In-Reply-To: <20260306125315.190298-1-g.goller@proxmox.com>
This should not contain any functional change, just moving around some
stuff.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
.../expected_controller_config | 108 ++++++++----------
.../expected_controller_config | 60 ++++++----
2 files changed, 87 insertions(+), 81 deletions(-)
diff --git a/src/test/zones/evpn/frr_local_merge/expected_controller_config b/src/test/zones/evpn/frr_local_merge/expected_controller_config
index 6589e6facada..368a8d0b2108 100644
--- a/src/test/zones/evpn/frr_local_merge/expected_controller_config
+++ b/src/test/zones/evpn/frr_local_merge/expected_controller_config
@@ -4,30 +4,12 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_myzone
vni 1000
vni 1005
ip route 192.0.2.0/24 null0
exit-vrf
!
-vrf vrf_yourzone
- ip route 198.51.100.0/24 null0
-exit-vrf
-!
-interface ens19
- no ip ospf passive
-!
-interface eth0
- ip router isis isis1
-!
-interface eth1
- ip router isis isis1
- isis circuit-type level-2-only
-!
-interface iface2
- ip ospf area 0
-!
router bgp 65000
bgp router-id 192.168.0.1
no bgp default ipv4-unicast
@@ -74,33 +56,60 @@ router bgp 65000 vrf vrf_myzone
no bgp hard-administrative-reset
no bgp graceful-restart notification
bgp disable-ebgp-connected-route-check
- !
address-family ipv4 unicast
redistribute kernel
exit-address-family
- !
address-family ipv6 unicast
redistribute kernel
exit-address-family
- !
address-family l2vpn evpn
redistribute kernel
exit-address-family
exit
!
+router isis isis1
+ net 47.0023.0000.0000.0000.0000.0000.0000.1900.0004.00
+ redistribute ipv4 connected level-1
+ redistribute ipv6 connected level-1
+ log-adjacency-changes
+exit
+!
+interface eth0
+ ip router isis isis1
+exit
+!
+interface eth1
+ ip router isis isis1
+ isis circuit-type level-2-only
+exit
+!
+ip prefix-list loopbacks_ips seq 10 permit 0.0.0.0/0 le 32
+ip prefix-list PL_ALLOW seq 10 permit 10.0.0.0/8 le 24
+ip prefix-list loopbacks_ips seq 5 deny 8.8.8.0/0 le 32
+ipv6 prefix-list PL_ALLOW_6 seq 10 permit fd80:: le 64
+bgp community-list standard CL_LOCAL permit 65000:200
+interface iface2
+ ip ospf area 0
+exit
+!
+interface ens19
+ no ip ospf passive
+exit
+!
+router ospf
+ passive-interface default
+exit
+!
router bgp 65000 vrf vrf_yourzone
bgp router-id 172.31.2.1
no bgp hard-administrative-reset
no bgp graceful-restart notification
- !
address-family ipv4 unicast
redistribute kernel
exit-address-family
- !
address-family ipv6 unicast
redistribute kernel
exit-address-family
- !
address-family l2vpn evpn
redistribute kernel
exit-address-family
@@ -110,43 +119,19 @@ router eigrp 1
network 10.0.0.0/8
exit
!
-router isis isis1
- net 47.0023.0000.0000.0000.0000.0000.0000.1900.0004.00
- redistribute ipv4 connected level-1
- redistribute ipv6 connected level-1
- log-adjacency-changes
-exit
-!
-router ospf
- passive-interface default
-exit
-!
+vrf vrf_yourzone
+ ip route 198.51.100.0/24 null0
+access-list filter seq 5 permit ip host 10.0.20.2 232.1.1.0 0.0.0.128
access-list filter seq 10 deny ip 10.0.20.0 0.0.0.255 232.1.1.0 0.0.0.255
access-list filter seq 15 permit ip any any
-access-list filter seq 5 permit ip host 10.0.20.2 232.1.1.0 0.0.0.128
-!
-ip prefix-list PL_ALLOW seq 10 permit 10.0.0.0/8 le 24
-ip prefix-list loopbacks_ips seq 10 permit 0.0.0.0/0 le 32
-ip prefix-list loopbacks_ips seq 5 deny 8.8.8.0/0 le 32
-!
-ipv6 prefix-list PL_ALLOW_6 seq 10 permit fd80:: le 64
-!
-bgp community-list standard CL_LOCAL permit 65000:200
-!
route-map CUSTOM_MAP permit 1
match ip address prefix-list PL_ALLOW
exit
!
-route-map MAP_VTEP_IN permit 1
-exit
-!
route-map MAP_VTEP_IN permit 2
set community 65000:200
exit
!
-route-map MAP_VTEP_OUT permit 1
-exit
-!
route-map MAP_VTEP_OUT permit 2
set community 65000:100
exit
@@ -155,16 +140,11 @@ route-map MAP_VTEP_OUT permit 3
match ip next-hop LOCAL
exit
!
-route-map correct_src permit 1
- match ip address prefix-list loopbacks_ips
- set src 192.168.0.1
-exit
-!
route-map correct_src deny 2
match ip next-hop NOT_LOCAL
exit
!
-ip protocol bgp route-map correct_src
+!
router ospf
ospf router-id 172.20.30.1
exit
@@ -180,13 +160,25 @@ exit
!
access-list pve_ospf_test_ips permit 172.20.30.0/24
!
+route-map MAP_VTEP_IN permit 1
+exit
+!
+route-map MAP_VTEP_OUT permit 1
+exit
+!
+route-map correct_src permit 1
+ match ip address prefix-list loopbacks_ips
+ set src 192.168.0.1
+exit
+!
route-map pve_ospf permit 100
match ip address pve_ospf_test_ips
set src 172.20.30.1
exit
!
-ip protocol ospf route-map pve_ospf
+ip protocol bgp route-map correct_src
!
+ip protocol ospf route-map pve_ospf
!
line vty
!
diff --git a/src/test/zones/evpn/frr_local_merge_router_without_exit/expected_controller_config b/src/test/zones/evpn/frr_local_merge_router_without_exit/expected_controller_config
index 8797e3fd82b1..dfedf23cb778 100644
--- a/src/test/zones/evpn/frr_local_merge_router_without_exit/expected_controller_config
+++ b/src/test/zones/evpn/frr_local_merge_router_without_exit/expected_controller_config
@@ -4,16 +4,9 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_evpnz
vni 999
vni 1233
- exit-vrf
-exit-vrf
-!
-vrf vrf_qwe
- vni 1234
- exit-vrf
exit-vrf
!
router bgp 65001
@@ -28,18 +21,17 @@ router bgp 65001
neighbor 172.31.2.1 peer-group VTEP
neighbor 172.31.2.2 peer-group VTEP
neighbor 172.31.2.4 peer-group VTEP
- bgp graceful-restart rib-stale-time 123
- !
+ bgp graceful-restart rib-stale-time 123
address-family ipv6 unicast
- redistribute static
- exit-address-family
+ redistribute static
+exit-address-family
!
address-family l2vpn evpn
neighbor VTEP activate
neighbor VTEP route-map MAP_VTEP_IN in
neighbor VTEP route-map MAP_VTEP_OUT out
advertise-all-vni
- redistribute static
+ redistribute static
exit-address-family
exit
!
@@ -47,7 +39,7 @@ router bgp 65001 vrf vrf_evpnz
bgp router-id 17.29.105.96
no bgp hard-administrative-reset
no bgp graceful-restart notification
- bgp graceful-restart rib-stale-time 123
+ bgp graceful-restart rib-stale-time 123
!
address-family ipv4 unicast
redistribute connected
@@ -55,37 +47,36 @@ router bgp 65001 vrf vrf_evpnz
!
address-family ipv6 unicast
redistribute connected
- redistribute static
+ redistribute static
exit-address-family
!
address-family l2vpn evpn
advertise ipv4 unicast
advertise ipv6 unicast
- redistribute static
+ redistribute static
exit-address-family
exit
+vrf vrf_qwe
+ vni 1234
+exit-vrf
!
router eigrp 1337
network 203.0.113.0/27
exit
!
-bgp community-list 70 deny
bgp community-list 70 permit 7675:70
-bgp community-list 80 deny
+bgp community-list 70 deny
bgp community-list 80 permit 7675:80
-bgp community-list 90 deny
+bgp community-list 80 deny
bgp community-list 90 permit 7675:90
-bgp community-list expanded cme-prefmod-range permit 64512:2...
+bgp community-list 90 deny
bgp community-list standard FILTER deny 1:1
bgp community-list standard FILTER permit
bgp community-list standard cm-prefmod-100 permit 64512:2100
bgp community-list standard cm-prefmod-200 permit 64512:2200
bgp community-list standard cm-prefmod-300 permit 64512:2300
bgp community-list standard cm-prefmod-400 permit 64512:2400
-!
-route-map MAP_VTEP_IN permit 1
-exit
-!
+bgp community-list expanded cme-prefmod-range permit 64512:2...
route-map MAP_VTEP_IN deny 2
exit
!
@@ -102,6 +93,29 @@ route-map MAP_VTEP_IN permit 5
set local-preference 200
exit
!
+route-map rm-blackhole permit 1
+ description blackhole, up-pref and ensure it cannot escape this AS
+ set ip next-hop 127.0.0.1
+ set local-preference 10
+ set community additive no-export
+route-map rm-blackhole permit 2
+route-map rm-prefmod permit 1
+ match community cm-prefmod-100
+ set local-preference 100
+route-map rm-prefmod permit 2
+ match community cm-prefmod-200
+ set local-preference 200
+route-map rm-prefmod permit 3
+ match community cm-prefmod-300
+ set local-preference 300
+route-map rm-prefmod permit 4
+ match community cm-prefmod-400
+ set local-preference 400
+route-map rm-prefmod permit 5
+!
+route-map MAP_VTEP_IN permit 1
+exit
+!
route-map MAP_VTEP_OUT permit 1
exit
!
--
2.47.3
next prev parent reply other threads:[~2026-03-06 12:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-06 12:52 [PATCH manager/network/proxmox{-ve-rs,-perl-rs} v4 00/19] Generate frr config using jinja templates and rust types Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 1/8] ve-config: firewall: cargo fmt Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 2/8] frr: add proxmox-frr-templates package that contains templates Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 3/8] ve-config: remove FrrConfigBuilder struct Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 4/8] sdn-types: support variable-length NET identifier Gabriel Goller
2026-03-06 12:52 ` [PATCH proxmox-ve-rs v4 5/8] frr: add template serializer and serialize fabrics using templates Gabriel Goller
2026-03-06 12:53 ` [PATCH proxmox-ve-rs v4 6/8] frr: add isis configuration and templates Gabriel Goller
2026-03-06 12:53 ` [PATCH proxmox-ve-rs v4 7/8] frr: support custom frr configuration lines Gabriel Goller
2026-03-06 12:53 ` [PATCH proxmox-ve-rs v4 8/8] frr: add bgp support with templates and serialization Gabriel Goller
2026-03-06 12:53 ` [PATCH proxmox-perl-rs v4 1/1] sdn: add function to generate the frr config for all daemons Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 1/9] tests: use Test::Differences to make test assertions Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 2/9] test: add tests for frr.conf.local merging Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 3/9] test: bgp: add some various integration tests Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 4/9] sdn: write structured frr config that can be rendered using templates Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 5/9] sdn: remove duplicate comment line '!' in frr config Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 6/9] tests: rearrange some statements in the " Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-network v4 7/9] sdn: adjust frr.conf.local merging to rust template types Gabriel Goller
2026-03-06 12:53 ` Gabriel Goller [this message]
2026-03-06 12:53 ` [PATCH pve-network v4 9/9] api: add dry-run endpoint for sdn apply to preview changes Gabriel Goller
2026-03-06 17:13 ` Hannes Laimer
2026-03-09 12:24 ` Gabriel Goller
2026-03-09 15:48 ` Gabriel Goller
2026-03-06 12:53 ` [PATCH pve-manager v4 1/1] sdn: add dry-run diff view for sdn apply Gabriel Goller
2026-03-10 12:10 ` [PATCH manager/network/proxmox{-ve-rs,-perl-rs} v4 00/19] Generate frr config using jinja templates and rust types Gabriel Goller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260306125315.190298-18-g.goller@proxmox.com \
--to=g.goller@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox