summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xFor Weekly Test/Advance/serialTest.py2
-rwxr-xr-xFor Weekly Test/tricode/ControllerClass.py33
-rwxr-xr-xFor Weekly Test/tricode/GSMHandler.py11
-rw-r--r--For Weekly Test/tricode/gsmselftest-website3.py32
-rwxr-xr-xFor Weekly Test/tricode/trueTableClass.py22
5 files changed, 62 insertions, 38 deletions
diff --git a/For Weekly Test/Advance/serialTest.py b/For Weekly Test/Advance/serialTest.py
index c39c80d..2838961 100755
--- a/For Weekly Test/Advance/serialTest.py
+++ b/For Weekly Test/Advance/serialTest.py
@@ -3,7 +3,7 @@ from serial import *
# configure the serial connections (the parameters differs on the device you are connecting to)
ser = Serial(
- port='/dev/ttyUSB1',
+ port='/dev/ttyu0',
baudrate=19200,
bytesize=EIGHTBITS,
parity=PARITY_NONE,
diff --git a/For Weekly Test/tricode/ControllerClass.py b/For Weekly Test/tricode/ControllerClass.py
index 76e9e58..cdd93ec 100755
--- a/For Weekly Test/tricode/ControllerClass.py
+++ b/For Weekly Test/tricode/ControllerClass.py
@@ -35,7 +35,7 @@ class doTheTest:
self.initCaller()
if self.callFrom =="GSMRZ3" or self.callFrom =="GSMRZ2": # wait until ssh connection establish
- sleep(5)
+ sleep(6)
else:
sleep(2)
self.callerGreeting()
@@ -50,7 +50,7 @@ class doTheTest:
self.initReceiver()
if self.dest =="GSMRZ3" or self.dest =="GSMRZ2": # wait until ssh connection establish
- sleep(5)
+ sleep(6)
else:
sleep(2)
self.receiverGreeting()
@@ -69,9 +69,12 @@ class doTheTest:
else:
self.testResult = 604
logger.logEvent('604 General Handler Error: Destination handler no respond timeout')
- self.caller.sendData('TERMINATE CONNECTION')
- self.receiver.closeConnection()
-
+ self.initTerminate()
+
+ elif self.connected == 'DEVICE NOT WORK':
+ self.testResult == 802
+ logger.logEvent('802 General Device Error: Destination device no respond timeout')
+ self.initTerminate()
else:
logger.logEvent('998 General Handler Error: Could not connect Destination handler')
self.testResult = 998
@@ -85,6 +88,13 @@ class doTheTest:
self.caller.sendData('TERMINATE CONNECTION')
self.caller.closeConnection()
self.initCancelTest()
+
+ elif self.connected == 'DEVICE NOT WORK':
+ self.testResult = 801
+ self.caller.sendData('TERMINATE CONNECTION')
+ self.caller.closeConnection()
+ logger.logEvent('802 General Device Error: Caller device no respond timeout')
+ self.initCancelTest()
else:
self.testResult = 999
logger.logEvent('999 General Handler Error: Could not connect to Caller handler')
@@ -212,9 +222,13 @@ class doTheTest:
if self.caller.connected == 1:
logger.logEvent('Connected to Caller Handler')
self.caller.sendData('HELLO HANDLER')
- if self.caller.receiveData(20) == 'HELLO CONTROLLER':
+ message = self.caller.receiveData(20)
+ if message == 'HELLO CONTROLLER':
logger.logEvent('Caller Handler respond')
self.connected = 'OK'
+ else:
+ logger.logEvent('Connect to Caller but device doesnt work')
+ self.connected = 'DEVICE NOT WORK'
else:
logger.logEvent('Cannt connect to Caller')
self.connected = 'NOT OK'
@@ -228,9 +242,14 @@ class doTheTest:
if self.receiver.connected == 1:
logger.logEvent('Connected to Receiver Handler')
self.receiver.sendData('HELLO HANDLER')
- if self.receiver.receiveData(20) == 'HELLO CONTROLLER':
+ message = self.receiver.receiveData(20)
+ if message == 'HELLO CONTROLLER':
logger.logEvent('Receiver Handler respond')
self.connected = 'OK'
+
+ else:
+ logger.logEvent('connect to Receiver but device doesnt work')
+ self.connected = 'DEVICE NOT WORK'
else:
logger.logEvent('Cannt connect to Receiver')
self.connected = 'NOT OK'
diff --git a/For Weekly Test/tricode/GSMHandler.py b/For Weekly Test/tricode/GSMHandler.py
index e8781a6..a7c995f 100755
--- a/For Weekly Test/tricode/GSMHandler.py
+++ b/For Weekly Test/tricode/GSMHandler.py
@@ -60,14 +60,15 @@ def initSystem():
handlerSocket = ServerClass.ServerHandler(portListen)
logger.logEvent('LISTEN ON PORT: '+str(portListen))
+ anyConnection = handlerSocket.openSocket()
#add this if you need it
- gsmDevice = GSMClass.serialPort(portAddress, baudRate, 60)
+ gsmDevice = GSMClass.serialPort(portAddress, baudRate, 15)
initDevice = gsmDevice.portInit()
########################################################
#add nice formating to the log file :)
- anyConnection = handlerSocket.openSocket()
+ #anyConnection = handlerSocket.openSocket()
if anyConnection == 1 and initDevice == 1:
@@ -267,6 +268,12 @@ while 1:
receivedMessage = 0
while receivedMessage < 4 and resetState!= 1:
receivedMessage += receiveMessage(30)
+ if test == 2:
+ print 'initialized system'
+ receivedMessage = 0
+ while receivedMessage < 4 and resetState!= 1:
+ handlerSocket.sendData('DEVICE NOT READY')
+ receivedMessage += receiveMessage(30)
del handlerSocket
del gsmDevice
diff --git a/For Weekly Test/tricode/gsmselftest-website3.py b/For Weekly Test/tricode/gsmselftest-website3.py
index 827eb7a..78365bf 100644
--- a/For Weekly Test/tricode/gsmselftest-website3.py
+++ b/For Weekly Test/tricode/gsmselftest-website3.py
@@ -101,6 +101,8 @@ def initTrueTable(x):
asterikServer = True
elif int(x[1]) == 998 or int(x[1]) == 999:
print bcolors.FAIL+name+ ' not Working, handler error'+ bcolors.ENDC
+ elif int(x[1]) == 801 or int(x[1]) == 802:
+ print bcolors.FAIL+name+ 'Device Error, Check the device'+ bcolors.ENDC
else:
print bcolors.OKGREEN +name+ ' not Working'+ bcolors.ENDC
@@ -131,11 +133,8 @@ def initTrueTable(x):
print '\n'
def errorCodes(callFrom, callTo, result):
- #initDB()
-
message = '|' + str(callFrom) + '|' + str(callTo) + '|' + str(result) + '|' + str(db.errorCode(result))
sendResultWebsite(message)
- #db.closeDBConn()
# function to search in the list
def isThere(keyword,lists):
@@ -148,10 +147,11 @@ def isThere(keyword,lists):
x = x+1
def testDest(callFrom, callTo, tried):
- #print 'fesfsef'
+
makeTest.initTest(callFrom,callTo)#xxxx
smartResultList.append([callFrom,callTo, makeTest.result,tried])
- errorCodes(callFrom, callTo, makeTest.result)
+ if WebStatus == True:
+ errorCodes(callFrom, callTo, makeTest.result)
def smartTest():
global smartResultList
@@ -165,7 +165,6 @@ def smartTest():
item = list()
cpgsmRZList = list()
- #self.db.closeDBConn()
for lists in deviceLists: #define category of the device
device = lists[0]
@@ -307,15 +306,19 @@ def smartTest():
return smartResultList
-def doSmartTest():
+def doSmartTest(status):
+ global WebStatus
initDB()
allPing()
db.updatePingResult('0', sipServer, sipGate, unisip, gsmBox1, gsmBox2)
global makeTest
+ if status == True:
+ WebStatus == True
makeTest = initTestClass.doTest()
result = smartTest()
initTrueTable(result)
- sendFinishMessage()
+ if status == True:
+ sendFinishMessage()
def doSipTest():
@@ -552,16 +555,7 @@ def autoUpdateDevice(status):
signal.alarm(0)
count = count + 1
message = "Timeout"
- #if status == True:
- # message = listNum[0]+' - /dev/'+portName+' - '+num+ ' update'
-
if status == True:
- #if count != 0:
- # message = 'Found '+str(x)+' devices, with '+str(count)+' error'
- #else:
- # message = 'Found '+str(x)+' devices'
- #sendResultWebsite(messages)
- #sleep(5)
sendFinishMessage()
else:
@@ -647,7 +641,7 @@ if len(sys.argv) > 1:
elif command == '--smart':
resultsList = list()
- doSmartTest()
+ doSmartTest(False)
#regularTest(False)
elif command == '--devconf':
@@ -688,7 +682,7 @@ else:
server.sendData('CONFIRM\n')
print 'SMART TEST STARTED'
resultsList = list()
- doSmartTest()
+ doSmartTest(True)
#regularTest(True)
if test == 'UPDATE DEVICE':
diff --git a/For Weekly Test/tricode/trueTableClass.py b/For Weekly Test/tricode/trueTableClass.py
index 377ac8e..b737559 100755
--- a/For Weekly Test/tricode/trueTableClass.py
+++ b/For Weekly Test/tricode/trueTableClass.py
@@ -109,20 +109,17 @@ class trueTable:
if found != True:
self.nanoBts.append([btsName,False])
+ elif result == '801' or result == '802':
+ self.nanoBts.append([key,result])
- if result == '998' and key == dest: # find how to solve this!!!
-
+ if result == '998' and key == dest:
if self.lookingBTSname(key) != True:
self.nanoBts.append([key,result])
- if result == '999' and key == call: # find how to solve this!!!
-
+ if result == '999' and key == call:
if self.lookingBTSname(key) != True:
- self.nanoBts.append([key,result])
-
-
-
+ self.nanoBts.append([key,result])
j = j+1
elif j == i:
stop = True
@@ -142,6 +139,9 @@ class trueTable:
found = True
if found != True:
self.nanoBts.append([call,result])
+
+ if result == '801':
+ self.nanoBts.append([call,result])
if dest[0:5]=='GSMEx': # looking for destination call to GSMexternal
found = False
@@ -159,8 +159,12 @@ class trueTable:
found = True
if found != True:
self.nanoBts.append([dest,result])
+
+ if result == '802':
+ self.nanoBts.append([dest,result])
+
for device in externalRZList:
if device == dest and int(result) == 200:
- self.outGoingRZ = True
+ self.outGoingRZ = True