summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/12-09-2011/ControllerClass.py
diff options
context:
space:
mode:
Diffstat (limited to 'For Weekly Test/12-09-2011/ControllerClass.py')
-rw-r--r--For Weekly Test/12-09-2011/ControllerClass.py28
1 files changed, 7 insertions, 21 deletions
diff --git a/For Weekly Test/12-09-2011/ControllerClass.py b/For Weekly Test/12-09-2011/ControllerClass.py
index 67356ff..30d8b33 100644
--- a/For Weekly Test/12-09-2011/ControllerClass.py
+++ b/For Weekly Test/12-09-2011/ControllerClass.py
@@ -1,8 +1,7 @@
import sys
import os
import subprocess
-import SSHTunnelBox1Class
-import SSHTunnelBox2Class
+import SSHTunnelBoxClass
import ClientClass
import LogFileClass
@@ -98,13 +97,11 @@ class doTheTest:
logger.logEvent('Test Succeed')
self.testResult = 200
self.initTerminate()
-
def startCall(self):
logger.logEvent('Start Call')
self.receiver.sendData('RECEIVE START')
self.caller.sendData('CALL START')
-
def initCaller(self):
logger.logEvent('init Caller')
@@ -112,37 +109,32 @@ class doTheTest:
if self.callFrom =="GSMRZ1":
self.portCaller = 50007
- #self.portAdd = '/dev/ttyUSB4'
self.initGSM(self.portCaller, self.callPortName)
elif self.callFrom =="GSMRZ2":
self.portCaller = 40000
- self.box1 = SHHTunnelBox1Class.SSHTunneling(40000, 50008, '10.4.58.241', 'lsfks', 'r')
+ self.box1 = SHHTunnelBoxClass.SSHTunneling(40000, 50008, '10.4.58.241', 'lsfks', 'r')
self.box1.startTunneling()
elif self.callFrom =="GSMRZ3":
- self.portCaller = 10000
- self.box2 = SSHTunnelBox2Class.SSHTunneling(10000, 50008, '132.230.4.202', 'gsmselgtest', 'r')#ip??
+ self.portCaller = 20000
+ self.box2 = SSHTunnelBoxClass.SSHTunneling(20000, 50008, '132.230.4.67', 'lsfks', 'r')#ip??
self.box2.startTunneling()
elif self.callFrom =="GSMExt.O2":
self.portCaller = 50010
- #self.portAdd = '/dev/ttyUSB0'
self.initGSM(self.portCaller, self.callPortName)
elif self.callFrom =="GSMExt.Voda":
self.portCaller = 50011
- #self.portAdd = '/dev/ttyUSB1'
self.initGSM(self.portCaller, self.callPortName)
elif self.callFrom =="GSMExt.Tm":
self.portCaller = 50012
- #self.portAdd = '/dev/ttyUSB3'
self.initGSM(self.portCaller, self.callPortName)
elif self.callFrom =="GSMExt.Eplus":
self.portCaller = 50013
- #self.portAdd = '/dev/ttyUSB2'
self.initGSM(self.portCaller, self.callPortName)
else:
@@ -155,38 +147,32 @@ class doTheTest:
if self.dest =="GSMRZ1":
self.portDest = 50007
- #self.portAdd = '/dev/ttyUSB4'
self.initGSM(self.portDest, self.destPortName)
elif self.dest =="GSMRZ2":
self.portDest = 40000
- self.box1 = SHHTunnelBox1Class.SSHTunneling(40000, 50008, '10.4.58.241', 'lsfks', 'r')
+ self.box1 = SHHTunnelBoxClass.SSHTunneling(40000, 50008, '10.4.58.241', 'lsfks', 'r')
self.box1.startTunneling()
elif self.dest =="GSMRZ3":
- self.portDest = 10000#should be 9
- self.box2 = SSHTunnelBox2Class.SSHTunneling(10000, 50008, '132.230.4.202', 'gsmselgtest', 'r')#ip??
+ self.portDest = 20000#should be 9
+ self.box2 = SSHTunnelBoxClass.SSHTunneling(20000, 50008, '132.230.4.67', 'lsfks', 'r')#ip??
self.box2.startTunneling()
-
elif self.dest =="GSMExt.O2":
self.portDest = 50010
- #self.portAdd = '/dev/ttyUSB0'
self.initGSM(self.portDest, self.destPortName)
elif self.dest =="GSMExt.Voda":
self.portDest = 50011
- #self.portAdd = '/dev/ttyUSB1'
self.initGSM(self.portDest, self.destPortName)
elif self.dest =="GSMExt.Tm":
self.portDest = 50012
- #self.portAdd = '/dev/ttyUSB3'
self.initGSM(self.portDest, self.destPortName)
elif self.dest =="GSMExt.Eplus":
self.portDest = 50013
- #self.portAdd = '/dev/ttyUSB2'
self.initGSM(self.portDest, self.destPortName)
else: