controller: Consolidate the netlink notifiers.

The netlink notifiers used a lot of code that was more or less
identical to each other. Extract the common code into separate module
which allows the definition of listeners and their specific data.
This should make it easier to add any new notifier, which will be the
case in the future. It should also make it slightly easier to track
individual updates and changes that could be processed incrementally
instead of full recompute when there is any change.

Acked-by: Dumitru Ceara <dceara@redhat.com>
Acked-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Ales Musil <amusil@redhat.com>

Author: almusil

controller/automake.mk

@@ -32,6 +32,7 @@ controller_ovn_controller_SOURCES = \
 	controller/lport.h \
 	controller/ofctrl.c \
 	controller/ofctrl.h \
+	controller/ovn-netlink-notifier.h \
 	controller/neighbor.c \
 	controller/neighbor.h \
 	controller/neighbor-of.c \
@@ -63,33 +64,29 @@ controller_ovn_controller_SOURCES = \
 	controller/ecmp-next-hop-monitor.h \
 	controller/ecmp-next-hop-monitor.c \
 	controller/route-exchange.h \
-	controller/route-table-notify.h \
 	controller/route.h \
 	controller/route.c \
 	controller/garp_rarp.h \
 	controller/garp_rarp.c \
 	controller/neighbor-exchange.h \
-	controller/neighbor-table-notify.h \
 	controller/host-if-monitor.h
 
 if HAVE_NETLINK
 controller_ovn_controller_SOURCES += \
 	controller/host-if-monitor.c \
+	controller/ovn-netlink-notifier.c \
 	controller/neighbor-exchange-netlink.h \
 	controller/neighbor-exchange-netlink.c \
 	controller/neighbor-exchange.c \
-	controller/neighbor-table-notify.c \
 	controller/route-exchange-netlink.h \
 	controller/route-exchange-netlink.c \
-	controller/route-exchange.c \
-	controller/route-table-notify.c
+	controller/route-exchange.c
 else
 controller_ovn_controller_SOURCES += \
 	controller/host-if-monitor-stub.c \
+	controller/ovn-netlink-notifier-stub.c \
 	controller/neighbor-exchange-stub.c \
-	controller/neighbor-table-notify-stub.c \
-	controller/route-exchange-stub.c \
-	controller/route-table-notify-stub.c
+	controller/route-exchange-stub.c
 endif
 
 controller_ovn_controller_LDADD = lib/libovn.la $(OVS_LIBDIR)/libopenvswitch.la

controller/neighbor-exchange.c

@@ -21,7 +21,6 @@
 #include "neighbor.h"
 #include "neighbor-exchange.h"
 #include "neighbor-exchange-netlink.h"
-#include "neighbor-table-notify.h"
 #include "openvswitch/poll-loop.h"
 #include "openvswitch/vlog.h"
 #include "ovn-util.h"
@@ -136,8 +135,7 @@ neighbor_exchange_run(const struct neighbor_exchange_ctx_in *n_ctx_in,
             break;
         }
 
-        neighbor_table_add_watch_request(&n_ctx_out->neighbor_table_watches,
-                                         if_index, nim->if_name);
+        vector_push(n_ctx_out->neighbor_table_watches, &if_index);
         vector_destroy(&received_neighbors);
     }
 }

controller/neighbor-exchange.h

@@ -30,8 +30,8 @@ struct neighbor_exchange_ctx_in {
 };
 
 struct neighbor_exchange_ctx_out {
-    /* Contains struct neighbor_table_watch_request. */
-    struct hmap neighbor_table_watches;
+    /* Contains int32_t representing if_index. */
+    struct vector *neighbor_table_watches;
     /* Contains 'struct evpn_remote_vtep'. */
     struct hmap *remote_vteps;
     /* Contains 'struct evpn_static_entry', remote FDB entries learned through