zebra: Cl to frr upstream zebra json

lib/nexthop.c

@@ -1210,7 +1210,7 @@ bool nexthop_is_blackhole(const struct nexthop *nh)
  */
 void nexthop_json_helper(json_object *json_nexthop,
 			 const struct nexthop *nexthop, bool display_vrfid,
-			 uint8_t rn_family)
+			 uint8_t rn_family, bool brief)
 {
 	json_object *json_labels = NULL;
 	json_object *json_backups = NULL;
@@ -1220,20 +1220,23 @@ void nexthop_json_helper(json_object *json_nexthop,
 	json_object *json_segs = NULL;
 	int i;
 
-	json_object_int_add(json_nexthop, "flags", nexthop->flags);
+	if (!brief) {
+		json_object_int_add(json_nexthop, "flags", nexthop->flags);
 
-	if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_DUPLICATE))
-		json_object_boolean_true_add(json_nexthop, "duplicate");
+	        if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_DUPLICATE))
+			json_object_boolean_true_add(json_nexthop, "duplicate");
 
-	if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB))
-		json_object_boolean_true_add(json_nexthop, "fib");
+		if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB))
+			json_object_boolean_true_add(json_nexthop, "fib");
+	}
 
 	switch (nexthop->type) {
 	case NEXTHOP_TYPE_IPV4:
 	case NEXTHOP_TYPE_IPV4_IFINDEX:
 		json_object_string_addf(json_nexthop, "ip", "%pI4",
 					&nexthop->gate.ipv4);
-		json_object_string_add(json_nexthop, "afi", "ipv4");
+		if (!brief)
+			json_object_string_add(json_nexthop, "afi", "ipv4");
 
 		if (nexthop->ifindex) {
 			json_object_int_add(json_nexthop, "interfaceIndex",
@@ -1247,7 +1250,8 @@ void nexthop_json_helper(json_object *json_nexthop,
 	case NEXTHOP_TYPE_IPV6_IFINDEX:
 		json_object_string_addf(json_nexthop, "ip", "%pI6",
 					&nexthop->gate.ipv6);
-		json_object_string_add(json_nexthop, "afi", "ipv6");
+		if (!brief)
+			json_object_string_add(json_nexthop, "afi", "ipv6");
 
 		if (nexthop->ifindex) {
 			json_object_int_add(json_nexthop, "interfaceIndex",
@@ -1259,42 +1263,48 @@ void nexthop_json_helper(json_object *json_nexthop,
 		break;
 
 	case NEXTHOP_TYPE_IFINDEX:
-		json_object_boolean_true_add(json_nexthop, "directlyConnected");
+		if (!brief)
+			json_object_boolean_true_add(json_nexthop, "directlyConnected");
 		json_object_int_add(json_nexthop, "interfaceIndex",
 				    nexthop->ifindex);
 		json_object_string_add(json_nexthop, "interfaceName",
 				       ifindex2ifname(nexthop->ifindex,
 						      nexthop->vrf_id));
 		break;
 	case NEXTHOP_TYPE_BLACKHOLE:
-		json_object_boolean_true_add(json_nexthop, "unreachable");
-		switch (nexthop->bh_type) {
-		case BLACKHOLE_REJECT:
-			json_object_boolean_true_add(json_nexthop, "reject");
-			break;
-		case BLACKHOLE_ADMINPROHIB:
-			json_object_boolean_true_add(json_nexthop,
+		if (!brief) {
+			json_object_boolean_true_add(json_nexthop, "unreachable");
+			switch (nexthop->bh_type) {
+			case BLACKHOLE_REJECT:
+				json_object_boolean_true_add(json_nexthop, "reject");
+				break;
+			case BLACKHOLE_ADMINPROHIB:
+				json_object_boolean_true_add(json_nexthop,
 						     "adminProhibited");
-			break;
-		case BLACKHOLE_NULL:
-			json_object_boolean_true_add(json_nexthop, "blackhole");
-			break;
-		case BLACKHOLE_UNSPEC:
-			break;
+				break;
+			case BLACKHOLE_NULL:
+				json_object_boolean_true_add(json_nexthop, "blackhole");
+				break;
+			case BLACKHOLE_UNSPEC:
+				break;
+			}
 		}
 		break;
 	}
 
+	if (display_vrfid)
+		json_object_string_add(json_nexthop, "vrf",
+				       vrf_id_to_name(nexthop->vrf_id));
+        if (brief)
+		return;
+
 	/* This nexthop is a resolver for the parent nexthop.
 	 * Set resolver flag for better clarity and delimiter
 	 * in flat list of nexthops in json.
 	 */
 	if (nexthop->rparent)
 		json_object_boolean_true_add(json_nexthop, "resolver");
 
-	if (display_vrfid)
-		json_object_string_add(json_nexthop, "vrf",
-				       vrf_id_to_name(nexthop->vrf_id));
 	if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_DUPLICATE))
 		json_object_boolean_true_add(json_nexthop, "duplicate");
 

lib/nexthop.h

@@ -260,7 +260,7 @@ int nexthop_str2backups(const char *str, int *num_backups,
 
 void nexthop_json_helper(json_object *json_nexthop,
 			 const struct nexthop *nexthop, bool display_vrfid,
-			 uint8_t rn_family);
+			 uint8_t rn_family, bool brief);
 void nexthop_vty_helper(struct vty *vty, const struct nexthop *nexthop,
 			bool display_vrfid, uint8_t rn_family);
 

zebra/interface.c

@@ -2530,42 +2530,58 @@ static inline bool if_is_protodown_applicable(struct interface *ifp)
 	return true;
 }
 
-static void zebra_vxlan_if_vni_dump_vty(struct vty *vty,
+static void zebra_vxlan_if_vni_dump_vty(struct vty *vty, json_object *json_if,
 					struct zebra_vxlan_vni *vni)
 {
-	char str[INET6_ADDRSTRLEN];
+	json_object *json_vni;
+	char vni_str[VNI_STR_LEN];
+	char buf[PREFIX_STRLEN];
 
-	vty_out(vty, "  VxLAN Id %u", vni->vni);
-	if (vni->access_vlan)
-		vty_out(vty, " Access VLAN Id %u\n", vni->access_vlan);
+	if (vty) {
+		vty_out(vty, "\n  VxLAN Id %u", vni->vni);
+		if (vni->access_vlan)
+			vty_out(vty, " Access VLAN Id %u", vni->access_vlan);
 
-	if (vni->mcast_grp.s_addr != INADDR_ANY)
-		vty_out(vty, "  Mcast Group %s",
-			inet_ntop(AF_INET, &vni->mcast_grp, str, sizeof(str)));
+		if (vni->mcast_grp.s_addr != INADDR_ANY &&
+		    inet_ntop(AF_INET, &vni->mcast_grp, buf, sizeof(buf)) != NULL)
+			vty_out(vty, "\n  Mcast Group %s", buf);
+	} else if (json_if) {
+		json_vni = json_object_new_object();
+		snprintf(vni_str, sizeof(vni_str), "%u", vni->vni);
+		json_object_int_add(json_vni, "accessVlan", vni->access_vlan);
+		json_object_string_addf(json_vni, "mcastGroup", "%pI4",
+				&vni->mcast_grp);
+		json_object_object_add(json_if, vni_str, json_vni);
+	}
 }
 
 static void zebra_vxlan_if_vni_hash_dump_vty(struct hash_bucket *bucket,
-					     void *ctxt)
+					     void **args)
 {
-	struct vty *vty;
 	struct zebra_vxlan_vni *vni;
+	struct vty *vty;
+	json_object *json_if;
 
 	vni = (struct zebra_vxlan_vni *)bucket->data;
-	vty = (struct vty *)ctxt;
+	vty = (struct vty *)args[0];
+	json_if = (json_object *)args[1];
 
-	zebra_vxlan_if_vni_dump_vty(vty, vni);
+	zebra_vxlan_if_vni_dump_vty(vty, json_if, vni);
 }
 
 static void zebra_vxlan_if_dump_vty(struct vty *vty, struct zebra_if *zebra_if)
 {
 	struct zebra_l2info_vxlan *vxlan_info;
 	struct zebra_vxlan_vni_info *vni_info;
+	void *args[2];
+	char buf[PREFIX_STRLEN];
 
 	vxlan_info = &zebra_if->l2info.vxl;
 	vni_info = &vxlan_info->vni_info;
 
-	if (vxlan_info->vtep_ip.s_addr != INADDR_ANY)
-		vty_out(vty, " VTEP IP: %pI4", &vxlan_info->vtep_ip);
+	if (vxlan_info->vtep_ip.s_addr != INADDR_ANY &&
+	    inet_ntop(AF_INET, &vxlan_info->vtep_ip, buf, sizeof(buf)) != NULL)
+		vty_out(vty, "  VTEP IP: %s", buf);
 
 	if (vxlan_info->ifindex_link && (vxlan_info->link_nsid != NS_UNKNOWN)) {
 		struct interface *ifp;
@@ -2578,10 +2594,14 @@ static void zebra_vxlan_if_dump_vty(struct vty *vty, struct zebra_if *zebra_if)
 	}
 
 	if (IS_ZEBRA_VXLAN_IF_VNI(zebra_if)) {
-		zebra_vxlan_if_vni_dump_vty(vty, &vni_info->vni);
+		zebra_vxlan_if_vni_dump_vty(vty, NULL, &vni_info->vni);
 	} else {
+		args[0] = vty;
+		args[1] = NULL;
 		hash_iterate(vni_info->vni_table,
-			     zebra_vxlan_if_vni_hash_dump_vty, vty);
+			     (void (*)(struct hash_bucket *,
+				       void *))zebra_vxlan_if_vni_hash_dump_vty,
+			     args);
 	}
 
 	vty_out(vty, "\n");
@@ -2910,23 +2930,14 @@ static void zebra_vxlan_if_vni_dump_vty_json(json_object *json_if,
 					&vni->mcast_grp);
 }
 
-static void zebra_vxlan_if_vni_hash_dump_vty_json(struct hash_bucket *bucket,
-						  void *ctxt)
-{
-	json_object *json_if;
-	struct zebra_vxlan_vni *vni;
-
-	vni = (struct zebra_vxlan_vni *)bucket->data;
-	json_if = (json_object *)ctxt;
-
-	zebra_vxlan_if_vni_dump_vty_json(json_if, vni);
-}
-
 static void zebra_vxlan_if_dump_vty_json(json_object *json_if,
 					 struct zebra_if *zebra_if)
 {
 	struct zebra_l2info_vxlan *vxlan_info;
 	struct zebra_vxlan_vni_info *vni_info;
+	json_object *json_vnis = NULL;
+	uint32_t num_vnis;
+	void *args[2];
 
 	vxlan_info = &zebra_if->l2info.vxl;
 	vni_info = &vxlan_info->vni_info;
@@ -2944,12 +2955,23 @@ static void zebra_vxlan_if_dump_vty_json(json_object *json_if,
 		json_object_string_add(json_if, "linkInterface",
 				       ifp == NULL ? "Unknown" : ifp->name);
 	}
+
+	json_vnis = json_object_new_object();
 	if (IS_ZEBRA_VXLAN_IF_VNI(zebra_if)) {
 		zebra_vxlan_if_vni_dump_vty_json(json_if, &vni_info->vni);
 	} else {
-		hash_iterate(vni_info->vni_table,
-			     zebra_vxlan_if_vni_hash_dump_vty_json, json_if);
+		num_vnis = hashcount(vni_info->vni_table);
+		if (num_vnis) {
+			args[0] = NULL;
+			args[1] = json_vnis;
+			hash_iterate(vni_info->vni_table,
+				     (void (*)(struct hash_bucket *, void *))
+					     zebra_vxlan_if_vni_hash_dump_vty,
+				     args);
+		}
 	}
+
+	json_object_object_add(json_if, "vxlanId", json_vnis);
 }
 
 static void if_dump_vty_json(struct vty *vty, struct interface *ifp,
@@ -3091,7 +3113,6 @@ static void if_dump_vty_json(struct vty *vty, struct interface *ifp,
 		json_object_int_add(json_if, "vlanId", vlan_info->vid);
 	} else if (IS_ZEBRA_IF_VXLAN(ifp)) {
 		zebra_vxlan_if_dump_vty_json(json_if, zebra_if);
-
 	} else if (IS_ZEBRA_IF_GRE(ifp)) {
 		struct zebra_l2info_gre *gre_info;
 
@@ -3104,8 +3125,8 @@ static void if_dump_vty_json(struct vty *vty, struct interface *ifp,
 					json_if, "vtepRemoteIp", "%pI4",
 					&gre_info->vtep_ip_remote);
 		}
-		if (gre_info->ifindex_link
-		    && (gre_info->link_nsid != NS_UNKNOWN)) {
+		if (gre_info->ifindex_link &&
+		    (gre_info->link_nsid != NS_UNKNOWN)) {
 			struct interface *ifp;
 
 			ifp = if_lookup_by_index_per_ns(

zebra/zebra_evpn.c

@@ -109,6 +109,9 @@ void zebra_evpn_print(struct zebra_evpn *zevpn, void **ctxt)
 	} else {
 		json_object_int_add(json, "vni", zevpn->vni);
 		json_object_string_add(json, "type", "L2");
+		json_object_int_add(json, "vlan", zevpn->vid);
+		json_object_string_add(json, "bridge",
+				zevpn->bridge_if ? zevpn->bridge_if->name: "");
 		json_object_string_add(json, "tenantVrf", vrf_id_to_name(zevpn->vrf_id));
 	}
 

zebra/zebra_evpn_mh.c

@@ -3101,6 +3101,9 @@ static void zebra_evpn_es_show_entry(struct vty *vty, struct zebra_evpn_es *es,
 				json_array_string_add(json_flags, "local");
 			if (es->flags & ZEBRA_EVPNES_REMOTE)
 				json_array_string_add(json_flags, "remote");
+			if (es->flags & ZEBRA_EVPNES_LOCAL &&
+			    !(es->flags & ZEBRA_EVPNES_NON_DF))
+				json_array_string_add(json_flags, "df");
 			if (es->flags & ZEBRA_EVPNES_NON_DF)
 				json_array_string_add(json_flags, "nonDF");
 			if (es->flags & ZEBRA_EVPNES_BYPASS)

zebra/zebra_l2.h

@@ -38,6 +38,13 @@ struct zebra_l2_bridge_vlan {
 	struct zebra_evpn_access_bd *access_bd;
 };
 
+struct zebra_l2_brvlan_mac {
+	struct interface *br_if;
+	vlanid_t vid;
+	struct ethaddr macaddr;
+	ifindex_t ifindex;
+};
+
 struct zebra_l2_bridge_if_ctx {
 	/* input */
 	struct zebra_if *zif;
@@ -48,10 +55,23 @@ struct zebra_l2_bridge_if_ctx {
 	void *arg;
 };
 
+struct zebra_l2_brvlan_mac_ctx {
+	/* input */
+	struct interface *br_if;
+	vlanid_t vid;
+	int (*func)(struct interface *br_if, vlanid_t vid,
+		    struct ethaddr *macaddr, ifindex_t ifidx, void *arg);
+
+	/* input-output */
+	void *arg;
+	struct json_object *json; /* Used for JSON Output */
+};
+
 struct zebra_l2_bridge_if {
 	uint8_t vlan_aware;
 	struct zebra_if *br_zif;
 	struct hash *vlan_table;
+	struct hash *mac_table[VLANID_MAX];
 };
 
 /* zebra L2 interface information - bridge interface */