Attachment 228985 Details for Bug 259403 – net/frr7: Backport 7573cb8 "yang: fix zebra module"

net/frr7: Backport 7573cb8 "yang: fix zebra module"

patch-net_frr7-7.5.1_3.txt (text/plain), 2.66 KB, created by John W. O'Brien on 2021-10-24 16:04:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. O'Brien

Created: 2021-10-24 16:04:01 UTC

Size: 2.66 KB

patch

obsolete

>diff --git a/net/frr7/Makefile b/net/frr7/Makefile
>index ec5061be54..245eb1cf95 100644
>--- a/net/frr7/Makefile
>+++ b/net/frr7/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	frr
> PORTVERSION=	7.5.1
> DISTVERSIONPREFIX=	frr-
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net
> .if defined(PYTHONTOOLS)
> PKGNAMESUFFIX=	7-pythontools
>diff --git a/net/frr7/files/patch-yang_frr-zebra.yang b/net/frr7/files/patch-yang_frr-zebra.yang
>new file mode 100644
>index 0000000000..eea78ef8f3
>--- /dev/null
>+++ b/net/frr7/files/patch-yang_frr-zebra.yang
>@@ -0,0 +1,64 @@
>+commit 7573cb86a259d3c9ef6eae9dd5d529f8080922cd
>+Author: Igor Ryzhov <iryzhov@nfware.com>
>+Date:   Thu Apr 22 12:48:19 2021 +0300
>+
>+    yang: fix zebra module
>+
>+    Fixes: #8521
>+    Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
>+
>+--- yang/frr-zebra.yang.orig	2021-03-04 02:14:50 UTC
>++++ 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;

Actions: View

Attachments on bug 259403: 228985