vrrpd: add administrative shutdown option

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 449b2aca7dadb032b2ad7a9e59b85d0a02261486..3a9746d5a9df652ad8500156ba306892ea734294 100644 (file)
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -2013,6 +2013,9 @@ int vrrp_config_write_interface(struct vty *vty)
                        vr->version == 2 ? " version 2" : "");
                ++writes;
 
+               if (vr->shutdown && ++writes)
+                       vty_out(vty, " vrrp %" PRIu8 " shutdown\n", vr->vrid);
+
                if (!vr->preempt_mode && ++writes)
                        vty_out(vty, " no vrrp %" PRIu8 " preempt\n", vr->vrid);
 

diff --git a/vrrpd/vrrp_vty.c b/vrrpd/vrrp_vty.c
index 4f1d5dfa088cfc49521a1a8b5be57622a2d3346f..7dcae8d0058f95a5e3532111a79a3c65825a23f1 100644 (file)
--- a/vrrpd/vrrp_vty.c
+++ b/vrrpd/vrrp_vty.c
@@ -85,6 +85,34 @@ DEFPY(vrrp_vrid,
        return CMD_SUCCESS;
 }
 
+DEFPY(vrrp_shutdown,
+      vrrp_shutdown_cmd,
+      "[no] vrrp (1-255)$vrid shutdown",
+      NO_STR
+      VRRP_STR
+      VRRP_VRID_STR
+      "Force VRRP router into administrative shutdown\n")
+{
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+
+       struct vrrp_vrouter *vr;
+
+       VROUTER_GET_VTY(vty, ifp, vrid, vr);
+
+       if (!no) {
+               if (vr->v4->fsm.state != VRRP_STATE_INITIALIZE)
+                       vrrp_event(vr->v4, VRRP_EVENT_SHUTDOWN);
+               if (vr->v6->fsm.state != VRRP_STATE_INITIALIZE)
+                       vrrp_event(vr->v6, VRRP_EVENT_SHUTDOWN);
+               vr->shutdown = true;
+       } else {
+               vr->shutdown = false;
+               vrrp_check_start(vr);
+       }
+
+       return CMD_SUCCESS;
+}
+
 DEFPY(vrrp_priority,
       vrrp_priority_cmd,
       "[no] vrrp (1-255)$vrid priority (1-254)",
@@ -287,6 +315,7 @@ static void vrrp_show(struct vty *vty, struct vrrp_vrouter *vr)
        ttable_add_row(tt, "%s|%" PRIu8, "Protocol Version", vr->version);
        ttable_add_row(tt, "%s|%s", "Autoconfigured",
                       vr->autoconf ? "Yes" : "No");
+       ttable_add_row(tt, "%s|%s", "Shutdown", vr->shutdown ? "Yes" : "No");
        ttable_add_row(tt, "%s|%s", "Interface", vr->ifp->name);
        prefix_mac2str(&vr->v4->vmac, ethstr4, sizeof(ethstr4));
        prefix_mac2str(&vr->v6->vmac, ethstr6, sizeof(ethstr6));
@@ -435,6 +464,7 @@ void vrrp_vty_init(void)
        install_element(CONFIG_NODE, &debug_vrrp_cmd);
        install_element(CONFIG_NODE, &vrrp_autoconfigure_cmd);
        install_element(INTERFACE_NODE, &vrrp_vrid_cmd);
+       install_element(INTERFACE_NODE, &vrrp_shutdown_cmd);
        install_element(INTERFACE_NODE, &vrrp_priority_cmd);
        install_element(INTERFACE_NODE, &vrrp_advertisement_interval_cmd);
        install_element(INTERFACE_NODE, &vrrp_ip_cmd);