zebra: consistently order static route attributes

Everyone else displays them with nexthop-vrf last.

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

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index ea35c782fd703601f003f17ccbfb26c595801baf..44f77f84b150fc88955e5a60e9e42fae68cd6b5f 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -2295,6 +2295,13 @@ int static_config(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi,
                        if (si->distance != ZEBRA_STATIC_DISTANCE_DEFAULT)
                                vty_out(vty, " %d", si->distance);
 
+                       /* Label information */
+                       if (si->snh_label.num_labels)
+                               vty_out(vty, " label %s",
+                                       mpls_label2str(si->snh_label.num_labels,
+                                                      si->snh_label.label, buf,
+                                                      sizeof buf, 0));
+
                        if (si->nh_vrf_id != si->vrf_id) {
                                struct vrf *vrf;
 
@@ -2303,13 +2310,6 @@ int static_config(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi,
                                        (vrf) ? vrf->name : "Unknown");
                        }
 
-                       /* Label information */
-                       if (si->snh_label.num_labels)
-                               vty_out(vty, " label %s",
-                                       mpls_label2str(si->snh_label.num_labels,
-                                                      si->snh_label.label, buf,
-                                                      sizeof buf, 0));
-
                        vty_out(vty, "\n");
 
                        write = 1;