diff options
| author | Rafael Zalamena <rzalamena@users.noreply.github.com> | 2024-12-16 13:57:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-16 13:57:31 +0100 |
| commit | 3bebb7be9204a51f194317438aa883f1b10c8646 (patch) | |
| tree | 6e4e508a35f6d03491661b25b645008d8ae7dd5a /yang | |
| parent | Merge pull request #17645 from donaldsharp/support_bundle_rip (diff) | |
| parent | doc: Clean up Multicast RIB documentation (diff) | |
| download | frr-3bebb7be9204a51f194317438aa883f1b10c8646.tar.xz frr-3bebb7be9204a51f194317438aa883f1b10c8646.zip | |
Merge pull request #17252 from nabahr/mcast-mode
Fix PIMD RPF lookup mode and nexthop tracking
Diffstat (limited to 'yang')
| -rw-r--r-- | yang/frr-pim.yang | 54 | ||||
| -rw-r--r-- | yang/frr-zebra.yang | 47 |
2 files changed, 51 insertions, 50 deletions
diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang index 5fd7e66a3..8dadf4fd7 100644 --- a/yang/frr-pim.yang +++ b/yang/frr-pim.yang @@ -83,6 +83,47 @@ module frr-pim { } /* + * Multicast RPF mode configurable type + */ + + typedef mcast-rpf-lookup-mode { + type enumeration { + enum "none" { + value 0; + description + "No mode set."; + } + enum "mrib-only" { + value 1; + description + "Lookup in unicast RIB only."; + } + enum "urib-only" { + value 2; + description + "Lookup in multicast RIB only."; + } + enum "mrib-then-urib" { + value 3; + description + "Try multicast RIB first, fall back to unicast RIB."; + } + enum "lower-distance" { + value 4; + description + "Lookup both unicast and mcast, use entry with lower distance."; + } + enum "longer-prefix" { + value 5; + description + "Lookup both unicast and mcast, use entry with longer prefix."; + } + } + description + "Multicast RPF lookup behavior"; + } + + /* * Groupings */ @@ -161,20 +202,27 @@ module frr-pim { description "A grouping defining per address family pim global attributes"; + leaf mcast-rpf-lookup { + type mcast-rpf-lookup-mode; + default "none"; + description + "Multicast RPF lookup behavior."; + } + leaf ecmp { type boolean; default "false"; description "Enable PIM ECMP."; } - + leaf ecmp-rebalance { type boolean; default "false"; description "Enable PIM ECMP Rebalance."; } - + leaf keep-alive-timer { type uint16 { range "1..max"; @@ -183,7 +231,7 @@ module frr-pim { description "Keep alive Timer in seconds."; } - + leaf rp-keep-alive-timer { type uint16 { range "1..max"; diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang index f97a4cc12..a3c066c56 100644 --- a/yang/frr-zebra.yang +++ b/yang/frr-zebra.yang @@ -157,47 +157,6 @@ module frr-zebra { "Zebra interface type gre."; } - /* - * Multicast RPF mode configurable type - */ - - typedef mcast-rpf-lookup-mode { - type enumeration { - enum "none" { - value 0; - description - "No mode set."; - } - enum "mrib-only" { - value 1; - description - "Lookup in unicast RIB only."; - } - enum "urib-only" { - value 2; - description - "Lookup in multicast RIB only."; - } - enum "mrib-then-urib" { - value 3; - description - "Try multicast RIB first, fall back to unicast RIB."; - } - enum "lower-distance" { - value 4; - description - "Lookup both unicast and mcast, use entry with lower distance."; - } - enum "longer-prefix" { - value 5; - description - "Lookup both unicast and mcast, use entry with longer prefix."; - } - } - description - "Multicast RPF lookup behavior"; - } - // End of ip6-route /* * VxLAN Network Identifier type @@ -2883,12 +2842,6 @@ module frr-zebra { container zebra { description "Data model for the Zebra daemon."; - leaf mcast-rpf-lookup { - type frr-zebra:mcast-rpf-lookup-mode; - default "mrib-then-urib"; - description - "Multicast RPF lookup behavior."; - } leaf ip-forwarding { type boolean; description |