pimd: fix dr-priority range

0 is a valid DR priority.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit b564c1d890aef75067db22df09e608faf72b99f5)

diff --git a/doc/user/pim.rst b/doc/user/pim.rst
index 80a6a2787c8372a56a89b4e1cab45169f878ca9d..b19bb9d1b3ad7f005356ad5900a845671451ce5b 100644 (file)
--- a/doc/user/pim.rst
+++ b/doc/user/pim.rst
@@ -211,7 +211,7 @@ is in a vrf, enter the interface command with the vrf keyword at the end.
    messages. This is enabled by default. 'no' form of this command is used to
    restrict processing of unicast bsm messages on this interface.
 
-.. clicmd:: ip pim drpriority (1-4294967295)
+.. clicmd:: ip pim drpriority (0-4294967295)
 
    Set the DR Priority for the interface. This command is useful to allow the
    user to influence what node becomes the DR for a lan segment.

diff --git a/doc/user/pimv6.rst b/doc/user/pimv6.rst
index d550c8e89ca9ab2d9a0912a1a63e38517fd5bcc0..b8567e4863ae8f6c110df025da0e661b876a13b4 100644 (file)
--- a/doc/user/pimv6.rst
+++ b/doc/user/pimv6.rst
@@ -135,7 +135,7 @@ is in a vrf, enter the interface command with the vrf keyword at the end.
    command will not do anything if you do not have the underlying ability
    of a mlag implementation.
 
-.. clicmd:: ipv6 pim drpriority (1-4294967295)
+.. clicmd:: ipv6 pim drpriority (0-4294967295)
 
    Set the DR Priority for the interface. This command is useful to allow the
    user to influence what node becomes the DR for a lan segment.

diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c
index 4db11572d8ebb330e29d0d6ae478adc07e9ba707..ec912700d193bd6a8a293703ee775aa691563592 100644 (file)
--- a/pimd/pim6_cmd.c
+++ b/pimd/pim6_cmd.c
@@ -244,7 +244,7 @@ DEFPY (interface_no_ipv6_pim,
 
 DEFPY (interface_ipv6_pim_drprio,
        interface_ipv6_pim_drprio_cmd,
-       "ipv6 pim drpriority (1-4294967295)",
+       "ipv6 pim drpriority (0-4294967295)",
        IPV6_STR
        PIM_STR
        "Set the Designated Router Election Priority\n"
@@ -255,7 +255,7 @@ DEFPY (interface_ipv6_pim_drprio,
 
 DEFPY (interface_no_ipv6_pim_drprio,
        interface_no_ipv6_pim_drprio_cmd,
-       "no ipv6 pim drpriority [(1-4294967295)]",
+       "no ipv6 pim drpriority [(0-4294967295)]",
        NO_STR
        IPV6_STR
        PIM_STR

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index be36a07687e8091611c013b136549b9ca2a4d689..c3528e27538d2fc22dc94f02a6b017e1c36cfb42 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -3953,7 +3953,7 @@ DEFUN (interface_no_ip_igmp_last_member_query_interval,
 
 DEFUN (interface_ip_pim_drprio,
        interface_ip_pim_drprio_cmd,
-       "ip pim drpriority (1-4294967295)",
+       "ip pim drpriority (0-4294967295)",
        IP_STR
        PIM_STR
        "Set the Designated Router Election Priority\n"
@@ -3966,7 +3966,7 @@ DEFUN (interface_ip_pim_drprio,
 
 DEFUN (interface_no_ip_pim_drprio,
        interface_no_ip_pim_drprio_cmd,
-       "no ip pim drpriority [(1-4294967295)]",
+       "no ip pim drpriority [(0-4294967295)]",
        NO_STR
        IP_STR
        PIM_STR

diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang
index e9b3f675073d5f1cb2fa81ad80ff94b13a7110e5..732a38a9e3aee7576dcf16a26a831128a922eea7 100644 (file)
--- a/yang/frr-pim.yang
+++ b/yang/frr-pim.yang
@@ -422,9 +422,7 @@ module frr-pim {
     }
 
     leaf dr-priority {
-      type uint32 {
-        range "1..max";
-      }
+      type uint32;
       default 1;
       description
         "DR (Designated Router) priority";