fixup! CP-44103: Ordering network devices - ordering logic

Signed-off-by: Ming Lu <[email protected]>

Author: minglumlu

ocaml/networkd/lib/network_device_order.ml

@@ -487,40 +487,33 @@ let generate_order ~(currents : Dev.t list) ~(rules : Rule.t list)
   OrderedDev.assert_no_duplicate_mac new_order ;
   new_order
 
-let generate ?(force = false) interface_order =
-  match interface_order with
-  | None ->
-      None
-  | Some last_order ->
-      let rules, last_order =
-        match (last_order, force) with
-        | [], _ | _ :: _, true ->
-            (Rule.rules_of_file ~path:initial_rules_file_path, [])
-        | (_ :: _ as last_order), false ->
-            ([], last_order)
-      in
-      let currents = Dev.get_all () in
-      currents
-      |> List.iter (fun x ->
-             debug "%s current: %s" __FUNCTION__ (Dev.to_string x)
-         ) ;
-      let new_order = generate_order ~currents ~rules ~last_order in
-      new_order
-      |> List.iter (fun x ->
-             debug "%s new order: %s" __FUNCTION__ (OrderedDev.to_string x)
-         ) ;
-
-      (* Find the NICs whose name changes *)
-      let changes =
-        let m = OrderedDev.map_by_position last_order in
-        List.fold_left
-          (fun acc {position; name= curr; _} ->
-            match IntMap.find_opt position m with
-            | Some {name= last; _} when last <> curr ->
-                (last, curr) :: acc
-            | _ ->
-                acc
-          )
-          [] new_order
-      in
-      Some (new_order, changes)
+let generate last_order =
+  let rules, last_order =
+    if last_order = [] then
+      (Rule.rules_of_file ~path:initial_rules_file_path, [])
+    else
+      ([], last_order)
+  in
+  let currents = Dev.get_all () in
+  currents
+  |> List.iter (fun x -> debug "%s current: %s" __FUNCTION__ (Dev.to_string x)) ;
+  let new_order = generate_order ~currents ~rules ~last_order in
+  new_order
+  |> List.iter (fun x ->
+         debug "%s new order: %s" __FUNCTION__ (OrderedDev.to_string x)
+     ) ;
+
+  (* Find the NICs whose name changes *)
+  let changes =
+    let m = OrderedDev.map_by_position last_order in
+    List.fold_left
+      (fun acc {position; name= curr; _} ->
+        match IntMap.find_opt position m with
+        | Some {name= last; _} when last <> curr ->
+            (last, curr) :: acc
+        | _ ->
+            acc
+      )
+      [] new_order
+  in
+  (new_order, changes)

ocaml/networkd/lib/network_device_order.mli

@@ -76,12 +76,8 @@ module OrderedDev : sig
   exception Duplicate_mac_address
 end
 
-val generate :
-     ?force:bool
-  -> OrderedDev.t list option
-  -> (OrderedDev.t list * (string * string) list) option
-(** [generate force ()] is to generate order, return the order and a list for device name changes (old_name, new_name).
-    When the [force] is [true], use the initial rules only. By default it is [false]. *)
+val generate : OrderedDev.t list -> OrderedDev.t list * (string * string) list
+(** [generate last_order] is to generate an order based on [last_order], return the new order and a list for device name changes (old_name, new_name). *)
 
 (* Below is exposed only for unit tests *)