Use Pool_features.assert_enabled where appropriate.

thomassa · thomassa · commit 9b72c479732b · 2015-12-09T15:00:43.000Z
Now we we no longer raise Api_errors.license_restriction except in
Pool_features.assert_enabled.

Signed-off-by: Thomas Sanders &lt;thomas.sanders@citrix.com&gt;
diff --git a/ocaml/xapi/workload_balancing.ml b/ocaml/xapi/workload_balancing.ml
@@ -46,9 +46,6 @@ let raise_not_initialized () =
 let raise_disabled () =
   raise (Api_errors.Server_error (Api_errors.wlb_disabled, []))
 
-let raise_license_restriction () =
-  raise (Api_errors.Server_error(Api_errors.license_restriction, []))
-
 let raise_timeout timeout =
   raise (Api_errors.Server_error
            (Api_errors.wlb_timeout, [string_of_float timeout]))
@@ -97,9 +94,7 @@ let wlb_host_port ~__context =
     split_host_port url
 
 let assert_wlb_licensed ~__context =
-  if not (Pool_features.is_enabled ~__context Features.WLB)
-  then
-    raise_license_restriction()
+  Pool_features.assert_enabled ~__context ~f:Features.WLB
 
 let assert_wlb_initialized ~__context =
   let pool = Helpers.get_pool ~__context in
diff --git a/ocaml/xapi/xapi_dr.ml b/ocaml/xapi/xapi_dr.ml
@@ -209,8 +209,7 @@ let clear_sr_introduced_by ~__context ~vm =
 let assert_session_allows_dr ~session_id ~action =
 	Server_helpers.exec_with_new_task ~session_id "Checking pool license and session permissions allow DR"
 		(fun __context ->
-			if (not (Pool_features.is_enabled ~__context Features.DR)) then
-				raise (Api_errors.Server_error(Api_errors.license_restriction, []));
+			Pool_features.assert_enabled ~__context ~f:Features.DR;
 			(* Any session can call VM(_appliance).recover since it is marked as readonly *)
 			(* so it can be used by the sessions returned by VDI.open_database. *)
 			(* We need to manually check that a session could legitimately have called VDI.open_database. *)
diff --git a/ocaml/xapi/xapi_dr_task.ml b/ocaml/xapi/xapi_dr_task.ml
@@ -92,8 +92,7 @@ let try_create_sr_from_record ~__context ~_type ~device_config ~dr_task ~sr_reco
 
 let create ~__context ~_type ~device_config ~whitelist =
 	(* Check if licence allows disaster recovery. *)
-	if (not (Pool_features.is_enabled ~__context Features.DR)) then
-		raise (Api_errors.Server_error(Api_errors.license_restriction, []));
+	Pool_features.assert_enabled ~__context ~f:Features.DR;
 	(* Check that the SR type supports metadata. *)
 	if not (List.mem_assoc Smint.Sr_metadata (Sm.features_of_driver _type)) then
 		raise (Api_errors.Server_error (Api_errors.operation_not_allowed,
diff --git a/ocaml/xapi/xapi_ha.ml b/ocaml/xapi/xapi_ha.ml
@@ -1346,8 +1346,7 @@ let enable __context heartbeat_srs configuration =
 	if Db.Pool.get_ha_enabled ~__context ~self:pool
 	then raise (Api_errors.Server_error(Api_errors.ha_is_enabled, []));
 
-	if not (Pool_features.is_enabled ~__context Features.HA)
-	then raise (Api_errors.Server_error(Api_errors.license_restriction, []));
+	Pool_features.assert_enabled ~__context ~f:Features.HA;
 
 	(* Check that all of our 'disallow_unplug' PIFs are currently attached *)
 	let unplugged_ununpluggable_pifs = Db.PIF.get_refs_where ~__context ~expr:(And (
diff --git a/ocaml/xapi/xapi_sr.ml b/ocaml/xapi/xapi_sr.ml
@@ -608,8 +608,7 @@ let find_or_create_metadata_vdi ~__context ~sr =
 		vdi
 
 let enable_database_replication ~__context ~sr =
-	if (not (Pool_features.is_enabled ~__context Features.DR)) then
-		raise (Api_errors.Server_error(Api_errors.license_restriction, []));
+	Pool_features.assert_enabled ~__context ~f:Features.DR;
 	assert_supports_database_replication ~__context ~sr;
 	let get_vdi_callback = (fun () -> find_or_create_metadata_vdi ~__context ~sr) in
 	Xapi_vdi_helpers.enable_database_replication ~__context ~get_vdi_callback
diff --git a/ocaml/xapi/xapi_subject.ml b/ocaml/xapi/xapi_subject.ml
@@ -177,9 +177,7 @@ let add_to_roles ~__context ~self ~role =
 	
 	(* CP-1224: Free Edition: Attempts to add or remove roles *)
 	(* will fail with a LICENSE_RESTRICTION error.*)
-	if (not (Pool_features.is_enabled ~__context Features.RBAC)) then
-		raise (Api_errors.Server_error(Api_errors.license_restriction, []))
-	else
+	Pool_features.assert_enabled ~__context ~f:Features.RBAC;
 
 	if (Xapi_role.is_valid_role ~__context ~role)
 	then
@@ -215,9 +213,7 @@ let remove_from_roles ~__context ~self ~role =
 
 	(* CP-1224: Free Edition: Attempts to add or remove roles *)
 	(* will fail with a LICENSE_RESTRICTION error.*)
-	if not (Pool_features.is_enabled ~__context Features.RBAC) then
-		raise (Api_errors.Server_error(Api_errors.license_restriction, []))
-	else
+	Pool_features.assert_enabled ~__context ~f:Features.RBAC;
 
 	if (List.mem role (Db.Subject.get_roles ~__context ~self))
 	then
diff --git a/ocaml/xapi/xapi_vif_helpers.ml b/ocaml/xapi/xapi_vif_helpers.ml
@@ -143,8 +143,7 @@ let gen_mac(dev, seed) =
 	 take_byte 2 mac_data_2; |]
 
 let assert_locking_licensed ~__context =
-	if (not (Pool_features.is_enabled ~__context Features.VIF_locking)) then
-		raise (Api_errors.Server_error(Api_errors.license_restriction, []))
+	Pool_features.assert_enabled ~__context ~f:Features.VIF_locking
 
 let m = Mutex.create () (* prevents duplicate VIFs being created by accident *)
 
diff --git a/ocaml/xapi/xapi_vm.ml b/ocaml/xapi/xapi_vm.ml
@@ -499,12 +499,9 @@ let snapshot ~__context ~vm ~new_name =
 (* Snapshot_with_quiesce triggers the VSS plugin which will then calls the VM.snapshot API call.     *)
 (* Thus, to avoid dead-locks, do not put snapshot and snapshot_with_quiesce on the same waiting line *)
 let snapshot_with_quiesce ~__context ~vm ~new_name =
-	if not (Pool_features.is_enabled ~__context Features.VSS)
-	then raise (Api_errors.Server_error(Api_errors.license_restriction, []))
-	else begin
-		TaskHelper.set_cancellable ~__context;
-		Xapi_vm_snapshot.snapshot_with_quiesce ~__context ~vm ~new_name
-	end
+	Pool_features.assert_enabled ~__context ~f:Features.VSS;
+	TaskHelper.set_cancellable ~__context;
+	Xapi_vm_snapshot.snapshot_with_quiesce ~__context ~vm ~new_name
 
 (* As we will destroy the domain ourself, we grab the vm_lock here in order to tell the event thread to *)
 (* do not look at this domain. The message forwarding layer already checked that the VM reference we    *)
@@ -521,16 +518,13 @@ let revert ~__context ~snapshot =
 (* As the checkpoint operation modify the domain state, we take the vm_lock to do not let the event *)
 (* thread mess around with that. *)
 let checkpoint ~__context ~vm ~new_name =
-	if not (Pool_features.is_enabled ~__context Features.Checkpoint) then
-		raise (Api_errors.Server_error(Api_errors.license_restriction, []))
-	else begin
-		Local_work_queue.wait_in_line Local_work_queue.long_running_queue
-			(Printf.sprintf "VM.checkpoint %s" (Context.string_of_task __context))
-			(fun () ->
-				TaskHelper.set_cancellable ~__context;
-				Xapi_vm_snapshot.checkpoint ~__context ~vm ~new_name
-			)
-	end
+	Pool_features.assert_enabled ~__context ~f:Features.Checkpoint;
+	Local_work_queue.wait_in_line Local_work_queue.long_running_queue
+		(Printf.sprintf "VM.checkpoint %s" (Context.string_of_task __context))
+		(fun () ->
+			TaskHelper.set_cancellable ~__context;
+			Xapi_vm_snapshot.checkpoint ~__context ~vm ~new_name
+		)
 
 let copy ~__context ~vm ~new_name ~sr =
 	(* See if the supplied SR is suitable: it must exist and be a non-ISO SR *)
diff --git a/ocaml/xapi/xapi_vm_migrate.ml b/ocaml/xapi/xapi_vm_migrate.ml
@@ -79,8 +79,7 @@ let assert_sr_support_migration ~__context ~vdi_map ~remote_rpc ~session_id =
 	) vdi_map
 
 let assert_licensed_storage_motion ~__context =
-	if (not (Pool_features.is_enabled ~__context Features.Storage_motion)) then
-		raise (Api_errors.Server_error(Api_errors.license_restriction, []))
+	Pool_features.assert_enabled ~__context ~f:Features.Storage_motion
 
 let get_ip_from_url url =
 	match Http.Url.of_string url with
