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.py55
1 files changed, 25 insertions, 30 deletions
diff --git a/For Weekly Test/12-09-2011/ControllerClass.py b/For Weekly Test/12-09-2011/ControllerClass.py
index 3b9ca62..67356ff 100644
--- a/For Weekly Test/12-09-2011/ControllerClass.py
+++ b/For Weekly Test/12-09-2011/ControllerClass.py
@@ -13,25 +13,20 @@ from time import sleep
class doTheTest:
- def __init__(self, callFrom, callAdd, accCaller, callTo, destAdd, destNo, accDest):
+ def __init__(self, callFrom, callPortName, accCaller, callTo, destPortName, destNo, accDest):
self.callFrom = callFrom
self.dest = callTo
self.destNo = destNo
self.accDest = accDest
self.accCaller = accCaller
- self.portAdd = None
+ self.callPortName = callPortName
+ self.destPortName = destPortName
self.portCaller = None
self.portDest = None
self.resultCaller = None
self.resultDest = None
self.testResult = None
- self.callAdd = callAdd
- self.recAdd = destAdd
- self.receiver = None
- self.caller = None
- self.connected = None
-
def FuncTest(self):
@@ -117,8 +112,8 @@ class doTheTest:
if self.callFrom =="GSMRZ1":
self.portCaller = 50007
- self.portAdd = '/dev/ttyUSB4'
- self.initGSM(self.portCaller, self.portAdd)
+ #self.portAdd = '/dev/ttyUSB4'
+ self.initGSM(self.portCaller, self.callPortName)
elif self.callFrom =="GSMRZ2":
self.portCaller = 40000
@@ -132,23 +127,23 @@ class doTheTest:
elif self.callFrom =="GSMExt.O2":
self.portCaller = 50010
- self.portAdd = '/dev/ttyUSB0'
- self.initGSM(self.portCaller, self.portAdd)
+ #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.portAdd)
+ #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.portAdd)
+ #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.portAdd)
+ #self.portAdd = '/dev/ttyUSB2'
+ self.initGSM(self.portCaller, self.callPortName)
else:
self.portCaller = 50099
@@ -160,8 +155,8 @@ class doTheTest:
if self.dest =="GSMRZ1":
self.portDest = 50007
- self.portAdd = '/dev/ttyUSB4'
- self.initGSM(self.portDest, self.portAdd)
+ #self.portAdd = '/dev/ttyUSB4'
+ self.initGSM(self.portDest, self.destPortName)
elif self.dest =="GSMRZ2":
self.portDest = 40000
@@ -176,23 +171,23 @@ class doTheTest:
elif self.dest =="GSMExt.O2":
self.portDest = 50010
- self.portAdd = '/dev/ttyUSB0'
- self.initGSM(self.portDest, self.portAdd)
+ #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.portAdd)
+ #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.portAdd)
+ #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.portAdd)
+ #self.portAdd = '/dev/ttyUSB2'
+ self.initGSM(self.portDest, self.destPortName)
else:
self.portDest = 50100
@@ -208,7 +203,7 @@ class doTheTest:
def callerGreeting(self):
self.connected = None
- self.caller = ClientClass.Connection(self.callAdd,self.portCaller)
+ self.caller = ClientClass.Connection('localhost',self.portCaller)
self.caller.connect()
if self.caller.connected == 1:
@@ -223,7 +218,7 @@ class doTheTest:
def receiverGreeting(self):
self.connected = None
- self.receiver = ClientClass.Connection(self.recAdd, self.portDest)
+ self.receiver = ClientClass.Connection('localhost', self.portDest)
self.receiver.connect()
if self.receiver.connected == 1: