Author: derek Date: Sun Aug 13 21:43:50 2006 New Revision: 66 Modified: sofaswitch/trunk/controller/basecall.py sofaswitch/trunk/controller/testmcu.py sofaswitch/trunk/controller/testmcu3.py sofaswitch/trunk/controller/testmcu3_time.py sofaswitch/trunk/controller/testmcu3a.py sofaswitch/trunk/controller/testmcu3b.py sofaswitch/trunk/controller/testmcurec.py sofaswitch/trunk/controller/testonemcu.py sofaswitch/trunk/controller/testonevoip.py sofaswitch/trunk/controller/testsound.py Log: Finish changover, to remove the ss prefix to sofaswitch component names. Modified: sofaswitch/trunk/controller/basecall.py ============================================================================== --- sofaswitch/trunk/controller/basecall.py (original) +++ sofaswitch/trunk/controller/basecall.py Sun Aug 13 21:43:50 2006 @@ -227,7 +227,7 @@ def send_id_request_to(self, fromNode): ''' send a REQUESTNEWID message to the remote node The remote - node could be just the name (like ssam) or it could be for a + node could be just the name (like am) or it could be for a new id, with an additional arguement. Like, we want to ask for a newid in room xxx of the mcu. ''' @@ -391,13 +391,13 @@ self.incomingNode = rn self.waited = time.time() - print 'request new id of ssam' - self.amNode = self.request_new_id('ssam', 2.0) + print 'request new id of am' + self.amNode = self.request_new_id('am', 2.0) self.test = None if self.amNode == self.test: print 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' - print ' The remote node of ssam did not tell us a new node we can talk with' + print ' The remote node of am did not tell us a new node we can talk with' self.send_message_to('answer false', self.incomingNode) self.send_message_to('hangup', self.incomingNode) return False @@ -424,7 +424,7 @@ return - def make_call_to(self, remote_node, localNode='ssam'): + def make_call_to(self, remote_node, localNode='am'): """ make a voip call to some node. When we receive a callestablished message, or a terminating message, return. The return value is either True (call worked) or False (call Failed) Modified: sofaswitch/trunk/controller/testmcu.py ============================================================================== --- sofaswitch/trunk/controller/testmcu.py (original) +++ sofaswitch/trunk/controller/testmcu.py Sun Aug 13 21:43:50 2006 @@ -22,8 +22,8 @@ counter = 0 -node1 = "ssmcu room" -node2 = "ssam" +node1 = "mcu room" +node2 = "am" soughtNodes = [node1, node2] for i in range(0, 100): Modified: sofaswitch/trunk/controller/testmcu3.py ============================================================================== --- sofaswitch/trunk/controller/testmcu3.py (original) +++ sofaswitch/trunk/controller/testmcu3.py Sun Aug 13 21:43:50 2006 @@ -38,8 +38,8 @@ Reads audio from sendFile,and puts that to the conference """ - self.oNode1 = "ssmcu room" - self.oNode2 = "ssam" + self.oNode1 = "mcu room" + self.oNode2 = "am" self.myRxFile = rxFile self.mySendFile = sendFile self.myController = cont @@ -97,7 +97,7 @@ memberE = OneMember("membereRecord.wav", "../prompts/sample_message.wav", controller) thread.start_new_thread(memberE.play_file_x_times, (10,)) -mcuNode = controller.request_new_id("ssmcu room", 2) +mcuNode = controller.request_new_id("mcu room", 2) if mcuNode == None: print 'failed to get mcu node for ssmcu room' controller.terminate_now() Modified: sofaswitch/trunk/controller/testmcu3_time.py ============================================================================== --- sofaswitch/trunk/controller/testmcu3_time.py (original) +++ sofaswitch/trunk/controller/testmcu3_time.py Sun Aug 13 21:43:50 2006 @@ -38,8 +38,8 @@ Reads audio from sendFile,and puts that to the conference """ - self.oNode1 = "ssmcu room" - self.oNode2 = "ssam" + self.oNode1 = "mcu room" + self.oNode2 = "am" self.mySendFile = sendFile self.myController = cont self.soughtNodes = [self.oNode1, self.oNode2] Modified: sofaswitch/trunk/controller/testmcu3a.py ============================================================================== --- sofaswitch/trunk/controller/testmcu3a.py (original) +++ sofaswitch/trunk/controller/testmcu3a.py Sun Aug 13 21:43:50 2006 @@ -38,8 +38,8 @@ Reads audio from sendFile,and puts that to the conference """ - self.oNode1 = "ssmcu room" - self.oNode2 = "ssam" + self.oNode1 = "mcu room" + self.oNode2 = "am" self.mySendFile = sendFile self.myController = cont self.soughtNodes = [self.oNode1, self.oNode2] Modified: sofaswitch/trunk/controller/testmcu3b.py ============================================================================== --- sofaswitch/trunk/controller/testmcu3b.py (original) +++ sofaswitch/trunk/controller/testmcu3b.py Sun Aug 13 21:43:50 2006 @@ -38,8 +38,8 @@ Reads audio from sendFile,and puts that to the conference """ - self.oNode1 = "ssmcu room" - self.oNode2 = "ssam" + self.oNode1 = "mcu room" + self.oNode2 = "am" self.mySendFile = sendFile self.myController = cont self.soughtNodes = [self.oNode1, self.oNode2] Modified: sofaswitch/trunk/controller/testmcurec.py ============================================================================== --- sofaswitch/trunk/controller/testmcurec.py (original) +++ sofaswitch/trunk/controller/testmcurec.py Sun Aug 13 21:43:50 2006 @@ -37,8 +37,8 @@ Reads audio from sendFile,and puts that to the conference """ - self.oNode1 = "ssmcu room" - self.oNode2 = "ssam" + self.oNode1 = "mcu room" + self.oNode2 = "am" self.mySendFile = sendFile self.myController = cont self.soughtNodes = [self.oNode1, self.oNode2] Modified: sofaswitch/trunk/controller/testonemcu.py ============================================================================== --- sofaswitch/trunk/controller/testonemcu.py (original) +++ sofaswitch/trunk/controller/testonemcu.py Sun Aug 13 21:43:50 2006 @@ -34,7 +34,7 @@ controller.connect_socket_start_threads() # print 'now start a call pair on iteration ', i - mcuNode = controller.request_new_id("ssmcu room", 2) + mcuNode = controller.request_new_id("mcu room", 2) if mcuNode == None: print 'mcu node is null - exit' Modified: sofaswitch/trunk/controller/testonevoip.py ============================================================================== --- sofaswitch/trunk/controller/testonevoip.py (original) +++ sofaswitch/trunk/controller/testonevoip.py Sun Aug 13 21:43:50 2006 @@ -64,7 +64,7 @@ controller.connect_socket_start_threads() # print 'now start a call pair on iteration ', i - voipNode = controller.request_new_id("ssvoip", 2) + voipNode = controller.request_new_id("voip", 2) if voipNode == None: print 'voip node is null - exit' Modified: sofaswitch/trunk/controller/testsound.py ============================================================================== --- sofaswitch/trunk/controller/testsound.py (original) +++ sofaswitch/trunk/controller/testsound.py Sun Aug 13 21:43:50 2006 @@ -24,7 +24,7 @@ for i in calls: print 'Iteration ', i - amNode = controller.request_new_id("ssam", 2) + amNode = controller.request_new_id("am", 2) controller.send_message_to('transferudp sound', amNode)