fixup! CP-41796 Close Port 80 (Encrypt Data Transfer During VM Migrations)

Signed-off-by: Christian Lindig <christian.lindig@cloud.com>

Author: Christian Lindig

lib/open_uri_patched.ml renamed to lib/open_uri_https.ml

@@ -83,7 +83,7 @@ let http_rpc string_of_call response_of_string ?(srcstr = "unset")
   let http_req =
     Cohttp.Request.make ~meth:`POST ~version:`HTTP_1_1 ~headers uri
   in
-  Open_uri_patched.with_open_uri uri (fun fd ->
+  Open_uri_https.with_open_uri uri (fun fd ->
       let ic = Unix.in_channel_of_descr fd in
       let oc = Unix.out_channel_of_descr fd in
       Request.write (fun writer -> Request.write_body writer req) http_req oc ;
@@ -137,7 +137,7 @@ let () =
 let binary_rpc string_of_call response_of_string ?(srcstr = "unset")
     ?(dststr = "unset") url (call : Rpc.call) : Rpc.response =
   let uri = Uri.of_string (url ()) in
-  Open_uri.with_open_uri uri (fun fd ->
+  Open_uri_https.with_open_uri uri (fun fd ->
       let ic = Unix.in_channel_of_descr fd in
       let oc = Unix.out_channel_of_descr fd in
       let msg_buf = string_of_call call in

lib/xcp_client_patched.ml renamed to lib/xcp_client_https.ml

@@ -2349,7 +2349,7 @@ and perform_exn ?subtask ?result (op : operation) (t : Xenops_task.task_handle)
         let module Remote =
         Xenops_interface.XenopsAPI (Idl.Exn.GenClient (struct
           let rpc =
-            Xcp_client_patched.xml_http_rpc ~srcstr:"xenops" ~dststr:"dst_xenops"
+            Xcp_client_https.xml_http_rpc ~srcstr:"xenops" ~dststr:"dst_xenops"
               (fun () -> vmm.vmm_url
             )
         end)) in
@@ -2396,7 +2396,7 @@ and perform_exn ?subtask ?result (op : operation) (t : Xenops_task.task_handle)
            memory on the receiver *)
         let state = B.VM.get_state vm in
         info "VM %s has memory_limit = %Ld" id state.Vm.memory_limit ;
-        Open_uri_patched.with_open_uri memory_url (fun mem_fd ->
+        Open_uri_https.with_open_uri memory_url (fun mem_fd ->
             let module Handshake = Xenops_migrate.Handshake in
             let do_request fd extra_cookies url =
               let https = Uri.scheme url = Some "https" in
@@ -2479,7 +2479,7 @@ and perform_exn ?subtask ?result (op : operation) (t : Xenops_task.task_handle)
                   make_url "/migrate-vgpu/"
                     (VGPU_DB.string_of_id (new_dest_id, dev_id))
                 in
-                Open_uri_patched.with_open_uri vgpu_url (fun vgpu_fd ->
+                Open_uri_https.with_open_uri vgpu_url (fun vgpu_fd ->
                     do_request vgpu_fd [(cookie_vgpu_migration, "")] vgpu_url ;
                     Handshake.recv_success vgpu_fd ;
                     debug "VM.migrate: Synchronisation point 1-vgpu" ;