* [pve-devel] [PATCH frr 1/3] patch: enable bfd daemon
2020-11-23 10:16 [pve-devel] [PATCH frr 0/3] update frr to 7.4 Alexandre Derumier
@ 2020-11-23 10:16 ` Alexandre Derumier
2020-11-23 10:16 ` [pve-devel] [PATCH frr 2/3] patch : add autort as derivation Alexandre Derumier
2020-11-23 10:16 ` [pve-devel] [PATCH frr 3/3] bump to 7.4 Alexandre Derumier
2 siblings, 0 replies; 4+ messages in thread
From: Alexandre Derumier @ 2020-11-23 10:16 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
.../patches/pve/0001-enable-bgp-daemon.patch | 27 +++++++++++++------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/debian/patches/pve/0001-enable-bgp-daemon.patch b/debian/patches/pve/0001-enable-bgp-daemon.patch
index d972f18..2403fd0 100644
--- a/debian/patches/pve/0001-enable-bgp-daemon.patch
+++ b/debian/patches/pve/0001-enable-bgp-daemon.patch
@@ -1,24 +1,35 @@
-From 13d0e8ea85fbbc4d53709a0fb28ebd66876884b4 Mon Sep 17 00:00:00 2001
+From 1ffeb1b2450bb97ae18c8754da188fad98d8dc10 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
-Date: Mon, 31 Dec 2018 09:50:06 +0100
-Subject: [PATCH] enable bgp daemon
+Date: Mon, 16 Nov 2020 08:01:38 +0100
+Subject: [PATCH] enable bgp && bfd daemons
+Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
- tools/etc/frr/daemons | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ tools/etc/frr/daemons | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
-index 9077606..2d11d6a 100644
+index f6d512be7..4cddea326 100644
--- a/tools/etc/frr/daemons
+++ b/tools/etc/frr/daemons
@@ -14,7 +14,7 @@
#
- # The watchfrr and zebra daemons are always started.
+ # The watchfrr, zebra and staticd daemons are always started.
#
-bgpd=no
+bgpd=yes
ospfd=no
ospf6d=no
ripd=no
+@@ -27,7 +27,7 @@ eigrpd=no
+ babeld=no
+ sharpd=no
+ pbrd=no
+-bfdd=no
++bfdd=yes
+ fabricd=no
+ vrrpd=no
+
--
-2.11.0
+2.20.1
+
--
2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pve-devel] [PATCH frr 2/3] patch : add autort as derivation
2020-11-23 10:16 [pve-devel] [PATCH frr 0/3] update frr to 7.4 Alexandre Derumier
2020-11-23 10:16 ` [pve-devel] [PATCH frr 1/3] patch: enable bfd daemon Alexandre Derumier
@ 2020-11-23 10:16 ` Alexandre Derumier
2020-11-23 10:16 ` [pve-devel] [PATCH frr 3/3] bump to 7.4 Alexandre Derumier
2 siblings, 0 replies; 4+ messages in thread
From: Alexandre Derumier @ 2020-11-23 10:16 UTC (permalink / raw)
To: pve-devel
pending upstream
https://github.com/FRRouting/frr/pull/7535/
This is for ebgp, to avoid to reload frr each time
when we define new vxlan.
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
...on-for-RT-auto-derivation-to-force-A.patch | 151 ++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 152 insertions(+)
create mode 100644 debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
diff --git a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
new file mode 100644
index 0000000..3306fbc
--- /dev/null
+++ b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
@@ -0,0 +1,151 @@
+From c3e66b067564281a58fcf3b99559d289a75090e9 Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@odiso.com>
+Date: Tue, 17 Nov 2020 06:01:26 +0100
+Subject: [PATCH 1/3] bgpd : add an option for RT auto-derivation to force AS
+
+Allow to define a custom AS for autort AS:VNI
+
+Usefull for evpn with ebgp, where we can't auto-derivated from the router AS,
+as route-target AS:VNI need to be the same on the each peer
+
+Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
+---
+ bgpd/bgp_evpn.c | 12 +++++++++--
+ bgpd/bgp_evpn_vty.c | 49 +++++++++++++++++++++++++++++++--------------
+ bgpd/bgpd.h | 3 +++
+ 3 files changed, 47 insertions(+), 17 deletions(-)
+
+diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
+index 84e8960ee..73acc5d7b 100644
+--- a/bgpd/bgp_evpn.c
++++ b/bgpd/bgp_evpn.c
+@@ -512,7 +512,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl)
+
+ if (bgp->advertise_autort_rfc8365)
+ vni |= EVPN_AUTORT_VXLAN;
+- encode_route_target_as((bgp->as & 0xFFFF), vni, &eval);
++ if (bgp->autort_as) {
++ encode_route_target_as((bgp->autort_as & 0xFFFF), vni, &eval);
++ } else {
++ encode_route_target_as((bgp->as & 0xFFFF), vni, &eval);
++ }
+
+ ecomadd = ecommunity_new();
+ ecommunity_add_val(ecomadd, &eval, false, false);
+@@ -4238,7 +4242,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl)
+
+ if (bgp->advertise_autort_rfc8365)
+ vni |= EVPN_AUTORT_VXLAN;
+- encode_route_target_as((bgp->as & 0xFFFF), vni, &eval);
++ if (bgp->autort_as) {
++ encode_route_target_as((bgp->autort_as & 0xFFFF), vni, &eval);
++ } else {
++ encode_route_target_as((bgp->as & 0xFFFF), vni, &eval);
++ }
+
+ ecom_auto = ecommunity_new();
+ ecommunity_add_val(ecom_auto, &eval, false, false);
+diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
+index e9e2aafeb..6cc6bba33 100644
+--- a/bgpd/bgp_evpn_vty.c
++++ b/bgpd/bgp_evpn_vty.c
+@@ -3226,32 +3226,48 @@ DEFUN (no_bgp_evpn_advertise_all_vni,
+ return CMD_SUCCESS;
+ }
+
+-DEFUN (bgp_evpn_advertise_autort_rfc8365,
+- bgp_evpn_advertise_autort_rfc8365_cmd,
+- "autort rfc8365-compatible",
+- "Auto-derivation of RT\n"
+- "Auto-derivation of RT using RFC8365\n")
++DEFPY(bgp_evpn_advertise_autort, bgp_evpn_advertise_autort_cmd,
++ "autort [rfc8365-compatible]$rfc8365 [as (1-65536)$as]",
++ "Auto-derivation of RT\n"
++ "Auto-derivation of RT using RFC8365\n"
++ "Auto-derivation AS\n")
+ {
+ struct bgp *bgp = VTY_GET_CONTEXT(bgp);
+
+ if (!bgp)
+ return CMD_WARNING;
+- evpn_set_advertise_autort_rfc8365(bgp);
++
++ if (as) {
++ bgp->autort_as = as;
++ bgp_evpn_handle_autort_change(bgp);
++ }
++
++ if (rfc8365)
++ evpn_set_advertise_autort_rfc8365(bgp);
++
+ return CMD_SUCCESS;
+ }
+
+-DEFUN (no_bgp_evpn_advertise_autort_rfc8365,
+- no_bgp_evpn_advertise_autort_rfc8365_cmd,
+- "no autort rfc8365-compatible",
+- NO_STR
+- "Auto-derivation of RT\n"
+- "Auto-derivation of RT using RFC8365\n")
++DEFPY(no_bgp_evpn_advertise_autort, no_bgp_evpn_advertise_autort_cmd,
++ "no autort [rfc8365-compatible]$rfc8365 [as (1-65536)$as]",
++ NO_STR
++ "Auto-derivation of RT\n"
++ "Auto-derivation of RT using RFC8365\n"
++ "Auto-derivation AS\n")
+ {
+ struct bgp *bgp = VTY_GET_CONTEXT(bgp);
+
+ if (!bgp)
+ return CMD_WARNING;
+- evpn_unset_advertise_autort_rfc8365(bgp);
++
++ if (as) {
++ bgp->autort_as = 0;
++ bgp_evpn_handle_autort_change(bgp);
++ }
++
++ if (rfc8365)
++ evpn_unset_advertise_autort_rfc8365(bgp);
++
+ return CMD_SUCCESS;
+ }
+
+@@ -5596,6 +5612,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
+ if (bgp->advertise_autort_rfc8365)
+ vty_out(vty, " autort rfc8365-compatible\n");
+
++ if (bgp->autort_as)
++ vty_out(vty, " autort as %u\n", bgp->autort_as);
++
+ if (bgp->advertise_gw_macip)
+ vty_out(vty, " advertise-default-gw\n");
+
+@@ -5732,8 +5751,8 @@ void bgp_ethernetvpn_init(void)
+ install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd);
+ install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd);
+ install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd);
+- install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_autort_rfc8365_cmd);
+- install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_autort_rfc8365_cmd);
++ install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_autort_cmd);
++ install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_autort_cmd);
+ install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_default_gw_cmd);
+ install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_default_gw_cmd);
+ install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_svi_ip_cmd);
+diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
+index d22fd008d..941066e2e 100644
+--- a/bgpd/bgpd.h
++++ b/bgpd/bgpd.h
+@@ -614,6 +614,9 @@ struct bgp {
+ /* EVPN - use RFC 8365 to auto-derive RT */
+ int advertise_autort_rfc8365;
+
++ /* EVPN - auto-derive RT AS */
++ uint16_t autort_as;
++
+ /*
+ * Flooding mechanism for BUM packets for VxLAN-EVPN.
+ */
+--
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index b2de4e5..50b22cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
pve/0001-enable-bgp-daemon.patch
+pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
--
2.20.1
^ permalink raw reply [flat|nested] 4+ messages in thread