From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-network v3 8/9] test: adjust frr_local_merge test for new template generation
Date: Thu, 5 Mar 2026 11:03:24 +0100 [thread overview]
Message-ID: <20260305100331.80741-18-g.goller@proxmox.com> (raw)
In-Reply-To: <20260305100331.80741-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 | 72 ++++++++++---------
1 file changed, 37 insertions(+), 35 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 82f36c9e37ec..a501791d1b2f 100644
--- a/src/test/zones/evpn/frr_local_merge/expected_controller_config
+++ b/src/test/zones/evpn/frr_local_merge/expected_controller_config
@@ -4,24 +4,10 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_myzone
vni 1000
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
@@ -69,10 +55,6 @@ router bgp 65000 vrf vrf_myzone
no bgp graceful-restart notification
exit
!
-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
@@ -80,27 +62,40 @@ router isis isis1
log-adjacency-changes
exit
!
-router ospf
- passive-interface default
+interface eth0
+ ip router isis isis1
exit
!
-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
+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
bgp community-list standard CL_LOCAL permit 65000:200
+interface iface2
+ ip ospf area 0
+exit
!
-route-map CUSTOM_MAP permit 1
- match ip address prefix-list PL_ALLOW
+interface ens19
+ no ip ospf passive
exit
!
-route-map MAP_VTEP_IN permit 1
+router ospf
+ passive-interface default
exit
!
-route-map MAP_VTEP_IN permit 2
- set community 65000:200
+router eigrp 1
+ network 10.0.0.0/8
exit
!
-route-map MAP_VTEP_OUT permit 1
+route-map CUSTOM_MAP permit 1
+ match ip address prefix-list PL_ALLOW
+exit
+!
+route-map MAP_VTEP_IN permit 2
+ set community 65000:200
exit
!
route-map MAP_VTEP_OUT permit 2
@@ -111,16 +106,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
@@ -136,13 +126,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
!
--
2.47.3
next prev parent reply other threads:[~2026-03-05 10:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-05 10:03 [PATCH manager/network/proxmox{-ve-rs,-perl-rs} v3 00/19] Generate frr config using jinja templates and rust types Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-ve-rs v3 1/8] ve-config: firewall: cargo fmt Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-ve-rs v3 2/8] frr: add proxmox-frr-templates package that contains templates Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-ve-rs v3 3/8] ve-config: remove FrrConfigBuilder struct Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-ve-rs v3 4/8] sdn-types: support variable-length NET identifier Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-ve-rs v3 5/8] frr: add template serializer and serialize fabrics using templates Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-ve-rs v3 6/8] frr: add isis configuration and templates Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-ve-rs v3 7/8] frr: support custom frr configuration lines Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-ve-rs v3 8/8] frr: add bgp support with templates and serialization Gabriel Goller
2026-03-05 10:03 ` [PATCH proxmox-perl-rs v3 1/1] sdn: add function to generate the frr config for all daemons Gabriel Goller
2026-03-05 10:03 ` [PATCH pve-network v3 1/9] tests: use Test::Differences to make test assertions Gabriel Goller
2026-03-05 10:03 ` [PATCH pve-network v3 2/9] test: add test for frr.conf.local merging Gabriel Goller
2026-03-05 10:03 ` [PATCH pve-network v3 3/9] test: bgp: add some various integration tests Gabriel Goller
2026-03-05 10:03 ` [PATCH pve-network v3 4/9] sdn: write structured frr config that can be rendered using templates Gabriel Goller
2026-03-05 10:03 ` [PATCH pve-network v3 5/9] sdn: remove duplicate comment line '!' in frr config Gabriel Goller
2026-03-05 10:03 ` [PATCH pve-network v3 6/9] tests: rearrange some statements in the " Gabriel Goller
2026-03-05 10:03 ` [PATCH pve-network v3 7/9] sdn: adjust frr.conf.local merging to rust template types Gabriel Goller
2026-03-05 10:03 ` Gabriel Goller [this message]
2026-03-05 10:03 ` [PATCH pve-network v3 9/9] api: add dry-run endpoint for sdn apply to preview changes Gabriel Goller
2026-03-05 10:03 ` [PATCH pve-manager v3 1/1] sdn: add dry-run diff view for sdn apply 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=20260305100331.80741-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.