Merge pull request #87 from DeliZhangX/private/deliz/CA-331398

Private/deliz/ca 331398

Author: Deli Zhang

src/XenCert/StorageHandler.py

@@ -25,7 +25,7 @@
 from xml.dom import minidom
 import StorageHandlerUtil
 from XenCertLog import Print, PrintOnSameLine, XenCertPrint
-from XenCertCommon import displayOperationStatus, getConfigWithHiddenPassword
+from XenCertCommon import displayOperationStatus, getConfigWithHiddenPassword, hidePathInfoPassword
 import scsiutil
 import iscsilib
 import util
@@ -665,7 +665,8 @@ def BlockUnblockPaths(self, blockOrUnblock, script, noOfPaths, passthrough):
 
             (rc, stdout, stderr) = util.doexec(cmd,'')
 
-            XenCertPrint("The path block/unblock utility returned rc: %s stdout: '%s', stderr: '%s'" % (rc, stdout, stderr))
+            stdoutPrint = hidePathInfoPassword(stdout) if self.storage_conf['storage_type'] == 'hba' else stdout
+            XenCertPrint("The path block/unblock utility returned rc: %s stdout: '%s', stderr: '%s'" % (rc, stdoutPrint, stderr))
             if rc != 0:
                 raise Exception("   - The path block/unblock utility returned an error: %s." % stderr)
             return stdout
@@ -2579,7 +2580,7 @@ def RandomlyFailPaths(self):
             XenCertPrint("No of paths which should fail is %s out of total %s" % \
                                             (self.noOfPaths, self.noOfTotalPaths))
             self.blockedpathinfo = scriptReturn.split('::')[0]
-            PrintOnSameLine(" -> Blocking paths (%s)\n" % self.blockedpathinfo)
+            PrintOnSameLine(" -> Blocking paths (%s)\n" % hidePathInfoPassword(self.blockedpathinfo))
             return True
         except Exception, e:            
             raise e
@@ -3395,6 +3396,9 @@ def __init__(self, base_handler):
         if self.device_config['provider'] == 'iscsi':
             self.device_config['target'] = storage_conf['target']
             self.device_config['targetIQN'] = storage_conf['targetIQN']
+            if storage_conf['chapuser'] is not None and storage_conf['chappasswd'] is not None:
+                self.device_config['chapuser'] = storage_conf['chapuser']
+                self.device_config['chappassword'] = storage_conf['chappasswd']
 
         super(StorageHandlerGFS2, self).__init__(storage_conf)
 
@@ -3413,15 +3417,19 @@ def Create(self):
 
             device_config = copy.deepcopy(self.device_config)
 
+            if 'targetIQN' in device_config and len(device_config['targetIQN'].split(',')) > 1:
+                device_config['targetIQN'] = '*'
+
             Print("      Creating the SR.")
             # try to create an SR with one of the LUNs mapped, if all fails
             # throw an exception
             for scsiId in listSCSIId:
                 try:
                     device_config['SCSIid'] = scsiId
+                    device_config_tmp = getConfigWithHiddenPassword(device_config, self.storage_conf['storage_type'])
                     XenCertPrint("The SR create parameters are {}, {}".format(
                         util.get_localhost_uuid(self.session),
-                        device_config))
+                        device_config_tmp))
 
                     sr_ref = self.session.xenapi.SR.create(
                             util.get_localhost_uuid(self.session),
@@ -3437,7 +3445,7 @@ def Create(self):
 
                     XenCertPrint(
                         "Created the SR {} using device_config {}".format(
-                            sr_ref, device_config))
+                            sr_ref, device_config_tmp))
                     displayOperationStatus(True)
                     break
 

src/XenCert/XenCertCommon.py

@@ -284,6 +284,12 @@ def getConfigWithHiddenPassword(config, storage_type):
         pass
     return config_with_hidden_password
 
+def hidePathInfoPassword(pathInfo, delimiter=':', password_index=2):
+    infoList = pathInfo.split(delimiter)
+    if len(infoList) > password_index:
+        infoList[password_index] = HIDDEN_PASSWORD
+    return delimiter.join(infoList)
+
 def showReport(msg, result, checkPoints=1, totalCheckPoints=1, time=0):
     Print("%-50s: %s, Pass percentage: %d, Completed: %s" %
           (msg, TAG_PASS if result else TAG_FAIL, int((checkPoints * 100) / totalCheckPoints), time))