Merge pull request #16261 from chiragshah6/evpn_dev4

zebra: clear evpn dup-addr return error-msg when there is no vni
FRRouting · Jun 25, 2024 · 67421ba · 67421ba
2 parents 3178350 + 56c16ee
commit 67421ba
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/zebra/zebra_nb_rpcs.c b/zebra/zebra_nb_rpcs.c
@@ -12,6 +12,8 @@
 #include "zebra/zebra_router.h"
 #include "zebra/zebra_vrf.h"
 #include "zebra/zebra_vxlan.h"
+#include "zebra/zebra_vxlan_if.h"
+#include "zebra/zebra_evpn.h"
 
 /*
  * XPath: /frr-zebra:clear-evpn-dup-addr
@@ -21,6 +23,11 @@ int clear_evpn_dup_addr_rpc(struct nb_cb_rpc_args *args)
 	struct zebra_vrf *zvrf;
 	int ret = NB_OK;
 
+	if (!is_evpn_enabled()) {
+		snprintf(args->errmsg, args->errmsg_len,
+			 "%% EVPN not enabled\n");
+		return NB_ERR_VALIDATION;
+	}
 	zvrf = zebra_vrf_get_evpn();
 
 	if (yang_dnode_exists(args->input, "all-vnis")) {
@@ -30,6 +37,12 @@ int clear_evpn_dup_addr_rpc(struct nb_cb_rpc_args *args)
 		struct ipaddr host_ip = {.ipa_type = IPADDR_NONE};
 		struct ethaddr mac;
 
+		if (!zebra_evpn_lookup(vni)) {
+			snprintf(args->errmsg, args->errmsg_len,
+				 "%% VNI %u does not exist\n", vni);
+			return NB_ERR_VALIDATION;
+		}
+
 		if (yang_dnode_exists(args->input, "mac-addr")) {
 			yang_dnode_get_mac(&mac, args->input, "mac-addr");
 			ret = zebra_vxlan_clear_dup_detect_vni_mac(zvrf, vni,