CP-28427: probe for first IQN if not given

Signed-off-by: Edwin Török <[email protected]>

Author: edwintorok

lib/test_sr.ml

@@ -52,13 +52,24 @@ let device_config ?(provider= "iscsi") ~ip ~iqn ?scsiid () =
   in
   (match scsiid with Some id -> ("SCSIid", id) :: conf | None -> conf)
 
-let create_gfs2_sr ctx ~iscsi ~iqn ?scsiid () =
+let create_gfs2_sr ctx ~iscsi ?iqn ?scsiid () =
   get_pool_master ctx
   >>= fun (_pool, master) ->
   (* probe *)
-  let device_config =
-    [("provider", "iscsi"); ("target", Ipaddr.V4.to_string iscsi); ("targetIQN", iqn)]
+  let probe_iqn device_config =
+    match iqn with
+    | Some iqn ->
+      Lwt.return (("targetIQN", iqn) :: device_config)
+    | None ->
+      rpc ctx @@ SR.probe_ext ~host:master ~device_config ~_type:"gfs2" ~sm_config:[]
+      >>= function
+      | [] -> Lwt.fail_with "Probe found nothing, not even a SCSIid"
+      | probed :: _ ->
+        Lwt.return probed.API.probe_result_configuration
   in
+  let device_config =
+    [("provider", "iscsi"); ("target", Ipaddr.V4.to_string iscsi)] in
+  probe_iqn device_config >>= fun device_config ->
   rpc ctx
   @@ SR.probe_ext ~host:master ~device_config ~_type:"gfs2" ~sm_config:[]
   >>= function
@@ -120,7 +131,7 @@ let plug_pbds ctx ~sr =
     pbds
 
 
-let get_gfs2_sr t ~iscsi ~iqn ?scsiid () =
+let get_gfs2_sr t ~iscsi ?iqn ?scsiid () =
   step t "GFS2 SR"
   @@ fun ctx ->
   debug (fun m -> m "Looking for GFS2 SR") ;
@@ -129,7 +140,7 @@ let get_gfs2_sr t ~iscsi ~iqn ?scsiid () =
   | (sr, _) :: _ ->
     debug (fun m -> m "Found existing GFS2 SR") ;
     plug_pbds ctx ~sr >>= fun () -> Lwt.return sr
-  | [] -> create_gfs2_sr ctx ~iscsi ~iqn ?scsiid ()
+  | [] -> create_gfs2_sr ctx ~iscsi ?iqn ?scsiid ()
 
 
 let do_ha t sr =

src/cmd_bonding.ml

@@ -91,9 +91,9 @@ let do_prepare conf =
   >>= fun () ->
   Test_sr.enable_clustering t
   >>= fun _cluster ->
-  (match (conf.iscsi, conf.iqn) with
-  | Some iscsi, Some iqn ->
-      Test_sr.get_gfs2_sr t ~iscsi ~iqn ?scsiid:conf.scsiid () >>= fun _gfs2 -> Lwt.return_unit
+  (match conf.iscsi with
+  | Some iscsi ->
+      Test_sr.get_gfs2_sr t ~iscsi ?iqn:conf.iqn ?scsiid:conf.scsiid () >>= fun _gfs2 -> Lwt.return_unit
   | _ -> Lwt.return_unit)
   >>= fun () ->
   Test_sr.make_pool ~uname:conf.uname ~pwd:conf.pwd conf conf.hosts)

src/cmd_lwt.ml

@@ -46,12 +46,11 @@ let do_prepare conf ~rollback ~clear_crashdumps =
   >>= fun () ->
   Test_sr.enable_clustering t
   >>= fun _cluster ->
-  match (conf.iscsi, conf.iqn) with
-  | Some iscsi, Some iqn ->
-      Test_sr.get_gfs2_sr t ~iscsi ~iqn ?scsiid:conf.scsiid () >>= fun _gfs2 -> Lwt.return_unit
+  match conf.iscsi with
+  | Some iscsi ->
+      Test_sr.get_gfs2_sr t ~iscsi ?iqn:conf.iqn ?scsiid:conf.scsiid () >>= fun _gfs2 -> Lwt.return_unit
   | _ -> Lwt.return_unit
 
-
 let lwt_main config f =
   Lwt_main.run (
   Lwt_io.with_file ~mode:Lwt_io.input config (fun ch -> Lwt_io.read ch)