CP-44103: Ordering network devices - IDL changes

Signed-off-by: Ming Lu <[email protected]>

Author: minglumlu

ocaml/networkd/lib/network_config.ml

@@ -187,6 +187,7 @@ let read_management_conf () =
     ; bridge_config
     ; gateway_interface= Some bridge_name
     ; dns_interface= Some bridge_name
+    ; interface_order= None
     }
   with e ->
     error "Error while trying to read firstboot data: %s\n%s"

ocaml/xapi-idl/network/dune

@@ -11,6 +11,7 @@
    xapi-idl
    xapi-log
    ipaddr
+   macaddr
  )
  (wrapped false)
  (preprocess (pps ppx_deriving_rpc)))

ocaml/xapi-idl/network/network_interface.ml

@@ -81,6 +81,34 @@ module Unix = struct
       }
 end
 
+module Macaddr = struct
+  include Macaddr
+
+  let typ_of =
+    Rpc.Types.Abstract
+      {
+        aname= "macaddr"
+      ; test_data= [Macaddr.of_string_exn "ca:fe:ba:be:ee:ee"]
+      ; rpc_of= (fun t -> Rpc.String (Macaddr.to_octets t))
+      ; of_rpc=
+          (function
+          | Rpc.String s ->
+              Macaddr.of_octets s
+              |> Result.map_error (fun (`Msg e) ->
+                     `Msg (Printf.sprintf "typ_of_macaddr: %s" e)
+                 )
+          | r ->
+              Error
+                (`Msg
+                  (Printf.sprintf
+                     "typ_of_macaddr: expectd rpc string but got %s"
+                     (Rpc.to_string r)
+                  )
+                  )
+          )
+      }
+end
+
 (** {2 Types} *)
 
 type debug_info = string [@@deriving rpcty]
@@ -91,6 +119,8 @@ type port = string [@@deriving rpcty]
 
 type bridge = string [@@deriving rpcty]
 
+type mac_address = Macaddr.t [@@deriving rpcty]
+
 (* rpcty cannot handle polymorphic variant, so change the definition to variant *)
 type dhcp_options = Set_gateway | Set_dns [@@deriving rpcty]
 
@@ -184,11 +214,21 @@ type bridge_config_t = {
 }
 [@@deriving rpcty]
 
+type ordered_iface = {
+    name: iface
+  ; position: int
+  ; mac: mac_address
+  ; pci: Xcp_pci.address
+  ; present: bool
+}
+[@@deriving rpcty]
+
 type config_t = {
     interface_config: (iface * interface_config_t) list [@default []]
   ; bridge_config: (bridge * bridge_config_t) list [@default []]
   ; gateway_interface: iface option [@default None]
   ; dns_interface: iface option [@default None]
+  ; interface_order: ordered_iface list option [@default None]
 }
 [@@deriving rpcty]
 
@@ -226,6 +266,7 @@ let default_config =
   ; bridge_config= []
   ; gateway_interface= None
   ; dns_interface= None
+  ; interface_order= None
   }
 
 (** {2 Configuration manipulation} *)