quarchpy 2.1.10.dev4__py3-none-any.whl → 2.1.10.dev6__py3-none-any.whl

quarchpy/iometer/iometerFuncs.py

@@ -5,7 +5,6 @@ This contains useful functions for Iometer automation with Quarch tools
 ########### VERSION HISTORY ###########
 
 13/08/2018 - Andy Norrie    - First version, based on initial work from Pedro Leao
-20/02/2023 - Matt Holsey    - Updating for App note overhaul, improving documentation
 '''
 
 '''
@@ -24,7 +23,6 @@ import datetime
 import socket
 import csv
 import mmap
-from quarchpy.iometer.gen_iometer_template import generate_iometer_template
 
 try:
     # for Python 2.x
@@ -67,20 +65,14 @@ def followResultsFile (theFile):
             continue
         yield line
 
+'''
+This function follows the data accumulating from Iometer, in the instant results file, and 
+processes it into QPS, adding annotationsa and custom channel data points as needed.
 
-def processIometerInstResults(testName, myStream, userCallbacks):
-    """
-    This function follows the data accumulating from Iometer, in the instant results file, and
-    processes it into QPS, adding annotationsa and custom channel data points as needed.
-
-    This currently assumes that custom channels have been created for IOPS, Data and Response
-
-    :param testName:
-    :param myStream:
-    :param userCallbacks:
-    :return:
-    """
-
+This currently assumes that custom channels have been created for IOPS, Data and Response
+'''
+def processIometerInstResults(testName, myStream, userCallbacks):    
+        
     # Wait for the file to exist
     while(os.path.isfile("insttestfile.csv") == False):
         pass
@@ -107,7 +99,6 @@ def processIometerInstResults(testName, myStream, userCallbacks):
         "RESPONSE": 0,
     }
 
-    # Loop through the lines generate from iometer output
     for dataLine in resultsIterator:
         f = StringIO (dataLine.decode ('utf-8'))
         lineCount = lineCount + 1           
@@ -126,8 +117,7 @@ def processIometerInstResults(testName, myStream, userCallbacks):
 
         if (fileSection == 1):            
             timeStamp =  csvData[0][0]
-
-            # Call start of test callback
+                     
             if "TEST_START" in userCallbacks:
                 userCallbacks["TEST_START"](myStream, timeStamp, testDescrip)
             
@@ -164,7 +154,6 @@ def processIometerInstResults(testName, myStream, userCallbacks):
                     resultsMap["IOPS"] = sum_all_threads1
                     resultsMap["DATA_RATE"] = sum_all_threads2
                     resultsMap["RESPONSE_TIME"] = sum_all_threads3
-                    # Call data callback
                     if "TEST_RESULT" in userCallbacks:
                         userCallbacks["TEST_RESULT"] (myStream, prevTimeStamp, resultsMap)                    
                 
@@ -200,7 +189,6 @@ def processIometerInstResults(testName, myStream, userCallbacks):
 
         if (fileSection == 4):
             timeStamp =  csvData[0][0]
-            # Call end of test callback
             if "TEST_END" in userCallbacks:
                 userCallbacks["TEST_END"](myStream, timeStamp, testDescrip)
             
@@ -208,17 +196,12 @@ def processIometerInstResults(testName, myStream, userCallbacks):
             resultsFile.close ()               
             
             return
-
+            
+'''
+Scans the given path for .conf files (ioMeter template files) and
+creates .icf files with the correct host and drive target information in place
+'''
 def generateIcfFromConf(confPath, driveInfo, managerName=socket.gethostname()):
-    """
-    Scans the given path for .conf files (ioMeter template files) and
-    creates .icf files with the correct host and drive target information in place
-
-    :param confPath: String         - Path to /conf
-    :param driveInfo: Dictionary    - Dict with 3 keys: NAME, DRIVE, FW_REV
-    :param managerName: String      - String of the current system name
-    :return: N/A
-    """
 
     configFiles = []
     fileCount = 0
@@ -241,6 +224,7 @@ def generateIcfFromConf(confPath, driveInfo, managerName=socket.gethostname()):
             fileData = openFile.read ()
             openFile.close ()
 
+
             # Create the string modifications needed to set the correct target
             if driveInfo["FW_REV"]:
                 newStr = str(driveInfo["DRIVE"]) +  ": \"" + str(driveInfo["NAME"]) + " " + str(driveInfo["FW_REV"]) + "\""
@@ -259,24 +243,28 @@ def generateIcfFromConf(confPath, driveInfo, managerName=socket.gethostname()):
             # Write the text out to the final ICF file
             openFile = open (icfFilePath, 'a+')
             openFile.write (fileData)
+
+            s = mmap.mmap(openFile.fileno(), 0, access=mmap.ACCESS_READ)
+            pos_start = s.find(str.encode('Assigned access specs'))
+            pos_end = s.find(str.encode('End assigned access specs'))
+            if pos_start != -1:
+                config_list.append(s[pos_start+21:pos_end-1])
+
             openFile.close ()
             
             # Increment file counter
             fileCount = fileCount + 1
 
+    return fileCount, config_list
 
+    
+'''
+Takes a CSV data dictionary and creates an .icf file at the given path. DriveInfo and optional manager name are
+used to specify the target and host within the file
+'''
 def generateIcfFromCsvLineData(csvData, icfFilePath, driveInfo, managerName=socket.gethostname()):
-    """
-    Takes a CSV data dictionary and creates an .icf file at the given path. DriveInfo and optional manager name are
-    used to specify the target and host within the file
-
-    :param csvData: Dictionary      - Row read from CSV
-    :param icfFilePath: String      - File path for the new file
-    :param driveInfo: Dictionary    - Dict with 3 keys: NAME, DRIVE, FW_REV
-    :param managerName: String      - Name of System
-    """
+    
 
-    # Creating a temporary file
     templateFilePath = os.path.dirname(os.path.abspath(__file__)) + "\\IometerTemplate.dat"
     csvTestName = None
     csvWorkers = None
@@ -300,18 +288,13 @@ def generateIcfFromCsvLineData(csvData, icfFilePath, driveInfo, managerName=sock
 
     # Delete any old icf file with the same name
     if os.path.exists(icfFilePath):
-        os.remove(icfFilePath)
-
-    # If the iometer template is missing, generate a new one
-    if not os.path.exists(templateFilePath):
-        generate_iometer_template()
+        os.remove(icfFilePath)        
 
-    # Open the template file and read the data
+    # Open the template file
     openFile = open (templateFilePath)
     fileData = openFile.readlines ()
     openFile.close ()
-
-    # Grabbing segments from template file
+    
     workerData = fileData[51:72]
     workerData = "".join(workerData)
     fileData = fileData[:51]
@@ -369,15 +352,15 @@ def generateIcfFromCsvLineData(csvData, icfFilePath, driveInfo, managerName=sock
     # Write the text out to the final ICF file
     openFile = open (icfFilePath, 'a+')
     openFile.write (fileData + finalString)
-    openFile.close ()
 
+    openFile.close ()
 
 
+'''
+Reads the given CSV file which must be formatter for Iometer .icf data (One header, no blank rows).
+Reads the data into a dictionary 
+'''
 def readIcfCsvLineData(csvFileName, csvFileLine):
-    """
-    Reads the given CSV file which must be formatter for Iometer .icf data (One header, no blank rows).
-    Reads the data into a dictionary
-    """
     csvFilePath = os.getcwd() + "\\" + csvFileName
     # Open the file
     with open(csvFilePath, 'rt') as csvFile:

quarchpy/user_interface/user_interface.py

@@ -285,7 +285,7 @@ def startTestBlock(text):
         else:
             print("")
             print("*** "+text+" ***")
-            return True
+            return
 
 '''
 endTestBlock()

{quarchpy-2.1.10.dev4.dist-info → quarchpy-2.1.10.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.1.10.dev4
+Version: 2.1.10.dev6
 Summary: This packpage offers Python support for Quarch Technology modules.
 Home-page: UNKNOWN
 Author: Quarch Technology ltd
@@ -35,13 +35,6 @@ Quarchpy
 Change Log
 ----------
 
-2.1.11
-------
-- New QPS v1.31
-- New QIS v1.34
-
-2.1.10
-------
 
 2.1.8
 -----