From a65c2fbc3f36933df31ba672e1e2df9af3041ed8 Mon Sep 17 00:00:00 2001 From: Guillaume Raffy Date: Fri, 28 Jan 2022 23:39:39 +0100 Subject: [PATCH] made cocluto work with simpaweb running on flask --- cocluto/ClusterController/JobsState.py | 2 +- cocluto/ClusterController/Log.py | 2 +- cocluto/ClusterController/QstatParser.py | 18 +++++++++--------- cocluto/ClusterController/Util.py | 14 +++++++------- cocluto/Ipmi/IpmiTool202Parser.py | 4 ++-- cocluto/Ipmi/IpmiTool218Parser.py | 4 ++-- cocluto/SimpaDbUtil.py | 8 ++++---- cocluto/Util.py | 2 +- cocluto/inventory.py | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cocluto/ClusterController/JobsState.py b/cocluto/ClusterController/JobsState.py index 76fb7c1..437bcc8 100644 --- a/cocluto/ClusterController/JobsState.py +++ b/cocluto/ClusterController/JobsState.py @@ -1,4 +1,4 @@ -from Log import * +from .Log import * class JobsState: """ diff --git a/cocluto/ClusterController/Log.py b/cocluto/ClusterController/Log.py index 9a5a650..98978ff 100644 --- a/cocluto/ClusterController/Log.py +++ b/cocluto/ClusterController/Log.py @@ -6,7 +6,7 @@ gLogFilePath = '/tmp/ClusterController.log'#'/var/log/ClusterController.log' def log( message ): threadName = threading.currentThread().getName() logMessage = time.asctime(time.localtime())+' : '+ threadName + ' : ' + message - print logMessage + print(logMessage) f = open(gLogFilePath, 'a+') assert( f ) try: diff --git a/cocluto/ClusterController/QstatParser.py b/cocluto/ClusterController/QstatParser.py index 28eb448..ddf5d9e 100644 --- a/cocluto/ClusterController/QstatParser.py +++ b/cocluto/ClusterController/QstatParser.py @@ -1,10 +1,10 @@ -import StringIO +import io import re -from JobsState import * -from QueueMachine import * -from Util import * -from Log import * -from Job import * +from .JobsState import * +from .QueueMachine import * +from .Util import * +from .Log import * +from .Job import * class QstatParser: def parseJobState( self, strJobStatus ): @@ -95,7 +95,7 @@ class QstatParser: qstatOutput = re.sub('\.univ[^ ]*', '.univ-rennes1.fr', qstatOutput) jobsState = JobsState() - f = StringIO.StringIO(qstatOutput) + f = io.StringIO(qstatOutput) line = f.readline() currentQueueMachine = None bInPendingJobsSection = False @@ -208,7 +208,7 @@ class QstatParser: matchObj = re.match('^[#]+$', line) if not matchObj: # unexpected line - print 'line = "' + line + '"' + print('line = "' + line + '"') assert( False ) None line = f.readline() @@ -218,7 +218,7 @@ class QstatParser: """ adds to job the details parsed from the output of the "qstat -j " command """ - f = StringIO.StringIO(qstatOutput) + f = io.StringIO(qstatOutput) line = f.readline() fieldRegularExp = re.compile( '^(?P[^:]+):[ ]+(?P[?]*)$' ) while( len(line) > 0 ): diff --git a/cocluto/ClusterController/Util.py b/cocluto/ClusterController/Util.py index 8ae86a7..e0e1b61 100644 --- a/cocluto/ClusterController/Util.py +++ b/cocluto/ClusterController/Util.py @@ -1,9 +1,9 @@ -import Lib.Util -import Lib.SimpaDbUtil -from Log import * -from PowerState import * +#import .Util +#import ..SimpaDbUtil +from .Log import * +from .PowerState import * import re -import StringIO +import io import os import traceback import sys @@ -91,7 +91,7 @@ def getPowerState( machineName ): elif strAcpiState == 'S5/G2': # soft-off ePowerState = PowerState.OFF else: - print strAcpiState + print(strAcpiState) assert( False ) bPowerStateRead = True else: @@ -207,7 +207,7 @@ def onException(exception): strExceptionType = type( exception ) strMessage = 'exception %s : %s\n' % (strExceptionType, exception.message) #traceback.print_last() - f = StringIO.StringIO() + f = io.StringIO() traceback.print_exc(file=f) strMessage += f.getvalue() f.close() diff --git a/cocluto/Ipmi/IpmiTool202Parser.py b/cocluto/Ipmi/IpmiTool202Parser.py index ef32b29..d1ec8aa 100644 --- a/cocluto/Ipmi/IpmiTool202Parser.py +++ b/cocluto/Ipmi/IpmiTool202Parser.py @@ -1,4 +1,4 @@ -import StringIO +import io import re from Sensor import FanSensor, TemperatureSensor from ClusterNodeSensorsReadings import ClusterNodeSensorsReadings @@ -6,7 +6,7 @@ from ClusterNodeSensorsReadings import ClusterNodeSensorsReadings class IpmiTool202Parser: def parseSensorOutput( self, strOutput, clusterNodeName ): sensorReadings=ClusterNodeSensorsReadings(clusterNodeName) - f = StringIO.StringIO(strOutput) + f = io.StringIO(strOutput) line = f.readline() while( len(line) > 0 ): #print line, diff --git a/cocluto/Ipmi/IpmiTool218Parser.py b/cocluto/Ipmi/IpmiTool218Parser.py index d4d0f91..798eb75 100644 --- a/cocluto/Ipmi/IpmiTool218Parser.py +++ b/cocluto/Ipmi/IpmiTool218Parser.py @@ -1,4 +1,4 @@ -import StringIO +import io import re from Sensor import FanSensor, TemperatureSensor from ClusterNodeSensorsReadings import ClusterNodeSensorsReadings @@ -6,7 +6,7 @@ from ClusterNodeSensorsReadings import ClusterNodeSensorsReadings class IpmiTool218Parser: def parseSensorOutput( self, strOutput, clusterNodeName ): sensorReadings=ClusterNodeSensorsReadings(clusterNodeName) - f = StringIO.StringIO(strOutput) + f = io.StringIO(strOutput) line = f.readline() while( len(line) > 0 ): #print line, diff --git a/cocluto/SimpaDbUtil.py b/cocluto/SimpaDbUtil.py index f6449f8..61fb4f7 100644 --- a/cocluto/SimpaDbUtil.py +++ b/cocluto/SimpaDbUtil.py @@ -1,4 +1,4 @@ -import MySQLdb # sudo port install py-mysql; sudo apt install python-mysqldb +import MySQLdb # sudo port install py-mysql; sudo apt install python-mysqldb or pip install mysqlclient import time import sys if sys.version_info < (3, 0): @@ -6,12 +6,12 @@ if sys.version_info < (3, 0): else: from io import StringIO import re -from wol import * +from .wol import * import os -from Util import * +from .Util import * import abc import sqlite3 -from mysql2sqlite import mysql_to_sqlite +from .mysql2sqlite import mysql_to_sqlite def isMachineResponding(machineName): diff --git a/cocluto/Util.py b/cocluto/Util.py index 317c354..7831eae 100644 --- a/cocluto/Util.py +++ b/cocluto/Util.py @@ -1,6 +1,6 @@ import time import subprocess -# import StringIO +import io import re # from wol import * # import os diff --git a/cocluto/inventory.py b/cocluto/inventory.py index 0892b7c..00b8d3f 100644 --- a/cocluto/inventory.py +++ b/cocluto/inventory.py @@ -1,7 +1,7 @@ # encoding: utf-8 import datetime # from Lib import SimpaDbUtil -import SimpaDbUtil +from . import SimpaDbUtil class MachineSpecIdNotFound(Exception):