summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTriatmoko2011-11-20 00:57:14 +0100
committerTriatmoko2011-11-20 00:57:14 +0100
commitbcd101043d63b62f0c384f7d046a875d477ecbd7 (patch)
tree80676433028ee0cb74a0a8b8d2c57f52246845a4
parentmodify truth message for manual testing (diff)
downloadgsm-selftest-bcd101043d63b62f0c384f7d046a875d477ecbd7.tar.gz
gsm-selftest-bcd101043d63b62f0c384f7d046a875d477ecbd7.tar.xz
gsm-selftest-bcd101043d63b62f0c384f7d046a875d477ecbd7.zip
decrease timeout value and edit error message
-rw-r--r--Code/Server-Code/SIPHandler.py8
-rw-r--r--Code/Server-Code/gsmselftest.py25
-rw-r--r--Code/Server-Code/initTestClass.py18
-rw-r--r--Code/Server-Code/truthtableClass.py3
4 files changed, 33 insertions, 21 deletions
diff --git a/Code/Server-Code/SIPHandler.py b/Code/Server-Code/SIPHandler.py
index eb5302c..263b454 100644
--- a/Code/Server-Code/SIPHandler.py
+++ b/Code/Server-Code/SIPHandler.py
@@ -29,7 +29,7 @@ class Account(pj.AccountCallback):
call.answer(200)
- sleep(2)
+ sleep(1)
logger.logEvent('CALL OK')
@@ -115,7 +115,7 @@ def greeting():
if server.connected == 1:
#connection to the controller establish
logger.logEvent('Connection Establish')
- if server.receiveData(25) == 'HELLO HANDLER':
+ if server.receiveData(20) == 'HELLO HANDLER':
server.sendData('HELLO CONTROLLER')
return 1
else:
@@ -147,7 +147,7 @@ def initState():
global num
logger.logEvent('init state')
- message = server.receiveData(30)
+ message = server.receiveData(15)
if message == 'RECEIVER':
state = 'RECEIVER'
@@ -227,7 +227,7 @@ while stop <> True:
if data == 'CALL START':
#print data
if num <> '':
- sleep(3)
+ sleep(2)
logger.logEvent(data)
logger.logEvent('Make a call to: ' + num)
number = "sip:"+num+"@"+sipServer
diff --git a/Code/Server-Code/gsmselftest.py b/Code/Server-Code/gsmselftest.py
index 55f1415..9f8ab79 100644
--- a/Code/Server-Code/gsmselftest.py
+++ b/Code/Server-Code/gsmselftest.py
@@ -78,8 +78,16 @@ def initDB(): # function for connection database
db = DbClass.DBMySQLConnection()
db.connectDB()
dbStatus = db.connectDB()
- if dbStatus == 1:
- db.lockMutex(600)
+ if dbStatus != 1:
+ print bcolors.FAIL+"Cant connect to database"+ bcolors.ENDC
+ if dbStatus ==2:
+ print bcolors.FAIL+"can't connect to mysql, mysql shutdown or wrong host"+ bcolors.ENDC
+ elif dbStatus ==0:
+ print bcolors.FAIL+"wrong username or password"+ bcolors.ENDC
+ sys.exit()
+ else:
+ if dbStatus == 1:
+ db.lockMutex(600)
def initNagiosString(x):
@@ -184,9 +192,6 @@ def smartTest():
gsmRZList = list()
sipList = list()
destList = list()
- rem = list()
- item = list()
-
cpgsmRZList = list()
for lists in deviceLists: #define category of the device
@@ -271,7 +276,6 @@ def smartTest():
callTo = dest[1]
if callFrom != callTo:
testDest(callFrom, callTo, 2)
- rem.append(dest)
else:
continue
@@ -283,8 +287,6 @@ def smartTest():
callFrom = 'sip'
callTo = dest[0]
testDest(callFrom, callTo, 2)
- rem.append(dest)
-
caller = dest[0] # to test nanobts if the test come from RZ GSM but fehler
if caller[0:5] == 'GSMRZ' and int(dest[3]) != 2 and dest[1] != 'sip':
@@ -296,7 +298,6 @@ def smartTest():
if repeatTest == True:
callFrom = 'sip'
testDest(callFrom, dest[0], 2)
- rem.append(dest)
# test to make sure nanoBTS working or not. sice probably that nanotbts seems error but actually not.
for RZ in cpgsmRZList:
@@ -329,8 +330,6 @@ def smartTest():
else:
x = i-1
testDest(cpgsmRZList[x], cpgsmRZList[i], 2)
- item = '['+str(From)+','+str(callTo)+','+str(result)+','+str(1)+']'
- rem.append(item)
return smartResultList
@@ -762,8 +761,10 @@ else:
else:
sys.exit('WE DIDN\'T RECEIVE THE CONFIRMATION')
+try:
db.closeDBConn()
-
+except ValueError:
+ message = "Error"
diff --git a/Code/Server-Code/initTestClass.py b/Code/Server-Code/initTestClass.py
index 568f840..2a75192 100644
--- a/Code/Server-Code/initTestClass.py
+++ b/Code/Server-Code/initTestClass.py
@@ -56,7 +56,15 @@ class initTesting:
if procNameCall in line:
pid = int(line.split(None, 1)[0])
os.kill(pid, signal.SIGKILL)
-
+ def writeToFile(self):
+ try:
+ string = '--'
+ with open('handler.txt', 'w') as F:
+ writer = csv.writer(F)
+ writer.writerow([string])
+ F.close()
+ except ValueError:
+ print "can't write to file"
def initTest(self, callFrom, callTo):
@@ -99,7 +107,7 @@ class initTesting:
else:
self.result = 100
- sleep(2)
+ sleep(1)
#make sure the handler have been terminated
self.killProc() # kill all the handler
@@ -114,7 +122,11 @@ class initTesting:
self.db.closeDBConn()
else:
self.result = 333
-
+ try:
+ self.writeToFile()
+ self.db.closeDBConn()
+ except ValueError:
+ message = "Error"
return self.result
diff --git a/Code/Server-Code/truthtableClass.py b/Code/Server-Code/truthtableClass.py
index 85fd5c6..d45a8fe 100644
--- a/Code/Server-Code/truthtableClass.py
+++ b/Code/Server-Code/truthtableClass.py
@@ -87,8 +87,7 @@ class trueTable:
found = True
if found == False:
self.deviceStatus.append([device,'UNKNOWN'])
- for status in self.deviceStatus:
-
+ for status in self.deviceStatus:
if status[1] == 'OK':
self.OK = self.OK+1
elif status[1] == 'NOT OK':