summaryrefslogtreecommitdiffstats
path: root/For Weekly Test
diff options
context:
space:
mode:
authortt412011-07-26 22:46:33 +0200
committertt412011-07-26 22:46:33 +0200
commit14a4141d9207b73c47b130309f130a849b95385e (patch)
tree70161898235a8000ebd4bab0869b90ae0e1ccd27 /For Weekly Test
parentno com (diff)
parentedit list problem, its have different method with refik have. (diff)
downloadgsm-selftest-14a4141d9207b73c47b130309f130a849b95385e.tar.gz
gsm-selftest-14a4141d9207b73c47b130309f130a849b95385e.tar.xz
gsm-selftest-14a4141d9207b73c47b130309f130a849b95385e.zip
Merge branch 'master' of lab.ks.uni-freiburg.de:lsfks/projekte/gsm-selftest
Diffstat (limited to 'For Weekly Test')
-rw-r--r--For Weekly Test/30-07-2011/2classController.log0
-rw-r--r--For Weekly Test/30-07-2011/AccClass.py40
-rw-r--r--For Weekly Test/30-07-2011/AccClass.pycbin1426 -> 0 bytes
-rw-r--r--For Weekly Test/30-07-2011/CallClass.py30
-rw-r--r--For Weekly Test/30-07-2011/CallClass.pycbin1160 -> 0 bytes
-rw-r--r--For Weekly Test/30-07-2011/ClientClass.pycbin3601 -> 3637 bytes
-rw-r--r--For Weekly Test/30-07-2011/Controller.py80
-rw-r--r--For Weekly Test/30-07-2011/ControllerClass.py76
-rw-r--r--For Weekly Test/30-07-2011/ControllerClass.pycbin5799 -> 5709 bytes
-rw-r--r--For Weekly Test/30-07-2011/DbClass.py44
-rw-r--r--For Weekly Test/30-07-2011/DbClass.pycbin7029 -> 7589 bytes
-rw-r--r--For Weekly Test/30-07-2011/LogFileClass.pycbin1494 -> 1514 bytes
-rw-r--r--For Weekly Test/30-07-2011/PingClass.pycbin1251 -> 1267 bytes
-rw-r--r--For Weekly Test/30-07-2011/callorigFR.py172
-rw-r--r--For Weekly Test/30-07-2011/classCheck.py3
-rw-r--r--For Weekly Test/30-07-2011/classCheck.pycbin1081 -> 1014 bytes
-rw-r--r--For Weekly Test/30-07-2011/classController.log92
-rw-r--r--For Weekly Test/30-07-2011/dbClass.py271
-rw-r--r--For Weekly Test/30-07-2011/dbClass.pycbin7453 -> 0 bytes
-rw-r--r--For Weekly Test/30-07-2011/sipHandler.log97
-rw-r--r--For Weekly Test/30-07-2011/sipHandler.py108
-rw-r--r--For Weekly Test/30-07-2011/sipHandler2.log159
-rw-r--r--For Weekly Test/30-07-2011/sipHandler2.py225
-rw-r--r--For Weekly Test/30-07-2011/sipHandler3.py139
-rw-r--r--For Weekly Test/30-07-2011/test.py7
-rw-r--r--For Weekly Test/30-07-2011/test2.py7
-rw-r--r--For Weekly Test/30-07-2011/test3.py31
-rw-r--r--For Weekly Test/30-07-2011/test4.py26
-rw-r--r--For Weekly Test/30-07-2011/test5.py6
-rw-r--r--For Weekly Test/30-07-2011/test6.py35
-rw-r--r--For Weekly Test/DBProblem/test3.py15
31 files changed, 210 insertions, 1453 deletions
diff --git a/For Weekly Test/30-07-2011/2classController.log b/For Weekly Test/30-07-2011/2classController.log
deleted file mode 100644
index e69de29..0000000
--- a/For Weekly Test/30-07-2011/2classController.log
+++ /dev/null
diff --git a/For Weekly Test/30-07-2011/AccClass.py b/For Weekly Test/30-07-2011/AccClass.py
deleted file mode 100644
index 9a3425d..0000000
--- a/For Weekly Test/30-07-2011/AccClass.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import CallClass
-import pjsua as pj
-
-class Account(pj.AccountCallback):
-
- def __init__(self, account=None):
- pj.AccountCallback.__init__(self, account)
-# self.server = server
- self.current_call = None
- self.call_cb = None
- self.statuss = None
- self.status = None
-
- def on_incoming_call(self, call):
- global statuss
- self.current_call = call
- self.call_cb = CallClass.Calling(self.current_call)
- self.current_call.set_callback(self.call_cb)
-
- #sleep(0.5)
- print "1"
- call.answer(200)
- self.statuss = 200
- #gger.logEvent("Answer call")
- #sleep(0.5)
-
- if self.current_call <> None:
- #logger.logEvent("Hangup call")
- print "2"
- call.hangup()
- #logger.logEvent('CALL OK')
- return 200
-
- def result(self):
- if self.statuss == 200:
- self.status == 'CALL OK'
- else:
- self.status == 'CALL NOT OK'
-
-
diff --git a/For Weekly Test/30-07-2011/AccClass.pyc b/For Weekly Test/30-07-2011/AccClass.pyc
deleted file mode 100644
index c32fa94..0000000
--- a/For Weekly Test/30-07-2011/AccClass.pyc
+++ /dev/null
Binary files differ
diff --git a/For Weekly Test/30-07-2011/CallClass.py b/For Weekly Test/30-07-2011/CallClass.py
deleted file mode 100644
index ced8e3e..0000000
--- a/For Weekly Test/30-07-2011/CallClass.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import pjsua as pj
-import AccClass
-
-class Calling(pj.CallCallback):
-
- def __init__(self, call=None):
- pj.CallCallback.__init__(self, call)
- #self.server = server
-
- def on_state(self):
- global current_call
-
- if self.call.info().state <> pj.CallState.DISCONNECTED:
- if self.call.info().state_text == "CONNECTING":
- #logger.logEvent("Call Connecting")
- #logger.logEvent('200')
- #self.server.sendData('CALL OK')
- print "Connect"
-
- if self.call.info().last_reason == "Busy Here":
- #logger.logEvent('Number busy or Offline')
- #server.sendData('CALL NOT OK')
- #logger.logEvent('CALL NOT OK')
- print "busy"
-
- if self.call.info().state == pj.CallState.DISCONNECTED:
- #logger.logEvent('Call Disconnected')
- current_call = None
- print "discon"
-
diff --git a/For Weekly Test/30-07-2011/CallClass.pyc b/For Weekly Test/30-07-2011/CallClass.pyc
deleted file mode 100644
index a05a25a..0000000
--- a/For Weekly Test/30-07-2011/CallClass.pyc
+++ /dev/null
Binary files differ
diff --git a/For Weekly Test/30-07-2011/ClientClass.pyc b/For Weekly Test/30-07-2011/ClientClass.pyc
index 7cdfa60..99656f8 100644
--- a/For Weekly Test/30-07-2011/ClientClass.pyc
+++ b/For Weekly Test/30-07-2011/ClientClass.pyc
Binary files differ
diff --git a/For Weekly Test/30-07-2011/Controller.py b/For Weekly Test/30-07-2011/Controller.py
index 592d545..a90d313 100644
--- a/For Weekly Test/30-07-2011/Controller.py
+++ b/For Weekly Test/30-07-2011/Controller.py
@@ -3,54 +3,96 @@ import ClientClass
import DbClass
import ControllerClass
import classCheck
+import PingClass
+from time import sleep
+
+
+def ping(handler):
+
+ global serverStatus
+
+ if handler == 'landline':
+ server = PingClass.Ping('sipgate.de')
+ serverStatus = server.ping(3)
+
+ elif handler == 'sip':
+ server = PingClass.Ping('132.230.4.8')
+ serverStatus = server.ping(3)
+
+ elif handler == 'unisip':
+ server = PingClass.Ping('132.230.252.228')
+ serverStatus = server.ping(3)
+
+ elif handler == 'gsmr1':
+ server = PingClass.Ping('localhost')
+ serverStatus = server.ping(3)
+
+ elif handler == 'gsmr2':
+ server = PingClass.Ping('132.230.4.64')
+ serverStatus = server.ping(3)
db = DbClass.DBMySQLConnection('root', 'randompasswordSQL', 'localhost', 'gsmselftesting')
db.connectDB()
dbStatus = db.connectDB()
-
+#serverStatus = None
if dbStatus == 1:
-
- db.anyTasksToDo()
if db.anyTasksToDo() == 1:
-
+ i=0
for item in db.tasksList:
-
taskID = item[0]
taskNo = item[1]
callFrom = item[2]
callTo = item[3]
- print "Test ID : " , taskID
- print "Caller : " , callFrom
- print "Receiver : " , callTo
+ destination = db.deviceAddress(str(callTo))
+
+ caller = db.deviceAddress(str(callFrom))
+
+ callAdd = caller[0]
+ recAdd = destination[0]
+ destNo = destination[1]
+
+ if callFrom == 'unisip':
+ destNo = destNo[7:]
- call = classCheck.checking(callFrom)
- rec = classCheck.checking(callTo)
+
+ print '\n'
+ print "Task ID: ", taskID
+ print "Calling From: ", callFrom
+ print "To: ", callTo
+ print "number: ", destNo
+
+ ping(callFrom)
- if call.serverStatus <> 0:
+ if serverStatus <> 0:
- if rec.serverStatus <> 0:
+ ping(callTo)
+ if serverStatus <> 0:
- makeTest = ControllerClass.test(callFrom, callTo,rec.destNumber)
+ makeTest = ControllerClass.test(callFrom, callAdd, callTo, recAdd, destNo)
makeTest.FuncTest()
db.addResult(taskID, makeTest.testResult)
if makeTest.repeatTest == True:
db.insertTaskIn2(callTo,callFrom,taskNo)
+
+ print "Result :", makeTest.testResult
+
+ db.deleteTempTask(taskID)
+ db.tasksList.remove(item)
+ db.tasksList.insert(i,'')
+ i = i+1
+
+ sleep(3)
else:
print "[failed] 500 "+callTo+ " Server Internal Error"
else:
print "[failed] 500 "+callFrom+ " Server Internal Error"
-
- call = None
- rec = None
- db.deleteTempTask(taskID)
- db.cleanTasksList()
- db.anyTasksToDo()
+ db.cleanTasksList()
else:
print "No job at all"
else:
diff --git a/For Weekly Test/30-07-2011/ControllerClass.py b/For Weekly Test/30-07-2011/ControllerClass.py
index 9ce5db4..753548d 100644
--- a/For Weekly Test/30-07-2011/ControllerClass.py
+++ b/For Weekly Test/30-07-2011/ControllerClass.py
@@ -12,7 +12,8 @@ from time import sleep
class test:
- def __init__(self, callFrom, callTo, destNo):
+ def __init__(self, callFrom, callAdd, callTo, recAdd, destNo):
+
self.callFrom = callFrom
self.dest = callTo
self.destNo = destNo
@@ -22,8 +23,8 @@ class test:
self.resultCaller = None
self.resultDest = None
self.testResult = None
- self.callAdd = None
- self.recAdd = None
+ self.callAdd = callAdd
+ self.recAdd = recAdd
self.receiver = None
self.caller = None
self.connected = None
@@ -53,7 +54,7 @@ class test:
if self.connected == 'OK':
self.receiver.sendData('RECEIVER')
- destHandler = self.receiver.receiveData(0)
+ destHandler = self.receiver.receiveData(60)
if destHandler == 'RECEIVER READY':
logger.logEvent('Receiver handler : Ready')
@@ -68,8 +69,8 @@ class test:
self.receiver.closeConnection()
else:
- logger.logEvent('xxx General Handler Error: Could not connect Destination handler')
- self.testResult = 999
+ logger.logEvent('998 General Handler Error: Could not connect Destination handler')
+ self.testResult = 998
self.caller.sendData('TERMINATE CONNECTION')
self.caller.closeConnection()
else:
@@ -80,36 +81,26 @@ class test:
else:
self.testResult = 999
- logger.logEvent('xxx General Handler Error: Could not connect to Caller handler')
+ logger.logEvent('999 General Handler Error: Could not connect to Caller handler')
def waitingFeedback(self):
logger.logEvent('waiting Feedback')
- self.resultCaller = self.caller.receiveData(60)
- self.resultDest = self.receiver.receiveData(60)
+ self.resultCaller = self.caller.receiveData(120)
+ self.resultDest = self.receiver.receiveData(120)
if self.resultCaller <> 'CALL OK' or self.resultDest <> 'CALL OK':
-
- self.startCall()
- 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
- logger.logEvent('Failed')
- else:
- self.testResult = 200
- logger.logEvent('Test Succeed')
- self.caller.sendData('TERMINATE CONNECTION')
- self.receiver.sendData('TERMINATE CONNECTION')
+
+ logger.logEvent('Test Failed')
+ self.testResult = 486
+ self.repeatTest = True
+ self.initTerminate()
else:
logger.logEvent('Test Succeed')
self.testResult = 200
- self.caller.sendData('TERMINATE CONNECTION')
- self.receiver.sendData('TERMINATE CONNECTION')
+ self.initTerminate()
def startCall(self):
@@ -121,43 +112,38 @@ class test:
def initCaller(self):
logger.logEvent('init Caller')
- if self.callFrom =="gsmBox1":
- self.portCaller = 50008 #temp
- self.callAdd = '132.230.4.64'
+ if self.callFrom =="gsmr1":
+ self.portCaller = 50008
- elif self.callFrom =="RZ2":
- self.portCaller = 50096
- self.callAdd = ''
+ elif self.callFrom =="gsmr2":
+ self.portCaller = 50008 #temp
- elif self.callFrom =="RZ3":
+ elif self.callFrom =="gsmr3":
self.portCaller = 50097
- self.callAdd = ''
else:
self.portCaller = 50099
- self.callAdd = 'localhost'
- subprocess.Popen(args=["gnome-terminal", '--command=python sipHandler2.py '+self.callFrom+ ' ' +str(self.portCaller)])
+ subprocess.Popen(args=["gnome-terminal", '--command=python sipHandler.py '+self.callFrom+ ' ' +str(self.portCaller)])
def initReceiver(self):
logger.logEvent('init Receiver')
- logger.logEvent(self.dest)
- if self.dest =="gsmBox1":
+ if self.dest =="gsmr1":
self.portDest = 50008
- self.recAdd = '132.230.4.64'
- elif self.dest =="gsmBox2":
- self.portDest = 50103
- self.recAdd = ''
+ elif self.dest =="gsmr2":
+ self.portDest = 50008 #temp
- elif self.dest =="gsmBox3":
+ elif self.dest =="gsmr3":
self.portDest = 50103
- self.recAdd = ''
else:
self.portDest = 50100
- self.recAdd = 'localhost'
- subprocess.Popen(args=['gnome-terminal', '--command=python sipHandler2.py '+self.dest+ ' ' +str(self.portDest)])
+ subprocess.Popen(args=['gnome-terminal', '--command=python sipHandler.py '+self.dest+ ' ' +str(self.portDest)])
+
+ def initTerminate(self):
+ self.caller.sendData('TERMINATE CONNECTION')
+ self.receiver.sendData('TERMINATE CONNECTION')
def callerGreeting(self):
self.connected = None
diff --git a/For Weekly Test/30-07-2011/ControllerClass.pyc b/For Weekly Test/30-07-2011/ControllerClass.pyc
index 855e630..d5ccb86 100644
--- a/For Weekly Test/30-07-2011/ControllerClass.pyc
+++ b/For Weekly Test/30-07-2011/ControllerClass.pyc
Binary files differ
diff --git a/For Weekly Test/30-07-2011/DbClass.py b/For Weekly Test/30-07-2011/DbClass.py
index 5556d47..442e777 100644
--- a/For Weekly Test/30-07-2011/DbClass.py
+++ b/For Weekly Test/30-07-2011/DbClass.py
@@ -63,7 +63,12 @@ class DBMySQLConnection:
#parse the output from the mysql by creating a list
#with lists where each attribue(column) gets independent
#element of the list
- self.tasksList = output
+ for record in output:
+ columns = list()
+ for entry in record:
+ columns.append(str(entry))
+ columns.append(str(0))
+ self.tasksList.append(columns)
return 1
except MySQLdb.Error, e:
error = str(e)
@@ -100,17 +105,32 @@ class DBMySQLConnection:
def deviceAddress(self,deviceName):
if self.connectionCreated == 1:
try:
- successful = self.cur.execute("SELECT `deviceIP` FROM DeviceAddress where `deviceName`=%s", deviceName)
+ successful = self.cur.execute("SELECT `deviceIP`,`number` FROM DeviceAddressTable where `deviceName`=%s", deviceName)
#self.cur.execute()
output = self.cur.fetchall() #get the mysql response
#parse the output from the mysql by creating a list
#with lists where each attribue(column) gets independent
#element of the list
+
+
+
+# for record in output:
+# columns = list()
+# for entry in record:
+# columns.append(str(entry))
+# columns.append(str(0))
+# self.tasksList.append(columns)
+
+
+
+
deviceAddr = ''
for record in output:
columns = list()
for entry in record:
- deviceAddr = str(entry)
+ columns.append(str(entry))
+ deviceAddr = columns
+
return deviceAddr
except MySQLdb.Error, e:
error = str(e)
@@ -180,6 +200,9 @@ class DBMySQLConnection:
if debugMode == 1:
print str(e)
return 3
+
+ else:
+ return 0
def addResult(self, taskID, result):
if self.connectionCreated == 1:
@@ -221,6 +244,20 @@ class DBMySQLConnection:
while self.cur.nextset() is not None: pass
+ newQuery1 = 'SELECT taskID FROM `TempTaskTable` ORDER BY taskID DESC LIMIT 1';
+ successful1 = self.cur.execute(newQuery1)
+ record = self.cur.fetchone()
+
+ columns = list()
+ for entry in record:
+ columns.append(str(entry))
+
+ columns.append(str(taskNo))
+ columns.append(str(fromDevice))
+ columns.append(str(toDevice))
+ columns.append(str(0))
+ self.tasksList.append(columns)
+
return 1
if debugMode == 1:
@@ -249,4 +286,3 @@ class DBMySQLConnection:
return 2 #that task wasn't found
else:
return 0
-
diff --git a/For Weekly Test/30-07-2011/DbClass.pyc b/For Weekly Test/30-07-2011/DbClass.pyc
index 2b125c7..03223fe 100644
--- a/For Weekly Test/30-07-2011/DbClass.pyc
+++ b/For Weekly Test/30-07-2011/DbClass.pyc
Binary files differ
diff --git a/For Weekly Test/30-07-2011/LogFileClass.pyc b/For Weekly Test/30-07-2011/LogFileClass.pyc
index 52fd946..6c2ecdc 100644
--- a/For Weekly Test/30-07-2011/LogFileClass.pyc
+++ b/For Weekly Test/30-07-2011/LogFileClass.pyc
Binary files differ
diff --git a/For Weekly Test/30-07-2011/PingClass.pyc b/For Weekly Test/30-07-2011/PingClass.pyc
index 9ac5c4b..2252892 100644
--- a/For Weekly Test/30-07-2011/PingClass.pyc
+++ b/For Weekly Test/30-07-2011/PingClass.pyc
Binary files differ
diff --git a/For Weekly Test/30-07-2011/callorigFR.py b/For Weekly Test/30-07-2011/callorigFR.py
deleted file mode 100644
index 10e492b..0000000
--- a/For Weekly Test/30-07-2011/callorigFR.py
+++ /dev/null
@@ -1,172 +0,0 @@
-# $Id$
-#
-# SIP call sample.
-#
-# Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-import sys
-import pjsua as pj
-
-LOG_LEVEL=3
-current_call = None
-
-# Logging callback
-def log_cb(level, str, len):
- print str,
-
-
-# Callback to receive events from account
-class MyAccountCallback(pj.AccountCallback):
-
- def __init__(self, account=None):
- pj.AccountCallback.__init__(self, account)
-
- # Notification on incoming call
- def on_incoming_call(self, call):
- global current_call
- if current_call:
- call.answer(486, "Busy")
- return
-
- print "Incoming call from ", call.info().remote_uri
- print "Press 'a' to answer"
-
- current_call = call
-
- call_cb = MyCallCallback(current_call)
- current_call.set_callback(call_cb)
-
- current_call.answer(180)
-
-
-# Callback to receive events from Call
-class MyCallCallback(pj.CallCallback):
-
- def __init__(self, call=None):
- pj.CallCallback.__init__(self, call)
-
- # Notification when call state has changed
- def on_state(self):
- global current_call
- print "Call with", self.call.info().remote_uri,
- print "is", self.call.info().state_text,
- print "last code =", self.call.info().last_code,
- print "(" + self.call.info().last_reason + ")"
-
- if self.call.info().state == pj.CallState.DISCONNECTED:
- current_call = None
- print 'Current call is', current_call
-
- # Notification when call's media state has changed.
- def on_media_state(self):
- if self.call.info().media_state == pj.MediaState.ACTIVE:
- # Connect the call to sound device
- call_slot = self.call.info().conf_slot
- pj.Lib.instance().conf_connect(call_slot, 0)
- pj.Lib.instance().conf_connect(0, call_slot)
- print "Media is now active"
- else:
- print "Media is inactive"
-
-# Function to make call
-def make_call(uri):
- try:
- print "Making call to", uri
- return acc.make_call(uri, cb=MyCallCallback())
- except pj.Error, e:
- print "Exception: " + str(e)
- return None
-
-
-# Create library instance
-lib = pj.Lib()
-
-try:
- # Init library with default config and some customized
- # logging config.
- lib.init(log_cfg = pj.LogConfig(level=LOG_LEVEL, callback=log_cb))
-
- # Create UDP transport which listens to any available port
- transport = lib.create_transport(pj.TransportType.UDP,
- pj.TransportConfig(0))
- print "\nListening on", transport.info().host,
- print "port", transport.info().port, "\n"
-
- # Start the library
- lib.start()
- lib.set_null_snd_dev()
-
- # Create local account
- acc_cfg = pj.AccountConfig("132.230.4.8", "mpselftest3", "3mpselftest")
- acc = lib.create_account(acc_cfg, cb=MyAccountCallback())
-
- # If argument is specified then make call to the URI
- if len(sys.argv) > 1:
- lck = lib.auto_lock()
- current_call = make_call(sys.argv[1])
- print 'Current call is', current_call
- del lck
-
- my_sip_uri = "sip:" + transport.info().host + \
- ":" + str(transport.info().port)
-
- # Menu loop
- while True:
- print "My SIP URI is", my_sip_uri, acc.info().reg_status
- print "Menu: m=make call, h=hangup call, a=answer call, q=quit"
-
- input = sys.stdin.readline().rstrip("\r\n")
- if input == "m":
- if current_call:
- print "Already have another call"
- continue
- print "Enter destination URI to call: ",
- input = sys.stdin.readline().rstrip("\r\n")
- if input == "":
- continue
- lck = lib.auto_lock()
- number = "sip:"+input+"@132.230.4.8"
- current_call = make_call(number)
- del lck
-
- elif input == "h":
- if not current_call:
- print "There is no call"
- continue
- current_call.hangup()
-
- elif input == "a":
- if not current_call:
- print "There is no call"
- continue
- current_call.answer(200)
-
- elif input == "q":
- break
-
- # Shutdown the library
- transport = None
- acc.delete()
- acc = None
- lib.destroy()
- lib = None
-
-except pj.Error, e:
- print "Exception: " + str(e)
- lib.destroy()
- lib = None
-
diff --git a/For Weekly Test/30-07-2011/classCheck.py b/For Weekly Test/30-07-2011/classCheck.py
index 056470f..a54cc8a 100644
--- a/For Weekly Test/30-07-2011/classCheck.py
+++ b/For Weekly Test/30-07-2011/classCheck.py
@@ -12,17 +12,14 @@ class checking:
if self.handler == 'landline':
server = PingClass.Ping('sipgate.de')
self.serverStatus = server.ping(3)
- self.destNumber = '076145875681'
if self.handler == 'sip':
server = PingClass.Ping('132.230.4.8')
self.serverStatus = server.ping(3)
- self.destNumber = '4661928'
if self.handler == 'unisip':
server = PingClass.Ping('132.230.252.228')
self.serverStatus = server.ping(3)
- self.destNumber = '076120397897'
if self.handler == 'gsmBox1':
self.destNumber = '4661447'
diff --git a/For Weekly Test/30-07-2011/classCheck.pyc b/For Weekly Test/30-07-2011/classCheck.pyc
index d36941a..c502989 100644
--- a/For Weekly Test/30-07-2011/classCheck.pyc
+++ b/For Weekly Test/30-07-2011/classCheck.pyc
Binary files differ
diff --git a/For Weekly Test/30-07-2011/classController.log b/For Weekly Test/30-07-2011/classController.log
deleted file mode 100644
index dcc7450..0000000
--- a/For Weekly Test/30-07-2011/classController.log
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:14:53.385166 ------------------
-On: 2011-07-25 18:14:53.385299 Event: init Caller
-On: 2011-07-25 18:14:56.392353 Event: Connected to Caller Handler
-On: 2011-07-25 18:14:56.392656 Event: Caller Handler respond
-On: 2011-07-25 18:14:56.393554 Event: Caller handler : Ready
-On: 2011-07-25 18:14:56.393612 Event: init Receiver
-On: 2011-07-25 18:14:56.393656 Event: landline
-On: 2011-07-25 18:14:59.398634 Event: Connected to Receiver Handler
-On: 2011-07-25 18:14:59.398932 Event: Receiver Handler respond
-On: 2011-07-25 18:14:59.401999 Event: Receiver handler : Ready
-On: 2011-07-25 18:14:59.402065 Event: Start Call
-On: 2011-07-25 18:14:59.402191 Event: waiting Feedback
-On: 2011-07-25 18:15:08.341758 Event: Test Succeed
-On: 2011-07-25 18:15:08.348842 Event:
-On: 2011-07-25 18:15:08.348928 Event: init Caller
-On: 2011-07-25 18:15:11.354522 Event: Cannt connect to Caller
-On: 2011-07-25 18:15:11.354599 Event: xxx General Handler Error: Could not connect to Caller handler
-On: 2011-07-25 18:15:11.360877 Event:
-On: 2011-07-25 18:15:11.360963 Event: init Caller
-On: 2011-07-25 18:15:14.366910 Event: Connected to Caller Handler
-On: 2011-07-25 18:15:14.370364 Event: Caller Handler respond
-On: 2011-07-25 18:15:14.371764 Event: Caller handler : Ready
-On: 2011-07-25 18:15:14.371828 Event: init Receiver
-On: 2011-07-25 18:15:14.371861 Event: sip
-On: 2011-07-25 18:15:17.378689 Event: Connected to Receiver Handler
-On: 2011-07-25 18:15:17.378995 Event: Receiver Handler respond
-On: 2011-07-25 18:15:17.379866 Event: Receiver handler : Ready
-On: 2011-07-25 18:15:17.379926 Event: Start Call
-On: 2011-07-25 18:15:17.380045 Event: waiting Feedback
-On: 2011-07-25 18:15:19.772125 Event: Test Succeed
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:17:02.107533 ------------------
-On: 2011-07-25 18:17:02.107636 Event: init Caller
-On: 2011-07-25 18:17:05.114113 Event: Connected to Caller Handler
-On: 2011-07-25 18:17:05.114422 Event: Caller Handler respond
-On: 2011-07-25 18:17:05.115279 Event: Caller handler : Ready
-On: 2011-07-25 18:17:05.115341 Event: init Receiver
-On: 2011-07-25 18:17:05.115377 Event: gsmBox1
-On: 2011-07-25 18:17:08.119612 Event: Connected to Receiver Handler
-On: 2011-07-25 18:17:08.122865 Event: Receiver Handler respond
-On: 2011-07-25 18:17:08.124230 Event: Receiver handler : Ready
-On: 2011-07-25 18:17:08.124294 Event: Start Call
-On: 2011-07-25 18:17:08.124391 Event: waiting Feedback
-On: 2011-07-25 18:17:15.028654 Event: Test Succeed
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:17:41.958688 ------------------
-On: 2011-07-25 18:17:41.958796 Event: init Caller
-On: 2011-07-25 18:17:44.963170 Event: Connected to Caller Handler
-On: 2011-07-25 18:17:44.966283 Event: Caller Handler respond
-On: 2011-07-25 18:17:44.967774 Event: Caller handler : Ready
-On: 2011-07-25 18:17:44.967841 Event: init Receiver
-On: 2011-07-25 18:17:44.967875 Event: sip
-On: 2011-07-25 18:17:47.974989 Event: Connected to Receiver Handler
-On: 2011-07-25 18:17:47.975264 Event: Receiver Handler respond
-On: 2011-07-25 18:17:47.976128 Event: Receiver handler : Ready
-On: 2011-07-25 18:17:47.976194 Event: Start Call
-On: 2011-07-25 18:17:47.976310 Event: waiting Feedback
-On: 2011-07-25 18:17:50.452525 Event: Test Succeed
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:19:00.933069 ------------------
-On: 2011-07-25 18:19:00.933171 Event: init Caller
-On: 2011-07-25 18:19:03.940235 Event: Connected to Caller Handler
-On: 2011-07-25 18:19:03.940545 Event: Caller Handler respond
-On: 2011-07-25 18:19:03.941410 Event: Caller handler : Ready
-On: 2011-07-25 18:19:03.941502 Event: init Receiver
-On: 2011-07-25 18:19:03.941554 Event: sip
-On: 2011-07-25 18:19:06.948483 Event: Connected to Receiver Handler
-On: 2011-07-25 18:19:06.948778 Event: Receiver Handler respond
-On: 2011-07-25 18:19:06.949684 Event: Receiver handler : Ready
-On: 2011-07-25 18:19:06.949741 Event: Start Call
-On: 2011-07-25 18:19:06.949867 Event: waiting Feedback
-On: 2011-07-25 18:19:12.524362 Event: Test Succeed
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:20:32.637749 ------------------
-On: 2011-07-25 18:20:32.637790 Event: init Caller
-On: 2011-07-25 18:20:35.643888 Event: Connected to Caller Handler
-On: 2011-07-25 18:20:35.644140 Event: Caller Handler respond
-On: 2011-07-25 18:20:35.645006 Event: Caller handler : Ready
-On: 2011-07-25 18:20:35.645074 Event: init Receiver
-On: 2011-07-25 18:20:35.645111 Event: unisip
-On: 2011-07-25 18:20:38.652012 Event: Connected to Receiver Handler
-On: 2011-07-25 18:20:38.652353 Event: Receiver Handler respond
-On: 2011-07-25 18:20:38.653181 Event: Receiver handler : Ready
-On: 2011-07-25 18:20:38.653246 Event: Start Call
-On: 2011-07-25 18:20:38.653355 Event: waiting Feedback
-On: 2011-07-25 18:20:44.204865 Event: Test Succeed
diff --git a/For Weekly Test/30-07-2011/dbClass.py b/For Weekly Test/30-07-2011/dbClass.py
deleted file mode 100644
index dc7ca41..0000000
--- a/For Weekly Test/30-07-2011/dbClass.py
+++ /dev/null
@@ -1,271 +0,0 @@
-import MySQLdb
-import string
-
-class DBMySQLConnection:
- def __init__(self, username, password, host, dbname):
- #initialize at the start all the user parameters
- self.usern = username
- self.passw = password
- self.host = host
- self.db = dbname
- self.connectionCreated = 0
- self.tasksList = list()
- global debugMode
- debugMode = 0
-
- def connectDB(self):
- try:
- #try the connection
- self.datBaseConn=MySQLdb.connect(self.host,self.usern, self.passw,self.db)
- self.datBaseConn.paramstyle = 'format'
- self.cur = self.datBaseConn.cursor() #make the cursor, used for sending queries
- self.connectionCreated = 1 #use it as an indicator that the connection was created
- return 1
-
- except MySQLdb.Error, e:
- #if we have an error then try to catch it
- error=str(e)
- if error[1:5] == '1045':
- #wrong username or password
- return 0
- elif error[1:5] == '2002':
- #can't connect to mysql, mysql shutdown or wrong host
- return 2
- else:
- if debugMode == 1:
- print error
- return 3
-
- def closeDBConn(self):
- #close the connection to the database here
- if self.connectionCreated == 1:
- try:
- #close the cursor and then the connection to the DB
- self.cur.close()
- self.datBaseConn.close()
- return 1
- except MySQLdb.Error, e:
- #in case of an error
- if debugMode == 1:
- error = str(e)
- print error
- return 3
- else:
- #I never really had a connection
- return 0
-
- def anyTasksToDo(self):
- #see are there any jobs to be executed and make a list out of it
- if self.connectionCreated == 1:
- try:
- self.cur.execute("SELECT * FROM TempTaskTable")
- output = self.cur.fetchall() #get the mysql response
- #parse the output from the mysql by creating a list
- #with lists where each attribue(column) gets independent
- #element of the list
- for record in output:
- columns = list()
- for entry in record:
- columns.append(str(entry))
- self.tasksList.append(columns)
- return 1
- except MySQLdb.Error, e:
- error = str(e)
- if error[1:5] == '1146':
- return 2 #the table doesn't exist
- if debugMode == 1:
- print str(e)
- return 3
- else:
- return 0
-
- def cleanTasksList(self):
- if self.connectionCreated == 1:
- del self.tasksList[:]
- return 1
- else:
- return 0
-
- def removeTaskFromList(self, taskID):
- #remove only one task from the task list
- if self.connectionCreated == 1:
- for index in range(len(self.tasksList)):
- item = self.tasksList[index]
- if item[0] == str(taskID):
- #self.tasksList.remove(index)
- #print 'found it'
- del self.tasksList[index]
- return 1 #deleted taskID
-
- return 2 #didn't find that taskID
- else:
- return 0
-
- def deviceAddress(self,deviceName):
- if self.connectionCreated == 1:
- try:
- successful = self.cur.execute("SELECT `deviceIP` FROM DeviceAddress where `deviceName`=%s", deviceName)
- #self.cur.execute()
- output = self.cur.fetchall() #get the mysql response
- #parse the output from the mysql by creating a list
- #with lists where each attribue(column) gets independent
- #element of the list
- deviceAddr = ''
- for record in output:
- columns = list()
- for entry in record:
- deviceAddr = str(entry)
- return deviceAddr
- except MySQLdb.Error, e:
- error = str(e)
- if error[1:5] == '1146':
- return 2 #the table doesn't exist
- if debugMode == 1:
- print str(e)
- return 3 #some error happened
- else:
- return 0 #I am not connected
-
- def updateTaskResult(self, taskID, status):
- if self.connectionCreated == 1:
- try:
- successful = self.cur.execute("UPDATE TaskTable SET status=%i WHERE taskID=%i"%(int(status), int(taskID)))
- output = self.cur.fetchone()
-
- if debugMode == 1:
- print output
- if successful == 0:
- return 1 #update successful
- else:
- return 4 #taskID doesn't exist
-
- except MySQLdb.Error, e:
- if debugMode == 1:
- print str(e)
- return 3
- else:
- return 0
-
- def updatePingResult(self, taskNo, sipServer, sipGate, sipLoc, gsmBox1, gsmBox2):
- if self.connectionCreated == 1:
- try:
- successful = self.cur.execute("UPDATE PingResultTable SET sipServer=%i, sipGate=%i, sipLoc=%i, gsmBox1=%i, gsmBox2=%i WHERE taskNo=%i"%(int(sipServer), int(sipGate), int(sipLoc), int(gsmBox1), int(gsmBox2), int(taskNo)))
- output = self.cur.fetchone()
-
- if debugMode == 1:
- print output
- if successful == 0:
- return 1 #ping table updated
- else:
- return 4 #the taskNo didn't exist
-
-
- except MySQLdb.Error, e:
- if debugMode == 1:
- print str(e)
- return 3
- else:
- return 0
-
- def deleteTempTask(self, taskID):
- if self.connectionCreated == 1:
- try:
- successful = self.cur.execute("DELETE FROM TempTaskTable WHERE taskID=%i"%(int(taskID)))
- output = self.cur.fetchone()
-
- if debugMode == 1:
- print output
-
- if successful == 1:
- return 1 #deleted it
- else:
- return 4 #that taskID didn't exist or something else
- except MySQLdb.Error, e:
- if debugMode == 1:
- print str(e)
- return 3
-
- else:
- return 0
-
- def addResult(self, taskID, result):
- if self.connectionCreated == 1:
- try:
- successful = self.cur.execute("INSERT INTO ResultTable(taskID, result) VALUES ('%i', '%i')"%(int(taskID), int(result)))
- output = self.cur.fetchone()
-
- if debugMode == 1:
- print output
- if successful == 1:
- return 1 #successfully added the result
- else:
- return 4 #hmmm
- except MySQLdb.Error, e:
- error = str(e)
- if error[1:5] == '1062':
- return 2 #duplicate entry for the key
- if debugMode == 1:
- print str(e)
- return 3
- else:
- return 0
-
-
- def insertTaskIn2(self, fromDevice, toDevice, taskNo):
- if self.connectionCreated == 1:
- try:
- #I used here a transaction since I want the mysql to execute a few commands and tell me was it successful rather than to execute some and there happens a mistake and one part is updated and the other isn't
- newQuery = "START TRANSACTION; INSERT INTO `TaskTable` (`taskNo`, `from`, `to`, `status`) VALUES ('" + str(taskNo) + "', '" + str(fromDevice) + "', '" + str(toDevice) +"', '0'); SELECT @taskID := LAST_INSERT_ID(); INSERT INTO `TempTaskTable` (`taskID`, `taskNo`, `from`, `to`) VALUES (@taskID, '" + str(taskNo) + "', '" + str(fromDevice) + "', '"+ str(toDevice) + "'); COMMIT;"
-
-
- successful = self.cur.execute(newQuery)
- output = self.cur.fetchone()
-
-
- #without closing the cursos we get a MySQL error, the mistake is an internal mistak of the MySQLdb python library
- # self.cur.close()
- # self.cur = self.datBaseConn.cursor()
-
- while self.cur.nextset() is not None: pass
-
- newQuery1 = 'SELECT taskID FROM `TempTaskTable` ORDER BY taskID DESC LIMIT 1';
- successful1 = self.cur.execute(newQuery1)
- record = self.cur.fetchone()
-
- columns = list()
- for entry in record:
- columns.append(str(entry))
-
- columns.append(str(taskNo))
- columns.append(str(fromDevice))
- columns.append(str(toDevice))
- self.tasksList.append(columns)
-
- return 1
-
- if debugMode == 1:
- print output
-
- except MySQLdb.Error, e:
- error = str(e)
- if debugMode == 1:
- print str(e)
- if error[1:5] == '1062':
- return 2 #duplicate entry for the key
- return 3
- else:
- return 0
-
-
- def searchTaskList(self, fromDevice, toDevice):
- if self.connectionCreated == 1:
- for item in self.tasksList:
- taskID = item[0]
- taskNo = item[1]
- callFrom = item[2]
- callTo = item [3]
- if callFrom == fromDevice and callTo == toDevice:
- return 1 #that task was found
- return 2 #that task wasn't found
- else:
- return 0
diff --git a/For Weekly Test/30-07-2011/dbClass.pyc b/For Weekly Test/30-07-2011/dbClass.pyc
deleted file mode 100644
index d51d30e..0000000
--- a/For Weekly Test/30-07-2011/dbClass.pyc
+++ /dev/null
Binary files differ
diff --git a/For Weekly Test/30-07-2011/sipHandler.log b/For Weekly Test/30-07-2011/sipHandler.log
deleted file mode 100644
index 791ab71..0000000
--- a/For Weekly Test/30-07-2011/sipHandler.log
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-------------------STARTED THE LOGGING 2011-07-25 17:57:47.509760 ------------------
-On: 2011-07-25 17:57:47.522766 Event: try to Connect to Controller
-On: 2011-07-25 17:57:50.343605 Event: Beeing SIP
-On: 2011-07-25 17:57:50.343770 Event: init state
-On: 2011-07-25 17:57:50.343852 Event: Register Account to SIP server
-On: 2011-07-25 17:57:50.344370 Event: 100
-On: 2011-07-25 17:57:50.344446 Event: Caller Handler Ready
-On: 2011-07-25 17:57:53.351950 Event: CALL START
-On: 2011-07-25 17:57:53.352014 Event: Make a call to: 076120397897
-
-
-------------------STARTED THE LOGGING 2011-07-25 17:57:50.505922 ------------------
-On: 2011-07-25 17:57:50.517415 Event: try to Connect to Controller
-On: 2011-07-25 17:57:53.350822 Event: Beeing University SIP
-On: 2011-07-25 17:57:53.350960 Event: init state
-On: 2011-07-25 17:57:53.351018 Event: Register Account to SIP server
-On: 2011-07-25 17:57:53.351557 Event: 100
-On: 2011-07-25 17:57:53.351633 Event: Receiver Handler Ready
-
-
-------------------STARTED THE LOGGING 2011-07-25 17:59:44.765028 ------------------
-On: 2011-07-25 17:59:44.778015 Event: try to Connect to Controller
-On: 2011-07-25 17:59:47.601914 Event: Beeing University SIP
-On: 2011-07-25 17:59:47.602094 Event: init state
-On: 2011-07-25 17:59:47.602164 Event: Register Account to SIP server
-On: 2011-07-25 17:59:47.602681 Event: 100
-On: 2011-07-25 17:59:47.602758 Event: Receiver Handler Ready
-
-
-------------------STARTED THE LOGGING 2011-07-25 17:59:41.779127 ------------------
-On: 2011-07-25 17:59:41.793337 Event: try to Connect to Controller
-On: 2011-07-25 17:59:44.595237 Event: Beeing SIP
-On: 2011-07-25 17:59:44.595365 Event: init state
-On: 2011-07-25 17:59:44.595429 Event: Register Account to SIP server
-On: 2011-07-25 17:59:44.595945 Event: 100
-On: 2011-07-25 17:59:44.596022 Event: Caller Handler Ready
-On: 2011-07-25 17:59:47.603081 Event: CALL START
-On: 2011-07-25 17:59:47.603134 Event: Make a call to: 076120397897
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:00:03.241267 ------------------
-On: 2011-07-25 18:00:03.252248 Event: try to Connect to Controller
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:02:42.276369 ------------------
-On: 2011-07-25 18:02:42.286340 Event: try to Connect to Controller
-On: 2011-07-25 18:02:45.125394 Event: Beeing SIP
-On: 2011-07-25 18:02:45.125556 Event: init state
-On: 2011-07-25 18:02:45.125618 Event: Register Account to SIP server
-On: 2011-07-25 18:02:45.126161 Event: 100
-On: 2011-07-25 18:02:45.126236 Event: Caller Handler Ready
-On: 2011-07-25 18:02:48.135874 Event: CALL START
-On: 2011-07-25 18:02:48.135942 Event: Make a call to: 076120397897
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:02:45.295371 ------------------
-On: 2011-07-25 18:02:45.305258 Event: try to Connect to Controller
-On: 2011-07-25 18:02:48.133570 Event: Beeing University SIP
-On: 2011-07-25 18:02:48.133713 Event: init state
-On: 2011-07-25 18:02:48.133772 Event: Register Account to SIP server
-On: 2011-07-25 18:02:48.134299 Event: 100
-On: 2011-07-25 18:02:48.134371 Event: Receiver Handler Ready
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:04:51.427991 ------------------
-On: 2011-07-25 18:04:51.439521 Event: try to Connect to Controller
-On: 2011-07-25 18:04:54.266406 Event: Beeing SIP
-On: 2011-07-25 18:04:54.266591 Event: init state
-On: 2011-07-25 18:04:54.266679 Event: Register Account to SIP server
-On: 2011-07-25 18:04:54.267218 Event: 100
-On: 2011-07-25 18:04:54.267313 Event: Caller Handler Ready
-On: 2011-07-25 18:04:57.276583 Event: CALL START
-On: 2011-07-25 18:04:57.276623 Event: Make a call to: 076145875681
-On: 2011-07-25 18:05:01.503218 Event: Call Connecting
-On: 2011-07-25 18:05:01.503291 Event: 200
-On: 2011-07-25 18:05:01.504517 Event: Terminate
-On: 2011-07-25 18:05:01.504576 Event: Goodbye
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:04:54.429321 ------------------
-On: 2011-07-25 18:04:54.439093 Event: try to Connect to Controller
-On: 2011-07-25 18:04:57.274706 Event: Beeing Landline
-On: 2011-07-25 18:04:57.274764 Event: init state
-On: 2011-07-25 18:04:57.274781 Event: Register Account to SIP server
-On: 2011-07-25 18:04:57.276195 Event: 100
-On: 2011-07-25 18:04:57.276296 Event: Receiver Handler Ready
-On: 2011-07-25 18:05:00.242406 Event: {Call "anonymous" <sip:anonymous@sipgate.de>}
-On: 2011-07-25 18:05:00.743816 Event: Call Connecting
-On: 2011-07-25 18:05:00.743886 Event: 200
-On: 2011-07-25 18:05:00.744082 Event: Answer call
-On: 2011-07-25 18:05:01.244752 Event: Hangup call
-On: 2011-07-25 18:05:01.245120 Event: CALL OK
-On: 2011-07-25 18:05:01.296246 Event: Call Disconnected
-On: 2011-07-25 18:05:01.503947 Event: Terminate
-On: 2011-07-25 18:05:01.504015 Event: Goodbye
diff --git a/For Weekly Test/30-07-2011/sipHandler.py b/For Weekly Test/30-07-2011/sipHandler.py
index 9144856..e404e03 100644
--- a/For Weekly Test/30-07-2011/sipHandler.py
+++ b/For Weekly Test/30-07-2011/sipHandler.py
@@ -68,36 +68,34 @@ def make_call(uri):
logger.logEvent('408')
return None
-global acc_cfg
-global handler
-global state
+def greeting():
+ global server
+ global status
+ global port
-handler = sys.argv[1]
-port = sys.argv[2]
+ port = sys.argv[2]
+ server = None
+ status = None
-lib = pj.Lib()
-stop = False
-
-logger = LogFileClass.Logging('sipHandler.log')
-logger.logEvent('')
-
-while stop <> True:
-
- acc_cfg = None
-
- lib.init(log_cfg = pj.LogConfig(level=1, callback=log_cb))
- transport = lib.create_transport(pj.TransportType.UDP, pj.TransportConfig(0))
-
- lib.start()
- lib.set_null_snd_dev()
-
server = ServerClass.ServerHandler(port)
- logger.logEvent('Connect to Controller')
+ logger.logEvent('try to Connect to Controller')
conn = server.openSocket()
-
- if server.receiveData(30) == 'HELLO HANDLER':
- server.sendData('HELLO CONTROLLER')
+ if server.connected == 1:
+ if server.receiveData(30) == 'HELLO HANDLER':
+ server.sendData('HELLO CONTROLLER')
+ status = 'OK'
+ else:
+ status = 'NOT OK'
+ logger.logEvent('cant connect to Controller')
+ sys.exit(1)
+
+def initState():
+ global message
+ global state
+ global num
+
+ logger.logEvent('init state')
message = server.receiveData(30)
if message == 'RECEIVER':
@@ -107,17 +105,29 @@ while stop <> True:
state = 'CALLER'
num = message[7:]
+def initHandler():
+ global acc_cfg
+ global handler
+ global sipServer
+
+
+ handler = sys.argv[1]
+
+
if handler == 'sip':
logger.logEvent('Beeing SIP')
acc_cfg = pj.AccountConfig("132.230.4.8","mpselftest1","1mpselftest")
+ sipServer = '132.230.4.8'
- elif handler == 'landline':
+ elif handler == 'landline':
logger.logEvent('Beeing Landline')
acc_cfg = pj.AccountConfig("sipgate.de","1289459","MMW9AX")
+ sipServer = 'sipgate.de'
elif handler == 'unisip':
logger.logEvent('Beeing University SIP')
acc_cfg = pj.AccountConfig("132.230.252.228", "4976120397897", "hB8M3WyFt61C")
+ sipServer = '132.230.252.228'
else:
logger.logEvent('Unknown Message')
@@ -125,8 +135,29 @@ while stop <> True:
server.closeConnection()
sys.exit(1)
- try:
+
+lib = pj.Lib()
+stop = False
+
+logger = LogFileClass.Logging('sipHandler.log')
+logger.logEvent('')
+
+while stop <> True:
+
+ acc_cfg = None
+
+ lib.init(log_cfg = pj.LogConfig(level=1, callback=log_cb))
+ transport = lib.create_transport(pj.TransportType.UDP, pj.TransportConfig(0))
+
+ lib.start()
+ lib.set_null_snd_dev()
+
+ greeting()
+ initHandler()
+
+ try:
+ initState()
logger.logEvent('Register Account to SIP server')
acc = lib.create_account(acc_cfg, cb=Account())
@@ -137,17 +168,16 @@ while stop <> True:
logger.logEvent(acc.info().reg_status)
server.sendData('RECEIVER READY')
logger.logEvent('Receiver Handler Ready')
- print "1"
while 1:
data = server.receiveData(3)
- print "here"
+
if data == 'RECEIVE START':
logger.logEvent(data)
- elif data == "TERMINATE CONNECTION":
- logger.logEvent(data)
+ if data == 'TERMINATE CONNECTION':
+ logger.logEvent('Terminate')
stop = True
break
@@ -159,21 +189,19 @@ while stop <> True:
while 1:
data = server.receiveData(3)
- print "here2"
- if event == "CALL START":
- if num <> "":
- logger.logEvent(event)
- print "here3"
- sleep(5) # waiting 5 second before call to waiting unisip get authentification from server
+ if data == 'CALL START':
+ if num <> '':
+ sleep(5)
+ logger.logEvent(data)
logger.logEvent('Make a call to: ' + num)
- number = "sip:"+num+"@132.230.4.8"
+ number = "sip:"+num+"@"+sipServer
make_call(number)
else:
logger.logEvent('No number to call')
logger.logEvent('CALL NOT OK')
- if data == "TERMINATE CONNECTION":
+ if data == 'TERMINATE CONNECTION':
stop = True
logger.logEvent('Terminate')
break
@@ -182,7 +210,7 @@ while stop <> True:
logger.logEvent('Unknow Message')
server.sendData('Unknow Message')
server.closeConnection()
- sys.exit(1)
+ sys.exit(0.5)
else:
logger.logEvent("488 Not Acceptable Here")
diff --git a/For Weekly Test/30-07-2011/sipHandler2.log b/For Weekly Test/30-07-2011/sipHandler2.log
deleted file mode 100644
index 781f71c..0000000
--- a/For Weekly Test/30-07-2011/sipHandler2.log
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:15:08.546646 ------------------
-On: 2011-07-25 18:15:08.560265 Event: try to Connect to Controller
-On: 2011-07-25 18:15:08.561619 Event: cant connect to Controller
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:14:53.541605 ------------------
-On: 2011-07-25 18:14:53.554463 Event: try to Connect to Controller
-On: 2011-07-25 18:14:56.392627 Event: Beeing SIP
-On: 2011-07-25 18:14:56.392803 Event: init state
-On: 2011-07-25 18:14:56.392874 Event: Register Account to SIP server
-On: 2011-07-25 18:14:56.393398 Event: 100
-On: 2011-07-25 18:14:56.393516 Event: Caller Handler Ready
-On: 2011-07-25 18:15:04.405530 Event: CALL START
-On: 2011-07-25 18:15:04.405630 Event: Make a call to: 076145875681
-On: 2011-07-25 18:15:08.341351 Event: Call Connecting
-On: 2011-07-25 18:15:08.341423 Event: 200
-On: 2011-07-25 18:15:08.342527 Event: Terminate
-On: 2011-07-25 18:15:08.342586 Event: Goodbye
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:14:56.580433 ------------------
-On: 2011-07-25 18:14:56.593545 Event: try to Connect to Controller
-On: 2011-07-25 18:14:59.398903 Event: Beeing Landline
-On: 2011-07-25 18:14:59.399076 Event: init state
-On: 2011-07-25 18:14:59.399145 Event: Register Account to SIP server
-On: 2011-07-25 18:14:59.401855 Event: 100
-On: 2011-07-25 18:14:59.401956 Event: Receiver Handler Ready
-On: 2011-07-25 18:14:59.402182 Event: RECEIVE START
-On: 2011-07-25 18:15:07.275120 Event: {Call "anonymous" <sip:anonymous@sipgate.de>}
-On: 2011-07-25 18:15:07.776533 Event: Call Connecting
-On: 2011-07-25 18:15:07.776602 Event: 200
-On: 2011-07-25 18:15:07.776802 Event: Answer call
-On: 2011-07-25 18:15:08.277520 Event: Hangup call
-On: 2011-07-25 18:15:08.277868 Event: CALL OK
-On: 2011-07-25 18:15:08.328895 Event: Call Disconnected
-On: 2011-07-25 18:15:08.341976 Event: Terminate
-On: 2011-07-25 18:15:08.342053 Event: Goodbye
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:15:14.555440 ------------------
-On: 2011-07-25 18:15:14.565189 Event: try to Connect to Controller
-On: 2011-07-25 18:15:17.378965 Event: Beeing SIP
-On: 2011-07-25 18:15:17.379135 Event: init state
-On: 2011-07-25 18:15:17.379206 Event: Register Account to SIP server
-On: 2011-07-25 18:15:17.379748 Event: 100
-On: 2011-07-25 18:15:17.379826 Event: Receiver Handler Ready
-On: 2011-07-25 18:15:17.380044 Event: RECEIVE START
-On: 2011-07-25 18:15:18.212245 Event: {Call "447" <sip:447@132.230.4.8>}
-On: 2011-07-25 18:15:18.713694 Event: Call Connecting
-On: 2011-07-25 18:15:18.713764 Event: 200
-On: 2011-07-25 18:15:18.713996 Event: Answer call
-On: 2011-07-25 18:15:19.214679 Event: Hangup call
-On: 2011-07-25 18:15:19.215053 Event: CALL OK
-On: 2011-07-25 18:15:19.266088 Event: Call Disconnected
-On: 2011-07-25 18:15:19.772360 Event: Terminate
-On: 2011-07-25 18:15:19.772438 Event: Goodbye
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:17:02.263362 ------------------
-On: 2011-07-25 18:17:02.276051 Event: try to Connect to Controller
-On: 2011-07-25 18:17:05.114394 Event: Beeing SIP
-On: 2011-07-25 18:17:05.114567 Event: init state
-On: 2011-07-25 18:17:05.114638 Event: Register Account to SIP server
-On: 2011-07-25 18:17:05.115163 Event: 100
-On: 2011-07-25 18:17:05.115240 Event: Caller Handler Ready
-On: 2011-07-25 18:17:13.125524 Event: CALL START
-On: 2011-07-25 18:17:13.125629 Event: Make a call to: 4661447
-On: 2011-07-25 18:17:14.852807 Event: Call Connecting
-On: 2011-07-25 18:17:14.852880 Event: 200
-On: 2011-07-25 18:17:15.028918 Event: Terminate
-On: 2011-07-25 18:17:15.029006 Event: Goodbye
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:17:45.129026 ------------------
-On: 2011-07-25 18:17:45.142058 Event: try to Connect to Controller
-On: 2011-07-25 18:17:47.975224 Event: Beeing SIP
-On: 2011-07-25 18:17:47.975367 Event: init state
-On: 2011-07-25 18:17:47.975426 Event: Register Account to SIP server
-On: 2011-07-25 18:17:47.975961 Event: 100
-On: 2011-07-25 18:17:47.976035 Event: Receiver Handler Ready
-On: 2011-07-25 18:17:47.976385 Event: RECEIVE START
-On: 2011-07-25 18:17:48.838579 Event: {Call "447" <sip:447@132.230.4.8>}
-On: 2011-07-25 18:17:49.339988 Event: Call Connecting
-On: 2011-07-25 18:17:49.340058 Event: 200
-On: 2011-07-25 18:17:49.340258 Event: Answer call
-On: 2011-07-25 18:17:49.840934 Event: Hangup call
-On: 2011-07-25 18:17:49.841303 Event: CALL OK
-On: 2011-07-25 18:17:49.842036 Event: Call Disconnected
-On: 2011-07-25 18:17:50.452655 Event: Terminate
-On: 2011-07-25 18:17:50.452680 Event: Goodbye
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:19:04.130794 ------------------
-On: 2011-07-25 18:19:04.144153 Event: try to Connect to Controller
-On: 2011-07-25 18:19:06.948727 Event: Beeing SIP
-On: 2011-07-25 18:19:06.948916 Event: init state
-On: 2011-07-25 18:19:06.948991 Event: Register Account to SIP server
-On: 2011-07-25 18:19:06.949561 Event: 100
-On: 2011-07-25 18:19:06.949642 Event: Receiver Handler Ready
-On: 2011-07-25 18:19:06.949861 Event: RECEIVE START
-On: 2011-07-25 18:19:11.997474 Event: {Call "4976120397897" <sip:4976120397897@132.230.4.8>}
-On: 2011-07-25 18:19:12.498758 Event: Call Connecting
-On: 2011-07-25 18:19:12.498827 Event: 200
-On: 2011-07-25 18:19:12.499026 Event: Answer call
-On: 2011-07-25 18:19:12.524644 Event: Terminate
-On: 2011-07-25 18:19:12.524669 Event: Goodbye
-On: 2011-07-25 18:19:12.999666 Event: Hangup call
-On: 2011-07-25 18:19:13.000009 Event: CALL OK
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:19:01.118826 ------------------
-On: 2011-07-25 18:19:01.129221 Event: try to Connect to Controller
-On: 2011-07-25 18:19:03.940517 Event: Beeing University SIP
-On: 2011-07-25 18:19:03.940686 Event: init state
-On: 2011-07-25 18:19:03.940758 Event: Register Account to SIP server
-On: 2011-07-25 18:19:03.941296 Event: 100
-On: 2011-07-25 18:19:03.941371 Event: Caller Handler Ready
-On: 2011-07-25 18:19:11.953492 Event: CALL START
-On: 2011-07-25 18:19:11.953562 Event: Make a call to: 4661928
-On: 2011-07-25 18:19:12.524058 Event: Call Connecting
-On: 2011-07-25 18:19:12.524132 Event: 200
-On: 2011-07-25 18:19:12.525120 Event: Terminate
-On: 2011-07-25 18:19:12.525175 Event: Goodbye
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:20:32.795622 ------------------
-On: 2011-07-25 18:20:32.805566 Event: try to Connect to Controller
-On: 2011-07-25 18:20:35.644115 Event: Beeing SIP
-On: 2011-07-25 18:20:35.644252 Event: init state
-On: 2011-07-25 18:20:35.644311 Event: Register Account to SIP server
-On: 2011-07-25 18:20:35.644847 Event: 100
-On: 2011-07-25 18:20:35.644943 Event: Caller Handler Ready
-On: 2011-07-25 18:20:43.658498 Event: CALL START
-On: 2011-07-25 18:20:43.658597 Event: Make a call to: 076120397897
-On: 2011-07-25 18:20:44.204552 Event: Call Connecting
-On: 2011-07-25 18:20:44.204622 Event: 200
-On: 2011-07-25 18:20:44.205528 Event: Terminate
-On: 2011-07-25 18:20:44.205597 Event: Goodbye
-
-
-------------------STARTED THE LOGGING 2011-07-25 18:20:35.802639 ------------------
-On: 2011-07-25 18:20:35.812459 Event: try to Connect to Controller
-On: 2011-07-25 18:20:38.652252 Event: Beeing University SIP
-On: 2011-07-25 18:20:38.652394 Event: init state
-On: 2011-07-25 18:20:38.652482 Event: Register Account to SIP server
-On: 2011-07-25 18:20:38.653012 Event: 100
-On: 2011-07-25 18:20:38.653089 Event: Receiver Handler Ready
-On: 2011-07-25 18:20:38.653378 Event: RECEIVE START
-On: 2011-07-25 18:20:43.670988 Event: {Call "mpselftest1" <sip:4661928@132.230.252.228>}
-On: 2011-07-25 18:20:44.172405 Event: Call Connecting
-On: 2011-07-25 18:20:44.172474 Event: 200
-On: 2011-07-25 18:20:44.172675 Event: Answer call
-On: 2011-07-25 18:20:44.205320 Event: Terminate
-On: 2011-07-25 18:20:44.205413 Event: Goodbye
-On: 2011-07-25 18:20:44.673307 Event: Hangup call
-On: 2011-07-25 18:20:44.673716 Event: CALL OK
-On: 2011-07-25 18:20:44.674459 Event: Call Disconnected
diff --git a/For Weekly Test/30-07-2011/sipHandler2.py b/For Weekly Test/30-07-2011/sipHandler2.py
deleted file mode 100644
index 6e23ab7..0000000
--- a/For Weekly Test/30-07-2011/sipHandler2.py
+++ /dev/null
@@ -1,225 +0,0 @@
-import sys
-import string
-import pjsua as pj
-import ServerClass
-import LogFileClass
-
-from time import sleep
-
-def log_cb(level, str, len):
- print "--------starting Handler--------"
-
-# Receive events from incoming Call
-class Account(pj.AccountCallback):
-
- def on_incoming_call(self, call):
- global current_call
-
- current_call = call
- call_cb = Calling(current_call)
- current_call.set_callback(call_cb)
-
- logger.logEvent(current_call)
- sleep(0.5)
-
- call.answer(200)
- logger.logEvent("Answer call")
- sleep(0.5)
-
- if current_call <> None:
- logger.logEvent("Hangup call")
- call.hangup()
-
- logger.logEvent('CALL OK')
-
-class Calling(pj.CallCallback):
-
- def __init__(self, call=None):
- pj.CallCallback.__init__(self, call)
-
- def on_state(self):
- global current_call
-
- if self.call.info().state <> pj.CallState.DISCONNECTED:
- if self.call.info().state_text == "CONNECTING":
- logger.logEvent("Call Connecting")
- logger.logEvent('200')
- server.sendData('CALL OK')
-
- if self.call.info().last_reason == "Busy Here":
- logger.logEvent('Number busy or Offline')
- server.sendData('CALL NOT OK')
- logger.logEvent('CALL NOT OK')
-
- if self.call.info().state == pj.CallState.DISCONNECTED:
- logger.logEvent('Call Disconnected')
- current_call = None
-
-
-def make_call(uri):
-
- try:
-
- cb=Calling()
- return acc.make_call(uri, cb)
-
- except pj.Error, e:
- print "408 " + str(e)
- logger.logEvent('408')
- return None
-
-def greeting():
- global server
- global status
- global port
-
- port = sys.argv[2]
- server = None
- status = None
-
- server = ServerClass.ServerHandler(port)
- logger.logEvent('try to Connect to Controller')
- conn = server.openSocket()
-
- if server.connected == 1:
- if server.receiveData(30) == 'HELLO HANDLER':
- server.sendData('HELLO CONTROLLER')
- status = 'OK'
- else:
- status = 'NOT OK'
- logger.logEvent('cant connect to Controller')
- sys.exit(1)
-
-def initState():
- global message
- global state
- global num
-
- logger.logEvent('init state')
- message = server.receiveData(30)
-
- if message == 'RECEIVER':
- state = 'RECEIVER'
-
- elif message[0:6] == 'CALLER':
- state = 'CALLER'
- num = message[7:]
-
-def initHandler():
- global acc_cfg
- global handler
-
-
- handler = sys.argv[1]
-
-
- if handler == 'sip':
- logger.logEvent('Beeing SIP')
- acc_cfg = pj.AccountConfig("132.230.4.8","mpselftest1","1mpselftest")
-
- elif handler == 'landline':
- logger.logEvent('Beeing Landline')
- acc_cfg = pj.AccountConfig("sipgate.de","1289459","MMW9AX")
-
- elif handler == 'unisip':
- logger.logEvent('Beeing University SIP')
- acc_cfg = pj.AccountConfig("132.230.252.228", "4976120397897", "hB8M3WyFt61C")
-
- else:
- logger.logEvent('Unknown Message')
- server.sendData('Unknown Message')
- server.closeConnection()
- sys.exit(1)
-
-
-
-lib = pj.Lib()
-stop = False
-
-logger = LogFileClass.Logging('sipHandler2.log')
-logger.logEvent('')
-
-while stop <> True:
-
- acc_cfg = None
-
- lib.init(log_cfg = pj.LogConfig(level=1, callback=log_cb))
- transport = lib.create_transport(pj.TransportType.UDP, pj.TransportConfig(0))
-
- lib.start()
- lib.set_null_snd_dev()
-
- greeting()
- initHandler()
-
- try:
- initState()
- logger.logEvent('Register Account to SIP server')
- acc = lib.create_account(acc_cfg, cb=Account())
-
-
- if acc.info().reg_status < 700:
-
- if state =='RECEIVER':
- logger.logEvent(acc.info().reg_status)
- server.sendData('RECEIVER READY')
- logger.logEvent('Receiver Handler Ready')
-
- while 1:
-
- data = server.receiveData(3)
-
- if data == 'RECEIVE START':
- logger.logEvent(data)
-
- if data == 'TERMINATE CONNECTION':
- logger.logEvent('Terminate')
- stop = True
- break
-
- elif state =='CALLER':
- logger.logEvent(acc.info().reg_status)
- server.sendData('CALLER READY')
- logger.logEvent('Caller Handler Ready')
-
- while 1:
-
- data = server.receiveData(3)
-
- if data == 'CALL START':
- if num <> '':
- sleep(5)
- logger.logEvent(data)
- 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 == 'TERMINATE CONNECTION':
- stop = True
- logger.logEvent('Terminate')
- break
-
- else:
- logger.logEvent('Unknow Message')
- server.sendData('Unknow Message')
- server.closeConnection()
- sys.exit(1)
-
- else:
- logger.logEvent("488 Not Acceptable Here")
- lib.destroy()
-
- except ValueError:
- print "401 Unauthorized " + str(e)
- logger.logEvent("401 Unauthorized ")
-
-logger.logEvent("Goodbye")
-acc.delete()
-lib.destroy()
-server.closeConnection()
-lib = None
-acc = None
-
diff --git a/For Weekly Test/30-07-2011/sipHandler3.py b/For Weekly Test/30-07-2011/sipHandler3.py
deleted file mode 100644
index 511bf43..0000000
--- a/For Weekly Test/30-07-2011/sipHandler3.py
+++ /dev/null
@@ -1,139 +0,0 @@
-import sys
-import string
-import pjsua as pj
-import ServerClass
-import LogFileClass
-import AccClass
-import CallClass
-
-from time import sleep
-
-def log_cb(level, str, len):
- print "--------starting Handler--------"
-
-# Receive events from incoming Call
-
-
-def make_call(uri):
-
- try:
-
- cb=CallClass.Calling()
- return acc.make_call(uri, cb)
-
- except pj.Error, e:
- print "408 " + str(e)
- logger.logEvent('408')
- return None
-
-def greeting():
- global server
- global status
- server = None
- status = None
-
- server = ServerClass.ServerHandler(50009)
- logger.logEvent('Connect to Controller')
- conn = server.openSocket()
- server.sendData('RECEIVER READY')
-
-def initHandler():
- global acc_cfg
- global handler
-
- handler = 'sip' #sys.argv[1]
- #port = sys.argv[2]
-
- if handler == 'sip':
- logger.logEvent('Beeing SIP')
- acc_cfg = pj.AccountConfig("132.230.4.8","mpselftest1","1mpselftest")
-
- elif handler == 'landline':
- logger.logEvent('Beeing Landline')
- acc_cfg = pj.AccountConfig("sipgate.de","1289459","MMW9AX")
-
- elif handler == 'unisip':
- logger.logEvent('Beeing University SIP')
- acc_cfg = pj.AccountConfig("132.230.252.228", "4976120397897", "hB8M3WyFt61C")
-
- else:
- logger.logEvent('Unknown Message')
- server.sendData('Unknown Message')
- server.closeConnection()
- sys.exit(1)
-
-
-
-lib = pj.Lib()
-stop = False
-
-logger = LogFileClass.Logging('sipHandler.log')
-logger.logEvent('')
-
-while stop <> True:
-
- acc_cfg = None
-
- lib.init(log_cfg = pj.LogConfig(level=1, callback=log_cb))
- transport = lib.create_transport(pj.TransportType.UDP, pj.TransportConfig(0))
-
- lib.start()
- lib.set_null_snd_dev()
-
- status = 'NOT OK'
- #greeting()
- initHandler()
- state = 'RECEIVER'
-
- try:
- #initState()
- logger.logEvent('Register Account to SIP server')
- cb1=AccClass.Account()
- acc = lib.create_account(acc_cfg, cb=cb1)
-
- print cb1
-
- if acc.info().reg_status < 700:
-
- if state =='RECEIVER':
- logger.logEvent(acc.info().reg_status)
- #server.sendData('RECEIVER READY')
- logger.logEvent('Receiver Handler Ready')
-
- while 1:
-
- #data = server.receiveData(3)
- data = 'hjk'
- print cb1.result()
- sleep(2)
- if cb1.status <> None:
- print cb1.statuss
- if data == 'RECEIVER START':
- logger.logEvent(data)
-
- if data == 'TERMINATE CONNECTION':
- logger.logEvent('Terminate')
- stop = True
- break
-
- else:
- logger.logEvent('Unknow Message')
- #server.sendData('Unknow Message')
- #server.closeConnection()
- sys.exit(1)
-
- else:
- logger.logEvent("488 Not Acceptable Here")
- lib.destroy()
-
- except ValueError:
- print "401 Unauthorized " + str(e)
- logger.logEvent("401 Unauthorized ")
-
-logger.logEvent("Goodbye")
-acc.delete()
-lib.destroy()
-#server.closeConnection()
-lib = None
-acc = None
-
diff --git a/For Weekly Test/30-07-2011/test.py b/For Weekly Test/30-07-2011/test.py
deleted file mode 100644
index 8a875a4..0000000
--- a/For Weekly Test/30-07-2011/test.py
+++ /dev/null
@@ -1,7 +0,0 @@
-class MyClass(object):
- def __init__(self):
- print "never called in this case"
-
-
-obj = MyClass()
-print obj
diff --git a/For Weekly Test/30-07-2011/test2.py b/For Weekly Test/30-07-2011/test2.py
deleted file mode 100644
index 414e491..0000000
--- a/For Weekly Test/30-07-2011/test2.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import sys
-import os
-import subprocess
-import test
-
-
-print "hallo"
diff --git a/For Weekly Test/30-07-2011/test3.py b/For Weekly Test/30-07-2011/test3.py
deleted file mode 100644
index bd759ca..0000000
--- a/For Weekly Test/30-07-2011/test3.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import sys
-import ClientClass
-import DbClass
-import ControllerClass
-import classCheck
-from time import sleep
-
-
-db = DbClass.DBMySQLConnection('root', 'randompasswordSQL', 'localhost', 'gsmselftesting')
-db.connectDB()
-dbStatus = db.connectDB()
-db.anyTasksToDo()
-if db.anyTasksToDo() == 1:
- templist = db.tasksList
- for item in templist:
- taskID = item[0]
- taskNo = item[1]
- callFrom = item[2]
- callTo = item[3]
-
- print "Test ID : " , taskID
- print "Caller : " , callFrom
- print "Receiver : " , callTo
- #templist.remove(item)
- #print item
- #db.deleteTempTask(taskID)
- if callTo == 'sip':
- db.insertTaskIn2(callTo,callFrom,taskNo)
-
-else:
- print "No job at all"
diff --git a/For Weekly Test/30-07-2011/test4.py b/For Weekly Test/30-07-2011/test4.py
deleted file mode 100644
index f12163d..0000000
--- a/For Weekly Test/30-07-2011/test4.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import dbClass
-user = 'root'
-passw = 'randompasswordSQL'
-host = 'localhost'
-dbname = 'gsmselftesting'
-
-x = dbClass.DBMySQLConnection(user, passw, host, dbname)
-print "connected to the DB ", x.connectDB()
-print "do i have anything to do", x.anyTasksToDo()
-temp = x.tasksList[:]
-for index in range(len(temp)):
- item = temp[index]
- taskID = item[0]
- if item[0] == '17' or item[0] =='18' or item[0]=='19':
- print "delete a task from temp table", x.deleteTempTask(taskID)
- x.tasksList.remove(item)
-
-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
diff --git a/For Weekly Test/30-07-2011/test5.py b/For Weekly Test/30-07-2011/test5.py
deleted file mode 100644
index 3f11e79..0000000
--- a/For Weekly Test/30-07-2011/test5.py
+++ /dev/null
@@ -1,6 +0,0 @@
-lista = ['a', 'b', 'c', 'd']
-templist = lista[:]
-for item in templist:
- print item
- lista.remove(item)
-
diff --git a/For Weekly Test/30-07-2011/test6.py b/For Weekly Test/30-07-2011/test6.py
deleted file mode 100644
index fa17798..0000000
--- a/For Weekly Test/30-07-2011/test6.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import sys
-import pjsua as pj
-import os
-import re
-import time
-import MySQLdb
-import subprocess
-from time import sleep
-from datetime import datetime
-
-
-try:
- mydb = MySQLdb.connect('localhost', 'root', 'randompasswordSQL','gsmselftesting');
- db=mydb.cursor()
-except MySQLdb.Error, e:
- print "Error %d: %s" % (e.args[0],e.args[1])
- sys.exit(1)
-
-db.execute("SELECT * FROM TempTaskTable")
-rows = db.fetchall()
-
-global tasksList
-tasksList = list()
-print rows
-for row in rows:
- columns = list()
- print row
- for rowe in rows:
- columns.append(str(row))
- print tasksList.append(columns)
- #print taskList
-# print "%s, %s" % (row[0], row[1])
-# print "Number of rows returned: %d" % db.rowcount
-
-
diff --git a/For Weekly Test/DBProblem/test3.py b/For Weekly Test/DBProblem/test3.py
index b616d18..4450790 100644
--- a/For Weekly Test/DBProblem/test3.py
+++ b/For Weekly Test/DBProblem/test3.py
@@ -1,14 +1,18 @@
import sys
-import ClientClass
+#import ClientClass
import DbClass
-import ControllerClass
-import classCheck
+#import ControllerClass
+#import classCheck
from time import sleep
db = DbClass.DBMySQLConnection('root', 'randompasswordSQL', 'localhost', 'gsmselftesting')
db.connectDB()
dbStatus = db.connectDB()
+print 'i am inserting into the table something', db.insertTaskIn2('gsm4','sip8',2)
+print 'i am inserting into the table something', db.insertTaskIn2('gsm4','sip8',2)
+print 'i am inserting into the table something', db.insertTaskIn2('gsm4','sip8',2)
+print 'i am inserting into the table something', db.insertTaskIn2('gsm4','sip8',2)
db.anyTasksToDo()
if db.anyTasksToDo() == 1:
@@ -21,11 +25,12 @@ if db.anyTasksToDo() == 1:
print "Test ID : " , taskID
print "Caller : " , callFrom
print "Receiver : " , callTo
- #templist.remove(item)
+ templist.remove(item)
#print item
- #db.deleteTempTask(taskID)
+ db.deleteTempTask(taskID)
if callTo == 'sip':
db.insertTaskIn2(callTo,callFrom,taskNo)
+
else:
print "No job at all"