From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Mon, 5 Feb 2018 15:30:21 +0000 (+0100)
Subject: zebra: adapt the vrf and logical router initialisation
X-Git-Tag: frr-5.0-dev~209^2~11
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=736d41ad74f1135256ece64873fb261164ed03e0;p=matthieu%2Ffrr.git

zebra: adapt the vrf and logical router initialisation

The zebra daemon introduces the logical router initialisation.
Because right now, the usage of logical router and vrf NETNS is
exclusive, then the logical router and VRF are initialised accordingly.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---

diff --git a/zebra/main.c b/zebra/main.c
index 9cad913f4b..749d509a86 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -34,6 +34,7 @@
 #include "privs.h"
 #include "sigevent.h"
 #include "vrf.h"
+#include "logicalrouter.h"
 #include "libfrr.h"
 
 #include "zebra/rib.h"
@@ -207,6 +208,8 @@ int main(int argc, char **argv)
 #endif
 
 	vrf_configure_backend(VRF_BACKEND_VRF_LITE);
+	logicalrouter_configure_backend(
+			 LOGICALROUTER_BACKEND_NETNS);
 
 	frr_preinit(&zebra_di, argc, argv);
 
@@ -285,6 +288,8 @@ int main(int argc, char **argv)
 			break;
 		case 'n':
 			vrf_configure_backend(VRF_BACKEND_NETNS);
+			logicalrouter_configure_backend(
+					LOGICALROUTER_BACKEND_OFF);
 			break;
 #endif /* HAVE_NETLINK */
 #if defined(HANDLE_ZAPI_FUZZING)
diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c
index 8940546f68..b28998acf8 100644
--- a/zebra/zebra_netns_notify.c
+++ b/zebra/zebra_netns_notify.c
@@ -84,7 +84,7 @@ static void zebra_ns_notify_create_context_from_entry_name(const char *name)
 	ns_id = zebra_ns_id_get(netnspath);
 	if (zserv_privs.change(ZPRIVS_LOWER))
 		zlog_err("Can't lower privileges");
-	ret = ns_handler_create(NULL, vrf, netnspath, ns_id);
+	ret = vrf_netns_handler_create(NULL, vrf, netnspath, ns_id);
 	if (ret != CMD_SUCCESS) {
 		zlog_warn("NS notify : failed to create NS %s", netnspath);
 		return;
diff --git a/zebra/zebra_ns.c b/zebra/zebra_ns.c
index da5b22def2..cb302985c8 100644
--- a/zebra/zebra_ns.c
+++ b/zebra/zebra_ns.c
@@ -23,6 +23,7 @@
 
 #include "lib/ns.h"
 #include "lib/vrf.h"
+#include "lib/logicalrouter.h"
 #include "lib/prefix.h"
 #include "lib/memory.h"
 
@@ -59,6 +60,8 @@ zebra_ns_table_entry_compare(const struct zebra_ns_table *e1,
 	return e1->tableid - e2->tableid;
 }
 
+static int logicalrouter_config_write(struct vty *vty);
+
 struct zebra_ns *zebra_ns_lookup(ns_id_t ns_id)
 {
 	if (ns_id == NS_DEFAULT)
@@ -241,9 +244,10 @@ int zebra_ns_init(void)
 	ns_id = zebra_ns_id_get_default();
 	if (zserv_privs.change(ZPRIVS_LOWER))
 		zlog_err("Can't lower privileges");
-	ns_init_zebra(ns_id);
 
-	ns_init();
+	ns_init_management(ns_id);
+
+	logicalrouter_init(logicalrouter_config_write);
 
 	/* Do any needed per-NS data structure allocation. */
 	dzns->if_table = route_table_init();
@@ -253,7 +257,7 @@ int zebra_ns_init(void)
 	zebra_vrf_init();
 
 	/* Default NS is activated */
-	zebra_ns_enable(NS_DEFAULT, (void **)&dzns);
+	zebra_ns_enable(ns_id, (void **)&dzns);
 
 	if (vrf_is_backend_netns()) {
 		ns_add_hook(NS_NEW_HOOK, zebra_ns_new);
@@ -266,6 +270,21 @@ int zebra_ns_init(void)
 	return 0;
 }
 
+static int logicalrouter_config_write(struct vty *vty)
+{
+	struct ns *ns;
+	int write = 0;
+
+	RB_FOREACH(ns, ns_head, &ns_tree) {
+		if (ns->ns_id == NS_DEFAULT || ns->name == NULL)
+			continue;
+		vty_out(vty, "logical-router %u netns %s\n", ns->ns_id,
+			ns->name);
+		write = 1;
+	}
+	return write;
+}
+
 int zebra_ns_config_write(struct vty *vty, struct ns *ns)
 {
 	if (ns && ns->name != NULL)
diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c
index 874a9c74e7..bb15fd04f3 100644
--- a/zebra/zebra_vrf.c
+++ b/zebra/zebra_vrf.c
@@ -581,8 +581,8 @@ static int vrf_config_write(struct vty *vty)
 /* Zebra VRF initialization. */
 void zebra_vrf_init(void)
 {
-	vrf_init(zebra_vrf_new, zebra_vrf_enable, zebra_vrf_disable,
-		 zebra_vrf_delete);
+	vrf_init(zebra_vrf_new, zebra_vrf_enable,
+		 zebra_vrf_disable, zebra_vrf_delete);
 
 	vrf_cmd_init(vrf_config_write);
 }
diff --git a/zebra/zebra_vrf.h b/zebra/zebra_vrf.h
index ae5a174116..4c12d7dee9 100644
--- a/zebra/zebra_vrf.h
+++ b/zebra/zebra_vrf.h
@@ -19,10 +19,9 @@
  * with this program; see the file COPYING; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#if !defined(__ZEBRA_RIB_H__)
-#define __ZEBRA_RIB_H__
+#if !defined(__ZEBRA_VRF_H__)
+#define __ZEBRA_VRF_H__
 
-#include <lib/ns.h>
 #include <zebra/zebra_ns.h>
 #include <zebra/zebra_pw.h>
 #include <lib/vxlan.h>
@@ -169,4 +168,4 @@ extern void zebra_vrf_init(void);
 
 extern void zebra_rtable_node_cleanup(struct route_table *table,
 				      struct route_node *node);
-#endif
+#endif /* ZEBRA_VRF_H */