Merge branch master into feature/host-network-device-ordering

Conflict between #6637 and #6466. The PR #6637 on master is a
simplified version of PR #6466 for upgrade from master to feature
version.
To solve the conflict, keep #6466, drop #6637.

Signed-off-by: Changlei Li <changlei.li@cloud.com>

Author: changlei-li

.github/workflows/generate-and-build-sdks.yml

@@ -188,7 +188,7 @@ jobs:
       - name: Build C# SDK
         shell: pwsh
         run: |
-          dotnet build source/src `
+          dotnet build source/src/XenServer.csproj `
           --disable-build-servers `
           --configuration Release `
           -p:Version=${{ env.XAPI_VERSION_NUMBER }}-prerelease-unsigned `
@@ -205,7 +205,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dotnet: ["6", "8"]
+        dotnet: ["8"]
     needs: build-csharp-sdk
     runs-on: windows-2022
     permissions:

.github/workflows/main.yml

@@ -21,14 +21,25 @@ concurrency: # On new push, cancel old workflows from the same PR, branch or tag
 jobs:
   ocaml-tests:
     name: Run OCaml tests
-    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        runs-on: ["ubuntu-22.04"]
+        experimental: [false]
+        include:
+        - runs-on: "ubuntu-22.04-arm"
+          experimental: true
+
+    continue-on-error: ${{ matrix.experimental }}
+    runs-on: ${{ matrix.runs-on }}
     permissions:
       contents: read
     env:
       # Ensure you also update test-sdk-builds
       # when changing this value, to keep builds
       # consistent
       XAPI_VERSION: "v0.0.0"
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -86,7 +86,7 @@ jobs:
       - name: Retrieve PowerShell 7.x SDK distribution artifacts
         uses: actions/download-artifact@v4
         with:
-          name: SDK_Binaries_XenServerPowerShell_NET6
+          name: SDK_Binaries_XenServerPowerShell_NET8
           path: sdk_powershell_7x/
 
       - name: Package C SDK artifacts for deployment

ocaml/idl/datamodel_vm.ml

@@ -2375,7 +2375,7 @@ let sysprep =
     ~params:
       [
         (Ref _vm, "self", "The VM")
-      ; (String, "unattend", "XML content passed to sysprep")
+      ; (SecretString, "unattend", "XML content passed to sysprep")
       ; (Float, "timeout", "timeout in seconds for expected reboot")
       ]
     ~doc:

ocaml/libs/xapi-rrd/lib/rrd.ml

@@ -342,9 +342,9 @@ let rra_update rrd proc_pdp_st elapsed_pdp_st pdps =
 
 (* We assume that the data being given is of the form of a rate; that is,
    it's dependent on the time interval between updates.
-   Gauge and Absolute data sources are simply kept as is without any
-   time-based calculations, while Derive data sources will be changed according
-   to the time passed since the last measurement. (see CA-404597) *)
+   Gauge data sources are simply kept as is without any time-based
+   calculations, while Absolute and Derive data sources will be changed
+   according to the time passed since the last measurement. (see CA-404597) *)
 let process_ds_value ds value interval new_rrd =
   if interval > ds.ds_mrhb then
     nan
@@ -361,8 +361,10 @@ let process_ds_value ds value interval new_rrd =
 
     let rate =
       match (ds.ds_ty, new_rrd) with
-      | Absolute, _ | Derive, true | Gauge, _ ->
+      | Derive, true | Gauge, _ ->
           value_raw
+      | Absolute, _ ->
+          value_raw /. interval
       | Derive, false -> (
         match (ds.ds_last, value) with
         | VT_Int64 x, VT_Int64 y ->

ocaml/libs/xapi-rrd/lib_test/unit_tests.ml

@@ -147,46 +147,22 @@ let absolute_rrd =
 
 let absolute_rrd_CA_404597 () =
   let rra = rra_create CF_Average 100 1 0.5 in
-  let rra2 = rra_create CF_Average 100 10 0.5 in
-  let rra3 = rra_create CF_Average 100 100 0.5 in
-  let rra4 = rra_create CF_Average 100 1000 0.5 in
-  let ts = 1000000000.0 in
+  let ts = 0.0 in
   let ds =
-    ds_create "foo" Absolute ~mrhb:10.0 ~min:0. ~max:infinity (VT_Float 0.0)
+    ds_create "foo" Absolute ~mrhb:1000.0 ~min:0. ~max:infinity (VT_Float 0.0)
   in
-  let ds2 =
-    ds_create "bar" Absolute ~mrhb:10.0 ~min:0. ~max:infinity (VT_Float 0.0)
-  in
-  let ds3 =
-    ds_create "baz" Absolute ~mrhb:10.0 ~min:0. ~max:infinity (VT_Float 0.0)
-  in
-  let ds4 =
-    ds_create "boo" Absolute ~mrhb:10.0 ~min:0. ~max:infinity (VT_Float 0.0)
-  in
-  let rrd = rrd_create [|ds; ds2; ds3; ds4|] [|rra; rra2; rra3; rra4|] 1L ts in
+  let rrd = rrd_create [|ds|] [|rra|] 1L ts in
   let id = Identity in
   for i = 1 to 100000 do
-    let t = 1000000.0 +. (0.7 *. float_of_int i) in
+    let t = 300. *. float_of_int i in
     let ((_, val1) as v1) =
-      (0, {value= VT_Float (0.5 +. (0.5 *. sin (t /. 10.0))); transform= id})
+      (0, {value= VT_Float (300. *. float_of_int i); transform= id})
     in
-    let ((_, val2) as v2) =
-      (1, {value= VT_Float (1.5 +. (0.5 *. cos (t /. 80.0))); transform= id})
-    in
-    let ((_, val3) as v3) =
-      (2, {value= VT_Float (3.5 +. (0.5 *. sin (t /. 700.0))); transform= id})
-    in
-    let ((_, val4) as v4) =
-      (3, {value= VT_Float (6.5 +. (0.5 *. cos (t /. 5000.0))); transform= id})
-    in
-    ds_update rrd t [|v1; v2; v3; v4|] false ;
+    ds_update rrd t [|v1|] false ;
 
-    Array.iter2
-      (fun ds value ->
-        compare_float __LOC__ ds.ds_value
-          (float_of_string (ds_value_to_string value.value))
-      )
-      rrd.rrd_dss [|val1; val2; val3; val4|]
+    compare_float __LOC__
+      (float_of_string (ds_value_to_string val1.value) /. 300.)
+      rrd.rrd_dss.(0).ds_value
   done
 
 (** Verify that Gauge data soruce values are correctly handled by the RRD lib

ocaml/networkd/bin/network_server.ml

@@ -715,8 +715,7 @@ module Interface = struct
   let set_dns _ dbg ~name ~nameservers ~domains =
     Debug.with_thread_associated dbg
       (fun () ->
-        update_config name
-          {(get_config name) with dns= Some (nameservers, domains)} ;
+        update_config name {(get_config name) with dns= (nameservers, domains)} ;
         debug "Configuring DNS for %s: nameservers: [%s]; domains: [%s]" name
           (String.concat ", " (List.map Unix.string_of_inet_addr nameservers))
           (String.concat ", " domains) ;
@@ -889,7 +888,7 @@ module Interface = struct
                   ; ipv6_conf
                   ; ipv6_gateway
                   ; ipv4_routes
-                  ; dns
+                  ; dns= nameservers, domains
                   ; mtu
                   ; ethtool_settings
                   ; ethtool_offload
@@ -898,10 +897,15 @@ module Interface = struct
                 ) ) ->
                 update_config name c ;
                 exec (fun () ->
-                    match dns with
-                    | Some (nameservers, domains) ->
+                    (* We only apply the DNS settings when not in a DHCP mode
+                       to avoid conflicts. The `dns` field
+                       should really be an option type so that we don't have to
+                       derive the intention of the caller by looking at other
+                       fields. *)
+                    match (ipv4_conf, ipv6_conf) with
+                    | Static4 _, _ | _, Static6 _ | _, Autoconf6 ->
                         set_dns () dbg ~name ~nameservers ~domains
-                    | None ->
+                    | _ ->
                         ()
                 ) ;
                 exec (fun () -> set_ipv4_conf dbg name ipv4_conf) ;

ocaml/networkd/bin_db/networkd_db.ml

@@ -115,25 +115,20 @@ let _ =
                     [("gateway", Unix.string_of_inet_addr addr)]
               in
               let dns =
-                interface_config.dns
-                |> Option.map fst
-                |> Option.map (List.map Unix.string_of_inet_addr)
-                |> Option.fold ~none:[] ~some:(function
-                     | [] ->
-                         []
-                     | dns' ->
-                         [("dns", String.concat "," dns')]
-                     )
+                let dns' =
+                  List.map Unix.string_of_inet_addr (fst interface_config.dns)
+                in
+                if dns' = [] then
+                  []
+                else
+                  [("dns", String.concat "," dns')]
               in
               let domains =
-                interface_config.dns
-                |> Option.map snd
-                |> Option.fold ~none:[] ~some:(function
-                     | [] ->
-                         []
-                     | domains' ->
-                         [("domain", String.concat "," domains')]
-                     )
+                let domains' = snd interface_config.dns in
+                if domains' = [] then
+                  []
+                else
+                  [("domain", String.concat "," domains')]
               in
               mode @ addrs @ gateway @ dns @ domains
           | None4 ->

ocaml/networkd/lib/network_config.ml

@@ -52,6 +52,7 @@ let bridge_naming_convention (device : string) pos_opt =
 let get_list_from ~sep ~key args =
   List.assoc_opt key args
   |> Option.map (fun v -> Astring.String.cuts ~empty:false ~sep v)
+  |> Option.value ~default:[]
 
 let parse_ipv4_config args = function
   | Some "static" ->
@@ -87,13 +88,11 @@ let parse_ipv6_config args = function
       (None6, None)
 
 let parse_dns_config args =
-  let ( let* ) = Option.bind in
-  let* nameservers =
-    get_list_from ~sep:"," ~key:"DNS" args
-    |> Option.map (List.map Unix.inet_addr_of_string)
+  let nameservers =
+    get_list_from ~sep:"," ~key:"DNS" args |> List.map Unix.inet_addr_of_string
   in
-  let* domains = get_list_from ~sep:" " ~key:"DOMAIN" args in
-  Some (nameservers, domains)
+  let domains = get_list_from ~sep:" " ~key:"DOMAIN" args in
+  (nameservers, domains)
 
 let write_manage_iface_to_inventory bridge_name management_address_type =
   info "Writing management interface to inventory: %s" bridge_name ;
@@ -126,15 +125,15 @@ let read_management_conf interface_order =
     let device =
       (* Take 1st member of bond *)
       match (bond_mode, bond_members) with
-      | None, _ | _, (None | Some []) -> (
+      | None, _ | _, [] -> (
         match List.assoc_opt "LABEL" args with
         | Some x ->
             x
         | None ->
             error "%s: missing LABEL in %s" __FUNCTION__ management_conf ;
             raise Read_error
       )
-      | _, Some (hd :: _) ->
+      | _, hd :: _ ->
           hd
     in
     let pos_opt =

ocaml/sdk-gen/csharp/autogen/src/Event.cs

@@ -45,6 +45,7 @@ public override void UpdateFrom(Event update)
             id = update.id;
         }
 
+        [Obsolete("Use the calls setting individual fields of the API object instead.")]
         public override string SaveChanges(Session session, string opaqueRef, Event serverObject)
         {
             if (opaqueRef == null)