From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 20A231FF13C for ; Thu, 05 Mar 2026 11:05:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9EF9C2F6A; Thu, 5 Mar 2026 11:04:40 +0100 (CET) From: Gabriel Goller 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 Message-ID: <20260305100331.80741-18-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260305100331.80741-1-g.goller@proxmox.com> References: <20260305100331.80741-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1772704991541 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: RQF6OPPGSOG7Q5JSZWB3OMJRDUOZLX2Z X-Message-ID-Hash: RQF6OPPGSOG7Q5JSZWB3OMJRDUOZLX2Z X-MailFrom: g.goller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This should not contain any functional change, just moving around some stuff. Signed-off-by: Gabriel Goller --- .../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