From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Tue, 1 Oct 2019 20:56:41 +0000 (-0300)
Subject: *: fix route map integration
X-Git-Tag: frr-7.5.1~833^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=91835f1fd2a8dd05a5ba03c8961b699aaabed7e7;p=mirror_frr.git

*: fix route map integration

Add the appropriated code to bootstrap route map northbound for all
daemons.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
---

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index fab2a584c..0b33f7e9d 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -360,6 +360,8 @@ static void bgp_vrf_terminate(void)
 }
 
 static const struct frr_yang_module_info *const bgpd_yang_modules[] = {
+	&frr_interface_info,
+	&frr_route_map_info,
 };
 
 FRR_DAEMON_INFO(bgpd, BGP, .vty_port = BGP_VTY_PORT,
diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c
index 0746b04ed..922c0fe3e 100644
--- a/eigrpd/eigrp_main.c
+++ b/eigrpd/eigrp_main.c
@@ -140,6 +140,7 @@ struct quagga_signal_t eigrp_signals[] = {
 static const struct frr_yang_module_info *const eigrpd_yang_modules[] = {
 	&frr_eigrpd_info,
 	&frr_interface_info,
+	&frr_route_map_info,
 };
 
 FRR_DAEMON_INFO(eigrpd, EIGRP, .vty_port = EIGRP_VTY_PORT,
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 364441f79..f7fe089b9 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -39,6 +39,7 @@
 #include "vrf.h"
 #include "qobj.h"
 #include "libfrr.h"
+#include "routemap.h"
 
 #include "isisd/isis_constants.h"
 #include "isisd/isis_common.h"
@@ -166,6 +167,7 @@ static const struct frr_yang_module_info *const isisd_yang_modules[] = {
 #ifndef FABRICD
 	&frr_isisd_info,
 #endif /* ifndef FABRICD */
+	&frr_route_map_info,
 };
 
 #ifdef FABRICD
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 0aaefeb3c..e4bed7a79 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -167,6 +167,7 @@ struct quagga_signal_t ospf6_signals[] = {
 
 static const struct frr_yang_module_info *const ospf6d_yang_modules[] = {
 	&frr_interface_info,
+	&frr_route_map_info,
 };
 
 FRR_DAEMON_INFO(ospf6d, OSPF6, .vty_port = OSPF6_VTY_PORT,
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index d02ffe044..7caa79d20 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -40,6 +40,7 @@
 #include "zclient.h"
 #include "vrf.h"
 #include "libfrr.h"
+#include "routemap.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_interface.h"
@@ -126,6 +127,7 @@ struct quagga_signal_t ospf_signals[] = {
 
 static const struct frr_yang_module_info *const ospfd_yang_modules[] = {
 	&frr_interface_info,
+	&frr_route_map_info,
 };
 
 FRR_DAEMON_INFO(ospfd, OSPF, .vty_port = OSPF_VTY_PORT,
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 060bb7658..ca41afaea 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -35,6 +35,7 @@
 #include "vrf.h"
 #include "if_rmap.h"
 #include "libfrr.h"
+#include "routemap.h"
 
 #include "ripd/ripd.h"
 #include "ripd/rip_nb.h"
@@ -115,6 +116,7 @@ static struct quagga_signal_t ripd_signals[] = {
 static const struct frr_yang_module_info *const ripd_yang_modules[] = {
 	&frr_interface_info,
 	&frr_ripd_info,
+	&frr_route_map_info,
 };
 
 FRR_DAEMON_INFO(ripd, RIP, .vty_port = RIP_VTY_PORT,
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 9daeeb958..99adb2cba 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -36,6 +36,7 @@
 #include "vrf.h"
 #include "if_rmap.h"
 #include "libfrr.h"
+#include "routemap.h"
 
 #include "ripngd/ripngd.h"
 #include "ripngd/ripng_nb.h"
@@ -115,6 +116,7 @@ struct quagga_signal_t ripng_signals[] = {
 static const struct frr_yang_module_info *const ripngd_yang_modules[] = {
 	&frr_interface_info,
 	&frr_ripngd_info,
+	&frr_route_map_info,
 };
 
 FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT,
diff --git a/zebra/main.c b/zebra/main.c
index f23702d87..5951c7e28 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -237,6 +237,7 @@ struct quagga_signal_t zebra_signals[] = {
 
 static const struct frr_yang_module_info *const zebra_yang_modules[] = {
 	&frr_interface_info,
+	&frr_route_map_info,
 };
 
 FRR_DAEMON_INFO(