summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--For Weekly Test/30-07-2011/ControllerClass.py259
-rw-r--r--For Weekly Test/30-07-2011/DbClass.py60
-rw-r--r--For Weekly Test/30-07-2011/sipHandler.py51
3 files changed, 180 insertions, 190 deletions
diff --git a/For Weekly Test/30-07-2011/ControllerClass.py b/For Weekly Test/30-07-2011/ControllerClass.py
index c722df3..8422040 100644
--- a/For Weekly Test/30-07-2011/ControllerClass.py
+++ b/For Weekly Test/30-07-2011/ControllerClass.py
@@ -2,9 +2,7 @@ import sys
import os
import subprocess
-import classClient
-import classDb
-import classPing
+import ClientClass
import LogFileClass
logger = LogFileClass.Logging('2classController.log')
@@ -14,128 +12,167 @@ from time import sleep
class test:
- def __init__(self, orig, dest, destNo):
- self.orig = orig
- self.dest = dest
- self.destNo = destNo
- self.repeatTest = None
- self.portOrig = None
- self.portDest = None
- self.resultOrig = None
- self.resultDest = None
- self.testResult = None
- self.add = None
-
- def FuncTest(self):
-
- logger.logEvent('')
-
- try:
+ def __init__(self, callFrom, dest, destNo):
+ self.callFrom = orig
+ self.dest = dest
+ self.destNo = destNo
+ self.repeatTest = None
+ self.portCaller = None
+ self.portDest = None
+ self.resultCaller = None
+ self.resultDest = None
+ self.testResult = None
+ self.callAdd = None
+ self.recAdd = None
+ self.receiver = None
+ self.caller = None
+ self.connected = None
+
+
+ def FuncTest(self):
+
+ logger.logEvent('')
+ self.initCaller()
+ sleep(5)
+
+ self.callerGreeting()
+
+ if self.connected == 'OK':
- if self.orig =="RZ1":
- self.portOrig = 50095
- self.add = ''
-
- elif self.orig =="RZ2":
- self.portOrig = 50096
- self.add = ''
-
- elif self.orig =="RZ3":
- self.portOrig = 50097
- self.add = ''
+ self.caller.sendData('CALLER|'+self.destNo)
+ callerHandler = self.caller.receiveData(60)
+
+ if callerHandler == "CALLER READY":
+ logger.logEvent('Caller handler : Ready')
+ self.initReceiver()
+ sleep(5)
+ self.receiverGreeting()
+
+ if self.connected == 'OK':
+
+ self.receiver.sendData('RECEIVER')
+ destHandler = self.receiver.receiveData(0)
+
+ if destHandler == 'RECEIVER READY':
- else:
- self.portOrig = 50099
- self.add = 'localhost'
- #command='--command=python 2sipHandler.py '+self.orig+ ' ' +str(self.portOrig)
- subprocess.Popen(args=["gnome-terminal", '--command=python 2sipHandler.py '+self.orig+ ' ' +str(self.portOrig)])
+ self.caller.sendData('CALL START')
+ self.receiver.sendData('RECEIVER START')
- sleep(3)
+ self.resultCaller = self.caller.receiveData(60)
+ self.resultDest = self.receiver.receiveData(60)
+
+ if self.resultCaller <> 'CALL OK' or self.resultDest <> 'CALL OK':
+
+ self.caller.sendData('CALL START')
+ self.receiver.sendData('RECEIVER START')
+
+ self.resultCaller = self.caller.receiveData(60)
+ self.resultDest = self.receiver.receiveData(60)
+
+ if self.resultCaller <> 'CALL OK' or self.resultDest <> 'CALL OK':
+ self.testResult = 486
+ self.repeatTest = True
+ else:
+ self.testResult = 200
+
+ self.caller.sendData('TERMINATE CONNECTION')
+ self.receiver.sendData('TERMINATE CONNECTION')
+
+ else:
+ self.testResult = 200
+ self.caller.sendData('TERMINATE CONNECTION')
+ self.receiver.sendData('TERMINATE CONNECTION')
+
+ else:
+ self.testResult = 604
+ logger.logEvent('604 General Handler Error: Destination handler no respond timeout')
+ self.caller.sendData('TERMINATE CONNECTION')
+ self.receiver.closeConnection()
+
+ else:
+ logger.logEvent('xxx General Handler Error: Could not connect Destination handler')
+ self.testResult = 999
+ self.caller.sendData('TERMINATE CONNECTION')
+ self.caller.closeConnection()
+ else:
+ self.testResult = 605
+ logger.logEvent('605 General Handler Error: Origin handler no respond timeout')
+
+ self.caller.closeConnection()
+
+ else:
+ self.testResult = 999
+ logger.logEvent('xxx General Handler Error: Could not connect to Caller handler')
- caller = classClient.Connection(self.add,self.portOrig)
- caller.connect()
- caller.sendData('CALLER|'+self.destNo)
- origHandler = caller.receiveData(60)
-
- if origHandler == "ready":
- logger.logEvent('Caller handler : Ready')
- try:
-
- if self.dest =="gsmBox1":
- self.portDest = 50102
- self.add = ''
- if self.dest =="gsmBox2":
- self.portDest = 50103
- self.add = ''
- if self.dest =="gsmBox3":
- self.portDest = 50103
- self.add = ''
-
- else:
- self.portDest = 50100
- #command='--command=python 2sipHandler.py '+self.dest+ ' ' +str(self.portDest)
- subprocess.Popen(args=['gnome-terminal', '--command=python 2sipHandler.py '+self.dest+ ' ' +str(self.portDest)])
- sleep(3)
-
- receiver = classClient.Connection('localhost', self.portDest)
-
- receiver.connect()
- receiver.sendData('RECEIVER')
- destHandler = receiver.receiveData(0)
- if destHandler == 'ready':
- caller.sendData('start')
- self.resultOrig = caller.receiveData(60)
- self.resultDest = receiver.receiveData(60)
-
- if self.resultOrig <> 200 or self.resultDest <> 200:
-
- caller.sendData('start')
+ def initCaller(self):
+ if self.callFrom =="RZ1":
+ self.portCaller = 50095
+ self.callAdd = ''
- self.resultOrig = caller.receiveData(60)
- self.resultDest = receiver.receiveData(60)
-
- if self.resultOrig <> 200 or self.resultDest <> 200:
- self.testResult = 486
- self.repeatTest = True
- else:
- self.testResult = 200
+ elif self.callFrom =="RZ2":
+ self.portCaller = 50096
+ self.callAdd = ''
- caller.sendData('487')
- receiver.sendData('487')
+ elif self.callFrom =="RZ3":
+ self.portCaller = 50097
+ self.callAdd = ''
- else:
-
- self.testResult = 200
- caller.sendData('487')
- receiver.sendData('487')
-
- else:
- self.testResult = 604
- logger.logEvent('604 General Handler Error: Destination handler no respond timeout')
- caller.sendData('487')
-
- receiver.closeConnection()
-
- except ValueError:
- logger.logEvent('601 General Handler Error: Could not open Destination handler')
- self.testResult = 601
- caller.sendData('487')
- caller.closeConnection()
else:
- self.testResult = 605
- logger.logEvent('605 General Handler Error: Origin handler no respond timeout')
-
- caller.closeConnection()
-
- except ValueError:
- self.testResult = 602
- logger.logEvent('602 General Handler Error: Could not open Origin handler')
+ self.portCaller = 50099
+ self.callAdd = 'localhost'
+ subprocess.Popen(args=["gnome-terminal", '--command=python sipHandler.py '+self.callFrom+ ' ' +str(self.portCaller)])
+
+ def initReceiver(self):
+ if self.dest =="gsmBox1":
+ self.portDest = 50102
+ self.recAdd = ''
+
+ if self.dest =="gsmBox2":
+ self.portDest = 50103
+ self.recAdd = ''
+
+ if self.dest =="gsmBox3":
+ self.portDest = 50103
+ self.recAdd = ''
+
+ else:
+ self.portDest = 50100
+ self.recAdd = 'localhost'
+ subprocess.Popen(args=['gnome-terminal', '--command=python sipHandler.py '+self.dest+ ' ' +str(self.portDest)])
+
+ def callerGreeting(self):
+ self.connected = None
+ self.caller = ClientClass.Connection(self.callAdd,self.portOrig)
+ self.caller.connect()
+
+ if self.caller.connected == 1:
+ self.caller.sendData('HELLO HANDLER')
+ if self.caller.receiveData(30) == 'HELLO CONTROLLER':
+ logger.logEvent('Handler respond')
+ self.connected = 'OK'
+ else:
+ logger.logEvent('Cannt connect to Caller')
+ self.connected = 'NOT OK'
+
+ def receiverGreeting(self):
+ self.connected = None
+ self.receiver = ClientClass.Connection(self.recAdd, self.portDest)
+ self.receiver.connect()
+
+ if self.receiver.connected == 1:
+ self.receiver.sendData('HELLO HANDLER')
+ if self.receiver.receiveData(30) == 'HELLO CONTROLLER':
+ logger.logEvent('Handler respond')
+ self.connected = 'OK'
+ else:
+ logger.logEvent('Cannt connect to Receiver')
+ self.connected = 'NOT OK'
diff --git a/For Weekly Test/30-07-2011/DbClass.py b/For Weekly Test/30-07-2011/DbClass.py
index f2a9afb..65f8150 100644
--- a/For Weekly Test/30-07-2011/DbClass.py
+++ b/For Weekly Test/30-07-2011/DbClass.py
@@ -269,64 +269,4 @@ class DBMySQLConnection:
return 2 #that task wasn't found
else:
return 0
-user = 'root'
-passw = 'randompasswordSQL'
-host = 'localhost'
-dbname = 'gsmselftesting'
-x = DBMySQLConnection(user, passw, host, dbname)
-print "connected to the DB ", x.connectDB()
-print "do i have anything to do", x.anyTasksToDo()
-for item in x.tasksList:
- taskID = item[0]
- taskNo = item[1]
- callFrom = item[2]
- callTo = item[3]
- print "call from to ", taskID , callFrom , callTo, taskNo
-
-print "found", x.searchTaskList('S1IP2','GSM1')
-#if variable == 0:
-# print x.insertTaskIn2('gsm4','sip8',2)
-
-print "remove a task ",x.removeTaskFromList('2')
-
-#print x.cleanTasksList()
-
-for item in x.tasksList:
- device = item[1]
- print "device name", device
- print "device's IP", x.deviceAddress(device)
-
-print "update task result ", x.updateTaskResult(1,3)
-
-print "update ping Table", x.updatePingResult(1,5,4,3,2,1)
-print "delete a task from temp table", x.deleteTempTask(2)
-print "add a result to the table", x.addResult(4,34)
-
-#new task to do
-#$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
-#just made for Tri :)---------------------------------------------------------------
-#print x.cleanTasksList()
-#print "do i have any task from SIP1 to GSM1 to do", x.anyTasksFromTo('SIP2', 'GSMu1', 2)
-#for item in x.tasksList:
-# taskID = item[0]
-# callFrom = item[1]
-# callTo = item[2]
-# print "call from to ", taskID , callFrom , callTo
-
-print 'i am inserting into the table something', x.insertTaskIn2('gsm4','sip8',2)
-print 'i am inserting into the table something', x.insertTaskIn2('gsm4','sip8',2)
-print 'i am inserting into the table something', x.insertTaskIn2('gsm4','sip8',2)
-print 'i am inserting into the table something', x.insertTaskIn2('gsm4','sip8',2)
-#-----------------------------------------------------------------------------------
-#$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
-for item in x.tasksList:
- taskID = item[0]
- taskNo = item[1]
- callFrom = item[2]
- callTo = item[3]
- print "call from to ", taskID , callFrom , callTo, taskNo
-
-print "close connection to the DB", x.closeDBConn()
-
-del x #delete
diff --git a/For Weekly Test/30-07-2011/sipHandler.py b/For Weekly Test/30-07-2011/sipHandler.py
index 91e3f62..4fbc4a3 100644
--- a/For Weekly Test/30-07-2011/sipHandler.py
+++ b/For Weekly Test/30-07-2011/sipHandler.py
@@ -1,7 +1,7 @@
import sys
import string
import pjsua as pj
-import classServer
+import ServerClass
import LogFileClass
from time import sleep
@@ -30,7 +30,7 @@ class Account(pj.AccountCallback):
logger.logEvent("Hangup call")
call.hangup()
- logger.logEvent('200')
+ logger.logEvent('CALL OK')
class Calling(pj.CallCallback):
@@ -44,12 +44,12 @@ class Calling(pj.CallCallback):
if self.call.info().state_text == "CONNECTING":
logger.logEvent("Call Connecting")
logger.logEvent('200')
- server.sendData('200')
+ server.sendData('CALL OK')
if self.call.info().last_reason == "Busy Here":
logger.logEvent('Number busy or Offline')
- server.sendData('486')
- logger.logEvent('486')
+ server.sendData('CALL NOT OK')
+ logger.logEvent('CALL NOT OK')
if self.call.info().state == pj.CallState.DISCONNECTED:
logger.logEvent('Call Disconnected')
@@ -91,12 +91,21 @@ while stop <> True:
lib.start()
lib.set_null_snd_dev()
- server = classServer.ServerHandler(port)
+ server = ServerClass.ServerHandler(port)
logger.logEvent('Connect to Controller')
- conn = server.openSocket()
+ conn = server.openSocket()
+
+ if server.receiveData(30) == 'HELLO HANDLER':
+ server.sendData('HELLO CONTROLLER')
message = server.receiveData(30)
- num = message[7:]
+
+ if message == 'RECEIVER':
+ state = 'RECEIVER' message[0:6]
+
+ elif message[0:6] == 'CALLER':
+ state = 'CALLER'
+ num = message[7:]
if handler == 'sip':
logger.logEvent('Beeing SIP')
@@ -124,37 +133,41 @@ while stop <> True:
if acc.info().reg_status < 700:
- if message.find('RECEIVER') <> -1:
+ if state =='RECEIVER':
logger.logEvent(acc.info().reg_status)
- server.sendData('ready')
+ server.sendData('RECEIVER READY')
logger.logEvent('Receiver Handler Ready')
while 1:
data = server.receiveData(3)
- if data == "487":
+ if data == "TERMINATE CONNECTION":
logger.logEvent('Terminate')
stop = True
break
- elif message.find('CALLER') <> -1:
+ elif state =='CALLER':
logger.logEvent(acc.info().reg_status)
- server.sendData('ready')
+ server.sendData('CALLER READY')
logger.logEvent('Caller Handler Ready')
while 1:
data = server.receiveData(3)
- if event == "start" and num <> "":
+ if event == "CALL START":
+ if num <> "":
- logger.logEvent(event)
- logger.logEvent('Make a call to: ' + num)
- number = "sip:"+num+"@132.230.4.8"
- make_call(number)
+ logger.logEvent(event)
+ logger.logEvent('Make a call to: ' + num)
+ number = "sip:"+num+"@132.230.4.8"
+ make_call(number)
+ else:
+ logger.logEvent('No number to call')
+ logger.logEvent('CALL NOT OK')
- if data == "487":
+ if data == "TERMINATE CONNECTION":
stop = True
logger.logEvent('Terminate')
break