Change argument of resort_guidances

Signed-off-by: Rob Hoes <[email protected]>
xapi-project · Aug 18, 2023 · a1a1562 · a1a1562
1 parent 4b27b24
commit a1a1562
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/ocaml/tests/test_repository_helpers.ml b/ocaml/tests/test_repository_helpers.ml
@@ -2755,7 +2755,8 @@ module GuidanceSetResortGuidancesTest = Generic.MakeStateless (struct
   let transform (kind, guidances) =
     guidances
     |> GuidanceSet.of_list
-    |> GuidanceSet.resort_guidances ~kind
+    |> GuidanceSet.resort_guidances
+         ~remove_evacuations:(kind = Guidance.Absolute)
     |> GuidanceSet.elements
 
   let tests =

diff --git a/ocaml/xapi/repository_helpers.ml b/ocaml/xapi/repository_helpers.ml
@@ -132,7 +132,7 @@ module GuidanceSet = struct
     ; (EvacuateHost, of_list [RestartDeviceModel])
     ]
 
-  let resort_guidances ~kind gs =
+  let resort_guidances ~remove_evacuations gs =
     let gs' =
       List.fold_left
         (fun acc (higher, lowers) ->
@@ -143,7 +143,10 @@ module GuidanceSet = struct
         )
         gs precedences
     in
-    match kind with Recommended -> gs' | Absolute -> remove EvacuateHost gs'
+    if remove_evacuations then
+      remove EvacuateHost gs'
+    else
+      gs'
 end
 
 let create_repository_record ~__context ~name_label ~name_description
@@ -647,7 +650,7 @@ let eval_guidances ~updates_info ~updates ~kind ~livepatches ~failed_livepatches
     )
     GuidanceSet.empty updates
   |> append_livepatch_guidances ~updates_info ~upd_ids_of_livepatches
-  |> GuidanceSet.resort_guidances ~kind
+  |> GuidanceSet.resort_guidances ~remove_evacuations:(kind = Guidance.Absolute)
   |> GuidanceSet.elements
 
 let merge_with_unapplied_guidances ~__context ~host ~guidances =
@@ -657,7 +660,7 @@ let merge_with_unapplied_guidances ~__context ~host ~guidances =
   |> List.filter (fun g -> g <> Guidance.RebootHostOnLivePatchFailure)
   |> of_list
   |> union (of_list guidances)
-  |> resort_guidances ~kind:Guidance.Recommended
+  |> resort_guidances ~remove_evacuations:false
   |> elements
 
 let repoquery_sep = ":|"