diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-12-03 22:24:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 22:24:21 +0100 |
| commit | d3e79428d7377ba4a5572f1bea6aba8ea26ba8d2 (patch) | |
| tree | b3e56650a59e5bd91a703035e189d51143da5b0b /ospfd | |
| parent | Merge pull request #7661 from volta-networks/fix_ldpsync_hello_timeout (diff) | |
| parent | ospfd: fix cosmetic show ip ospf when NSSA (diff) | |
| download | frr-d3e79428d7377ba4a5572f1bea6aba8ea26ba8d2.tar.xz frr-d3e79428d7377ba4a5572f1bea6aba8ea26ba8d2.zip | |
Merge pull request #7618 from ckishimo/nssa_role
ospfd: fix cosmetic show ip ospf when NSSA
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_vty.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index d6186fc7b..91a29f7d6 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -2702,6 +2702,10 @@ static void show_ip_ospf_area(struct vty *vty, struct ospf_area *area, json_object_boolean_true_add( json_area, "nssaTranslatorAlways"); + else + json_object_boolean_true_add( + json_area, + "nssaTranslatorNever"); } else { json_object_boolean_true_add(json_area, "abr"); if (area->NSSATranslatorRole @@ -2716,29 +2720,32 @@ static void show_ip_ospf_area(struct vty *vty, struct ospf_area *area, } } else { vty_out(vty, - " It is an NSSA configuration. \n Elected NSSA/ABR performs type-7/type-5 LSA translation. \n"); + " It is an NSSA configuration.\n Elected NSSA/ABR performs type-7/type-5 LSA translation.\n"); if (!IS_OSPF_ABR(area->ospf)) vty_out(vty, - " It is not ABR, therefore not Translator. \n"); + " It is not ABR, therefore not Translator.\n"); else if (area->NSSATranslatorState) { vty_out(vty, " We are an ABR and "); if (area->NSSATranslatorRole == OSPF_NSSA_ROLE_CANDIDATE) vty_out(vty, - "the NSSA Elected Translator. \n"); + "the NSSA Elected Translator.\n"); else if (area->NSSATranslatorRole == OSPF_NSSA_ROLE_ALWAYS) vty_out(vty, - "always an NSSA Translator. \n"); + "always an NSSA Translator.\n"); + else + vty_out(vty, + "never an NSSA Translator.\n"); } else { vty_out(vty, " We are an ABR, but "); if (area->NSSATranslatorRole == OSPF_NSSA_ROLE_CANDIDATE) vty_out(vty, - "not the NSSA Elected Translator. \n"); + "not the NSSA Elected Translator.\n"); else vty_out(vty, - "never an NSSA Translator. \n"); + "never an NSSA Translator.\n"); } } } |