CP-53719: Update monitor and collecting list for host network devices (#6480)

With interface-rename functionality, the host network devices are
ordered and renamed like "eth<N>". So they can be filtered by hard-coded
"eth" and added into the networkd monitor list and rrdd collecting list.

While the interface-rename is being replaced by the ordering function in
networkd. Unlike the interface-rename, the networkd will not rename the
host network devices anymore. Instead, the naming of them are left to
the built-in systemd and Kernel.

In both cases, the networkd's Interface.get_interface_position can
return the managed (ordered) host network devices: when the
interface-rename functionality is still working, it returns the list of
"eth<N>"; when networkd takes the place to perform the ordering, it
returns the names generated by systemd and Kernel.

Author: minglumlu

ocaml/networkd/bin/network_monitor_thread.ml

@@ -26,10 +26,7 @@ let bonds_status : (string, int * int) Hashtbl.t = Hashtbl.create 10
 
 let monitor_whitelist =
   ref
-    [
-      "eth"
-    ; "vif" (* This includes "tap" owing to the use of standardise_name below *)
-    ]
+    ["vif" (* This includes "tap" owing to the use of standardise_name below *)]
 
 let rpc xml =
   let open Xmlrpc_client in
@@ -108,7 +105,10 @@ let standardise_name name =
     newname
   with _ -> name
 
-let get_link_stats () =
+let get_link_stats dbg () =
+  let managed_host_net_devs =
+    Network_server.Interface.get_interface_positions dbg () |> List.map fst
+  in
   let open Netlink in
   let s = Socket.alloc () in
   Socket.connect s Socket.NETLINK_ROUTE ;
@@ -119,9 +119,10 @@ let get_link_stats () =
       List.exists
         (fun s -> Astring.String.is_prefix ~affix:s name)
         !monitor_whitelist
+      || List.mem name managed_host_net_devs
     in
     let is_vlan name =
-      Astring.String.is_prefix ~affix:"eth" name && String.contains name '.'
+      List.mem name managed_host_net_devs && String.contains name '.'
     in
     List.map (fun link -> standardise_name (Link.get_name link)) links
     |> (* Only keep interfaces with prefixes on the whitelist, and exclude VLAN
@@ -226,7 +227,7 @@ let rec monitor dbg () =
         Network_server.Bridge.get_all_bonds dbg from_cache
       in
       let add_bonds bonds devs = List.map fst bonds @ devs in
-      let devs = get_link_stats () |> add_bonds bonds |> get_stats bonds in
+      let devs = get_link_stats dbg () |> add_bonds bonds |> get_stats bonds in
       ( if List.length bonds <> Hashtbl.length bonds_status then
           let dead_bonds =
             Hashtbl.fold

ocaml/xcp-rrdd/bin/rrdp-netdev/rrdp_netdev.ml

@@ -42,17 +42,18 @@ let default_stats =
 
 let monitor_whitelist =
   ref
-    [
-      "eth"
-    ; "vif" (* This includes "tap" owing to the use of standardise_name below *)
-    ]
+    ["vif" (* This includes "tap" owing to the use of standardise_name below *)]
 
 (** Transform names of the form 'tapX.X' to 'vifX.X' so these can be handled
    consistently later *)
 let standardise_name name =
   try Scanf.sscanf name "tap%d.%d" @@ Printf.sprintf "vif%d.%d" with _ -> name
 
-let get_link_stats () =
+let get_link_stats dbg () =
+  let managed_host_net_devs =
+    Network_client.Client.Interface.get_interface_positions dbg ()
+    |> List.map fst
+  in
   let open Netlink in
   let s = Socket.alloc () in
   Socket.connect s Socket.NETLINK_ROUTE ;
@@ -63,9 +64,10 @@ let get_link_stats () =
       List.exists
         (fun s -> Astring.String.is_prefix ~affix:s name)
         !monitor_whitelist
+      || List.mem name managed_host_net_devs
     in
     let is_vlan name =
-      Astring.String.is_prefix ~affix:"eth" name && String.contains name '.'
+      List.mem name managed_host_net_devs && String.contains name '.'
     in
     List.map (fun link -> (standardise_name (Link.get_name link), link)) links
     |> (* Only keep interfaces with prefixes on the whitelist, and exclude VLAN
@@ -160,7 +162,7 @@ let generate_netdev_dss () =
     Network_client.Client.Bridge.get_all_bonds dbg from_cache
   in
 
-  let stats = get_link_stats () |> add_bonds bonds |> transform_taps in
+  let stats = get_link_stats dbg () |> add_bonds bonds |> transform_taps in
   let dss, sum_rx, sum_tx =
     List.fold_left
       (fun (dss, sum_rx, sum_tx) (dev, stat) ->