CP-3574: new error code PATCH_PRECHECK_FAILED_WRONG_SERVER_BUILD

Author: thomassa

ocaml/idl/api_errors.ml

@@ -302,6 +302,7 @@ let patch_already_applied = "PATCH_ALREADY_APPLIED"
 let patch_precheck_failed_unknown_error = "PATCH_PRECHECK_FAILED_UNKNOWN_ERROR"
 let patch_precheck_failed_prerequisite_missing = "PATCH_PRECHECK_FAILED_PREREQUISITE_MISSING"
 let patch_precheck_failed_wrong_server_version = "PATCH_PRECHECK_FAILED_WRONG_SERVER_VERSION"
+let patch_precheck_failed_wrong_server_build = "PATCH_PRECHECK_FAILED_WRONG_SERVER_BUILD"
 let patch_precheck_failed_vm_running = "PATCH_PRECHECK_FAILED_VM_RUNNING"
 let patch_apply_failed = "PATCH_APPLY_FAILED"
 let cannot_find_oem_backup_partition = "CANNOT_FIND_OEM_BACKUP_PARTITION"

ocaml/idl/datamodel.ml

@@ -963,6 +963,8 @@ let _ =
     ~doc:"The patch precheck stage failed: prerequisite patches are missing." ();
   error Api_errors.patch_precheck_failed_wrong_server_version [ "patch"; "found_version"; "required_version"]
     ~doc:"The patch precheck stage failed: the server is of an incorrect version." ();
+  error Api_errors.patch_precheck_failed_wrong_server_build [ "patch"; "found_build"; "required_build"]
+    ~doc:"The patch precheck stage failed: the server is of an incorrect build." ();
   error Api_errors.patch_precheck_failed_vm_running [ "patch" ]
     ~doc:"The patch precheck stage failed: there are one or more VMs still running on the server.  All VMs must be suspended before the patch can be applied." ();
 

ocaml/xapi/xapi_pool_patch.ml

@@ -617,6 +617,20 @@ let parse_patch_precheck_xml patch = function
         let found = findElement "found" children in
         let required = findElement "required" children in
         raise (Api_errors.Server_error (Api_errors.patch_precheck_failed_wrong_server_version, [Ref.string_of patch; found; required]))
+  | Element ("error", [("errorcode", "PATCH_PRECHECK_FAILED_WRONG_SERVER_BUILD")], children) ->
+      (* Exactly like the previous one but SERVER_BUILD instead of SERVER_VERSION *)
+      (* <error errorcode="PATCH_PRECHECK_FAILED_WRONG_SERVER_BUILD">
+        <found>50845c</found>
+        <required>^58332[pc]$</required>
+      </error> *)
+      let rec findElement name = function
+        | Element (tagName, _, (PCData head)::_)::tail -> if tagName = name then head else findElement name tail
+        | _::tail -> findElement name tail
+        | [] -> raise (Bad_precheck_xml "Could not find element %s")
+      in
+        let found = findElement "found" children in
+        let required = findElement "required" children in
+        raise (Api_errors.Server_error (Api_errors.patch_precheck_failed_wrong_server_build, [Ref.string_of patch; found; required]))
   | Element ("error", [("errorcode", "PATCH_PRECHECK_FAILED_VM_RUNNING")], _) ->
       (* <error errorcode="PATCH_PRECHECK_FAILED_VM_RUNNING" /> *)
       raise (Api_errors.Server_error (Api_errors.patch_precheck_failed_vm_running, [Ref.string_of patch]))