[asterisk-commits] mmichelson: branch mmichelson/srv_sip_outbound r205 - in /asterisk/team/mmich...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Apr  6 11:17:34 2010
New Revision: 205

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=205
Log:
Add sip.conf and more scenarios for extensions.conf


Added:
    asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/sip.conf   (with props)
Modified:
    asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/extensions.conf
    asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/test.lua

Modified: asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/extensions.conf?view=diff&rev=205&r1=204&r2=205
==============================================================================
--- asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/extensions.conf (original)
+++ asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/extensions.conf Tue Apr  6 11:17:34 2010
@@ -1,9 +1,35 @@
 [test_context]
 
-exten => test,1,Dial(SIP/peer//127.0.0.1:5061,,M(readdtmf),S(3))
-exten => test,n,Hangup
+;Base line.
+;Result: Use sip.conf info
+exten => test1,1,Dial(SIP/peer,,M(readdtmf),S(1))
+exten => test1,n,Hangup
+
+;Basic change to outbound. Should dial to explicit host:port
+;Result: Use host in dialstring
+exten => test2,1,Dial(SIP/peer//127.0.0.1:5062,,M(readdtmf),S(1))
+exten => test2,n,Hangup
+
+;Adding user portion should not affect routing
+;Result: Use host in dialstring
+exten => test3,1,Dial(SIP/1000 at peer//127.0.0.1:5062,,M(readdtmf),S(1))
+exten => test3,n,Hangup
+
+;Neither should adding extension between peer and host
+;Result: Use host in dialstring
+exten => test4,1,Dial(SIP/peer/1000/127.0.0.1:5062,,M(readdtmf),S(1))
+exten => test4,n,Hangup
+
+;Neither should a conflict in which extension to use
+;Result: Use host in dialstring
+exten => test5,1,Dial(SIP/1000 at peer/1000/127.0.0.1:5062,,M(readdtmf),S(1))
+exten => test5,n,Hangup
+
+;This one has the wrong number of slashes before the host
+;Result: Use sip.conf info
+exten => test6,1,Dial(SIP/1000 at peer/127.0.0.1:5062,,M(readdtmf),S(1))
+exten => test6,n,Hangup
 
 [macro-readdtmf]
-
 exten => s,1,Read(READRESULT,,1,,1,5)
 exten => s,n,MacroExit

Added: asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/sip.conf?view=auto&rev=205
==============================================================================
--- asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/sip.conf (added)
+++ asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/sip.conf Tue Apr  6 11:17:34 2010
@@ -1,0 +1,15 @@
+[general]
+canreinvite=no
+
+;This is the peer dialed for
+;all outbound calls
+[peer]
+dtmfmode=rfc2833
+host=127.0.0.1
+port=5061
+
+;This is the caller who initiates calls to 'peer'
+;In other words, all inbound calls come from this guy
+[caller]
+host=127.0.0.1
+port=6000

Propchange: asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/sip.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/sip.conf
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/configs/sip.conf
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/test.lua?view=diff&rev=205&r1=204&r2=205
==============================================================================
--- asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/test.lua (original)
+++ asterisk/team/mmichelson/srv_sip_outbound/tests/sip_outbound_address/test.lua Tue Apr  6 11:17:34 2010
@@ -61,7 +61,7 @@
 	end
 end
 
-function test_call(scenario, handler, name, local_port)
+function test_call(uac_scenario, handler, name, local_port)
 	m:register_event("VarSet", handler)
 	local t1 = sipp_exec(scenario, name, local_port)