pim6d: Add ipv6 pim register-suppress-time CLI

Adding below CLI for pim6d
[no] ipv6 pim register-suppress-time (1-65535)

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>

diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c
index b8aac48ce9ae14ab59ed646fa1273840644cccee..06790d3d63ff4528a1ee977ad81f029c8a7a83c8 100644 (file)
--- a/pimd/pim6_cmd.c
+++ b/pimd/pim6_cmd.c
@@ -187,6 +187,29 @@ DEFPY (no_ipv6_pim_rp_keep_alive,
        return pim_process_no_rp_kat_cmd(vty);
 }
 
+DEFPY (ipv6_pim_register_suppress,
+       ipv6_pim_register_suppress_cmd,
+       "ipv6 pim register-suppress-time (1-65535)$rst",
+       IPV6_STR
+       PIM_STR
+       "Register Suppress Timer\n"
+       "Seconds\n")
+{
+       return pim_process_register_suppress_cmd(vty, rst_str);
+}
+
+DEFPY (no_ipv6_pim_register_suppress,
+       no_ipv6_pim_register_suppress_cmd,
+       "no ipv6 pim register-suppress-time [(1-65535)]",
+       NO_STR
+       IPV6_STR
+       PIM_STR
+       "Register Suppress Timer\n"
+       IGNORED_IN_NO_STR)
+{
+       return pim_process_no_register_suppress_cmd(vty);
+}
+
 void pim_cmd_init(void)
 {
        if_cmd_init(pim_interface_config_write);
@@ -203,4 +226,6 @@ void pim_cmd_init(void)
        install_element(CONFIG_NODE, &no_ipv6_pim_keep_alive_cmd);
        install_element(CONFIG_NODE, &ipv6_pim_rp_keep_alive_cmd);
        install_element(CONFIG_NODE, &no_ipv6_pim_rp_keep_alive_cmd);
+       install_element(CONFIG_NODE, &ipv6_pim_register_suppress_cmd);
+       install_element(CONFIG_NODE, &no_ipv6_pim_register_suppress_cmd);
 }

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 5568893a653be8a12225bb93ac0a28eb4935f172..76f90cdba7d0e1567d6e6396569398fc1afe8050 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -6821,23 +6821,15 @@ DEFUN (no_ip_pim_joinprune_time,
        return pim_process_no_join_prune_cmd(vty);
 }
 
-DEFUN (ip_pim_register_suppress,
+DEFPY (ip_pim_register_suppress,
        ip_pim_register_suppress_cmd,
-       "ip pim register-suppress-time (1-65535)",
+       "ip pim register-suppress-time (1-65535)$rst",
        IP_STR
        "pim multicast routing\n"
        "Register Suppress Timer\n"
        "Seconds\n")
 {
-       char xpath[XPATH_MAXLEN];
-
-       snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH,
-                "frr-routing:ipv4");
-       strlcat(xpath, "/register-suppress-time", sizeof(xpath));
-
-       nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, argv[3]->arg);
-
-       return nb_cli_apply_changes(vty, NULL);
+       return pim_process_register_suppress_cmd(vty, rst_str);
 }
 
 DEFUN (no_ip_pim_register_suppress,
@@ -6849,15 +6841,7 @@ DEFUN (no_ip_pim_register_suppress,
        "Register Suppress Timer\n"
        IGNORED_IN_NO_STR)
 {
-       char xpath[XPATH_MAXLEN];
-
-       snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH,
-                "frr-routing:ipv4");
-       strlcat(xpath, "/register-suppress-time", sizeof(xpath));
-
-       nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-
-       return nb_cli_apply_changes(vty, NULL);
+       return pim_process_no_register_suppress_cmd(vty);
 }
 
 DEFPY (ip_pim_rp_keep_alive,

diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c
index 1a1e11cfd7227776ad8b15cc0d6a9b74931e5c20..6adea54a611153591fc71b535f7ea7a4d7dacb31 100644 (file)
--- a/pimd/pim_cmd_common.c
+++ b/pimd/pim_cmd_common.c
@@ -300,3 +300,29 @@ int pim_process_no_rp_kat_cmd(struct vty *vty)
 
        return nb_cli_apply_changes(vty, NULL);
 }
+
+int pim_process_register_suppress_cmd(struct vty *vty, const char *rst)
+{
+       char xpath[XPATH_MAXLEN];
+
+       snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH,
+                FRR_PIM_AF_XPATH_VAL);
+       strlcat(xpath, "/register-suppress-time", sizeof(xpath));
+
+       nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, rst);
+
+       return nb_cli_apply_changes(vty, NULL);
+}
+
+int pim_process_no_register_suppress_cmd(struct vty *vty)
+{
+       char xpath[XPATH_MAXLEN];
+
+       snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH,
+                FRR_PIM_AF_XPATH_VAL);
+       strlcat(xpath, "/register-suppress-time", sizeof(xpath));
+
+       nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
+
+       return nb_cli_apply_changes(vty, NULL);
+}

diff --git a/pimd/pim_cmd_common.h b/pimd/pim_cmd_common.h
index 8cba5ae3ebea1c4c8ca6d2dbe9e134bd4c3a46e5..49fc6bcbebbc0c87faf82056d7eacfa52b0d3183 100644 (file)
--- a/pimd/pim_cmd_common.h
+++ b/pimd/pim_cmd_common.h
@@ -33,5 +33,7 @@ int pim_process_keepalivetimer_cmd(struct vty *vty, const char *kat);
 int pim_process_no_keepalivetimer_cmd(struct vty *vty);
 int pim_process_rp_kat_cmd(struct vty *vty, const char *rpkat);
 int pim_process_no_rp_kat_cmd(struct vty *vty);
+int pim_process_register_suppress_cmd(struct vty *vty, const char *rst);
+int pim_process_no_register_suppress_cmd(struct vty *vty);
 
 #endif /* PIM_CMD_COMMON_H */