Convert CommandException to XenError("Command") in get_scsi_id()

The get_scsi_id() utility function is called by consumers of the
now-obsoleted sm-core-libs. Those callers are expecting a XenError
rather than a CommandException should there be an issue, so perform the
conversion here.

Signed-off-by: Tim Smith <[email protected]>

Author: Tim Smith

libs/sm/core/util.py

@@ -1627,9 +1627,13 @@ def get_isl_scsiids(session):
 def get_scsi_id(path):
     """
     Compatibility wrapper for sm-core-libs which had its own copy
-    of scsiutil.getSCSIid()
+    of scsiutil.getSCSIid(). Converts any CommandException raised
+    to a XenError as consumers of sm-core-libs are expecting.
     """
-    return scsiutil.getSCSIid(path)
+    try:
+        return scsiutil.getSCSIid(path)
+    except CommandException as e:
+        raise f_exceptions.XenError("Command", e.reason)
 
 
 class extractXVA: