Merge branch 'master' into private/bengangy/merge-ssh-to-master

Author: BengangY

doc/content/xapi/storage/_index.md

@@ -338,6 +338,7 @@
     base64
     (bos :with-test)
     cdrom
+    (clock (= :version))
     cmdliner
     cohttp
     conf-pam
@@ -398,7 +399,6 @@
     (xapi-idl (= :version))
     (xapi-inventory (= :version))
     (xapi-log (= :version))
-    (xapi-stdext-date (= :version))
     (xapi-stdext-pervasives (= :version))
     (xapi-stdext-std (= :version))
     (xapi-stdext-threads (= :version))
@@ -604,6 +604,7 @@ This package provides an Lwt compatible interface to the library.")
     (alcotest :with-test)
     astring
     (base64 (>= "3.1.0"))
+    (clock (= :version))
     fmt
     ipaddr
     mtime
@@ -619,7 +620,6 @@ This package provides an Lwt compatible interface to the library.")
     xapi-backtrace
     (xapi-idl (= :version))
     (xapi-log (= :version))
-    (xapi-stdext-date (= :version))
     (xapi-stdext-pervasives (= :version))
     (xapi-stdext-threads (= :version))
     (xapi-tracing (= :version))

dune-project

@@ -13,6 +13,7 @@ depends: [
   "alcotest" {with-test}
   "astring"
   "base64" {>= "3.1.0"}
+  "clock" {= version}
   "fmt"
   "ipaddr"
   "mtime"
@@ -28,7 +29,6 @@ depends: [
   "xapi-backtrace"
   "xapi-idl" {= version}
   "xapi-log" {= version}
-  "xapi-stdext-date" {= version}
   "xapi-stdext-pervasives" {= version}
   "xapi-stdext-threads" {= version}
   "xapi-tracing" {= version}

http-lib.opam

@@ -1,5 +1,5 @@
 module XenAPI = Client.Client
-module Date = Xapi_stdext_date.Date
+module Date = Clock.Date
 
 type cert =
   | CA of API.ref_Certificate * API.datetime

ocaml/alerts/certificate/certificate_check.ml

@@ -14,7 +14,8 @@
 
 val alert : (Rpc.call -> Rpc.response) -> [< `session] Ref.t -> unit
 
-(* Below exposed only for ease of testing *)
+(* Below exposed only for ease of testing, drop any documentation *)
+(**/**)
 
 type cert =
   | CA of API.ref_Certificate * API.datetime
@@ -25,11 +26,11 @@ val certificate_description : cert -> string
 
 val alert_conditions : cert -> (int * (string * int64)) list
 
-val get_expiry : cert -> Xapi_stdext_date.Date.t
+val get_expiry : cert -> Clock.Date.t
 
 val maybe_generate_alert :
-     Xapi_stdext_date.Date.t
+     Clock.Date.t
   -> string
   -> (int * (string * int64)) list
-  -> Xapi_stdext_date.Date.t
+  -> Clock.Date.t
   -> (string * (string * int64)) option

ocaml/alerts/certificate/certificate_check.mli

@@ -4,11 +4,12 @@
   (modes best)
   (libraries
     astring
+    ptime
     xapi-expiry-alerts
     xapi-client
     xapi-consts
     xapi-types
-    xapi-stdext-date
+    clock
   )
 )
 
@@ -18,7 +19,7 @@
   (modules certificate_check_main)
   (libraries
     certificate_check
-    
+
     http_lib
     xapi-client
     xapi-types

ocaml/alerts/certificate/dune

@@ -2,8 +2,8 @@
   (name expiry_alert)
   (public_name xapi-expiry-alerts)
   (libraries
+    clock
     xapi-client
     xapi-types
-    xapi-stdext-date
   )
 )

ocaml/alerts/dune

@@ -13,7 +13,7 @@
  *)
 
 module XenAPI = Client.Client
-module Date = Xapi_stdext_date.Date
+module Date = Clock.Date
 
 type message_name = string
 
@@ -37,7 +37,7 @@ type raw_alert = {
   ; obj_uuid: string
   ; obj_description: string
   ; alert_conditions: (remaining_days * message_id) list
-  ; expiry: Xapi_stdext_date.Date.t (* when the obj will expire *)
+  ; expiry: Date.t (* when the obj will expire *)
 }
 
 let seconds_per_day = 3600. *. 24.
@@ -87,7 +87,7 @@ let filter_messages msg_name_list msg_obj_uuid alert all_msgs =
      )
 
 let alert ~rpc ~session_id raw_alerts =
-  let now = Date.now () in
+  let now = Clock.Date.now () in
   let all_msgs = all_messages rpc session_id in
   List.iter
     (fun {cls; obj_uuid; obj_description; alert_conditions; expiry} ->

ocaml/alerts/expiry_alert.ml

@@ -55,7 +55,7 @@ type raw_alert = {
          * sent, and when it has expired, message "host_server_certificate_expired"
          * should be sent.
          *)
-  ; expiry: Xapi_stdext_date.Date.t
+  ; expiry: Clock.Date.t
         (* the last second when the obj is valid, it will expire in the next second *)
 }
 
@@ -69,17 +69,17 @@ val alert :
 
 (* Below exposed only for ease of testing *)
 
-val message_body : string -> Xapi_stdext_date.Date.t -> string
+val message_body : string -> Clock.Date.t -> string
 
 val expired_message : string -> string
 
 val expiring_message : string -> string
 
 val maybe_generate_alert :
-     Xapi_stdext_date.Date.t
+     Clock.Date.t
   -> string
   -> (remaining_days * message_id) list
-  -> Xapi_stdext_date.Date.t
+  -> Clock.Date.t
   -> (string * message_id) option
 (** An inner function exposed only for ease of testing, it returns None if there is no
     need for an expiry alert as it is not expiring or expired yet, otherwise an "alert"

ocaml/alerts/expiry_alert.mli

@@ -15,7 +15,6 @@
    xapi-log
    xapi-stdext-pervasives
    xapi-stdext-unix
-   xapi-stdext-date
    xapi-tracing
  )
  (preprocess (per_module ((pps ppx_deriving_rpc) Fe))))