matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #8687 from opensourcerouting/bgp-fix-mcast

Browse source 
yang: fix BGP multicast prefix specification
This commit is contained in:
Igor Ryzhov 2021-05-21 18:56:26 +03:00 committed by GitHub
parent 10d52ac7f7 684a5c8a6b
commit 80b82d5289
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
yang/frr-bgp.yang
View file

@ -11,10 +11,6 @@ module frr-bgp {
prefix inet;
}
import ietf-routing-types {
prefix rt-types;
}
import frr-interface {
prefix frr-interface;
}
@ -23,6 +19,10 @@ module frr-bgp {
prefix frr-bt;
}
import frr-route-types {
prefix frr-route-types;
}
include "frr-bgp-common";
include "frr-bgp-common-structure";
@ -405,7 +405,7 @@ module frr-bgp {
description
"A list of network routes.";
leaf prefix {
type rt-types:ipv4-multicast-group-address;
type frr-route-types:ipv4-multicast-group-prefix;
description
"IPv4 multicast destination prefix.";
}
@ -425,7 +425,7 @@ module frr-bgp {
description
"A list of aggregated routes.";
leaf prefix {
type rt-types:ipv4-multicast-group-address;
type frr-route-types:ipv4-multicast-group-prefix;
description
"IPv4 multicast destination prefix.";
}
@ -438,7 +438,7 @@ module frr-bgp {
description
"A list of routes with a particular admin distance.";
leaf prefix {
type rt-types:ipv4-multicast-group-address;
type frr-route-types:ipv4-multicast-group-prefix;
description
"IPv4 multicast destination prefix.";
}
@ -459,7 +459,7 @@ module frr-bgp {
description
"A list of network routes.";
leaf prefix {
type rt-types:ipv6-multicast-group-address;
type frr-route-types:ipv6-multicast-group-prefix;
description
"IPv6 multicast destination prefix.";
}
@ -479,7 +479,7 @@ module frr-bgp {
description
"A list of aggregated routes.";
leaf prefix {
type rt-types:ipv6-multicast-group-address;
type frr-route-types:ipv6-multicast-group-prefix;
description
"IPv6 multicast destination prefix.";
}
@ -492,7 +492,7 @@ module frr-bgp {
description
"A list of routes with a particular admin distance.";
leaf prefix {
type rt-types:ipv6-multicast-group-address;
type frr-route-types:ipv6-multicast-group-prefix;
description
"IPv6 multicast destination prefix.";
}

41
yang/frr-pim-rp.yang
View file

@ -8,10 +8,6 @@ module frr-pim-rp {
prefix "inet";
}
import ietf-routing-types {
prefix "rt-types";
}
import frr-routing {
prefix "frr-rt";
}
@ -20,6 +16,10 @@ module frr-pim-rp {
prefix "frr-pim";
}
import frr-route-types {
prefix frr-route-types;
}
organization
"FRRouting";
@ -63,37 +63,6 @@ module frr-pim-rp {
"RFC XXXX: A YANG Data Model for PIM RP";
}
typedef ipv4-multicast-group-address-prefix {
type inet:ipv4-prefix{
pattern '(2((2[4-9])|(3[0-9]))\.)(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){2}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(/(([4-9])|([1-2][0-9])|(3[0-2])))';
}
description
"This type represents an IPv4 multicast group prefix,
which is in the range from 224.0.0.0 to 239.255.255.255.";
}
typedef ipv6-multicast-group-address-prefix {
type inet:ipv6-prefix {
pattern
'(((FF|ff)[0-9a-fA-F]{2}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/((1[6-9])|([2-9][0-9])|(1[0-1][0-9])|(12[0-8])))';
pattern
'(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(/.+)';
}
description
"This type represents an IPv6 multicast group prefix,
which is in the range of FF00::/8.";
}
typedef ip-multicast-group-address-prefix {
description "The IP-Multicast-Group-Address-Prefix type represents an IP multicast address
prefix and is IP version neutral. The format of the textual representations implies the IP
version. It includes a prefix-length, separated by a '/' sign.";
type union {
type ipv4-multicast-group-address-prefix;
type ipv6-multicast-group-address-prefix;
}
} // typedef ip-multicast-group-address-prefix
typedef plist-ref {
type string;
}
@ -124,7 +93,7 @@ module frr-pim-rp {
description "Use group-list or prefix-list";
case group-list {
leaf-list group-list{
type ip-multicast-group-address-prefix;
type frr-route-types:ip-multicast-group-prefix;
description
"List of multicast group address.";
}

35
yang/frr-route-types.yang
View file

@ -3,6 +3,10 @@ module frr-route-types {
namespace "http://frrouting.org/yang/route-types";
prefix frr-route-types;
import ietf-inet-types {
prefix inet;
}
organization
"FRRouting";
contact
@ -145,4 +149,35 @@ module frr-route-types {
type frr-route-types-v6;
}
}
typedef ipv4-multicast-group-prefix {
type inet:ipv4-prefix {
pattern '(2((2[4-9])|(3[0-9]))\.)(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){2}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(/(([4-9])|([1-2][0-9])|(3[0-2])))';
}
description
"This type represents an IPv4 multicast group prefix,
which is in the range from 224.0.0.0 to 239.255.255.255.";
}
typedef ipv6-multicast-group-prefix {
type inet:ipv6-prefix {
pattern
'(((FF|ff)[0-9a-fA-F]{2}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/((1[6-9])|([2-9][0-9])|(1[0-1][0-9])|(12[0-8])))';
pattern
'(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(/.+)';
}
description
"This type represents an IPv6 multicast group prefix,
which is in the range of FF00::/8.";
}
typedef ip-multicast-group-prefix {
description "The IP-Multicast-Group-Address-Prefix type represents an IP multicast address
prefix and is IP version neutral. The format of the textual representations implies the IP
version. It includes a prefix-length, separated by a '/' sign.";
type union {
type ipv4-multicast-group-prefix;
type ipv6-multicast-group-prefix;
}
}
}