summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Under-Testing/Server-Code-New/gsmselftest.py6
-rw-r--r--Under-Testing/Server-Code-New/truthtableClass.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/Under-Testing/Server-Code-New/gsmselftest.py b/Under-Testing/Server-Code-New/gsmselftest.py
index 0824cf4..082b19f 100644
--- a/Under-Testing/Server-Code-New/gsmselftest.py
+++ b/Under-Testing/Server-Code-New/gsmselftest.py
@@ -87,11 +87,11 @@ def initNagiosString(x):
initResult.initNagiosResult()
if int(initResult.FAILED) != 0:
- print "GSM CRITICAL - Number of test :"+str(initResult.testMount)+'; Failure :'+str(initResult.FAILED)+'; Unknown :'+str(initResult.handlerError)
+ print "GSM CRITICAL - Number of test "+str(initResult.testMount)+'; Failure '+str(initResult.FAILED)+'; Unknown '+str(initResult.handlerError)
elif int(initResult.handlerError) != 0:
- print "GSM WARNING - Number of test :"+str(initResult.testMount)+'; Failure :'+str(initResult.FAILED)+'; Unknown :'+str(initResult.handlerError)
+ print "GSM WARNING - Number of test "+str(initResult.testMount)+'; Failure '+str(initResult.FAILED)+'; Unknown '+str(initResult.handlerError)
elif int(initResult.FAILED) == 0 and int(initResult.handlerError) == 0:
- print "GSM OK - Number of test :"+str(initResult.testMount)+'; Failure :'+str(initResult.FAILED)+'; Unknown :'+str(initResult.handlerError)
+ print "GSM OK - Number of test "+str(initResult.testMount)+'; Failure '+str(initResult.FAILED)+'; Unknown '+str(initResult.handlerError)
else:
print "unknown error"
diff --git a/Under-Testing/Server-Code-New/truthtableClass.py b/Under-Testing/Server-Code-New/truthtableClass.py
index 3195dee..c45ab4d 100644
--- a/Under-Testing/Server-Code-New/truthtableClass.py
+++ b/Under-Testing/Server-Code-New/truthtableClass.py
@@ -48,7 +48,8 @@ class trueTable:
deviceLists = self.db.deviceList()
self.db.closeDBConn()
- for device in deviceLists:
+ for items in deviceLists:
+ device = items[0]
for result in self.resultsList:
if device == result[0] or device == result[1]:
if int(result[2]) == 200:
@@ -63,7 +64,6 @@ class trueTable:
self.deviceStatus.append([device,'OK'])
else:
self.deviceStatus.append([device,'OK'])
- break
elif int(result[2]) == 486:
found = False
@@ -83,9 +83,9 @@ class trueTable:
self.deviceStatus.append([device,'UNKNOWN'])
for status in self.deviceStatus:
- if status[2] == 'OK':
+ if status[1] == 'OK':
self.OK = self.OK+1
- elif status[2] == 'NOT OK':
+ elif status[1] == 'NOT OK':
self.FAILED = self.FAILED+1
else:
self.handlerError = self.handlerError+1