Merge pull request #8983 from mobash-rasool/pim-upstreaming-activity

pimd: Minor fixes for BSM Show CLI and Hold Timer CLI

diff --git a/doc/user/pim.rst b/doc/user/pim.rst
index 83d19d61880e768763fe65000b6074ce95d2ee4e..4b67326b3d70b40ff9f01060e03c771bed72eb93 100644 (file)
--- 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 a0f4fd0b233b934739afd043f6e8f5edb47e7148..ac9b15fb5211ce7caf965cb9f762dea8e67bf4a5 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1154,6 +1154,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 {
@@ -1308,6 +1314,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");
                }
        }
 
@@ -8771,7 +8786,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
@@ -8806,7 +8821,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 dfdbd6dee204e1fea5108d154a74d5673cdd5162..bd5e2150274c601cf73920e642eb1d4a980537ac 100644 (file)
--- a/pimd/pim_nb_config.c
+++ b/pimd/pim_nb_config.c
@@ -1613,7 +1613,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 48b1a30f2d8c4bb9f6a6d78c69ef9c0a8ad0aaa7..571173c62a2478e5cbddacca7e4b15351aa5d292 100644 (file)
--- 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 6329e45588990849249e144d74eafba4b7c1a156..f73776c1af13e99e7f66af1a089b1ace41d07478 100644 (file)
--- a/yang/frr-pim.yang
+++ b/yang/frr-pim.yang
@@ -351,8 +351,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";