zebra: show nexthop count in nexthop-group command

Show the nexthops count in an NHG

Signed-off-by: Krishnasamy <krishnasamyr@nvidia.com>

Author: krishna-samy

lib/nexthop_group.c

@@ -81,7 +81,7 @@ uint16_t nexthop_group_nexthop_num(const struct nexthop_group *nhg)
 	return num;
 }
 
-static uint16_t nexthop_group_nexthop_num_no_recurse(const struct nexthop_group *nhg)
+uint16_t nexthop_group_nexthop_num_no_recurse(const struct nexthop_group *nhg)
 {
 	struct nexthop *nhop;
 	uint16_t num = 0;

lib/nexthop_group.h

@@ -153,6 +153,7 @@ extern uint16_t nexthop_group_nexthop_num(const struct nexthop_group *nhg);
 extern uint16_t nexthop_group_active_nexthop_num(const struct nexthop_group *nhg);
 
 extern bool nexthop_group_has_label(const struct nexthop_group *nhg);
+extern uint16_t nexthop_group_nexthop_num_no_recurse(const struct nexthop_group *nhg);
 
 #ifdef __cplusplus
 }

zebra/zebra_vty.c

@@ -1071,13 +1071,16 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe,
 	json_object *json = NULL;
 	json_object *json_backup_nexthop_array = NULL;
 	json_object *json_backup_nexthops = NULL;
+	uint16_t nexthop_count = 0;
 
 
 	uptime2str(nhe->uptime, up_str, sizeof(up_str));
 
 	if (json_nhe_hdr)
 		json = json_object_new_object();
 
+	nexthop_count = nexthop_group_nexthop_num_no_recurse(&nhe->nhg);
+
 	if (json) {
 		json_object_string_add(json, "type",
 				       zebra_route_string(nhe->type));
@@ -1092,6 +1095,7 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe,
 		json_object_string_add(json, "vrf",
 				       vrf_id_to_name(nhe->vrf_id));
 		json_object_string_add(json, "afi", zebra_nhg_afi2str(nhe));
+		json_object_int_add(json, "nexthopCount", nexthop_count);
 
 	} else {
 		vty_out(vty, "ID: %u (%s)\n", nhe->id,
@@ -1107,6 +1111,7 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe,
 		vty_out(vty, "     Uptime: %s\n", up_str);
 		vty_out(vty, "     VRF: %s(%s)\n", vrf_id_to_name(nhe->vrf_id),
 			zebra_nhg_afi2str(nhe));
+		vty_out(vty, "     Nexthop Count: %u\n", nexthop_count);
 	}
 
 	if (CHECK_FLAG(nhe->flags, NEXTHOP_GROUP_VALID)) {