Merge branch 'master' into private/asultanov/restr_removal

Signed-off-by: Andriy Sultanov <[email protected]>

.github/workflows/format.yml

@@ -28,14 +28,13 @@ jobs:
         run: sudo apt-get update
 
       - name: Use ocaml
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }}
           opam-repositories: |
             xs-opam: ${{ steps.dotenv.outputs.repository }}
           dune-cache: true
           opam-pin: false
-          opam-depext: false
 
       - name: Install ocamlformat
         run: opam install ocamlformat

.github/workflows/setup-xapi-environment/action.yml

@@ -45,12 +45,13 @@ runs:
     # We set DUNE_CACHE_STORAGE_MODE, it is required for dune cache to work inside opam for now,
     # otherwise it gets EXDEV and considers it a cache miss
     - name: Use ocaml
-      uses: ocaml/setup-ocaml@v2
+      uses: ocaml/setup-ocaml@v3
       with:
         ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }}
         opam-repositories: |
           xs-opam: ${{ steps.dotenv.outputs.repository }}
         dune-cache: true
+        opam-pin: false
       env:
         DUNE_CACHE_STORAGE_MODE: copy
 

clock.opam

@@ -7,12 +7,14 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "ocaml" {>= "4.12"}
   "alcotest" {with-test}
   "astring"
   "mtime"
   "ptime"
+  "qcheck-core" {with-test}
+  "qcheck-alcotest" {with-test}
   "odoc" {with-doc}
 ]
 build: [

dune

@@ -3,7 +3,7 @@
     (ocamlopt_flags (:standard -g -p -w -39))
     (flags (:standard -w -39))
   )
-  (dev (flags (:standard -g -w -39)))
+  (dev (flags (:standard -g -w -39 -warn-error -69)))
   (release
     (flags (:standard -w -39-6@5))
     (env-vars (ALCOTEST_COMPACT 1))

dune-project

@@ -1,4 +1,5 @@
-(lang dune 3.0)
+(lang dune 3.15)
+
 (formatting (enabled_for ocaml))
 (using menhir 2.0)
 
@@ -28,6 +29,8 @@
     astring
     mtime
     ptime
+    (qcheck-core :with-test)
+    (qcheck-alcotest :with-test)
   )
 )
 
@@ -66,7 +69,6 @@
   (synopsis "Xen-API client library for remotely-controlling a xapi host")
   (authors "David Scott" "Anil Madhavapeddy" "Jerome Maloberti" "John Else" "Jon Ludlam" "Thomas Sanders" "Mike McClurg")
   (depends
-   dune-build-info
    (alcotest :with-test)
    astring
    (cohttp (>= "0.22.0"))
@@ -187,7 +189,6 @@
   (description "This daemon monitors 'datasources' i.e. time-varying values such as performance counters and records the samples in RRD archives. These archives can be used to examine historical performance trends.")
   (depends
    (ocaml (>= "4.02.0"))
-   dune-build-info
    (alcotest :with-test)
    astring
    (gzip (= :version))
@@ -300,6 +301,69 @@
 
 (package
   (name xapi)
+  (synopsis "The toolstack daemon which implements the XenAPI")
+  (description "This daemon exposes the XenAPI and is used by clients such as 'xe' and 'XenCenter' to manage clusters of Xen-enabled hosts.")
+  (depends
+    alcotest ; needed for the quicktest binary
+    angstrom
+    base-threads
+    base64
+    cdrom
+    conf-pam
+    (crowbar :with-test)
+    ctypes
+    ctypes-foreign
+    domain-name
+    (ezxenstore (= :version))
+    (fmt :with-test)
+    hex
+    (http-lib (and :with-test (= :version))) ; the public library is only used for testing
+    ipaddr
+    mirage-crypto
+    mirage-crypto-pk
+    (mirage-crypto-rng (>= "0.11.0"))
+    (message-switch-unix (= :version))
+    mtime
+    opentelemetry-client-ocurl
+    pci
+    (pciutil (= :version))
+    ppx_deriving_rpc
+    ppx_sexp_conv
+    ppx_deriving
+    psq
+    qcheck-alcotest
+    rpclib
+    (rrdd-plugin (= :version))
+    rresult
+    sexpr
+    sha
+    (stunnel (= :version))
+    tar
+    tar-unix
+    (uuid (= :version))
+    x509
+    (xapi-client (= :version))
+    (xapi-cli-protocol (= :version))
+    (xapi-consts (= :version))
+    (xapi-datamodel (= :version))
+    (xapi-expiry-alerts (= :version))
+    (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))
+    (xapi-stdext-unix (= :version))
+    (xapi-stdext-zerocheck (= :version))
+    (xapi-test-utils :with-test)
+    (xapi-tracing (= :version))
+    (xapi-types (= :version))
+    (xapi-xenopsd (= :version))
+    (xml-light2 (= :version))
+    yojson
+    (zstd (= :version))
+  )
 )
 
 (package
@@ -321,6 +385,32 @@
 
 (package
   (name vhd-tool)
+  (synopsis "Manipulate .vhd files")
+  (tags ("org.mirage" "org:xapi-project"))
+  (depends
+    (alcotest-lwt :with-test)
+    cohttp-lwt
+    conf-libssl
+    (cstruct (>= "3.0.0"))
+    (ezxenstore (= :version))
+    (forkexec (= :version))
+    io-page
+    lwt
+    nbd-unix
+    ppx_cstruct
+    ppx_deriving_rpc
+    re
+    rpclib
+    sha
+    tar
+    (vhd-format (= :version))
+    (vhd-format-lwt (= :version))
+    (xapi-idl (= :version))
+    (xapi-log (= :version))
+    (xen-api-client-lwt (= :version))
+    xenstore
+    xenstore_transport
+  )
 )
 
 (package
@@ -438,6 +528,16 @@ This package provides an Lwt compatible interface to the library.")
 
 (package
   (name message-switch-unix)
+  (synopsis "A simple store-and-forward message switch")
+  (description "The switch stores messages in queues with well-known names. Clients use a simple HTTP protocol to enqueue and dequeue messages.")
+  (depends
+    base-threads
+    cohttp
+    (message-switch-core (= :version))
+    ppx_deriving_rpc
+    rpclib
+    (xapi-stdext-threads (= :version))
+  )
 )
 
 (package

forkexec.opam

@@ -8,7 +8,7 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "base-threads"
   "fd-send-recv" {>= "2.0.0"}
   "ppx_deriving_rpc"

http-lib.opam

@@ -9,7 +9,7 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "alcotest" {with-test}
   "astring"
   "base64" {>= "3.1.0"}

message-switch-core.opam

@@ -9,7 +9,7 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.15"}
   "astring"
   "cohttp" {>= "0.21.1"}
   "ppx_deriving_rpc"

message-switch-unix.opam

@@ -1,29 +1,35 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-name: "message-switch-unix"
-maintainer: "[email protected]"
-authors: [ "[email protected]" ]
-homepage: "https://github.com/xapi-project/xen-api"
+synopsis: "A simple store-and-forward message switch"
+description:
+  "The switch stores messages in queues with well-known names. Clients use a simple HTTP protocol to enqueue and dequeue messages."
+maintainer: ["Xapi project maintainers"]
+authors: ["[email protected]"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-tags: [ "org:xapi-project" ]
-build: [
-  ["./configure" "--prefix" "%{prefix}%"]
-  [ "dune" "build" "-p" name "-j" jobs ]
-]
 depends: [
-  "ocaml"
-  "dune" {build & >= "1.4"}
-  "odoc" {with-doc}
+  "dune" {>= "3.15"}
   "base-threads"
-  "message-switch-core"
+  "cohttp"
+  "message-switch-core" {= version}
   "ppx_deriving_rpc"
+  "rpclib"
+  "xapi-stdext-threads" {= version}
+  "odoc" {with-doc}
 ]
-synopsis: "A simple store-and-forward message switch"
-description: """
-The switch stores messages in queues with well-known names. Clients use
-a simple HTTP protocol to enqueue and dequeue messages."""
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"

message-switch.opam

@@ -31,6 +31,7 @@ depends: [
   "ppx_sexp_conv"
   "sexplib"
   "shared-block-ring" {>= "2.3.0"}
+  "xapi-stdext-unix"
 ]
 synopsis: "A simple store-and-forward message switch"
 description: """

message-switch.opam.template

@@ -29,6 +29,7 @@ depends: [
   "ppx_sexp_conv"
   "sexplib"
   "shared-block-ring" {>= "2.3.0"}
+  "xapi-stdext-unix"
 ]
 synopsis: "A simple store-and-forward message switch"
 description: """

ocaml/alerts/certificate/dune

@@ -1,6 +1,7 @@
 (library
   (name certificate_check)
   (modules certificate_check)
+  (modes best)
   (libraries
     astring
     xapi-expiry-alerts
@@ -19,7 +20,7 @@
   (modules certificate_check_main)
   (libraries
     certificate_check
-    dune-build-info
+
     http_lib
     xapi-client
     xapi-types

ocaml/alerts/dune

@@ -2,9 +2,7 @@
   (name expiry_alert)
   (public_name xapi-expiry-alerts)
   (libraries
-    astring
     xapi-client
-    xapi-consts
     xapi-types
     xapi-stdext-date
   )

ocaml/auth/dune

@@ -1,4 +1,5 @@
 (library
+  (modes best)
   (foreign_stubs
     (language c)
     (names xa_auth xa_auth_stubs)