From e83a19713dcb2d374defae560a499ae4d28ff475 Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 13 Jan 2020 16:00:33 -0500
Subject: [PATCH] zebra: Modify 'show nexthop-group rib ip|ipv6'

The zebra implementation of nexthop groups has
two types of nexthops groups currently.  Singleton
objects which have afi's and combined nexthop groups
that do not.  Specifically call this out in the code
to make this distinction.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---
 zebra/zebra_vty.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index c8b96011dc..ef6c4eb6f3 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1351,18 +1351,19 @@ DEFPY (show_interface_nexthop_group,
 
 DEFPY (show_nexthop_group,
        show_nexthop_group_cmd,
-       "show nexthop-group rib <(0-4294967295)$id|[<ip$v4|ipv6$v6>] [vrf <NAME$vrf_name|all$vrf_all>]>",
+       "show nexthop-group rib <(0-4294967295)$id|[singleton <ip$v4|ipv6$v6>] [vrf <NAME$vrf_name|all$vrf_all>]>",
        SHOW_STR
        "Show Nexthop Groups\n"
        "RIB information\n"
        "Nexthop Group ID\n"
+       "Show Singleton Nexthop-Groups\n"
        IP_STR
        IP6_STR
        VRF_FULL_CMD_HELP_STR)
 {
 
 	struct zebra_vrf *zvrf = NULL;
-	afi_t afi = 0;
+	afi_t afi = AFI_UNSPEC;
 
 	if (id)
 		return show_nexthop_group_id_cmd_helper(vty, id);
-- 
2.39.5