Implement correct support for updating network interfaces for neighbors

cli/bus.h

@@ -53,6 +53,7 @@ inline std::vector<bus_request_info> get_bus_requests(common::sdp::DataPlaneInSh
 	        {common::idp::requestType::dump_physical_port, "dump_physical_port"},
 	        {common::idp::requestType::balancer_state_clear, "balancer_state_clear"},
 	        {common::idp::requestType::neighbor_show, "neighbor_show"},
+	        {common::idp::requestType::neighbor_show_cache, "neighbor_show_cache"},
 	        {common::idp::requestType::neighbor_insert, "neighbor_insert"},
 	        {common::idp::requestType::neighbor_remove, "neighbor_remove"},
 	        {common::idp::requestType::neighbor_clear, "neighbor_clear"},

cli/main.cpp

@@ -82,6 +82,7 @@ std::vector<std::tuple<std::string,
                     {"route counters", "", [](const auto& args) { Call(route::counters, args); }},
                     {"route tunnel counters", "", [](const auto& args) { Call(route::tunnel::counters, args); }},
                     {"neighbor show", "", [](const auto& args) { Call(neighbor::show, args); }},
+                    {"neighbor show cache", "", [](const auto& args) { Call(neighbor::show_cache, args); }},
                     {"neighbor insert", "[route_name] [interface_name] [ip_address] [mac_address]", [](const auto& args) { Call(neighbor::insert, args); }},
                     {"neighbor remove", "[route_name] [interface_name] [ip_address]", [](const auto& args) { Call(neighbor::remove, args); }},
                     {"neighbor flush", "", [](const auto& args) { Call(neighbor::flush, args); }},

cli/neighbor.h

@@ -13,6 +13,18 @@ void show()
 
 	FillAndPrintTable({"route_name",
 	                   "interface_name",
+	                   "ip_address",
+	                   "mac_address"},
+	                  response,
+	                  {.optional_null = "static"});
+}
+
+void show_cache()
+{
+	interface::dataPlane dataplane;
+	const auto response = dataplane.neighbor_show_cache();
+
+	FillAndPrintTable({"interface_name",
 	                   "ip_address",
 	                   "mac_address",
 	                   "last_update",

common/idataplane.h

@@ -210,6 +210,11 @@ class dataPlane
 		return get<common::idp::requestType::neighbor_show, common::idp::neighbor_show::response>();
 	}
 
+	auto neighbor_show_cache() const
+	{
+		return get<common::idp::requestType::neighbor_show_cache, common::idp::neighbor_show_cache::response>();
+	}
+
 	auto neighbor_insert(const common::idp::neighbor_insert::request& request) const
 	{
 		return get<common::idp::requestType::neighbor_insert, eResult>(request);
@@ -250,6 +255,11 @@ class dataPlane
 		return get<common::idp::requestType::memory_manager_stats, common::idp::memory_manager_stats::response>();
 	}
 
+	auto neighbor_interfaces_switch() const
+	{
+		return get<common::idp::requestType::neighbor_interfaces_switch, eResult>();
+	}
+
 protected:
 	void connectToDataPlane() const
 	{

common/idp.h

@@ -74,6 +74,7 @@ enum class requestType : uint32_t
 	dump_physical_port,
 	balancer_state_clear,
 	neighbor_show,
+	neighbor_show_cache,
 	neighbor_insert,
 	neighbor_remove,
 	neighbor_clear,
@@ -82,6 +83,7 @@ enum class requestType : uint32_t
 	neighbor_stats,
 	memory_manager_update,
 	memory_manager_stats,
+	neighbor_interfaces_switch,
 	size, // size should always be at the bottom of the list, this enum allows us to find out the size of the enum list
 };
 
@@ -965,6 +967,15 @@ namespace neighbor_show
 {
 using entry = std::tuple<std::string, ///< route_name
                          std::string, ///< interface_name
+                         ip_address_t, ///< ip_address
+                         mac_address_t>; ///< mac_address
+
+using response = std::vector<entry>;
+}
+
+namespace neighbor_show_cache
+{
+using entry = std::tuple<std::string, ///< interface_name
                          ip_address_t, ///< ip_address
                          mac_address_t, ///< mac_address
                          std::optional<uint32_t>, ///< last_update_timestamp
@@ -1068,6 +1079,7 @@ using response = std::variant<std::tuple<>,
                               get_shm_info::response,
                               get_shm_tsc_info::response,
                               neighbor_show::response,
+                              neighbor_show_cache::response,
                               neighbor_stats::response,
                               memory_manager_stats::response>;
 }

controlplane/route.cpp

@@ -1024,6 +1024,7 @@ void route_t::reload_after()
 	generations.switch_generation();
 	generations_neighbors.next_unlock();
 	generations.next_unlock();
+	dataplane.neighbor_interfaces_switch();
 }
 
 void route_t::prefix_flush_prefixes(common::idp::updateGlobalBase::request& globalbase)

dataplane/bus.cpp

@@ -318,6 +318,10 @@ void cBus::clientThread(int clientSocket)
 		{
 			response = dataPlane->neighbor.neighbor_show();
 		}
+		else if (type == common::idp::requestType::neighbor_show_cache)
+		{
+			response = dataPlane->neighbor.neighbor_show_cache();
+		}
 		else if (type == common::idp::requestType::neighbor_insert)
 		{
 			response = dataPlane->neighbor.neighbor_insert(std::get<common::idp::neighbor_insert::request>(std::get<1>(request)));
@@ -350,6 +354,10 @@ void cBus::clientThread(int clientSocket)
 		{
 			response = dataPlane->memory_manager.memory_manager_stats();
 		}
+		else if (type == common::idp::requestType::neighbor_interfaces_switch)
+		{
+			response = dataPlane->neighbor.neighbor_interfaces_switch();
+		}
 		else
 		{
 			stats.errors[(uint32_t)common::idp::errorType::busParse]++;

dataplane/controlplane.cpp

@@ -60,6 +60,7 @@ common::idp::updateGlobalBase::response cControlPlane::updateGlobalBase(const co
 	{
 		return result;
 	}
+	dataPlane->neighbor.UpdateFromCache(false, true);
 
 	DEBUG_LATCH_WAIT(common::idp::debug_latch_update::id::global_base_switch);