From d7ca63748140a9c5b76ba3a701e71552e17322d1 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Wed, 4 Apr 2018 15:23:05 -0400 Subject: [PATCH] zebra: consistently order static route attributes Everyone else displays them with nexthop-vrf last. Signed-off-by: Quentin Young --- zebra/zebra_vty.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index ea35c782fd..44f77f84b1 100644 --- 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; -- 2.39.5