CP-51895: Drop FCoE support when fcoe_driver does not exists

- Add logs when fcoe_driver does not exist
- Use List.assoc_opt instead of try catch
- Add __FUNCTION__ to the logs

Signed-off-by: Lin Liu <[email protected]>

Author: liulinC

ocaml/networkd/lib/network_utils.ml

@@ -1069,13 +1069,15 @@ module Fcoe = struct
   let get_capabilities name =
     match Sys.file_exists !fcoedriver with
     | false ->
+        info "%s: %s not found, does not support FCoE" __FUNCTION__ !fcoedriver ;
         [] (* Does not support FCoE *)
     | true -> (
       try
         let output = call ~log:false ["--xapi"; name; "capable"] in
         if Astring.String.is_infix ~affix:"True" output then ["fcoe"] else []
       with _ ->
-        debug "Failed to get fcoe support status on device %s" name ;
+        debug "%s: Failed to get fcoe support status on device %s" __FUNCTION__
+          name ;
         []
     )
 end

ocaml/xapi/xapi_pif.ml

@@ -323,33 +323,32 @@ let assert_fcoe_not_in_use ~__context ~self =
   | false ->
       (* Does not support FCoE from XS9, presuming not in use
        * Upgrade plugin will block upgrade with FCoE in use *)
-      ()
+      debug "%s not found, does not support FCoE" !Xapi_globs.fcoe_driver
   | true ->
       let interface = Db.PIF.get_device ~__context ~self in
       let output, _ =
         Forkhelpers.execute_command_get_output !Xapi_globs.fcoe_driver
           ["-t"; interface]
       in
       let output = String.trim output in
-      debug "Scsi ids on %s are: %s" interface output ;
+      debug "%s: SCSI ids on %s are: %s" __FUNCTION__ interface output ;
       let fcoe_scsids = Str.split (Str.regexp " ") output in
       Helpers.get_my_pbds __context
       |> List.iter (fun (_, pbd_rec) ->
              let sr = pbd_rec.API.pBD_SR in
              match Db.SR.get_type ~__context ~self:sr with
              | "lvmofcoe" -> (
-               try
-                 let scsid =
-                   List.assoc "SCSIid" pbd_rec.API.pBD_device_config
-                 in
-                 if List.mem scsid fcoe_scsids then
-                   raise
-                     (Api_errors.Server_error
-                        ( Api_errors.pif_has_fcoe_sr_in_use
-                        , [Ref.string_of self; Ref.string_of sr]
-                        )
-                     )
-               with Not_found -> ()
+               match List.assoc_opt "SCSIid" pbd_rec.API.pBD_device_config with
+               | Some scsid ->
+                   if List.mem scsid fcoe_scsids then
+                     raise
+                       (Api_errors.Server_error
+                          ( Api_errors.pif_has_fcoe_sr_in_use
+                          , [Ref.string_of self; Ref.string_of sr]
+                          )
+                       )
+               | None ->
+                   ()
              )
              | _ ->
                  ()