Merge pull request #81 from DeliZhangX/private/deliz/CA-329871

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

.travis.yml

@@ -1,9 +1,9 @@
 language: python
 python:
-    - "2.6"
+    - "2.7"
 # command to install dependencies
 install:
-      - "pip install -r requirements.txt --use-mirrors"
+      - "pip install -r requirements.txt"
 # command to run tests
 script:
         - "pylint --version"

src/XenCert/StorageHandler.py

@@ -3155,7 +3155,7 @@ def FunctionalTests(self):
                     StorageHandlerUtil.DestroySR(self.session, sr_ref)
                 checkPoints += 1
             except Exception, e:
-                Print("   - Failed to cleanup after CIFS functional tests, please delete the following manually: %s, %s, %s. Exception: %s" % (testfile, testdir, mountpoint, str(e)))
+                Print("   - Failed to cleanup after CIFS functional tests, please delete the following manually: %s, %s, %s(sr). Exception: %s" % (testfile, testdir, self.session.xenapi.SR.get_uuid(sr_ref), str(e)))
 
         return (retVal, checkPoints, totalCheckPoints)
 
@@ -3464,5 +3464,6 @@ def GetStorageHandler(g_storage_conf):
         return StorageHandlerCIFS(g_storage_conf)
 
     if g_storage_conf["storage_type"] == "isl":
-        return StorageHandlerISL(g_storage_conf)
+        #return StorageHandlerISL(g_storage_conf)
+        pass
     return None

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

tests/pylintrc

@@ -122,6 +122,8 @@ zope=no
 # so shouldn't trigger E0201 when accessed (need zope=yes to be considered).
 acquired-members=REQUEST,acl_users,aq_parent
 
+ignored-modules=scsiutil,iscsilib,util,BaseISCSI,nfs,lvhdutil,lvutil,srmetadata,metadata,vhdutil,mpath_cli,mpath_dmp,xs_errors
+
 
 # checks for
 # * unused variables / imports