LVHDoISCSISR7.patch

--- a/LVHDoISCSISR.py	2016-05-30 14:48:25.000000000 +1000
+++ b/LVHDoISCSISR.py	2016-05-30 14:48:36.000000000 +1000
@@ -18,7 +18,7 @@
 # LVHDoISCSISR: LVHD over ISCSI software initiator SR driver
 #
 
-import SR, VDI, LVHDSR, BaseISCSI, SRCommand, util, scsiutil, lvutil
+import SR, VDI, LVHDSR, RBDSR, BaseISCSI, SRCommand, util, scsiutil, lvutil
 import statvfs, time
 import os, socket, sys, re
 import xs_errors
@@ -79,7 +79,11 @@
 
         if self.original_srcmd.dconf.has_key('target'):
             self.original_srcmd.dconf['targetlist'] = self.original_srcmd.dconf['target']
-        iscsi = BaseISCSI.BaseISCSISR(self.original_srcmd, sr_uuid)
+
+        if self.original_srcmd.dconf.has_key('port') and '6789' in self.original_srcmd.dconf['port']:
+            iscsi = RBDSR.RBDSR(self.original_srcmd, sr_uuid) 
+        else:
+            iscsi = BaseISCSI.BaseISCSISR(self.original_srcmd, sr_uuid)
         self.iscsiSRs = []
         self.iscsiSRs.append(iscsi)
         
@@ -144,7 +148,10 @@
                     srcmd_copy.dconf['targetIQN'] = iqn
                     srcmd_copy.dconf['multiSession'] = IQNstring
                     util.SMlog("Setting targetlist: %s" % srcmd_copy.dconf['targetlist'])
-                    self.iscsiSRs.append(BaseISCSI.BaseISCSISR(srcmd_copy, sr_uuid))
+                    if self.original_srcmd.dconf.has_key('port') and '6789' in self.original_srcmd.dconf['port']:
+                        self.iscsiSRs.append(RBDSR.RBDSR(srcmd_copy, sr_uuid)) 
+                    else:
+                        self.iscsiSRs.append(BaseISCSI.BaseISCSISR(srcmd_copy, sr_uuid))
                 pbd = util.find_my_pbd(self.session, self.host_ref, self.sr_ref)
                 if pbd <> None and not self.dconf.has_key('multiSession'):
                     dconf = self.session.xenapi.PBD.get_device_config(pbd)
@@ -557,7 +564,10 @@
             raise xs_errors.XenError('InvalidDev')
         self._pathrefresh(LVHDoISCSISR)
         out = LVHDSR.LVHDSR.probe(self)
-        self.iscsi.detach(self.uuid)
+        if self.original_srcmd.dconf.has_key('port') and '6789' in self.original_srcmd.dconf['port']:
+            util.SMlog('This is RBD SR, we don\'t attach target during probing so no detach required')
+        else:
+            self.iscsi.detach(self.uuid)
         return out
 
     def vdi(self, uuid):