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.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/For Weekly Test/12-09-2011/ControllerClass.py b/For Weekly Test/12-09-2011/ControllerClass.py
index 45f415d..3b9ca62 100644
--- a/For Weekly Test/12-09-2011/ControllerClass.py
+++ b/For Weekly Test/12-09-2011/ControllerClass.py
@@ -117,18 +117,18 @@ class doTheTest:
if self.callFrom =="GSMRZ1":
self.portCaller = 50007
- self.portAdd = ''
+ self.portAdd = '/dev/ttyUSB4'
self.initGSM(self.portCaller, self.portAdd)
elif self.callFrom =="GSMRZ2":
- self.portCaller = 50008
- box1 = SHTunnelBox1Class.SSHTunneling(50000, 50008, '10.4.58.241', 'lsfks', 'r')
- box1.startTunneling()
+ self.portCaller = 40000
+ self.box1 = SHHTunnelBox1Class.SSHTunneling(40000, 50008, '10.4.58.241', 'lsfks', 'r')
+ self.box1.startTunneling()
elif self.callFrom =="GSMRZ3":
- self.portCaller = 50009
- box2 = SHTunnelBox2Class.SSHTunneling(50000, 50009, '10.4.58.241', 'lsfks', 'r')#ip??
- box2.startTunneling()
+ self.portCaller = 10000
+ self.box2 = SSHTunnelBox2Class.SSHTunneling(10000, 50008, '132.230.4.202', 'gsmselgtest', 'r')#ip??
+ self.box2.startTunneling()
elif self.callFrom =="GSMExt.O2":
self.portCaller = 50010
@@ -160,18 +160,18 @@ class doTheTest:
if self.dest =="GSMRZ1":
self.portDest = 50007
- self.portAdd = ''
+ self.portAdd = '/dev/ttyUSB4'
self.initGSM(self.portDest, self.portAdd)
elif self.dest =="GSMRZ2":
- self.portDest = 50008
- box1 = SHTunnelBox1Class.SSHTunneling(50000, 50008, '10.4.58.241', 'lsfks', 'r')
- box1.startTunneling()
+ self.portDest = 40000
+ self.box1 = SHHTunnelBox1Class.SSHTunneling(40000, 50008, '10.4.58.241', 'lsfks', 'r')
+ self.box1.startTunneling()
elif self.dest =="GSMRZ3":
- self.portDest = 50009
- box2 = SHTunnelBox2Class.SSHTunneling(50000, 50009, '10.4.58.241', 'lsfks', 'r')#ip??
- box2.startTunneling()
+ self.portDest = 10000#should be 9
+ self.box2 = SSHTunnelBox2Class.SSHTunneling(10000, 50008, '132.230.4.202', 'gsmselgtest', 'r')#ip??
+ self.box2.startTunneling()
elif self.dest =="GSMExt.O2":
@@ -202,9 +202,9 @@ class doTheTest:
self.caller.sendData('TERMINATE CONNECTION')
self.receiver.sendData('TERMINATE CONNECTION')
if self.dest =="GSMRZ2" or self.callFrom =="GSMRZ2":
- box1.killTunneling()
+ self.box1.killTunneling()
if self.dest =="GSMRZ3" or self.callFrom =="GSMRZ3":
- box2.killTunneling()
+ self.box2.killTunneling()
def callerGreeting(self):
self.connected = None