CA-425192/CP-311612/CP-311613: backport quicktest SMAPIv3 fixes to LCM branch (#6959)

Backport #6908 to the LCM
branch.
These latent bugs have existed in the tests for a long time, but
previously our test system (XenRT) picked machines randomly, so it
would've been unlikely to pick a machine which has a local 4K SR
(SMAPIv3 instead of SMAPIv1), and even if it did, the test would
seemingly pass on a rerun (because another machine would get picked).
We are now explicitly running the test multiple times on different
hardware categories, and some of those tests are now failing 100% of the
time.

Author: edwintorok

ocaml/quicktest/qt_filter.mli

@@ -68,6 +68,9 @@ module SR : sig
   val not_type : string -> srs -> srs
   (** Filters out SRs of the given type *)
 
+  val is_smapiv1 : Qt.sr_info -> bool
+  (** Whether this is a v1 (true) or v3+ (false) SR *)
+
   val smapiv1 : srs -> srs
   (** Selects SMAPIv1 SRs *)
 

ocaml/quicktest/quicktest_cbt.ml

@@ -73,19 +73,21 @@ let vdi_data_destroy_test rpc session_id sr_info () =
         (VDI.get_type ~session_id ~rpc ~self:snapshot) ;
       assert_cbt_status true ~rpc ~session_id ~vDI:snapshot
         ~msg:"VDI snapshot cbt_enabled field erroneously set to false" ;
+
       (* test_vdi_update ~session_id  snapshot;
          temporarily comment this out as it is blocked on CA-273981
          VDI.update doesn't currently work on cbt-metadata VDIs *)
-      let content_id_str = "/No content: this is a cbt_metadata VDI/" in
-      Alcotest.(check string)
-        (Printf.sprintf
-           "VDI.data_destroy failed to update VDI.content_id to \"%s\""
-           content_id_str
-        )
-        (VDI.get_other_config ~session_id ~rpc ~self:snapshot
-        |> List.assoc "content_id"
-        )
-        content_id_str
+      if Qt_filter.SR.is_smapiv1 sr_info then
+        let content_id_str = "/No content: this is a cbt_metadata VDI/" in
+        Alcotest.(check string)
+          (Printf.sprintf
+             "VDI.data_destroy failed to update VDI.content_id to \"%s\""
+             content_id_str
+          )
+          (VDI.get_other_config ~session_id ~rpc ~self:snapshot
+          |> List.assoc "content_id"
+          )
+          content_id_str
   )
 
 (* Check VDI.{copy, clone} all properly update cbt_enabled

ocaml/quicktest/quicktest_vdi_ops_data_integrity.ml

@@ -256,9 +256,9 @@ let large_data_integrity_tests vdi_op op_name =
 let sr_with_vdi_create_destroy =
   Qt_filter.SR.(all |> allowed_operations [`vdi_create; `vdi_destroy] |> not_iso)
 
-let supported_srs test_case =
+let supported_srs ?(f = Fun.id) test_case =
   let open Qt_filter in
-  test_case |> conn |> sr sr_with_vdi_create_destroy
+  test_case |> conn |> sr (f sr_with_vdi_create_destroy)
 
 (* XXX Currently only GFS2 SRs support sparse reading of VDIs exported as TAR *)
 let supported_gfs2_srs test_case =
@@ -276,7 +276,7 @@ let tests () =
     )
   @ (delta_data_integrity_tests delta_export_import_vhd
        "VDI delta export/import to/from VHD file"
-    |> supported_srs
+    |> supported_srs ~f:Qt_filter.SR.smapiv1
     )
   @ (data_integrity_tests export_import_tar "VDI export/import to/from TAR file"
     |> supported_srs