[asterisk-commits] pabelanger: branch pabelanger/default_settings r1041 - in /asterisk/team/pabe...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Dec 2 15:06:57 CST 2010


Author: pabelanger
Date: Thu Dec  2 15:06:53 2010
New Revision: 1041

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1041
Log:
Revert change to cli_originate, however keep using cli_aliases.

Modified:
    asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py
    asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test
    asterisk/team/pabelanger/default_settings/tests/callparking/run-test
    asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test
    asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test
    asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/say-time/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/stream-file/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/wait-for-digit/run-test
    asterisk/team/pabelanger/default_settings/tests/feature_attended_transfer/run-test
    asterisk/team/pabelanger/default_settings/tests/feature_blonde_transfer/run-test
    asterisk/team/pabelanger/default_settings/tests/one-step-parking/run-test

Modified: asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/pabelanger/default_settings/lib/python/asterisk/asterisk.py Thu Dec  2 15:06:53 2010
@@ -238,6 +238,45 @@
             print "'%s' and '%s' are the same file" % (cfg_path, target_path)
         except IOError:
             print "The destination is not writable '%s'" % target_path
+
+    def cli_originate(self, argstr, blocking=True):
+        """Starts a call from the CLI and links it to an application or
+        context.
+
+        Must pass a valid argument string in the following form:
+
+        <tech/data> application <appname> appdata
+        <tech/data> extension <exten>@<context>
+
+        If no context is specified, the 'default' context will be
+        used. If no extension is given, the 's' extension will be used.
+
+        Keyword Arguments:
+        blocking -- When True, do not return from this function until the CLI
+                    command finishes running.  The default is True.
+
+        Example Usage:
+        asterisk.originate("Local/a_exten at context extension b_exten at context")
+        """
+
+        args = argstr.split()
+        raise_error = False
+        if len(args) != 3 and len(args) != 4:
+            raise_error = True
+            print "Wrong number of arguments."
+        if args[1] != "extension" and args[1] != "application":
+            raise_error = True
+            print '2nd argument must be "extension" or "application"'
+        if args[0].find("/") == -1:
+            raise_error = True
+            print 'Channel dial string must be in the form "tech/data".'
+        if raise_error is True:
+            raise Exception, "Cannot originate call!\n\
+            Argument string must be in one of these forms:\n\
+            <tech/data> application <appname> appdata\n\
+            <tech/data> extension <exten>@<context>"
+
+        self.cli_exec("originate %s" % argstr, blocking=blocking)
 
     def cli_exec(self, cli_cmd, blocking=True):
         """Execute a CLI command on this instance of Asterisk.

Modified: asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/blind-transfer-parkingtimeout/run-test Thu Dec  2 15:06:53 2010
@@ -88,7 +88,7 @@
     # 4.  B reports results to FastAGI and hangup
     def launch_test(self):
         self.log_last_step("Originating call to begin test")
-        self.ast1.cli_exec("originate IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
+        self.ast1.cli_originate("IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")

Modified: asterisk/team/pabelanger/default_settings/tests/callparking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/callparking/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/callparking/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/callparking/run-test Thu Dec  2 15:06:53 2010
@@ -70,7 +70,7 @@
     def get_result_b(self, agi):
         self.log_last_step("got AGI connection from userB. "
          "Initiate new call between userB and userC now")
-        self.ast1.cli_exec("originate IAX2/userB at 127.0.0.1:4572/c_exten extension bridge_to_B at parking")
+        self.ast1.cli_originate("IAX2/userB at 127.0.0.1:4572/c_exten extension bridge_to_B at parking")
         return agi.finish()
 
     # This gets invoked by the dialplan when userC has parked userB to 702.
@@ -78,7 +78,7 @@
     def get_result_c(self, agi):
         self.log_last_step("got AGI connection from userC. "
          "Now retrieve userA -> call 701")
-        self.ast3.cli_exec("originate IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
+        self.ast3.cli_originate("IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
         return agi.finish()
 
     # This gets invoked by the dialplan when userC has retrieved userA.
@@ -86,7 +86,7 @@
     def get_result_retrieve_A(self, agi):
         self.log_last_step("got AGI connection from userC. "
          "userA retrieved successfully, now retrieve userB")
-        self.ast3.cli_exec("originate IAX2/userA at 127.0.0.1:4570/702 extension retrieve_B at parking")
+        self.ast3.cli_originate("IAX2/userA at 127.0.0.1:4570/702 extension retrieve_B at parking")
         return agi.finish()
 
     # This gets invoked by the dialplan when userC has retrieved userB.
@@ -135,7 +135,7 @@
 
     def launch_test(self):
         self.log_last_step("Originating call to begin test")
-        self.ast1.cli_exec("originate IAX2/userA at 127.0.0.1:4571/b_exten extension bridge_to_A at parking")
+        self.ast1.cli_originate("IAX2/userA at 127.0.0.1:4571/b_exten extension bridge_to_A at parking")
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")

Modified: asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_barge/run-test Thu Dec  2 15:06:53 2010
@@ -134,10 +134,10 @@
 
     def callChanSpy(self):
         self.logLastStep("Placing call to ChanSpy extension.")
-        self.ast1.cli_exec("originate SIP/end_b extension chanspytest at test")
+        self.ast1.cli_originate("SIP/end_b extension chanspytest at test")
 
     def verifyAudio(self):
-        self.ast1.cli_exec("originate Local/play_recording at test extension detect_audio at test")
+        self.ast1.cli_originate("Local/play_recording at test extension detect_audio at test")
 
     def run(self):
 

Modified: asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/chanspy/chanspy_w_mixmonitor/run-test Thu Dec  2 15:06:53 2010
@@ -150,7 +150,7 @@
         reactor.callLater(2, self.verifyAudio)
 
     def verifyAudio(self):
-        self.ast1.cli_exec("originate Local/play_recording at test extension detect_audio at test")
+        self.ast1.cli_originate("Local/play_recording at test extension detect_audio at test")
 
     def run(self):
 

Modified: asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/directed_pickup/run-test Thu Dec  2 15:06:53 2010
@@ -114,7 +114,7 @@
 
     def launch_test1(self):
         self.log_last_step("Starting Test 1")
-        self.ast1.cli_exec("originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
+        self.ast1.cli_originate("IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
         self.test1_pickup()
 
     def test2_pickup(self):
@@ -128,7 +128,7 @@
             self.test2 = SKIP
             self.shut_down()
         else:
-            self.ast1.cli_exec("originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
+            self.ast1.cli_originate("IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
             self.test2_pickup()
 
     def start_asterisk(self):

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test Thu Dec  2 15:06:53 2010
@@ -91,7 +91,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/no_answer at agitest extension echo at agitest", blocking=False)
+        self.ast1.cli_originate("Local/no_answer at agitest extension echo at agitest", blocking=False)
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test Thu Dec  2 15:06:53 2010
@@ -63,7 +63,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/501 at agitest extension echo at agitest")
+        self.ast1.cli_originate("Local/501 at agitest extension echo at agitest")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/control-stream-file/run-test Thu Dec  2 15:06:53 2010
@@ -73,7 +73,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/504 at agitest extension echo at agitest")
+        self.ast1.cli_originate("Local/504 at agitest extension echo at agitest")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/database/run-test Thu Dec  2 15:06:53 2010
@@ -185,7 +185,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/506 at agitest extension echo at agitest")
+        self.ast1.cli_originate("Local/506 at agitest extension echo at agitest")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/execute/run-test Thu Dec  2 15:06:53 2010
@@ -170,7 +170,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/507 at agitest extension echo at agitest")
+        self.ast1.cli_originate("Local/507 at agitest extension echo at agitest")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/get-data/run-test Thu Dec  2 15:06:53 2010
@@ -82,7 +82,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/502 at agitest extension 1 at get-data")
+        self.ast1.cli_originate("Local/502 at agitest extension 1 at get-data")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/hangup/run-test Thu Dec  2 15:06:53 2010
@@ -95,7 +95,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/503 at agitest extension echo at agitest")
+        self.ast1.cli_originate("Local/503 at agitest extension echo at agitest")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/record-file/run-test Thu Dec  2 15:06:53 2010
@@ -119,9 +119,9 @@
         print "Originating call to begin test which terminates recording",\
             "with", self.test
         if self.test is "DTMF":
-            self.ast1.cli_exec("originate Local/508 at agitest extension 1 at record-file")
+            self.ast1.cli_originate("Local/508 at agitest extension 1 at record-file")
         elif self.test is "HANGUP":
-            self.ast1.cli_exec("originate Local/509 at agitest extension 2 at record-file")
+            self.ast1.cli_originate("Local/509 at agitest extension 2 at record-file")
         else:
             self.result_changed()
 

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-alpha/run-test Thu Dec  2 15:06:53 2010
@@ -81,7 +81,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/510 at agitest extension 1 at td_and_agi_notify")
+        self.ast1.cli_originate("Local/510 at agitest extension 1 at td_and_agi_notify")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-date/run-test Thu Dec  2 15:06:53 2010
@@ -83,7 +83,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/511 at agitest extension 1 at td_and_agi_notify")
+        self.ast1.cli_originate("Local/511 at agitest extension 1 at td_and_agi_notify")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-datetime/run-test Thu Dec  2 15:06:53 2010
@@ -80,7 +80,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/512 at agitest extension 1 at td_and_agi_notify")
+        self.ast1.cli_originate("Local/512 at agitest extension 1 at td_and_agi_notify")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-digits/run-test Thu Dec  2 15:06:53 2010
@@ -81,7 +81,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/514 at agitest extension 1 at td_and_agi_notify")
+        self.ast1.cli_originate("Local/514 at agitest extension 1 at td_and_agi_notify")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-number/run-test Thu Dec  2 15:06:53 2010
@@ -82,7 +82,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/515 at agitest extension 1 at td_and_agi_notify")
+        self.ast1.cli_originate("Local/515 at agitest extension 1 at td_and_agi_notify")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-phonetic/run-test Thu Dec  2 15:06:53 2010
@@ -81,7 +81,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/516 at agitest extension 1 at td_and_agi_notify")
+        self.ast1.cli_originate("Local/516 at agitest extension 1 at td_and_agi_notify")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/say-time/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/say-time/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/say-time/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/say-time/run-test Thu Dec  2 15:06:53 2010
@@ -82,7 +82,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/513 at agitest extension 1 at td_and_agi_notify")
+        self.ast1.cli_originate("Local/513 at agitest extension 1 at td_and_agi_notify")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/stream-file/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/stream-file/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/stream-file/run-test Thu Dec  2 15:06:53 2010
@@ -74,7 +74,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/505 at agitest extension echo at agitest")
+        self.ast1.cli_originate("Local/505 at agitest extension echo at agitest")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/wait-for-digit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/wait-for-digit/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/wait-for-digit/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/wait-for-digit/run-test Thu Dec  2 15:06:53 2010
@@ -78,7 +78,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/basic_agi at agitest extension play_dtmf at agitest")
+        self.ast1.cli_originate("Local/basic_agi at agitest extension play_dtmf at agitest")
 
     def start_asterisk(self):
         print "Starting Asterisk"

Modified: asterisk/team/pabelanger/default_settings/tests/feature_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/feature_attended_transfer/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/feature_attended_transfer/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/feature_attended_transfer/run-test Thu Dec  2 15:06:53 2010
@@ -134,7 +134,7 @@
         self.ast2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
 
         self.log_last_step("Originating call to begin test 1")
-        self.ast2.cli_exec("originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
+        self.ast2.cli_originate("IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")

Modified: asterisk/team/pabelanger/default_settings/tests/feature_blonde_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/feature_blonde_transfer/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/feature_blonde_transfer/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/feature_blonde_transfer/run-test Thu Dec  2 15:06:53 2010
@@ -113,7 +113,7 @@
         self.ast2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
 
         self.log_last_step("Originating call to begin test 1")
-        self.ast2.cli_exec("originate IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
+        self.ast2.cli_originate("IAX2/iax_b at 127.0.0.1:4571/b_exten extension a_dial at transfertest")
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")

Modified: asterisk/team/pabelanger/default_settings/tests/one-step-parking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/one-step-parking/run-test?view=diff&rev=1041&r1=1040&r2=1041
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/one-step-parking/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/one-step-parking/run-test Thu Dec  2 15:06:53 2010
@@ -58,7 +58,7 @@
     # and userB is trying to retrieve userA by dialing 701
     def get_result_dial_a(self, agi):
         self.log_last_step("Dial userA (701)")
-        self.ast2.cli_exec("originate IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
+        self.ast2.cli_originate("IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
         return agi.finish()
 
    # This gets invoked by the dialplan when test succeeds.
@@ -102,7 +102,7 @@
     # 4.  B calls 701 and retrieves A
     def launch_test(self):
         self.log_last_step("Originating call to begin test")
-        self.ast1.cli_exec("originate IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
+        self.ast1.cli_originate("IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")




More information about the asterisk-commits mailing list