xapi-aux: remove cstruct usage from networking_info

The only use of it was a parameter that was not used anywhere

Signed-off-by: Pau Ruiz Safont <[email protected]>

Author: psafont

ocaml/xapi-aux/networking_info.ml

@@ -61,8 +61,6 @@ let ipaddr_to_octets = function
   | Ipaddr.V6 addr ->
       Ipaddr.V6.to_octets addr
 
-let ipaddr_to_cstruct c = ipaddr_to_octets c |> Cstruct.of_string
-
 let get_management_ip_addrs ~dbg =
   let iface = Inventory.lookup Inventory._management_interface in
   try
@@ -101,8 +99,7 @@ let get_management_ip_addrs ~dbg =
 let get_management_ip_addr ~dbg =
   match get_management_ip_addrs ~dbg with
   | Ok (preferred, _) ->
-      List.nth_opt preferred 0
-      |> Option.map (fun addr -> (Ipaddr.to_string addr, ipaddr_to_cstruct addr))
+      List.nth_opt preferred 0 |> Option.map Ipaddr.to_string
   | Error _ ->
       None
 

ocaml/xapi-aux/networking_info.mli

@@ -24,10 +24,9 @@ val management_ip_error_to_string : management_ip_error -> string
 (** [management_ip_error err] returns a string representation of [err], useful
     only for logging. *)
 
-val get_management_ip_addr : dbg:string -> (string * Cstruct.t) option
+val get_management_ip_addr : dbg:string -> string option
 (** [get_management_ip_addr ~dbg] returns the preferred IP of the management
-    network, or None. The address is returned in two formats: a human-readable
-    string and its bytes representation. *)
+    network, or None. The address is returned in a human-readable string *)
 
 val get_host_certificate_subjects :
      dbg:string

ocaml/xapi/helpers.ml

@@ -157,7 +157,7 @@ let get_management_iface_is_connected ~__context =
 
 let get_management_ip_addr ~__context =
   let dbg = Context.string_of_task __context in
-  Option.map fst (Networking_info.get_management_ip_addr ~dbg)
+  Networking_info.get_management_ip_addr ~dbg
 
 let get_localhost_uuid () =
   Xapi_inventory.lookup Xapi_inventory._installation_uuid