From 762237f8597a5db4613644e2558811d823c1ad13 Mon Sep 17 00:00:00 2001 From: tt41 Date: Wed, 31 Aug 2011 23:37:22 +0200 Subject: new account for Univ. telp. network. --- For Weekly Test/12-09-2011/gsmselftest.py | 72 ++++++++++++++++--------------- 1 file changed, 38 insertions(+), 34 deletions(-) (limited to 'For Weekly Test/12-09-2011') diff --git a/For Weekly Test/12-09-2011/gsmselftest.py b/For Weekly Test/12-09-2011/gsmselftest.py index 5f4789f..9f8d0c2 100644 --- a/For Weekly Test/12-09-2011/gsmselftest.py +++ b/For Weekly Test/12-09-2011/gsmselftest.py @@ -24,7 +24,7 @@ def ping(handler): server = PingClass.Ping('132.230.252.228') serverStatus = server.ping(1) - elif handler == 'GSMRZ1': + elif handler == 'GSMRZ3': server = PingClass.Ping('localhost') serverStatus = server.ping(1) @@ -54,7 +54,7 @@ def allPing(): server = PingClass.Ping('localhost') gsmBox1 = server.ping(1) - server = PingClass.Ping('132.230.4.64') + server = PingClass.Ping('10.4.58.241') gsmBox2 = server.ping(1) def initDB(): @@ -383,7 +383,7 @@ def smartTest(): callerList = ['sip'] destinationList = ['SIP', 'GSMExt'] - #destinationList = ['GSMExt', 'GSMRZ', 'SIP', 'RZOutgoing'] + #destinationList = ['GSMExt', 'GSMRZ', 'SIP', 'RZOutgoing', 'RZincoming'] for callFrom in callerList: for destination in destinationList: @@ -610,24 +610,10 @@ def smartTest(): initTest('GSMRZ1','unisip') if result =='200': - - initTest('GSMRZ1','GSMExt.O2') - if result =='200': - print "Outgoing call from GSM RZ is working" - elif result == '486': - print "Outgoing call from GSM RZ to GSM external indicate having problem" - else: - print "incomplete test, GSM Handler having error, please do one more test" + print "Outgoing call from GSM RZ is working" elif result == '486': - - initTest('GSMRZ1','GSMExt.O2') - if result =='200': - print "Outgoing call from GSM RZ to University telephone network indicate having problem" - elif result == '486': - print "Outgoing call from GSM RZ to GSM external and UTN indicate having problem" - else: - print "incomplete test, GSM Handler having error, please do one more test" + print "Outgoing call from GSM RZ to UTN indicate having problem" else: print "incomplete test, Handler having error, please do one more test" else: @@ -639,23 +625,10 @@ def smartTest(): initTest('GSMRZ1','unisip') if result == '200': - - initTest('GSMRZ1','GSMExt.O2') - if result == '200': - print "Outgoing call from GSM RZ to Landline indicate having problem" - elif result == '486': - print "Outgoing call from GSM RZ to GSM External and landline indicate having problem" - else: - print "incomplete test, GSM Handler having error, please do one more test" + print "Outgoing call from GSM RZ to Landline indicate having problem" elif result == '486': - initTest('GSMRZ1','GSMExt.O2') - if result == '200': - print "Outgoing call from GSM RZ to Landline and UTN indicate having problem" - elif result == '486': - print "Outgoing call from GSM RZ having problem" - else: - print "incomplete test, GSM Handler having error, please do one more test" + print "Outgoing call from GSM RZ to Landline and UTN indicate having problem" else: print "incomplete test, Handler having error, please do one more test" else: @@ -665,6 +638,37 @@ def smartTest(): else: print "No connection to SIP Gate server, check your connection" + elif destination == 'RZincoming': + + ping('landline') + if serverStatus <> 0: + initTest('landline', 'GSMRZ1') + + if result == '486': + + initTest('GSMExt.O2','GSMRZ1') + + if result =='200': + print "incoming call to GSM RZ working" + + elif result == '486': + + initTest('GSMExt.Voda','GSMRZ1') + if result =='200': + print "incoming call to GSM RZ working" + elif result == '486': + print "incoming call to GSM RZ notworking" + else: + print "incomplete test, GSM Handler having error, please do one more test" + else: + print "incomplete test, Handler having error, please do one more test" + + elif result == '200': + print "incoming call to GSM RZ working" + else: + print "No connection to SIP Gate server, check your connection" + + if len(sys.argv) > 1: command = sys.argv[1] -- cgit v1.2.3-55-g7522 From 451ba9298b9de3fbf2aa560bd39c1e8577af3d1b Mon Sep 17 00:00:00 2001 From: tt41 Date: Thu, 1 Sep 2011 22:46:31 +0200 Subject: clean the comment --- Database/gsmselftesting.sql | 4 +-- For Weekly Test/12-09-2011/DbClass.py | 54 +------------------------------ For Weekly Test/12-09-2011/gsmselftest.py | 4 --- 3 files changed, 2 insertions(+), 60 deletions(-) (limited to 'For Weekly Test/12-09-2011') diff --git a/Database/gsmselftesting.sql b/Database/gsmselftesting.sql index 0ac203f..be80cb2 100644 --- a/Database/gsmselftesting.sql +++ b/Database/gsmselftesting.sql @@ -49,7 +49,7 @@ INSERT INTO `DeviceAddressTable` (`deviceName`, `deviceIP`, `number`, `lastChang ('unisip', 'localhost', '076120397898', '2011-07-27 00:00:00', '4976120397898', 'itzEfmLkzvS9', '132.230.252.228'), ('landline', 'localhost', '076145875681', '2011-07-26 00:00:00', '1289459', 'MMW9AX', 'sipgate.de'), ('GSMRZ1', 'localhost', '07612034661xxx', '2011-07-27 15:47:08', '', '', ''), -('GSMRZ2', '132.230.4.64', '07612034661455', '2011-07-27 15:48:04', '', '', ''), +('GSMRZ2', 'localhost', '07612034661455', '2011-07-27 15:48:04', '', '', ''), ('GSMExt.Eplus', 'localhost', '015782677224', '2011-07-28 14:33:43', '', '', ''), ('GSMExt.Voda', 'localhost', '015252423662', '2011-07-28 14:35:33', '', '', ''), ('GSMExt.O2', 'localhost', '017678038038', '2011-07-28 14:36:13', '', '', ''); @@ -132,7 +132,6 @@ CREATE TABLE IF NOT EXISTS `TaskTable` ( `taskNo` int(11) NOT NULL, `from` varchar(15) NOT NULL, `to` varchar(15) NOT NULL, - `status` int(1) NOT NULL, `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`taskID`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=25 ; @@ -154,7 +153,6 @@ CREATE TABLE IF NOT EXISTS `TempTaskTable` ( `taskNo` int(11) NOT NULL, `from` varchar(15) NOT NULL, `to` varchar(15) NOT NULL, - `status` int(1) NOT NULL, PRIMARY KEY (`taskID`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; diff --git a/For Weekly Test/12-09-2011/DbClass.py b/For Weekly Test/12-09-2011/DbClass.py index f25afe2..d312b63 100644 --- a/For Weekly Test/12-09-2011/DbClass.py +++ b/For Weekly Test/12-09-2011/DbClass.py @@ -98,11 +98,7 @@ class DBMySQLConnection: if self.connectionCreated == 1: try: successful = self.cur.execute("SELECT `deviceIP`,`number`, `username`, `password`, `server` FROM DeviceAddressTable where `deviceName`=%s", deviceName) - 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 - + output = self.cur.fetchall() deviceAddr = '' for record in output: columns = list() @@ -187,54 +183,6 @@ class DBMySQLConnection: return 0 - def insertTaskIn2(self, fromDevice, toDevice, taskNo, status): - 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`,`status` ) VALUES (@taskID, '" + str(taskNo) + "', '" + str(fromDevice) + "', '"+ str(toDevice) + "', '"+ str(status) + "'); 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)) - columns.append(str(status)) - #columns.append(str(0)) - 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 errorCode(self,code): if self.connectionCreated == 1: try: diff --git a/For Weekly Test/12-09-2011/gsmselftest.py b/For Weekly Test/12-09-2011/gsmselftest.py index 9f8d0c2..3e82b27 100644 --- a/For Weekly Test/12-09-2011/gsmselftest.py +++ b/For Weekly Test/12-09-2011/gsmselftest.py @@ -327,7 +327,6 @@ def doSipTest(): print '--SIP Part Test--' destList = ['gsmr1','gsmr2', 'gsmr3', 'landline', 'unisip', 'GSMExt.O2', 'GSMExt.Voda', 'GSMExt.Eplus', 'GSMExt.Tm' ] - #destList = ['landline'] for callTo in destList: callFrom = 'sip' @@ -360,7 +359,6 @@ def doGsmExtTest(): destList = ['GSMExt.O2', 'GSMExt.Voda', 'GSMExt.Eplus', 'GSMExt.Tm'] callList = ['sip'] - #callList = ['sip', 'GSMRZ1'] for callFrom in callList: for callTo in destList: @@ -714,8 +712,6 @@ else: taskNo = item[1] callFrom = item[2] callTo = item[3] - tried = item[4] - #if i == 0: #db.updatePingResult(taskNo, sipServer, sipGate, unisip, gsmBox1, gsmBox2) -- cgit v1.2.3-55-g7522