Merge pull request FRRouting#6866 from chiragshah6/mdev

lib: yang afi-safi identityref translation

lib/yang_wrappers.c

@@ -1203,6 +1203,16 @@ const char *yang_afi_safi_value2identity(afi_t afi, safi_t safi)
 		return "frr-routing:ipv4-multicast";
 	if (afi == AFI_IP6 && safi == SAFI_MULTICAST)
 		return "frr-routing:ipv6-multicast";
+	if (afi == AFI_IP && safi == SAFI_MPLS_VPN)
+		return "frr-routing:l3vpn-ipv4-unicast";
+	if (afi == AFI_IP6 && safi == SAFI_MPLS_VPN)
+		return "frr-routing:l3vpn-ipv6-unicast";
+	if (afi == AFI_L2VPN && safi == SAFI_EVPN)
+		return "frr-routing:l2vpn-evpn";
+	if (afi == AFI_IP && safi == SAFI_LABELED_UNICAST)
+		return "frr-routing:ipv4-labeled-unicast";
+	if (afi == AFI_IP6 && safi == SAFI_LABELED_UNICAST)
+		return "frr-routing:ipv6-labeled-unicast";
 
 	return NULL;
 }
@@ -1221,6 +1231,21 @@ void yang_afi_safi_identity2value(const char *key, afi_t *afi, safi_t *safi)
 	} else if (strmatch(key, "frr-routing:ipv6-multicast")) {
 		*afi = AFI_IP6;
 		*safi = SAFI_MULTICAST;
+	} else if (strmatch(key, "frr-routing:l3vpn-ipv4-unicast")) {
+		*afi = AFI_IP;
+		*safi = SAFI_MPLS_VPN;
+	} else if (strmatch(key, "frr-routing:l3vpn-ipv6-unicast")) {
+		*afi = AFI_IP6;
+		*safi = SAFI_MPLS_VPN;
+	} else if (strmatch(key, "frr-routing:ipv4-labeled-unicast")) {
+		*afi = AFI_IP;
+		*safi = SAFI_LABELED_UNICAST;
+	} else if (strmatch(key, "frr-routing:ipv6-labeled-unicast")) {
+		*afi = AFI_IP6;
+		*safi = SAFI_LABELED_UNICAST;
+	} else if (strmatch(key, "frr-routing:l2vpn-evpn")) {
+		*afi = AFI_L2VPN;
+		*safi = SAFI_EVPN;
 	} else {
 		*afi = AFI_UNSPEC;
 		*safi = SAFI_UNSPEC;