CA-329871: Remove usage of xslib.py of sm

Signed-off-by: Deli Zhang <[email protected]>

Author: Deli Zhang

src/XenCert/blockunblockhbapaths-brocade

@@ -17,9 +17,8 @@
 
 import sys
 sys.path.insert(0, "/opt/xensource/sm")
-sys.path.insert(0, "/opt/xensource/sm/snapwatchd")
 import util
-import xslib
+import xen.lowlevel.xs
 import random
 import os
 from XenCertLog import XenCertPrint
@@ -70,8 +69,8 @@ for port in sampled_portlist:
     elif op == 'unblock':
         blockUnblockPort(False, ip, username, password, port)
 
-xs_handle = xslib.get_xs_handle()
-xslib.setval(xs_handle, '/xencert/block-unblock-over', '1')
+xs_handle = xen.lowlevel.xs.xs()
+xs_handle.write('', '/xencert/block-unblock-over', '1')
 del xs_handle
 
 if op == 'block':

src/XenCert/blockunblockhbapaths-cisco

@@ -17,9 +17,8 @@
 #
 import sys
 sys.path.insert(0, "/opt/xensource/sm")
-sys.path.insert(0, "/opt/xensource/sm/snapwatchd")
 import util
-import xslib
+import xen.lowlevel.xs
 import random
 import os
 from XenCertLog import XenCertPrint
@@ -70,8 +69,8 @@ for port in sampled_portlist:
     elif op == 'unblock':
         blockUnblockPort(False, ip, username, password, port)
 
-xs_handle = xslib.get_xs_handle()
-xslib.setval(xs_handle, '/xencert/block-unblock-over', '1')
+xs_handle = xen.lowlevel.xs.xs()
+xs_handle.write('', '/xencert/block-unblock-over', '1')
 del xs_handle
 
 if op == 'block':

src/XenCert/blockunblockhbapaths-qlogic

@@ -17,9 +17,8 @@
 #
 import sys
 sys.path.insert(0, "/opt/xensource/sm")
-sys.path.insert(0, "/opt/xensource/sm/snapwatchd")
 import util
-import xslib
+import xen.lowlevel.xs
 import random
 import os
 from XenCertLog import XenCertPrint
@@ -70,8 +69,8 @@ for port in sampled_portlist:
     elif op == 'unblock':
         blockUnblockPort(False, ip, username, password, port)
 
-xs_handle = xslib.get_xs_handle()
-xslib.setval(xs_handle, '/xencert/block-unblock-over', '1')
+xs_handle = xen.lowlevel.xs.xs()
+xs_handle.write('', '/xencert/block-unblock-over', '1')
 del xs_handle
 
 if op == 'block':

src/XenCert/blockunblockiscsipaths

@@ -17,9 +17,8 @@
 #
 import sys
 sys.path.insert(0, "/opt/xensource/sm")
-sys.path.insert(0, "/opt/xensource/sm/snapwatchd")
 import util
-import xslib
+import xen.lowlevel.xs
 import random
 
 def help():
@@ -70,9 +69,10 @@ for ip in newList:
 
 paths = paths.strip(',')
 
-xs_handle = xslib.get_xs_handle()
-xslib.setval(xs_handle, '/xencert/block-unblock-over', '1')
+xs_handle = xen.lowlevel.xs.xs()
+xs_handle.write('', '/xencert/block-unblock-over', '1')
 del xs_handle
+
 if op == 'block':
     sys.stdout.write(paths)
 sys.exit(0)

src/XenCert/blockunblockpaths

@@ -24,9 +24,8 @@
 
 import sys
 sys.path.insert(0, "/opt/xensource/sm")
-sys.path.insert(0, "/opt/xensource/sm/snapwatchd")
 import util
-import xslib
+import xen.lowlevel.xs
 import os
 import time
 from XenCertLog import Print, XenCertPrint
@@ -42,9 +41,9 @@ if len(sys.argv) != 5 and len(sys.argv) != 1 :
     help()
 
 retVal = ''
-xs_handle = xslib.get_xs_handle()
-xslib.setval(xs_handle, '/xencert/block-unblock-over', '0')
-block_unblock_over = xslib.getval(xs_handle, '/xencert/block-unblock-over')
+xs_handle = xen.lowlevel.xs.xs()
+xs_handle.write('', '/xencert/block-unblock-over', '0')
+block_unblock_over = xs_handle.read('', '/xencert/block-unblock-over')
 if len(sys.argv) == 5:
     cmd = [sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4]]
     XenCertPrint('blockunblockpaths - now call %s and wait for block/unblock to finish.' % cmd)
@@ -58,7 +57,7 @@ elif len(sys.argv) == 1:
 
 while block_unblock_over != '1':
     time.sleep(1)
-    block_unblock_over = xslib.getval(xs_handle, '/xencert/block-unblock-over')
+    block_unblock_over = xs_handle.read('', '/xencert/block-unblock-over')
 
 os.system('xenstore-rm /xencert')
 del xs_handle