fixup! Datamodel: add supported_image_format field to SM object

Author: gthvn1

ocaml/idl/datamodel.ml

@@ -4998,6 +4998,17 @@ module SR = struct
 end
 
 module SM = struct
+  let formats =
+    [
+      ("raw", "Plain disk image")
+    ; ("vhd", "Virtual Hard Disk")
+    ; ("qcow2", "Qemu Copy-On-Write version 2")
+    ]
+
+  let formats_desc = formats |> List.map fst |> String.concat ", "
+
+  let image_format_type = Enum ("image_format_type", formats)
+
   (** XXX: just make this a field and be done with it. Cowardly refusing to change the schema for now. *)
   let get_driver_filename =
     call ~name:"get_driver_filename" ~in_oss_since:None
@@ -5119,9 +5130,9 @@ module SM = struct
             "The storage plugin requires that one of these cluster stacks is \
              configured and running."
         ; field ~lifecycle:[] ~qualifier:DynamicRO
-            ~default_value:(Some (VSet [])) ~ty:(Set String)
+            ~default_value:(Some (VSet [])) ~ty:(Set image_format_type)
             "supported_image_formats"
-            "Image formats supported by the SR (VHD, RAW, Qcow2, ...)"
+            (Printf.sprintf "Image formats supported by the SR: %s" formats_desc)
         ]
       ()
 end

ocaml/idl/schematest.ml

@@ -3,7 +3,7 @@ let hash x = Digest.string x |> Digest.to_hex
 (* BEWARE: if this changes, check that schema has been bumped accordingly in
    ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)
 
-let last_known_schema_hash = "d7e51f8c9ed9bb9ded5982b6a79bd426"
+let last_known_schema_hash = "957db9d8442259d5888ac88c0ae01a7b"
 
 let current_schema_hash : string =
   let open Datamodel_types in

ocaml/xapi-cli-server/records.ml

@@ -3867,7 +3867,8 @@ let sm_record rpc session_id sm =
           ()
       ; make_field ~name:"supported-image-formats"
           ~get:(fun () ->
-            concat_with_comma (x ()).API.sM_supported_image_formats
+            map_and_concat Record_util.image_format_type_to_string
+              (x ()).API.sM_supported_image_formats
           )
           ()
       ]

ocaml/xapi/xapi_sm.ml

@@ -49,7 +49,10 @@ let create_from_query_result ~__context q =
       ~host_pending_features:[] ~configuration:q.configuration ~other_config:[]
       ~driver_filename:(Sm_exec.cmd_name q.driver)
       ~required_cluster_stack:q.required_cluster_stack
-      ~supported_image_formats:q.supported_image_formats
+      ~supported_image_formats:
+        (List.map Record_util.image_format_type_of_string
+           q.supported_image_formats
+        )
   )
 
 let find_pending_features existing_features features =
@@ -113,6 +116,10 @@ let update_from_query_result ~__context (self, r) q_result =
       |> addto_pending_hosts_features ~__context self
       |> valid_hosts_pending_features ~__context
     in
+    let supported_image_formats =
+      List.map Record_util.image_format_type_of_string
+        q_result.supported_image_formats
+    in
     remove_valid_features_from_pending ~__context ~self new_features ;
     let features = existing_features @ new_features in
     List.iter
@@ -145,9 +152,9 @@ let update_from_query_result ~__context (self, r) q_result =
       Db.SM.set_configuration ~__context ~self ~value:q_result.configuration ;
     if r.API.sM_driver_filename <> driver_filename then
       Db.SM.set_driver_filename ~__context ~self ~value:driver_filename ;
-    if r.API.sM_supported_image_formats <> q_result.supported_image_formats then
+    if r.API.sM_supported_image_formats <> supported_image_formats then
       Db.SM.set_supported_image_formats ~__context ~self
-        ~value:q_result.supported_image_formats
+        ~value:supported_image_formats
   )
 
 let is_v1 x = version_of_string x < [2; 0]