evpn-netns: Revert PR5077, has been re-worked post-refactor

Revert "zebra: support for macvlan interfaces"

This reverts commit bf69e212fd053af3298fc3cba38458b396467849.

Revert "doc: add some documentation about bgp evpn netns support"

This reverts commit 89b97c33d7a6d9dc427d56fea52fa27334dde81d.

Revert "zebra: dynamically detect vxlan link interfaces in other netns"

This reverts commit de0ebb25404fe984f084a0d57b7f873618423876.

Revert "bgpd: sanity check when updating nexthop from bgp to zebra"

This reverts commit ee9633ed87f0ff5da1373a42d6c044f0a682c8d3.

Revert "lib, zebra: reuse and adapt ns_list walk functionality"

This reverts commit c4d466c830083e8ba58881d7ad03a90f6baf0754.

Revert "zebra: local mac entries populated in correct netnamespace"

This reverts commit 40424548910887f3bbbf544ce964d3b736048ae5.

Revert "zebra: when parsing local entry against dad, retrieve config"

This reverts commit 3acc394bc5e5c225e9258fd0d57a6cebea0c0ccd.

Revert "bgpd: evpn nexthop can be changed by default"

This reverts commit a2342a241253c41b798845cae155b4caab4bcda5.

Revert "zebra: zvni_map_to_vlan() adaptation for all namespaces"

This reverts commit db81d18647bbd81a2c335620c9a03e32e4a5b2be.

Revert "zebra: add ns_id attribute to mac structure"

This reverts commit 388d5b438e22cddc6740e362763c0922edbb242a.

Revert "zebra: bridge layer2 information records ns_id where bridge is"

This reverts commit b5b453a2d6af58692bee0e256fe1dffe99824801.

Revert "zebra, lib: new API to get absolute netns val from relative netns val"

This reverts commit b6ebab34f664ba1cc9479fc1287f127c12077509.

Revert "zebra, lib: store relative default ns id in each namespace"

This reverts commit 9d3555e06ccc68fe37e0a00100029ac4bad8dee2.

Revert "zebra, lib: add an internal API to get relative default nsid in other ns"

This reverts commit 97c9e7533bd22029ac19838c043cfca82d2f6eb3.

Revert "zebra: map vxlan interface to bridge interface with correct ns id"

This reverts commit 7c990878f20efff335c1211deda3ec50071ae2b5.

Revert "zebra: fdb and neighbor table are read for all zns"

This reverts commit f8ed2c5420106314a940cb67264494e0110fc4c0.

Revert "zebra: zvni_map_to_svi() adaptation for other network namespaces"

This reverts commit 2a9dccb6475bfc11af2b855c4c8ff9e500ba21f4.

Revert "zebra: display interface slave type"

This reverts commit fc3141393ad95651d31fccd144b5c029d00e5f3a.

Revert "zebra: zvni_from_svi() adaptation for other network namespaces"

This reverts commit 6fe516bd4b85569b3b8b4bcc2910afc5569aa026.

Revert "zebra: importation of bgp evpn rt5 from vni with other netns"

This reverts commit 28254125d06f65cc4344b6156eec76a37ec6aede.

Revert "lib, zebra: update interface name at netlink creation"

This reverts commit 1f7a68a2ff0ba1424131f30112e0cc1572f0bee3.

Signed-off-by: Pat Ruddy <pat@voltanet.io>

1 files changed, 0 insertions, 20 deletions

diff --git a/zebra/interface.c b/zebra/interface.c
index 53ae1d2089..c23e6037c5 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1233,23 +1233,6 @@ static void nbr_connected_dump_vty(struct vty *vty,
 	vty_out(vty, "\n");
 }
 
-static const char *zebra_zifslavetype_2str(zebra_slave_iftype_t zif_slave_type)
-{
-	switch (zif_slave_type) {
-	case ZEBRA_IF_SLAVE_BRIDGE:
-		return "Bridge";
-	case ZEBRA_IF_SLAVE_VRF:
-		return "Vrf";
-	case ZEBRA_IF_SLAVE_BOND:
-		return "Bond";
-	case ZEBRA_IF_SLAVE_OTHER:
-		return "Other";
-	case ZEBRA_IF_SLAVE_NONE:
-		return "None";
-	}
-	return "None";
-}
-
 static const char *zebra_ziftype_2str(zebra_iftype_t zif_type)
 {
 	switch (zif_type) {
@@ -1477,9 +1460,6 @@ static void if_dump_vty(struct vty *vty, struct interface *ifp)
 
 	vty_out(vty, "  Interface Type %s\n",
 		zebra_ziftype_2str(zebra_if->zif_type));
-	vty_out(vty, "  Interface Slave Type %s\n",
-		zebra_zifslavetype_2str(zebra_if->zif_slave_type));
-
 	if (IS_ZEBRA_IF_BRIDGE(ifp)) {
 		struct zebra_l2info_bridge *bridge_info;