summaryrefslogtreecommitdiffstats
path: root/For Weekly Test/Advance/ControllerClass.py
diff options
context:
space:
mode:
Diffstat (limited to 'For Weekly Test/Advance/ControllerClass.py')
-rw-r--r--For Weekly Test/Advance/ControllerClass.py72
1 files changed, 36 insertions, 36 deletions
diff --git a/For Weekly Test/Advance/ControllerClass.py b/For Weekly Test/Advance/ControllerClass.py
index db9ac70..394a677 100644
--- a/For Weekly Test/Advance/ControllerClass.py
+++ b/For Weekly Test/Advance/ControllerClass.py
@@ -104,32 +104,32 @@ class doTheTest:
self.receiver.sendData('RECEIVE START')
self.caller.sendData('CALL START')
- def initAccount(self,account):
+ def initAccount(self,account):
- accConf = account
- self.username = accConf[0:accConf.find(':')]
+ accConf = account
+ self.username = accConf[0:accConf.find(':')]
- line = accConf[accConf.find(':')+1:]
- self.password = line[0:line.find(':')]
+ line = accConf[accConf.find(':')+1:]
+ self.password = line[0:line.find(':')]
- newLine = line[line.find(':')+1:]
- self.server = newLine[0:newLine.find(':')]
+ newLine = line[line.find(':')+1:]
+ self.server = newLine[0:newLine.find(':')]
def initCaller(self):
logger.logEvent('init Caller')
logger.logEvent(self.callFrom)
- self.portCaller = random.randint(30000,60000)
+ self.portCaller = random.randint(30000,60000)
- if self.callFrom[0:3] == 'GSMR':
- if self.callFrom =="GSMRZ1":
- self.initGSM(self.portCaller, self.callPortName)
- else:
- initAccount(self.account)
- self.boxCaller = SHHTunnelBoxClass.SSHTunneling(self.portCaller, 50008, self.server, self.username, self.password)
- self.boxCaller.startTunneling()
+ if self.callFrom[0:4] == 'GSMR':
+ if self.callFrom =="GSMRZ1":
+ self.initGSM(self.portCaller, self.callPortName)
+ else:
+ initAccount(self.account)
+ self.boxCaller = SHHTunnelBoxClass.SSHTunneling(self.portCaller, 50008, self.server, self.username, self.password)
+ self.boxCaller.startTunneling()
- elif self.callFrom[0:3] == 'GSME':
- self.initGSM(self.portCaller, self.callPortName)
+ elif self.callFrom[0:4] == 'GSME':
+ self.initGSM(self.portCaller, self.callPortName)
else:
subprocess.Popen(args=["gnome-terminal", '--command=python SIPHandler.py '+self.accCaller+ ' ' +str(self.portCaller)])
@@ -137,18 +137,18 @@ class doTheTest:
def initReceiver(self):
logger.logEvent('init Receiver')
logger.logEvent(self.dest)
- self.portDest = random.randint(30000,60000)
+ self.portDest = random.randint(30000,60000)
- if self.dest[0:3] == 'GSMR':
- if self.dest =="GSMRZ1":
- self.initGSM(self.portDest, self.destPortName)
- else:
- initAccount(self.account)
- self.boxDest = SHHTunnelBoxClass.SSHTunneling(self.portCaller, 50008, self.server, self.username, self.password)
- self.boxDest.startTunneling()
+ if self.dest[0:4] == 'GSMR':
+ if self.dest =="GSMRZ1":
+ self.initGSM(self.portDest, self.destPortName)
+ else:
+ initAccount(self.account)
+ self.boxDest = SHHTunnelBoxClass.SSHTunneling(self.portCaller, 50008, self.server, self.username, self.password)
+ self.boxDest.startTunneling()
- elif self.dest[0:3] == 'GSME':
- self.initGSM(self.portDest, self.destPortName)
+ elif self.dest[0:4] == 'GSME':
+ self.initGSM(self.portDest, self.destPortName)
else:
self.portDest = 50100
@@ -157,14 +157,14 @@ class doTheTest:
def initTerminate(self):
self.caller.sendData('TERMINATE CONNECTION')
self.receiver.sendData('TERMINATE CONNECTION')
- if self.callFrom[0:3] == 'GSMR' or self.callTo[0:3] == 'GSMR':
- if self.callFrom[0:4] != 'GSMR1':
- self.boxCaller.killTunneling()
- if self.callTo[0:4] != 'GSMR1':
- self.boxDest.killTunneling()
- else:
- self.receiver.closeConnection()
- self.caller.closeConnection()
+ if self.callFrom[0:4] == 'GSMR' or self.callTo[0:4] == 'GSMR':
+ if self.callFrom[0:5] != 'GSMR1':
+ self.boxCaller.killTunneling()
+ if self.callTo[0:5] != 'GSMR1':
+ self.boxDest.killTunneling()
+ else:
+ self.receiver.closeConnection()
+ self.caller.closeConnection()
def callerGreeting(self):
self.connected = None
@@ -198,7 +198,7 @@ class doTheTest:
def initGSM(self, portCommunication, portDevice, handler):
- subprocess.Popen(args=["gnome-terminal", '--command=python GSMHandler.py '+str(portCommunication)+ ' ' +str(portDevice) ' '+str(handler)])
+ subprocess.Popen(args=["gnome-terminal", '--command=python GSMHandler.py '+str(portCommunication)+ ' ' +str(portDevice)+' '+str(handler)])