CP-54766 Remove internal path manipulation referencing /opt

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

Author: Tim Smith

libs/sm/on_slave.py

@@ -13,8 +13,6 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-import sys
-sys.path.append("/opt/xensource/sm/")
 from sm.core import util
 from sm.core import lock
 from sm.lvmcache import LVMCache

scripts/make-dummy-sr

@@ -4,7 +4,7 @@
 if [ -d /sys/class/iscsi_session ] ; then
     for dir in /sys/class/iscsi_session/* ; do
      if [ -d "$dir" ] ; then
-       # Ensure that the SR backend /opt/xensource/sm does not deactivate
+       # Ensure that the SR backend does not deactivate
        # this iSCSI session by saying it is in use by a "dummy" SR
        iqn="$(cat $dir/targetname)"
        dummy_sr="00000000-0000-0000-0000-000000000000"

scripts/plugins/coalesce-leaf

@@ -22,8 +22,6 @@ import sys
 import XenAPIPlugin
 from functools import reduce
 
-sys.path.append("/opt/xensource/sm/")
-sys.path.insert(0, "/opt/xensource/sm")
 import getopt
 import XenAPI
 from sm import cleanup

scripts/plugins/intellicache-clean

@@ -19,7 +19,6 @@
 
 import sys
 import XenAPIPlugin
-sys.path.append("/opt/xensource/sm/")
 from sm.core import util
 from sm import cleanup
 

scripts/plugins/lvhd-thin

@@ -20,7 +20,6 @@
 
 import sys
 import XenAPIPlugin
-sys.path.append("/opt/xensource/sm/")
 from sm.core import util
 from sm import lvhdutil
 from sm.lvmcache import LVMCache

scripts/plugins/nfs-on-slave

@@ -17,7 +17,6 @@
 #
 # A plugin for synchronizing slaves when something changes on the Master
 
-import sys; sys.path.append("/opt/xensource/sm/")
 from sm.core import util
 import os, glob, errno
 

scripts/plugins/tapdisk-pause

@@ -18,11 +18,9 @@
 # Pause/unpause tapdisk on the local host
 
 import os
-import sys
 import XenAPIPlugin
 import XenAPI
 
-sys.path.append("/opt/xensource/sm/")
 from sm import blktap2
 from sm.core import util
 from sm.core.lock import Lock
@@ -163,7 +161,7 @@ class Tapdisk:
                     continue
                 lvm_cache.activate(ns, uuid, lv_name, False)
 
-        import VDI
+        from sm import VDI
         vdi = VDI.VDI.from_uuid(self.session, self.vdi_uuid)
         # Check if CBT is enabled on disk we are about to unpause
         if vdi._get_blocktracking_status():

scripts/plugins/trim

@@ -18,10 +18,8 @@
 # A plugin for enabling trim on LVM based SRs to free up storage space
 # in Storage arrays.
 
-import sys
 import XenAPIPlugin
+from sm import trim_util
 
 if __name__ == "__main__":
-    sys.path.append("/opt/xensource/sm/")
-    from sm import trim_util
     XenAPIPlugin.dispatch({"do_trim": trim_util.do_trim})

utils/blktap2

@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-import sys
-sys.path.append("/opt/xensource/sm/")
 import os
+import sys
 import json
 
 from sm.core import util

utils/cleanup

@@ -21,7 +21,6 @@
 import getopt
 import sys
 
-sys.path.append("/opt/xensource/sm/")
 from sm import cleanup
 
 

utils/sr_health_check

@@ -19,10 +19,6 @@
 Health check for SR, to be triggered periodically by a systemd timer. What is checked is
 SR implementation type dependent.
 """
-# This path adjustment can be removed eventually
-import sys
-sys.path.append("/opt/xensource/sm/")
-
 from sm import sr_health_check
 
 if __name__ == "__main__":