From: Donald Sharp <sharpd@nvidia.com>
Date: Tue, 10 Oct 2023 20:43:48 +0000 (-0400)
Subject: Revert "bgpd: add bgp default link-state command"
X-Git-Tag: frr-9.1-rc~15^2~11
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cb7df45e6a9baf1c5a5653afe93aa13636c30956;p=mirror%2Ffrr.git

Revert "bgpd: add bgp default link-state command"

This reverts commit 38a7e20fc98ed750d9b2cdae1c79d1e19ceadcd3.

(cherry picked from commit 7679d6056b96f707c01157fe5cefab06a7a6392b)
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 636792f6bb..c70bcb241a 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -465,8 +465,6 @@ afi_t bgp_vty_afi_from_str(const char *afi_str)
 		afi = AFI_IP6;
 	else if (strmatch(afi_str, "l2vpn"))
 		afi = AFI_L2VPN;
-	else if (strmatch(afi_str, "link-state"))
-		afi = AFI_LINKSTATE;
 	return afi;
 }
 
@@ -486,10 +484,6 @@ int argv_find_and_parse_afi(struct cmd_token **argv, int argc, int *index,
 		ret = 1;
 		if (afi)
 			*afi = AFI_L2VPN;
-	} else if (argv_find(argv, argc, "link-state", index)) {
-		ret = 1;
-		if (afi)
-			*afi = AFI_LINKSTATE;
 	}
 	return ret;
 }
@@ -545,10 +539,6 @@ int argv_find_and_parse_safi(struct cmd_token **argv, int argc, int *index,
 		ret = 1;
 		if (safi)
 			*safi = SAFI_FLOWSPEC;
-	} else if (argv_find(argv, argc, "link-state", index)) {
-		ret = 1;
-		if (safi)
-			*safi = SAFI_LINKSTATE;
 	}
 	return ret;
 }
@@ -4212,7 +4202,6 @@ DEFPY(bgp_default_afi_safi, bgp_default_afi_safi_cmd,
       "ipv6-vpn|"
       "ipv6-labeled-unicast|"
       "ipv6-flowspec|"
-      "link-state|"
       "l2vpn-evpn>$afi_safi",
       NO_STR
       BGP_STR
@@ -4227,7 +4216,6 @@ DEFPY(bgp_default_afi_safi, bgp_default_afi_safi_cmd,
       "Activate ipv6-vpn for a peer by default\n"
       "Activate ipv6-labeled-unicast for a peer by default\n"
       "Activate ipv6-flowspec for a peer by default\n"
-      "Activate link-state for a peer by default\n"
       "Activate l2vpn-evpn for a peer by default\n")
 {
 	VTY_DECLVAR_CONTEXT(bgp, bgp);
@@ -4237,14 +4225,9 @@ DEFPY(bgp_default_afi_safi, bgp_default_afi_safi_cmd,
 	strlcpy(afi_safi_str, afi_safi, sizeof(afi_safi_str));
 	char *afi_str = strtok_r(afi_safi_str, "-", &afi_safi_str_tok);
 	char *safi_str = strtok_r(NULL, "-", &afi_safi_str_tok);
-	afi_t afi;
+	afi_t afi = bgp_vty_afi_from_str(afi_str);
 	safi_t safi;
 
-	if (strmatch(afi_safi, "link-state"))
-		afi = bgp_vty_afi_from_str("link-state");
-	else
-		afi = bgp_vty_afi_from_str(afi_str);
-
 	/*
 	 * Impossible situation but making coverity happy
 	 */
@@ -4252,8 +4235,6 @@ DEFPY(bgp_default_afi_safi, bgp_default_afi_safi_cmd,
 
 	if (strmatch(safi_str, "labeled"))
 		safi = bgp_vty_safi_from_str("labeled-unicast");
-	else if (strmatch(afi_safi, "link-state"))
-		safi = bgp_vty_safi_from_str("link-state");
 	else
 		safi = bgp_vty_safi_from_str(safi_str);