From: Don Slice <dslice@cumulusnetworks.com>
Date: Tue, 29 Mar 2016 19:43:57 +0000 (+0000)
Subject: zebra: Use vrf name instead of vrf-id for router-id definition
X-Git-Tag: frr-2.0-rc1~1029
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1d75f88306ee450c4a3b4f4d68060e189d3a37e9;p=mirror%2Ffrr.git

zebra: Use vrf name instead of vrf-id for router-id definition

Changed display/saving of global router-id to use the vrf name instead
of the vrf_id, since the vrf_id would get lost on quagga restart or
reboot.

Ticket: CM-10106
Signed-off-by: Don Slice
Reviewed-by: Donald Sharp
---

diff --git a/zebra/router-id.c b/zebra/router-id.c
index 3277dd1780..968fbc677d 100644
--- a/zebra/router-id.c
+++ b/zebra/router-id.c
@@ -206,9 +206,9 @@ router_id_write (struct vty *vty)
                      inet_ntoa (zvrf->rid_user_assigned.u.prefix4),
                      VTY_NEWLINE);
           else
-            vty_out (vty, "router-id %s vrf %u%s",
+            vty_out (vty, "router-id %s vrf %s%s",
                      inet_ntoa (zvrf->rid_user_assigned.u.prefix4),
-                     zvrf->vrf_id,
+                     zvrf->name,
                      VTY_NEWLINE);
         }
 }