[pve-devel] [PATCH frr] add upstream 7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch

[pve-devel] [PATCH frr] add upstream 7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch

[Alexandre Derumier]

user have requested a patch from upstream, fixing special manual config in frr

https://forum.proxmox.com/threads/sdn-issue-with-frr-version-7-5-1-99-pve-really7-4-and-set-src.95532/
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 debian/patches/series                         |  1 +
 ...cb86a259d3c9ef6eae9dd5d529f8080922cd.patch | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 debian/patches/upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch

diff --git a/debian/patches/series b/debian/patches/series
index 41c48c5..8ea3ad1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch
 pve/0001-enable-bgp-daemon.patch
 pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
+upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch
\ No newline at end of file
diff --git a/debian/patches/upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch b/debian/patches/upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch
new file mode 100644
index 0000000..a413910
--- /dev/null
+++ b/debian/patches/upstream/7573cb86a259d3c9ef6eae9dd5d529f8080922cd.patch
@@ -0,0 +1,68 @@
+From 7573cb86a259d3c9ef6eae9dd5d529f8080922cd Mon Sep 17 00:00:00 2001
+From: Igor Ryzhov <iryzhov@nfware.com>
+Date: Thu, 22 Apr 2021 12:48:19 +0300
+Subject: [PATCH] yang: fix zebra module
+
+Fixes: #8521
+Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
+---
+ yang/frr-zebra.yang | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang
+index 2efc45c1464..6b4be659152 100644
+--- a/yang/frr-zebra.yang
++++ b/yang/frr-zebra.yang
+@@ -2184,8 +2184,8 @@ module frr-zebra {
+     + "/frr-route-map:match-condition"
+     + "/frr-route-map:condition-value" {
+     case ipv4-prefix-length {
+-      when "./condition = 'ipv4-prefix-length' or
+-            ./condition = 'ipv4-next-hop-prefix-length'";
++      when "./frr-route-map:condition = 'ipv4-prefix-length' or
++            ./frr-route-map:condition = 'ipv4-next-hop-prefix-length'";
+       leaf ipv4-prefix-length {
+         type uint8 {
+           range "0..32";
+@@ -2193,7 +2193,7 @@ module frr-zebra {
+       }
+     }
+     case ipv6-prefix-length {
+-      when "./condition = 'ipv6-prefix-length'";
++      when "./frr-route-map:condition = 'ipv6-prefix-length'";
+       leaf ipv6-prefix-length {
+         type uint8 {
+           range "0..128";
+@@ -2201,13 +2201,13 @@ module frr-zebra {
+       }
+     }
+     case source-protocol {
+-      when "./condition = 'source-protocol'";
++      when "./frr-route-map:condition = 'source-protocol'";
+       leaf source-protocol {
+         type frr-route-types:frr-route-types;
+       }
+     }
+     case source-instance {
+-      when "./condition = 'source-instance'";
++      when "./frr-route-map:condition = 'source-instance'";
+       leaf source-instance {
+         type uint8 {
+           range "0..255";
+@@ -2222,14 +2222,14 @@ module frr-zebra {
+           + "/frr-route-map:set-action"
+           + "/frr-route-map:action-value" {
+     case source-v4 {
+-      when "./action = 'source'";
++      when "./frr-route-map:action = 'source'";
+       leaf source-v4 {
+         description "IPv4 address";
+         type inet:ipv4-address;
+       }
+     }
+     case source-v6 {
+-      when "./action = 'source'";
++      when "./frr-route-map:action = 'source'";
+       leaf source-v6 {
+         description "IPv6 address";
+         type inet:ipv6-address;
-- 
2.30.2