]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd: fix pim ecmp rebalance config write
authorChirag Shah <chirag@cumulusnetworks.com>
Mon, 10 Apr 2017 20:27:56 +0000 (13:27 -0700)
committerChirag Shah <chirag@cumulusnetworks.com>
Sun, 7 May 2017 00:38:18 +0000 (17:38 -0700)
ip pim ecmp and ip pim ecmp rebalance configuration CLIs were
not adding to Quagga.confg or running configuration.
Added both the configuration write in Config write handler.

Testing Done: Execute configuration cli and verified running config
and Quagga.conf file containing both configuration.

03# show running-config
Building configuration...

Current configuration:
!
ip multicast-routing
ip pim rp 6.0.0.9 230.0.0.0/16
ip pim join-prune-interval 61
ip pim ecmp
ip pim ecmp rebalance
!

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
pimd/pim_cmd.c
pimd/pim_vty.c

index d40ff0fe30464ba764d35654eb4c912f9ed50468..1224bc5fc80223b9da14d172784a79d6de848915 100644 (file)
@@ -4085,6 +4085,7 @@ DEFUN (ip_pim_ecmp_rebalance,
        "Enable PIM ECMP \n"
        "Enable PIM ECMP Rebalance\n")
 {
+  qpim_ecmp_enable = 1;
   qpim_ecmp_rebalance_enable = 1;
 
   return CMD_SUCCESS;
index c8322b629a8907c36f3ea580fdb5a40ed3d035f5..754cf8468b415569b7cd079fd0a02ff147a4c343 100644 (file)
@@ -192,7 +192,16 @@ int pim_global_config_write(struct vty *vty)
                  VTY_NEWLINE);
       ++writes;
     }
-
+  if (qpim_ecmp_rebalance_enable)
+    {
+      vty_out (vty, "ip pim ecmp rebalance%s", VTY_NEWLINE);
+      ++writes;
+    }
+  else if (qpim_ecmp_enable)
+    {
+      vty_out (vty, "ip pim ecmp%s", VTY_NEWLINE);
+      ++writes;
+    }
   if (qpim_ssmpingd_list) {
     struct listnode *node;
     struct ssmpingd_sock *ss;