CA-260262: also test Xapi_vdi.update_allowed_operations

Signed-off-by: Gabor Igloi <[email protected]>

Author: gaborigloi

ocaml/xapi/test_vdi_allowed_operations.ml

@@ -274,23 +274,42 @@ let test_cbt =
 
 (** The set of allowed operations must be restricted during rolling pool
     upgrade to the enums known by older releases. *)
-let test_operations_restricted_during_rpu () =
-  let __context = Mock.make_context_with_new_db "Mock context" in
-  let master = Test_common.make_host __context () in
-  let pool = Test_common.make_pool ~__context ~master () in
-  Db.Pool.add_to_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress ~value:"x";
-  run_assert_equal_with_vdi
-    ~__context
-    ~sm_fun:(fun sm -> Db.SM.set_features ~__context ~self:sm ~value:["VDI_MIRROR",1L])
-    `mirror
-    (Some(Api_errors.not_supported_during_upgrade, []));
-  Db.Pool.remove_from_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress;
-  run_assert_equal_with_vdi
-    ~__context
-    ~sm_fun:(fun sm -> Db.SM.set_features ~__context ~self:sm ~value:["VDI_MIRROR",1L])
-    `mirror
-    None
+let test_operations_restricted_during_rpu =
+  let test_check_operation_error () =
+    let __context = Mock.make_context_with_new_db "Mock context" in
+    let master = Test_common.make_host __context () in
+    let pool = Test_common.make_pool ~__context ~master () in
+    Db.Pool.add_to_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress ~value:"x";
+    run_assert_equal_with_vdi
+      ~__context
+      ~sm_fun:(fun sm -> Db.SM.set_features ~__context ~self:sm ~value:["VDI_MIRROR",1L])
+      `mirror
+      (Some(Api_errors.not_supported_during_upgrade, []));
+    Db.Pool.remove_from_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress;
+    run_assert_equal_with_vdi
+      ~__context
+      ~sm_fun:(fun sm -> Db.SM.set_features ~__context ~self:sm ~value:["VDI_MIRROR",1L])
+      `mirror
+      None
+  in
 
+  let test_update_allowed_operations () =
+    let __context = Mock.make_context_with_new_db "Mock context" in
+    let master = Test_common.make_host __context () in
+    let pool = Test_common.make_pool ~__context ~master () in
+    Db.Pool.add_to_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress ~value:"x";
+    let self, _ = setup_test ~__context ~vdi_fun:(fun vdi -> Db.VDI.set_type ~__context ~self:vdi ~value:`user) () in
+    Xapi_vdi.update_allowed_operations ~__context ~self;
+    OUnit.assert_bool "update_allowed_operations should exclude `enable_cbt during RPU" (not @@ List.mem `enable_cbt (Db.VDI.get_allowed_operations ~__context ~self));
+    Db.Pool.remove_from_other_config ~__context ~self:pool ~key:Xapi_globs.rolling_upgrade_in_progress;
+    Xapi_vdi.update_allowed_operations ~__context ~self;
+    OUnit.assert_bool "update_allowed_operations should consider `enable_cbt when RPU is not running" (List.mem `enable_cbt (Db.VDI.get_allowed_operations ~__context ~self))
+  in
+
+  "test_operations_restricted_during_rpu" >:::
+  [ "test_check_operation_error" >:: test_check_operation_error
+  ; "test_update_allowed_operations" >:: test_update_allowed_operations
+  ]
 
 let test =
   "test_vdi_allowed_operations" >:::
@@ -300,5 +319,5 @@ let test =
     "test_ca125187" >:: test_ca125187;
     "test_ca126097" >:: test_ca126097;
     test_cbt;
-    "test_operations_restricted_during_rpu" >:: test_operations_restricted_during_rpu;
+    test_operations_restricted_during_rpu;
   ]