CP-47656 Anti-affinity feature generate alert - Code refactoring

Signed-off-by: Lunfan Zhang <Lunfan.Zhang@cloud.com>

Author: LunfanZhang

ocaml/xapi-types/features.mli

@@ -74,6 +74,8 @@ type feature =
   | VTPM  (** Support VTPM device required by Win11 guests *)
   | VM_anti_affinity  (** Enable use of VM anti-affinity placement *)
 
+type orientation = Positive | Negative  (** Orientation type for features *)
+
 val feature_of_rpc : Rpc.t -> feature
 (** Convert RPC into {!feature}s *)
 
@@ -83,6 +85,9 @@ val rpc_of_feature : feature -> Rpc.t
 val name_of_feature : feature -> string
 (** Convert {!feature}s into strings *)
 
+val string_of_feature : feature -> string * orientation
+(** Return restriction and orientation of feature *)
+
 val all_features : feature list
 (** The list of all known features. *)
 

ocaml/xapi/xapi_vm_group_helpers.ml

@@ -66,7 +66,7 @@ let get_anti_affinity_alerts ~__context =
              .all_vms_in_the_anti_affinity_group_are_running_on_a_single_host
      )
 
-let alert_of_group ~__context ~label_name ~id alert =
+let alert_matched ~__context ~label_name ~id alert =
   let alert_rec = snd alert in
   match Xml.parse_string alert_rec.API.message_body with
   | Xml.Element ("body", _, children) -> (
@@ -94,17 +94,15 @@ let alert_of_group ~__context ~label_name ~id alert =
 let filter_alerts_with_group ~__context ~group ~alerts =
   let group_uuid = Db.VM_group.get_uuid ~__context ~self:group in
   List.filter
-    (alert_of_group ~__context ~label_name:"VM_group" ~id:group_uuid)
+    (alert_matched ~__context ~label_name:"VM_group" ~id:group_uuid)
     alerts
 
 let filter_alerts_with_host ~__context ~host ~alerts =
   let host_uuid = Db.Host.get_uuid ~__context ~self:host in
-  List.filter
-    (alert_of_group ~__context ~label_name:"host" ~id:host_uuid)
-    alerts
+  List.filter (alert_matched ~__context ~label_name:"host" ~id:host_uuid) alerts
 
-(** If it is breach and no alerts exists, generate one, 
-    If it is not breach and alerts exists, dismiss the existing alert *)
+(** If it is a breach and no alerts exist, generate one,
+    If it is not a breach and alerts exist, dismiss the existing alert *)
 let update_vm_anti_affinity_alert_for_group ~__context ~group ~alerts =
   let breach_on_host =
     check_breach_on_vm_anti_affinity_rules ~__context ~group
@@ -147,11 +145,11 @@ let maybe_update_vm_anti_affinity_alert_for_vm ~__context ~vm =
         ()
     | group :: _ ->
         let alerts = get_anti_affinity_alerts ~__context in
-        let alert_of_group =
+        let alerts_of_group =
           filter_alerts_with_group ~__context ~group ~alerts
         in
         update_vm_anti_affinity_alert_for_group ~__context ~group
-          ~alerts:alert_of_group
+          ~alerts:alerts_of_group
   with e -> error "%s" (Printexc.to_string e)
 
 let remove_vm_anti_affinity_alert_for_group ~__context ~group ~alerts =
@@ -173,10 +171,10 @@ let update_alert ~__context ~groups ~action =
            Db.VM_group.get_placement ~__context ~self:g = `anti_affinity
        )
     |> List.iter (fun group ->
-           let alert_of_group =
+           let alerts_of_group =
              filter_alerts_with_group ~__context ~group ~alerts
            in
-           action ~__context ~group ~alerts:alert_of_group
+           action ~__context ~group ~alerts:alerts_of_group
        )
   with e -> error "%s" (Printexc.to_string e)
 
@@ -191,8 +189,7 @@ let remove_vm_anti_affinity_alert ~__context ~groups =
 let maybe_update_alerts_on_feature_change ~__context ~old_restrictions
     ~new_restrictions =
   try
-    let feature_name = Features.name_of_feature Features.VM_anti_affinity in
-    let feature = "restrict_" ^ String.lowercase_ascii feature_name in
+    let feature, _ = Features.(string_of_feature Features.VM_anti_affinity) in
     let groups = Db.VM_group.get_all ~__context in
     match
       ( List.assoc_opt feature old_restrictions