Merge pull request #9175 from FRRouting/mergify/bp/stable/8.0/pr-8983

pimd: Minor fixes for BSM Show CLI and Hold Timer CLI (backport #8983)

5 files changed, 25 insertions, 10 deletions

diff --git a/doc/user/pim.rst b/doc/user/pim.rst
index 103760933c..d05d3fdb19 100644
--- a/doc/user/pim.rst
+++ b/doc/user/pim.rst
@@ -199,7 +199,7 @@ is in a vrf, enter the interface command with the vrf keyword at the end.
    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.
 
-.. clicmd:: ip pim hello (1-180) (1-180)
+.. clicmd:: ip pim hello (1-180) (1-630)
 
    Set the pim hello and hold interval for a interface.
 
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index f6072b1771..e6806bbbda 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1135,6 +1135,12 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
 			json_object_int_add(
 				json_row, "overrideIntervalHighest",
 				pim_ifp->pim_neighbors_highest_override_interval_msec);
+			if (pim_ifp->bsm_enable)
+				json_object_boolean_true_add(json_row,
+							     "bsmEnabled");
+			if (pim_ifp->ucast_bsm_accept)
+				json_object_boolean_true_add(json_row,
+							     "ucastBsmEnabled");
 			json_object_object_add(json, ifp->name, json_row);
 
 		} else {
@@ -1289,6 +1295,15 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
 				pim_ifp->pim_neighbors_highest_override_interval_msec);
 			vty_out(vty, "\n");
 			vty_out(vty, "\n");
+
+			vty_out(vty, "BSM Status\n");
+			vty_out(vty, "----------\n");
+			vty_out(vty, "Bsm Enabled          : %s\n",
+				pim_ifp->bsm_enable ? "yes" : "no");
+			vty_out(vty, "Unicast Bsm Enabled  : %s\n",
+				pim_ifp->ucast_bsm_accept ? "yes" : "no");
+			vty_out(vty, "\n");
+			vty_out(vty, "\n");
 		}
 	}
 
@@ -8705,7 +8720,7 @@ DEFUN (interface_no_ip_mroute,
 
 DEFUN (interface_ip_pim_hello,
        interface_ip_pim_hello_cmd,
-       "ip pim hello (1-180) [(1-180)]",
+       "ip pim hello (1-180) [(1-630)]",
        IP_STR
        PIM_STR
        IFACE_PIM_HELLO_STR
@@ -8740,7 +8755,7 @@ DEFUN (interface_ip_pim_hello,
 
 DEFUN (interface_no_ip_pim_hello,
        interface_no_ip_pim_hello_cmd,
-       "no ip pim hello [(1-180) [(1-180)]]",
+       "no ip pim hello [(1-180) [(1-630)]]",
        NO_STR
        IP_STR
        PIM_STR
diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c
index 11e8da3b87..c13165a706 100644
--- a/pimd/pim_nb_config.c
+++ b/pimd/pim_nb_config.c
@@ -1851,7 +1851,7 @@ int lib_interface_pim_hello_holdtime_modify(struct nb_cb_modify_args *args)
 		ifp = nb_running_get_entry(args->dnode, NULL, true);
 		pim_ifp = ifp->info;
 		pim_ifp->pim_default_holdtime =
-			yang_dnode_get_uint8(args->dnode, NULL);
+			yang_dnode_get_uint16(args->dnode, NULL);
 		break;
 	}
 
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index 48b1a30f2d..571173c62a 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -350,8 +350,8 @@ pim_neighbor_new(struct interface *ifp, struct in_addr source_addr,
 			   __func__, src_str, ifp->name);
 	}
 
-	zlog_info("PIM NEIGHBOR UP: neighbor %s on interface %s", src_str,
-		  ifp->name);
+	zlog_notice("PIM NEIGHBOR UP: neighbor %s on interface %s", src_str,
+		    ifp->name);
 
 	if (neigh->propagation_delay_msec
 	    > pim_ifp->pim_neighbors_highest_propagation_delay_msec) {
@@ -616,8 +616,8 @@ void pim_neighbor_delete(struct interface *ifp, struct pim_neighbor *neigh,
 	assert(pim_ifp);
 
 	pim_inet4_dump("<src?>", neigh->source_addr, src_str, sizeof(src_str));
-	zlog_info("PIM NEIGHBOR DOWN: neighbor %s on interface %s: %s", src_str,
-		  ifp->name, delete_message);
+	zlog_notice("PIM NEIGHBOR DOWN: neighbor %s on interface %s: %s",
+		    src_str, ifp->name, delete_message);
 
 	THREAD_OFF(neigh->t_expire_timer);
 
diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang
index 70adb37b26..7f833a8057 100644
--- a/yang/frr-pim.yang
+++ b/yang/frr-pim.yang
@@ -291,8 +291,8 @@ module frr-pim {
     }
 
     leaf hello-holdtime {
-      type uint8 {
-        range "1..180";
+      type uint16 {
+        range "1..630";
       }
       must ". > ./../hello-interval" {
       error-message "HoldTime must be greater than Hello";