From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-network v3 6/9] tests: rearrange some statements in the frr config
Date: Thu, 5 Mar 2026 11:03:22 +0100 [thread overview]
Message-ID: <20260305100331.80741-16-g.goller@proxmox.com> (raw)
In-Reply-To: <20260305100331.80741-1-g.goller@proxmox.com>
Move some stuff up and down, this makes it easier to generate the config
using templates.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
.../zones/evpn/bgp_ebgp/expected_controller_config | 1 -
.../bgp_ebgp_multihop/expected_controller_config | 3 +--
.../expected_controller_config | 1 -
.../evpn/bgp_loopback/expected_controller_config | 1 -
.../bgp_multipath_relax/expected_controller_config | 3 +--
.../combined_bgp_isis/expected_controller_config | 8 ++++----
.../evpn/ebgp_loopback/expected_controller_config | 2 +-
.../evpn/ebgp_only/expected_controller_config | 1 -
.../zones/evpn/isis/expected_controller_config | 14 ++++++++------
.../evpn/isis_loopback/expected_controller_config | 14 ++++++++------
.../isis_standalone/expected_controller_config | 13 +++++++------
.../multipath_relax/expected_controller_config | 2 +-
.../openfabric_fabric/expected_controller_config | 11 ++++++-----
.../evpn/ospf_fabric/expected_controller_config | 11 ++++++-----
14 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/src/test/zones/evpn/bgp_ebgp/expected_controller_config b/src/test/zones/evpn/bgp_ebgp/expected_controller_config
index 85015dc2e41b..037079654b0f 100644
--- a/src/test/zones/evpn/bgp_ebgp/expected_controller_config
+++ b/src/test/zones/evpn/bgp_ebgp/expected_controller_config
@@ -4,7 +4,6 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_myzone
vni 1000
exit-vrf
diff --git a/src/test/zones/evpn/bgp_ebgp_multihop/expected_controller_config b/src/test/zones/evpn/bgp_ebgp_multihop/expected_controller_config
index 77db51ef64f2..5da2ac744be1 100644
--- a/src/test/zones/evpn/bgp_ebgp_multihop/expected_controller_config
+++ b/src/test/zones/evpn/bgp_ebgp_multihop/expected_controller_config
@@ -4,7 +4,6 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_myzone
vni 1000
exit-vrf
@@ -15,13 +14,13 @@ router bgp 65000
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
+ bgp disable-ebgp-connected-route-check
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
neighbor VTEP update-source lo
neighbor 192.168.0.2 peer-group VTEP
neighbor 192.168.0.3 peer-group VTEP
- bgp disable-ebgp-connected-route-check
neighbor BGP peer-group
neighbor BGP remote-as external
neighbor BGP bfd
diff --git a/src/test/zones/evpn/bgp_ebgp_reverse_order/expected_controller_config b/src/test/zones/evpn/bgp_ebgp_reverse_order/expected_controller_config
index 42adea515950..4857dc8a502f 100644
--- a/src/test/zones/evpn/bgp_ebgp_reverse_order/expected_controller_config
+++ b/src/test/zones/evpn/bgp_ebgp_reverse_order/expected_controller_config
@@ -4,7 +4,6 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_myzone
vni 1000
exit-vrf
diff --git a/src/test/zones/evpn/bgp_loopback/expected_controller_config b/src/test/zones/evpn/bgp_loopback/expected_controller_config
index 0a4207b807cb..a2d2db04d28d 100644
--- a/src/test/zones/evpn/bgp_loopback/expected_controller_config
+++ b/src/test/zones/evpn/bgp_loopback/expected_controller_config
@@ -4,7 +4,6 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_myzone
vni 1000
exit-vrf
diff --git a/src/test/zones/evpn/bgp_multipath_relax/expected_controller_config b/src/test/zones/evpn/bgp_multipath_relax/expected_controller_config
index 2f2bf397edb6..a8a5a85e060e 100644
--- a/src/test/zones/evpn/bgp_multipath_relax/expected_controller_config
+++ b/src/test/zones/evpn/bgp_multipath_relax/expected_controller_config
@@ -4,7 +4,6 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_myzone
vni 1000
exit-vrf
@@ -15,12 +14,12 @@ router bgp 65000
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
+ bgp bestpath as-path multipath-relax
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
neighbor 192.168.0.2 peer-group VTEP
neighbor 192.168.0.3 peer-group VTEP
- bgp bestpath as-path multipath-relax
neighbor BGP peer-group
neighbor BGP remote-as 65000
neighbor BGP bfd
diff --git a/src/test/zones/evpn/combined_bgp_isis/expected_controller_config b/src/test/zones/evpn/combined_bgp_isis/expected_controller_config
index 35a3a54e0376..427dc797c3b2 100644
--- a/src/test/zones/evpn/combined_bgp_isis/expected_controller_config
+++ b/src/test/zones/evpn/combined_bgp_isis/expected_controller_config
@@ -4,14 +4,10 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
vrf vrf_myzone
vni 1000
exit-vrf
!
-interface eth1
- ip router isis isis1
-!
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
@@ -57,6 +53,10 @@ router isis isis1
log-adjacency-changes
exit
!
+interface eth1
+ ip router isis isis1
+exit
+!
ip prefix-list loopbacks_ips seq 10 permit 0.0.0.0/0 le 32
!
route-map MAP_VTEP_IN permit 1
diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config
index 38f62d06540c..aedb2daef418 100644
--- a/src/test/zones/evpn/ebgp_loopback/expected_controller_config
+++ b/src/test/zones/evpn/ebgp_loopback/expected_controller_config
@@ -14,6 +14,7 @@ router bgp 65001
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
+ bgp disable-ebgp-connected-route-check
neighbor VTEP peer-group
neighbor VTEP remote-as external
neighbor VTEP bfd
@@ -21,7 +22,6 @@ router bgp 65001
neighbor VTEP update-source dummy1
neighbor 192.168.0.2 peer-group VTEP
neighbor 192.168.0.3 peer-group VTEP
- bgp disable-ebgp-connected-route-check
neighbor BGP peer-group
neighbor BGP remote-as external
neighbor BGP bfd
diff --git a/src/test/zones/evpn/ebgp_only/expected_controller_config b/src/test/zones/evpn/ebgp_only/expected_controller_config
index 4751428b639c..83910dfc2157 100644
--- a/src/test/zones/evpn/ebgp_only/expected_controller_config
+++ b/src/test/zones/evpn/ebgp_only/expected_controller_config
@@ -4,7 +4,6 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
-!
router bgp 65001
bgp router-id 192.168.0.1
no bgp default ipv4-unicast
diff --git a/src/test/zones/evpn/isis/expected_controller_config b/src/test/zones/evpn/isis/expected_controller_config
index 2361879e0cc2..af9ba30ac97e 100644
--- a/src/test/zones/evpn/isis/expected_controller_config
+++ b/src/test/zones/evpn/isis/expected_controller_config
@@ -8,12 +8,6 @@ vrf vrf_myzone
vni 1000
exit-vrf
!
-interface eth0
- ip router isis isis1
-!
-interface eth1
- ip router isis isis1
-!
router bgp 65000
bgp router-id 192.168.0.1
no bgp hard-administrative-reset
@@ -47,6 +41,14 @@ router isis isis1
log-adjacency-changes
exit
!
+interface eth0
+ ip router isis isis1
+exit
+!
+interface eth1
+ ip router isis isis1
+exit
+!
route-map MAP_VTEP_IN permit 1
exit
!
diff --git a/src/test/zones/evpn/isis_loopback/expected_controller_config b/src/test/zones/evpn/isis_loopback/expected_controller_config
index f4a6e353377b..0eed628286af 100644
--- a/src/test/zones/evpn/isis_loopback/expected_controller_config
+++ b/src/test/zones/evpn/isis_loopback/expected_controller_config
@@ -8,12 +8,6 @@ vrf vrf_myzone
vni 1000
exit-vrf
!
-interface eth0
- ip router isis isis1
-!
-interface eth1
- ip router isis isis1
-!
router bgp 65000
bgp router-id 10.0.0.1
no bgp hard-administrative-reset
@@ -48,6 +42,14 @@ router isis isis1
log-adjacency-changes
exit
!
+interface eth0
+ ip router isis isis1
+exit
+!
+interface eth1
+ ip router isis isis1
+exit
+!
route-map MAP_VTEP_IN permit 1
exit
!
diff --git a/src/test/zones/evpn/isis_standalone/expected_controller_config b/src/test/zones/evpn/isis_standalone/expected_controller_config
index 92a6f3843646..149e4e1f8b79 100644
--- a/src/test/zones/evpn/isis_standalone/expected_controller_config
+++ b/src/test/zones/evpn/isis_standalone/expected_controller_config
@@ -4,18 +4,19 @@ hostname localhost
log syslog informational
service integrated-vtysh-config
!
+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
-!
-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
!
line vty
diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config
index 783d05cf24d5..26b70b767782 100644
--- a/src/test/zones/evpn/multipath_relax/expected_controller_config
+++ b/src/test/zones/evpn/multipath_relax/expected_controller_config
@@ -14,12 +14,12 @@ router bgp 65000
no bgp default ipv4-unicast
coalesce-time 1000
no bgp graceful-restart notification
+ bgp bestpath as-path multipath-relax
neighbor VTEP peer-group
neighbor VTEP remote-as 65000
neighbor VTEP bfd
neighbor 192.168.0.2 peer-group VTEP
neighbor 192.168.0.3 peer-group VTEP
- bgp bestpath as-path multipath-relax
neighbor BGP peer-group
neighbor BGP remote-as 65000
neighbor BGP bfd
diff --git a/src/test/zones/evpn/openfabric_fabric/expected_controller_config b/src/test/zones/evpn/openfabric_fabric/expected_controller_config
index 16358190b44d..e749e279769e 100644
--- a/src/test/zones/evpn/openfabric_fabric/expected_controller_config
+++ b/src/test/zones/evpn/openfabric_fabric/expected_controller_config
@@ -35,11 +35,6 @@ router bgp 65000 vrf vrf_evpn
no bgp graceful-restart notification
exit
!
-route-map MAP_VTEP_IN permit 1
-exit
-!
-route-map MAP_VTEP_OUT permit 1
-exit
router openfabric test
net 49.0001.1720.2000.3001.00
exit
@@ -61,6 +56,12 @@ exit
!
access-list pve_openfabric_test_ips permit 172.20.3.0/24
!
+route-map MAP_VTEP_IN permit 1
+exit
+!
+route-map MAP_VTEP_OUT permit 1
+exit
+!
route-map pve_openfabric permit 100
match ip address pve_openfabric_test_ips
set src 172.20.3.1
diff --git a/src/test/zones/evpn/ospf_fabric/expected_controller_config b/src/test/zones/evpn/ospf_fabric/expected_controller_config
index 8aa09026e7f9..b5a1b925213c 100644
--- a/src/test/zones/evpn/ospf_fabric/expected_controller_config
+++ b/src/test/zones/evpn/ospf_fabric/expected_controller_config
@@ -35,11 +35,6 @@ router bgp 65000 vrf vrf_evpn
no bgp graceful-restart notification
exit
!
-route-map MAP_VTEP_IN permit 1
-exit
-!
-route-map MAP_VTEP_OUT permit 1
-exit
router ospf
ospf router-id 172.20.30.1
exit
@@ -55,6 +50,12 @@ 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 pve_ospf permit 100
match ip address pve_ospf_test_ips
set src 172.20.30.1
--
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 ` Gabriel Goller [this message]
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 ` [PATCH pve-network v3 8/9] test: adjust frr_local_merge test for new template generation Gabriel Goller
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-16-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