Merge pull request #218 from xapi-project/feature/REQ477/master

477 merge

Author: lindig

storage/storage_interface.ml

@@ -98,6 +98,7 @@ let vdi_info_of_rpc rpc = Rpc.struct_extend rpc (rpc_of_vdi_info default_vdi_inf
 type sr_health = Healthy | Recovering
 
 type sr_info = {
+    sr_uuid: string option;
     name_label: string;
     name_description: string;
     total_space: int64;        (** total number of bytes on the storage substrate *)
@@ -119,13 +120,15 @@ type dp_stat_t = {
 let string_of_dp_stat_t (x: dp_stat_t) = Jsonrpc.to_string (rpc_of_dp_stat_t x)
 
 type probe = {
-  srs: (string * sr_info) list; (* SRs we found *)
-  uris: string list; (* other uris we found which could be probed recursively *)
+  configuration: (string * string) list;
+  complete: bool;
+  sr: sr_info option;
+  extra_info: (string * string) list;
 }
 
 type probe_result =
   | Raw of string (* SMAPIv1 adapters return arbitrary data *)
-  | Probe of probe
+  | Probe of probe list
 
 module Mirror = struct
 	type id = string