CP-44106: Add interface sort error print

Signed-off-by: Changlei Li <[email protected]>

Author: changlei-li

ocaml/networkd/bin/network_server.ml

@@ -97,7 +97,8 @@ let sort_and_update () =
           ; interface_order= Some new_order
           }
     | Error err ->
-        error "Failed to sort interface order"
+        error "Failed to sort interface order [%s]"
+          (Network_device_order.string_of_error err)
 
 let sort_on_first_boot () =
   if Network_utils.is_sorted_by_script () then
@@ -107,7 +108,8 @@ let sort_on_first_boot () =
     | Ok (sorted, _) ->
         Some sorted
     | Error err ->
-        error "Failed to sort interface order" ;
+        error "Failed to sort interface order [%s]"
+          (Network_device_order.string_of_error err) ;
         Some []
 
 let build_config () =

ocaml/networkd/lib/network_config.ml

@@ -87,6 +87,7 @@ let parse_dns_config args =
   (nameservers, domains)
 
 let write_manage_iface_to_inventory bridge_name =
+  info "Writing management interface to inventory: %s" bridge_name ;
   Inventory.update Inventory._management_interface bridge_name
 
 let read_management_conf interface_order =

ocaml/networkd/lib/network_device_order.ml

@@ -36,6 +36,22 @@ type error =
   | Duplicate_position
   | Invalid_biosdevname_key_value of (string * string)
 
+let string_of_error = function
+  | Pci_addr_parse_error s ->
+      Printf.sprintf "Invalid PCI address: %s" s
+  | Mac_addr_parse_error s ->
+      Printf.sprintf "Invalid MAC address: %s" s
+  | Rule_parse_error s ->
+      Printf.sprintf "Invalid rule: %s" s
+  | Missing_biosdevname_key k ->
+      Printf.sprintf "Missing key in biosdevname output: %s" k
+  | Duplicate_mac_address ->
+      "Duplicate MAC address"
+  | Duplicate_position ->
+      "Duplicate position"
+  | Invalid_biosdevname_key_value (k, v) ->
+      Printf.sprintf "Invalid key-value pair in biosdevname output: %s=%s" k v
+
 module Pciaddr = struct
   type t = Xcp_pci.address
 

ocaml/networkd/lib/network_device_order.mli

@@ -24,6 +24,9 @@ type error =
   | Duplicate_position
   | Invalid_biosdevname_key_value of (string * string)
 
+val string_of_error : error -> string
+(** [string_of_error e] returns a string representation of the error [e]. *)
+
 (** PCI address in format SBDF: domain:bus:device:function *)
 module Pciaddr : sig
   (** Type of the PCI address *)