[svn-commits] pabelanger: testsuite/asterisk/trunk r1228 - in /asterisk/trunk: ./ lib/pytho...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Dec 16 20:58:36 UTC 2010
Author: pabelanger
Date: Thu Dec 16 14:58:31 2010
New Revision: 1228
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1228
Log:
Use spaces to format XML and create SIPpVersion class
A new dependency section for SIPp has been created in test-config.yaml. The
testsuite will new check the local binary and confirm it is greater or equal to
the dependency setting. If SIPp is not found, the test is skipped.
- sipp :
- version : 'v3.0'
- feature : 'TLS'
Review: https://reviewboard.asterisk.org/r/1049/
Added:
asterisk/trunk/lib/python/sipp/
- copied from r1227, asterisk/team/pabelanger/sipp/lib/python/sipp/
asterisk/trunk/lib/python/sipp/__init__.py
- copied unchanged from r1227, asterisk/team/pabelanger/sipp/lib/python/sipp/__init__.py
asterisk/trunk/lib/python/sipp/version.py
- copied unchanged from r1227, asterisk/team/pabelanger/sipp/lib/python/sipp/version.py
Modified:
asterisk/trunk/runtests.py
asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/call.xml
asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/wait-for-call.xml
asterisk/trunk/tests/cdr/app_dial_G_flag/test-config.yaml
asterisk/trunk/tests/cdr/app_queue/sipp/call-then-hangup.xml
asterisk/trunk/tests/cdr/app_queue/sipp/call.xml
asterisk/trunk/tests/cdr/app_queue/sipp/wait-for-call-hangup.xml
asterisk/trunk/tests/cdr/app_queue/test-config.yaml
asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/call-then-blind-transfer.xml
asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/register.xml
asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/wait-for-call-do-hangup.xml
asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/wait-for-call.xml
asterisk/trunk/tests/cdr/blind-transfer-accountcode/test-config.yaml
asterisk/trunk/tests/cdr/originate-cdr-disposition/sipp/wait-for-call-busy.xml
asterisk/trunk/tests/cdr/originate-cdr-disposition/sipp/wait-for-call-congestion.xml
asterisk/trunk/tests/cdr/originate-cdr-disposition/sipp/wait-for-call-timeout.xml
asterisk/trunk/tests/cdr/originate-cdr-disposition/sipp/wait-for-call.xml
asterisk/trunk/tests/cdr/originate-cdr-disposition/test-config.yaml
asterisk/trunk/tests/queues/position_priority_maxlen/test-config.yaml
asterisk/trunk/tests/queues/ringinuse_and_pause/sipp/uas.xml
asterisk/trunk/tests/queues/ringinuse_and_pause/test-config.yaml
asterisk/trunk/tests/rfc2833_dtmf_detect/sipp/broken_dtmf.xml
asterisk/trunk/tests/rfc2833_dtmf_detect/sipp/dtmf_baseline.xml
asterisk/trunk/tests/rfc2833_dtmf_detect/sipp/dtmf_noend.xml
asterisk/trunk/tests/rfc2833_dtmf_detect/sipp/register.xml
asterisk/trunk/tests/rfc2833_dtmf_detect/test-config.yaml
asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml
asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml
asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-notify-provisional.xml
asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-notify.xml
asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-400.xml
asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-500.xml
asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-603.xml
asterisk/trunk/tests/sip/handle_response_refer/test-config.yaml
asterisk/trunk/tests/sip/options/sipp/options.xml
asterisk/trunk/tests/sip/options/sipp/options2.xml
asterisk/trunk/tests/sip/options/test-config.yaml
asterisk/trunk/tests/sip_channel_params/sipp/call.xml
asterisk/trunk/tests/sip_channel_params/sipp/register.xml
asterisk/trunk/tests/sip_channel_params/test-config.yaml
asterisk/trunk/tests/sip_outbound_address/sipp/uas1.xml
asterisk/trunk/tests/sip_outbound_address/sipp/uas2.xml
asterisk/trunk/tests/sip_outbound_address/test-config.yaml
asterisk/trunk/tests/sip_register/sipp/registerv4.xml
asterisk/trunk/tests/sip_register/sipp/registerv6.xml
asterisk/trunk/tests/sip_register/test-config.yaml
Modified: asterisk/trunk/runtests.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/runtests.py?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/runtests.py (original)
+++ asterisk/trunk/runtests.py Thu Dec 16 14:58:31 2010
@@ -21,14 +21,19 @@
from asterisk.version import AsteriskVersion
from asterisk.asterisk import Asterisk
from asterisk import utils
+from sipp.version import SIPpVersion
+
TESTS_CONFIG = "tests.yaml"
TEST_RESULTS = "asterisk-test-suite-report.xml"
+
class Dependency:
def __init__(self, dep):
self.name = ""
+ self.version = ""
self.met = False
+ self.sipp_version = SIPpVersion()
if "app" in dep:
self.name = dep["app"]
self.met = utils.which(self.name) is not None
@@ -39,6 +44,22 @@
self.met = True
except ImportError:
pass
+ elif "sipp" in dep:
+ self.name = "SIPp"
+ version = None
+ feature = None
+ if 'version' in dep['sipp']:
+ version = dep['sipp']['version']
+ if 'feature' in dep['sipp']:
+ feature = dep['sipp']['feature']
+ self.version = SIPpVersion(version, feature)
+ if self.sipp_version >= self.version:
+ self.met = True
+ if self.version.tls and not self.sipp_version.tls:
+ self.met = False
+ if self.version.pcap and not self.sipp_version.pcap:
+ self.met = False
+
elif "custom" in dep:
self.name = dep["custom"]
method = "depend_%s" % self.name
@@ -97,6 +118,7 @@
return True
return False
+
class TestConfig:
def __init__(self, test_name, ast_version):
@@ -277,7 +299,12 @@
print " --> Maximum Version: %s (%s)" % \
(str(t.maxversion), str(t.maxversion_check))
for d in t.deps:
- print " --> Dependency: %s -- Met: %s" % (d.name,
+ if d.version:
+ print " --> Dependency: %s" % (d.name)
+ print " --> Version: %s -- Met: %s" % (d.version,
+ str(d.met))
+ else:
+ print " --> Dependency: %s -- Met: %s" % (d.name,
str(d.met))
i += 1
Modified: asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/call.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/call.xml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/call.xml (original)
+++ asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/call.xml Thu Dec 16 14:58:31 2010
@@ -1,77 +1,74 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<scenario name="send a call then wait for a hangup">
- <Global variables="file,user"/>
- <nop>
- <action>
- <lookup assign_to="line" file="[$file]" key="[$user]"/>
- </action>
- </nop>
- <Reference variables="file,user"/>
+ <Global variables="file,user" />
+ <nop>
+ <action>
+ <lookup assign_to="line" file="[$file]" key="[$user]" />
+ </action>
+ </nop>
+ <Reference variables="file,user" />
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
- INVITE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Type: application/sdp
- Content-Length: [len]
+ INVITE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 INVITE
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Type: application/sdp
+ Content-Length: [len]
- v=0
- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio [media_port] RTP/AVP 0
- a=rtpmap:0 PCMU/8000
+ v=0
+ o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+ s=-
+ c=IN IP[media_ip_type] [media_ip]
+ t=0 0
+ m=audio [media_port] RTP/AVP 0
+ a=rtpmap:0 PCMU/8000
- ]]>
- </send>
+ ]]>
+ </send>
- <recv response="100" optional="true"/>
- <recv response="180" optional="true"/>
- <recv response="183" optional="true"/>
+ <recv response="100" optional="true" />
+ <recv response="180" optional="true" />
+ <recv response="183" optional="true" />
+ <recv response="200" rtd="true" rrs="true" />
- <recv response="200" rtd="true" rrs="true"/>
-
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- ACK sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Length: 0
+ ACK sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 ACK
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Length: 0
- ]]>
- </send>
+ ]]>
+ </send>
- <recv request="BYE" optional="false"/>
+ <recv request="BYE" optional="false" />
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ SIP/2.0 200 OK
+ [last_Via:]
+ [last_From:]
+ [last_To:];tag=[call_number]
+ [last_Call-ID:]
+ [last_CSeq:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- ]]>
- </send>
-
+ ]]>
+ </send>
</scenario>
-
Modified: asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/wait-for-call.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/wait-for-call.xml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/wait-for-call.xml (original)
+++ asterisk/trunk/tests/cdr/app_dial_G_flag/sipp/wait-for-call.xml Thu Dec 16 14:58:31 2010
@@ -2,64 +2,60 @@
<scenario name="wait for a call followed by a hangup">
- <Global variables="file,user"/>
- <nop>
- <action>
- <lookup assign_to="line" file="[$file]" key="[$user]"/>
- </action>
- </nop>
- <Reference variables="file,user"/>
+ <Global variables="file,user" />
+ <nop>
+ <action>
+ <lookup assign_to="line" file="[$file]" key="[$user]" />
+ </action>
+ </nop>
+ <Reference variables="file,user" />
- <recv request="INVITE" crlf="true"/>
+ <recv request="INVITE" crlf="true" />
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- SIP/2.0 180 Ringing
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ SIP/2.0 180 Ringing
+ [last_Via:]
+ [last_From:]
+ [last_To:];tag=[call_number]
+ [last_Call-ID:]
+ [last_CSeq:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- ]]>
- </send>
+ ]]>
+ </send>
+ <send>
+ <![CDATA[
- <send>
- <![CDATA[
+ SIP/2.0 200 OK
+ [last_Via:]
+ [last_From:]
+ [last_To:];tag=[call_number]
+ [last_Call-ID:]
+ [last_CSeq:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ ]]>
+ </send>
- ]]>
- </send>
-
- <recv request="ACK" optional="false"/>
- <recv request="BYE" optional="false"/>
+ <recv request="ACK" optional="false" />
+ <recv request="BYE" optional="false" />
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ SIP/2.0 200 OK
+ [last_Via:]
+ [last_From:]
+ [last_To:];tag=[call_number]
+ [last_Call-ID:]
+ [last_CSeq:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- ]]>
- </send>
-
-
+ ]]>
+ </send>
</scenario>
-
Modified: asterisk/trunk/tests/cdr/app_dial_G_flag/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_dial_G_flag/test-config.yaml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/app_dial_G_flag/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/app_dial_G_flag/test-config.yaml Thu Dec 16 14:58:31 2010
@@ -10,6 +10,6 @@
minversion: '1.4'
dependencies:
- app : 'bash'
- - app : 'sipp'
- app : 'asttest'
-
+ - sipp :
+ version : 'v3.0'
Modified: asterisk/trunk/tests/cdr/app_queue/sipp/call-then-hangup.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_queue/sipp/call-then-hangup.xml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/app_queue/sipp/call-then-hangup.xml (original)
+++ asterisk/trunk/tests/cdr/app_queue/sipp/call-then-hangup.xml Thu Dec 16 14:58:31 2010
@@ -1,80 +1,77 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<scenario name="send a call then hanup">
- <Global variables="file,user"/>
- <nop>
- <action>
- <lookup assign_to="line" file="[$file]" key="[$user]"/>
- </action>
- </nop>
- <Reference variables="file,user"/>
+ <Global variables="file,user" />
+ <nop>
+ <action>
+ <lookup assign_to="line" file="[$file]" key="[$user]" />
+ </action>
+ </nop>
+ <Reference variables="file,user" />
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
- INVITE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Type: application/sdp
- Content-Length: [len]
+ INVITE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 INVITE
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Type: application/sdp
+ Content-Length: [len]
- v=0
- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio [media_port] RTP/AVP 0
- a=rtpmap:0 PCMU/8000
+ v=0
+ o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+ s=-
+ c=IN IP[media_ip_type] [media_ip]
+ t=0 0
+ m=audio [media_port] RTP/AVP 0
+ a=rtpmap:0 PCMU/8000
- ]]>
- </send>
+ ]]>
+ </send>
- <recv response="100" optional="true"/>
- <recv response="180" optional="true"/>
- <recv response="183" optional="true"/>
+ <recv response="100" optional="true" />
+ <recv response="180" optional="true" />
+ <recv response="183" optional="true" />
+ <recv response="200" rtd="true" rrs="true" />
- <recv response="200" rtd="true" rrs="true"/>
-
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- ACK sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Length: 0
+ ACK sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 ACK
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Length: 0
- ]]>
- </send>
+ ]]>
+ </send>
- <pause milliseconds="5000"/>
+ <pause milliseconds="5000" />
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
- BYE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 2 BYE
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Length: 0
+ BYE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 2 BYE
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Length: 0
- ]]>
- </send>
-
- <recv response="200" optional="false"/>
+ ]]>
+ </send>
+ <recv response="200" optional="false" />
</scenario>
-
Modified: asterisk/trunk/tests/cdr/app_queue/sipp/call.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_queue/sipp/call.xml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/app_queue/sipp/call.xml (original)
+++ asterisk/trunk/tests/cdr/app_queue/sipp/call.xml Thu Dec 16 14:58:31 2010
@@ -1,77 +1,74 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<scenario name="send a call then wait for a hangup">
- <Global variables="file,user"/>
- <nop>
- <action>
- <lookup assign_to="line" file="[$file]" key="[$user]"/>
- </action>
- </nop>
- <Reference variables="file,user"/>
+ <Global variables="file,user" />
+ <nop>
+ <action>
+ <lookup assign_to="line" file="[$file]" key="[$user]" />
+ </action>
+ </nop>
+ <Reference variables="file,user" />
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
- INVITE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Type: application/sdp
- Content-Length: [len]
+ INVITE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 INVITE
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Type: application/sdp
+ Content-Length: [len]
- v=0
- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio [media_port] RTP/AVP 0
- a=rtpmap:0 PCMU/8000
+ v=0
+ o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+ s=-
+ c=IN IP[media_ip_type] [media_ip]
+ t=0 0
+ m=audio [media_port] RTP/AVP 0
+ a=rtpmap:0 PCMU/8000
- ]]>
- </send>
+ ]]>
+ </send>
- <recv response="100" optional="true"/>
- <recv response="180" optional="true"/>
- <recv response="183" optional="true"/>
+ <recv response="100" optional="true" />
+ <recv response="180" optional="true" />
+ <recv response="183" optional="true" />
+ <recv response="200" rtd="true" rrs="true" />
- <recv response="200" rtd="true" rrs="true"/>
-
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- ACK sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Length: 0
+ ACK sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field1 line="[$line]"] <sip:[field1 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 ACK
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Length: 0
- ]]>
- </send>
+ ]]>
+ </send>
- <recv request="BYE" optional="false"/>
+ <recv request="BYE" optional="false" />
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ SIP/2.0 200 OK
+ [last_Via:]
+ [last_From:]
+ [last_To:];tag=[call_number]
+ [last_Call-ID:]
+ [last_CSeq:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- ]]>
- </send>
-
+ ]]>
+ </send>
</scenario>
-
Modified: asterisk/trunk/tests/cdr/app_queue/sipp/wait-for-call-hangup.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_queue/sipp/wait-for-call-hangup.xml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/app_queue/sipp/wait-for-call-hangup.xml (original)
+++ asterisk/trunk/tests/cdr/app_queue/sipp/wait-for-call-hangup.xml Thu Dec 16 14:58:31 2010
@@ -2,67 +2,64 @@
<scenario name="wait for a call followed by a hangup">
- <Global variables="file,user"/>
- <nop>
- <action>
- <lookup assign_to="line" file="[$file]" key="[$user]"/>
- </action>
- </nop>
- <Reference variables="file,user"/>
+ <Global variables="file,user" />
+ <nop>
+ <action>
+ <lookup assign_to="line" file="[$file]" key="[$user]" />
+ </action>
+ </nop>
+ <Reference variables="file,user" />
- <recv request="INVITE" crlf="true"/>
+ <recv request="INVITE" crlf="true" />
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- SIP/2.0 180 Ringing
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ SIP/2.0 180 Ringing
+ [last_Via:]
+ [last_From:]
+ [last_To:]
+ [last_Call-ID:]
+ [last_CSeq:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- ]]>
- </send>
+ ]]>
+ </send>
+ <send>
+ <![CDATA[
- <send>
- <![CDATA[
+ SIP/2.0 200 OK
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ [last_From:]
+ [last_To:]
+ [last_Call-ID:]
+ [last_CSeq:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- SIP/2.0 200 OK
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ ]]>
+ </send>
- ]]>
- </send>
-
- <recv request="ACK" optional="false"/>
+ <recv request="ACK" optional="false" />
- <pause milliseconds="5000"/>
+ <pause milliseconds="5000" />
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
- BYE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- CSeq: 2 BYE
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Length: 0
+ BYE sip:[field1 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ [last_From:]
+ [last_To:]
+ [last_Call-ID:]
+ CSeq: 2 BYE
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Length: 0
- ]]>
- </send>
-
- <recv response="200" optional="false"/>
+ ]]>
+ </send>
+ <recv response="200" optional="false" />
</scenario>
-
Modified: asterisk/trunk/tests/cdr/app_queue/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_queue/test-config.yaml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/app_queue/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/app_queue/test-config.yaml Thu Dec 16 14:58:31 2010
@@ -10,6 +10,6 @@
minversion: '1.4'
dependencies:
- app : 'bash'
- - app : 'sipp'
- app : 'asttest'
-
+ - sipp :
+ version : 'v3.0'
Modified: asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/call-then-blind-transfer.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/call-then-blind-transfer.xml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/call-then-blind-transfer.xml (original)
+++ asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/call-then-blind-transfer.xml Thu Dec 16 14:58:31 2010
@@ -1,116 +1,114 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<scenario name="Send Call then Blind Transfer">
- <Global variables="file,user"/>
- <nop>
- <action>
- <lookup assign_to="line" file="[$file]" key="[$user]"/>
- </action>
- </nop>
- <Reference variables="file,user"/>
+ <Global variables="file,user" />
+ <nop>
+ <action>
+ <lookup assign_to="line" file="[$file]" key="[$user]" />
+ </action>
+ </nop>
+ <Reference variables="file,user" />
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
- INVITE sip:[field2 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field2 line="[$line]"] <sip:[field2 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Type: application/sdp
- Content-Length: [len]
+ INVITE sip:[field2 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field2 line="[$line]"] <sip:[field2 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 INVITE
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Type: application/sdp
+ Content-Length: [len]
- v=0
- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio [media_port] RTP/AVP 0
- a=rtpmap:0 PCMU/8000
+ v=0
+ o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+ s=-
+ c=IN IP[media_ip_type] [media_ip]
+ t=0 0
+ m=audio [media_port] RTP/AVP 0
+ a=rtpmap:0 PCMU/8000
- ]]>
- </send>
+ ]]>
+ </send>
- <recv response="100" optional="true"/>
- <recv response="180" optional="true"/>
- <recv response="183" optional="true"/>
+ <recv response="100" optional="true" />
+ <recv response="180" optional="true" />
+ <recv response="183" optional="true" />
+ <recv response="200" rtd="true" rrs="true" />
- <recv response="200" rtd="true" rrs="true"/>
-
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- ACK sip:[field2 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field2 line="[$line]"] <sip:[field2 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Length: 0
+ ACK sip:[field2 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field2 line="[$line]"] <sip:[field2 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 ACK
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Length: 0
- ]]>
- </send>
+ ]]>
+ </send>
- <pause milliseconds="1000"/>
+ <pause milliseconds="1000" />
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
- REFER sip:[field2 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field2 line="[$line]"] <sip:[field2 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 2 REFER
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Max-Forwards: 70
- Content-Length: 0
- Refer-To: <sip:[field3 line="[$line]"]@[remote_ip]:[remote_port]>
- Reffered-By: <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>
+ REFER sip:[field2 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field2 line="[$line]"] <sip:[field2 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 2 REFER
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Max-Forwards: 70
+ Content-Length: 0
+ Refer-To: <sip:[field3 line="[$line]"]@[remote_ip]:[remote_port]>
+ Reffered-By: <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>
- ]]>
- </send>
+ ]]>
+ </send>
- <recv response="202" optional="false"/>
+ <recv response="202" optional="false" />
+ <recv request="NOTIFY" optional="false" />
- <recv request="NOTIFY" optional="false"/>
- <send>
- <![CDATA[
+ <send>
+ <![CDATA[
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- [last_Record-Route:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ SIP/2.0 200 OK
+ [last_Via:]
+ [last_From:]
+ [last_To:]
+ [last_Call-ID:]
+ [last_CSeq:]
+ [last_Record-Route:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- ]]>
- </send>
-
- <recv request="NOTIFY" optional="false"/>
- <send>
- <![CDATA[
+ ]]>
+ </send>
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- [last_Record-Route:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ <recv request="NOTIFY" optional="false" />
- ]]>
- </send>
+ <send>
+ <![CDATA[
+ SIP/2.0 200 OK
+ [last_Via:]
+ [last_From:]
+ [last_To:]
+ [last_Call-ID:]
+ [last_CSeq:]
+ [last_Record-Route:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
+
+ ]]>
+ </send>
</scenario>
-
Modified: asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/register.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/register.xml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/register.xml (original)
+++ asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/register.xml Thu Dec 16 14:58:31 2010
@@ -1,39 +1,32 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
<!--
This scenario will execute a sip register with the given parameters.
-->
+<scenario name="Register">
+ <Global variables="file,user" />
+ <nop>
+ <action>
+ <lookup assign_to="line" file="[$file]" key="[$user]" />
+ </action>
+ </nop>
+ <Reference variables="file,user" />
+ <send retrans="500">
+ <![CDATA[
-<scenario name="Register">
+ REGISTER sip:[field0 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
+ To: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
+ Expires: [field1 line="[$line]"]
- <Global variables="file,user"/>
- <nop>
- <action>
- <lookup assign_to="line" file="[$file]" key="[$user]"/>
- </action>
- </nop>
- <Reference variables="file,user"/>
+ ]]>
+ </send>
- <send retrans="500">
- <![CDATA[
-
- REGISTER sip:[field0 line="[$line]"]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[local_ip]:[local_port]>;tag=[call_number]
- To: [field0 line="[$line]"] <sip:[field0 line="[$line]"]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 REGISTER
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
- Expires: [field1 line="[$line]"]
-
- ]]>
- </send>
-
- <recv response="100" optional="true"/>
-
- <recv response="200"/>
-
+ <recv response="100" optional="true" />
+ <recv response="200" />
</scenario>
-
Modified: asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/wait-for-call-do-hangup.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/wait-for-call-do-hangup.xml?view=diff&rev=1228&r1=1227&r2=1228
==============================================================================
--- asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/wait-for-call-do-hangup.xml (original)
+++ asterisk/trunk/tests/cdr/blind-transfer-accountcode/sipp/wait-for-call-do-hangup.xml Thu Dec 16 14:58:31 2010
@@ -1,68 +1,64 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<scenario name="wait for a call, then hangup">
+ <Global variables="file,user" />
+ <nop>
+ <action>
+ <lookup assign_to="line" file="[$file]" key="[$user]" />
+ </action>
+ </nop>
+ <Reference variables="file,user" />
- <Global variables="file,user"/>
- <nop>
- <action>
- <lookup assign_to="line" file="[$file]" key="[$user]"/>
- </action>
- </nop>
- <Reference variables="file,user"/>
+ <recv request="INVITE" crlf="true" />
- <recv request="INVITE" crlf="true"/>
+ <send>
+ <![CDATA[
- <send>
- <![CDATA[
+ SIP/2.0 180 Ringing
+ [last_Via:]
+ [last_From:]
+ [last_To:];tag=[call_number]
+ [last_Call-ID:]
+ [last_CSeq:]
+ Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
+ Content-Length: 0
- SIP/2.0 180 Ringing
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: sip:[field0 line="[$line]"]@[local_ip]:[local_port]
- Content-Length: 0
+ ]]>
+ </send>
+ <send>
+ <![CDATA[
- ]]>
- </send>
+ SIP/2.0 200 OK
+ [last_Via:]
+ [last_From:]
+ [last_To:];tag=[call_number]
+ [last_Call-ID:]
+ [last_CSeq:]
[... 3708 lines stripped ...]
More information about the svn-commits
mailing list