[Asterisk-code-review] testsuite branching: Remove non eligible tests from the 14 b... (testsuite[14])
George Joseph
asteriskteam at digium.com
Wed Mar 14 10:26:28 CDT 2018
George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/8488 )
Change subject: testsuite branching: Remove non eligible tests from the 14 branch
......................................................................
testsuite branching: Remove non eligible tests from the 14 branch
This patch removes any tests that do not belong in the 14 branch. Essentially,
those tests with a minversion >= 15.0.0, or tests with a maxversion < 14.7.6
(where 14.7.6 is the Asterisk version cutoff at the time of branching).
Change-Id: I975f02422c8b4fe70d270be862e2d76d6d95ff31
---
M tests/apps/tests.yaml
D tests/apps/waitdigit/configs/ast1/extensions.conf
D tests/apps/waitdigit/test-config.yaml
D tests/channels/SIP/ami/sip_notify/call_id/configs/ast1/extensions.conf
D tests/channels/SIP/ami/sip_notify/call_id/configs/ast1/sip.conf
D tests/channels/SIP/ami/sip_notify/call_id/sipp/callee.xml
D tests/channels/SIP/ami/sip_notify/call_id/sipp/caller.xml
D tests/channels/SIP/ami/sip_notify/call_id/test-config.yaml
M tests/channels/SIP/ami/sip_notify/tests.yaml
D tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/configs/ast1/extensions.conf
D tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/configs/ast1/pjsip.conf
D tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/sipp/playback_with_initial_sdp.xml
D tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/test-config.yaml
M tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml
D tests/channels/pjsip/dialplan_functions/pjsip_channel2/configs/ast1/extensions.conf
D tests/channels/pjsip/dialplan_functions/pjsip_channel2/configs/ast1/pjsip.conf
D tests/channels/pjsip/dialplan_functions/pjsip_channel2/sipp/incoming.xml
D tests/channels/pjsip/dialplan_functions/pjsip_channel2/test-config.yaml
M tests/channels/pjsip/dialplan_functions/tests.yaml
D tests/channels/pjsip/identify/header_ordering_header_ip/configs/ast1/extensions.conf
D tests/channels/pjsip/identify/header_ordering_header_ip/configs/ast1/pjsip.conf
D tests/channels/pjsip/identify/header_ordering_header_ip/sipp/nominal.xml
D tests/channels/pjsip/identify/header_ordering_header_ip/test-config.yaml
D tests/channels/pjsip/identify/header_ordering_ip_header/configs/ast1/extensions.conf
D tests/channels/pjsip/identify/header_ordering_ip_header/configs/ast1/pjsip.conf
D tests/channels/pjsip/identify/header_ordering_ip_header/sipp/nominal.xml
D tests/channels/pjsip/identify/header_ordering_ip_header/test-config.yaml
M tests/channels/pjsip/identify/tests.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/sipp/uac-multiple-video-with-audio.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/test-config.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/sipp/uac-multiple-audio-with-video.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/test-config.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/sipp/uac-multiple-video-with-audio.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/test-config.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/tests.yaml
M tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/tests.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/sipp/uac-multiple-audio.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/test-config.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/sipp/uac-multiple-audio.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/test-config.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/sipp/uac-multiple-audio.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/test-config.yaml
M tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/tests.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/sipp/uac-multiple-video.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/test-config.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/sipp/uac-multiple-video.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/test-config.yaml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/configs/ast1/extensions.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/configs/ast1/pjsip.conf
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/sipp/uac-multiple-video.xml
D tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/test-config.yaml
M tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/tests.yaml
D tests/channels/pjsip/subscriptions/large_number_of_accept_headers/configs/ast1/pjsip.conf
D tests/channels/pjsip/subscriptions/large_number_of_accept_headers/sipp/subscribe.xml
D tests/channels/pjsip/subscriptions/large_number_of_accept_headers/test-config.yaml
M tests/channels/pjsip/subscriptions/presence/tests.yaml
D tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py
D tests/channels/pjsip/subscriptions/presence/verify_bodies/tests.yaml
D tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/configs/ast1/extensions.conf
D tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/configs/ast1/pjsip.conf
D tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/sipp/subscribe.xml
D tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml
D tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/configs/ast1/extensions.conf
D tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/configs/ast1/pjsip.conf
D tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/sipp/subscribe.xml
D tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml
M tests/channels/pjsip/subscriptions/tests.yaml
83 files changed, 0 insertions(+), 4,068 deletions(-)
Approvals:
Corey Farrell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
diff --git a/tests/apps/tests.yaml b/tests/apps/tests.yaml
index 5c79751..3b94a91 100644
--- a/tests/apps/tests.yaml
+++ b/tests/apps/tests.yaml
@@ -23,4 +23,3 @@
- dir: 'disa'
- dir: 'authenticate'
- dir: 'statsd'
- - test: 'waitdigit'
diff --git a/tests/apps/waitdigit/configs/ast1/extensions.conf b/tests/apps/waitdigit/configs/ast1/extensions.conf
deleted file mode 100644
index 1ddf420..0000000
--- a/tests/apps/waitdigit/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[default]
-
-exten => test,1,NoOp()
-same => n,Answer()
-
-same => n,WaitDigit(5000ms,123)
-same => n,Noop(${WAITDIGITSTATUS}${WAITDIGITRESULT})
-same => n,ExecIf($[${WAITDIGITSTATUS}${WAITDIGITRESULT}=DTMF2]?UserEvent(Test1,result:pass))
-
-same => n,WaitDigit(invalid,123)
-same => n,ExecIf($[${WAITDIGITSTATUS}=ERROR]?UserEvent(Test2,result:pass))
-
-same => n,WaitDigit(100ms,123)
-same => n,ExecIf($[${WAITDIGITSTATUS}=TIMEOUT]?UserEvent(Test3,result:pass))
-
-same => n,WaitDigit(5s,123)
-exten => h,1,ExecIf($[${WAITDIGITSTATUS}=CANCEL]?UserEvent(Test4,result:pass))
-
-
-[caller]
-exten => test,1,NoOp()
-same => n,Answer()
-same => n,Wait(0.5)
-; 5 is not among the accepted digits so it will be ignored.
-same => n,SendDTMF(5)
-same => n,SendDTMF(2)
-same => n,Wait(0.5)
-same => n,Hangup()
diff --git a/tests/apps/waitdigit/test-config.yaml b/tests/apps/waitdigit/test-config.yaml
deleted file mode 100644
index 160c8b4..0000000
--- a/tests/apps/waitdigit/test-config.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-testinfo:
- summary: 'Test WaitDigit'
- description: |
- 'Basic testing of WaitDigit.'
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'test_case.SimpleTestCase'
- modules:
- -
- config-section: ami-config
- typename: 'ami.AMIEventModule'
-
-test-object-config:
- spawn-after-hangup: True
- expected_events: 4
- test-iterations:
- -
- channel: 'Local/test at default'
- context: 'caller'
- exten: 'test'
- priority: 1
-
-ami-config:
- -
- type: 'headermatch'
- conditions:
- match:
- Event: 'UserEvent'
- requirements:
- match:
- Result: 'pass'
- count: '4'
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - python : 'twisted'
- - python : 'starpy'
- - asterisk : 'app_userevent'
- - asterisk : 'app_senddtmf'
diff --git a/tests/channels/SIP/ami/sip_notify/call_id/configs/ast1/extensions.conf b/tests/channels/SIP/ami/sip_notify/call_id/configs/ast1/extensions.conf
deleted file mode 100644
index 106b4ff..0000000
--- a/tests/channels/SIP/ami/sip_notify/call_id/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[default]
-exten => callee,1,Dial(SIP/callee)
-
diff --git a/tests/channels/SIP/ami/sip_notify/call_id/configs/ast1/sip.conf b/tests/channels/SIP/ami/sip_notify/call_id/configs/ast1/sip.conf
deleted file mode 100644
index d782b39..0000000
--- a/tests/channels/SIP/ami/sip_notify/call_id/configs/ast1/sip.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[general]
-udpbindaddr=0.0.0.0:5060
-
-[caller]
-type=friend
-host=127.0.0.1
-port=5062
-directmedia=no
-disallow=all
-allow=ulaw
-context=default
-
-[callee]
-type=friend
-host=127.0.0.1
-port=5063
-directmedia=no
-disallow=all
-allow=ulaw
-context=default
-
diff --git a/tests/channels/SIP/ami/sip_notify/call_id/sipp/callee.xml b/tests/channels/SIP/ami/sip_notify/call_id/sipp/callee.xml
deleted file mode 100644
index 4e61799..0000000
--- a/tests/channels/SIP/ami/sip_notify/call_id/sipp/callee.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Notify Request with Call-ID">
-
- <recv request="INVITE">
- <action>
- <ereg regexp=": .*"
- search_in="hdr"
- header="Call-ID"
- check_it="true"
- assign_to="1"/>
- <ereg regexp=": .*"
- search_in="hdr"
- header="CSeq"
- check_it="true"
- assign_to="2"/>
- <log message="Received INVITE with Call-ID [$1] and CSeq [$2]." />
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- SIP/2.0 180 Ringing
- [last_Via:]
- [last_From:]
- [last_To:];tag=[pid]SIPpTag[call_number]
- Call-ID: [call_id]
- [last_CSeq:]
- Contact: <sip:user1@[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
- ]]>
- </send>
-
- <recv request="NOTIFY">
- <action>
- <ereg regexp=": .*$"
- search_in="hdr"
- header="Call-ID"
- check_it="true"
- assign_to="3"/>
- <log message="Received NOTIFY with Call-ID [$3]." />
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[pid]SIPpTag[call_number]
- Call-ID: [call_id]
- [last_CSeq:]
- Contact: <sip:user1@[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
- ]]>
- </send>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[pid]SIPpTag[call_number]
- Call-ID: [call_id]
- CSeq[$2]
- Contact: <sip:user1@[local_ip]:[local_port];transport=[transport]>
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=user2 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[local_ip_type] [local_ip]
- t=0 0
- m=audio 9000 RTP/AVP 8
- a=rtpmap:8 PCMU/8000
- ]]>
- </send>
-
- <recv request="ACK">
- </recv>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[pid]SIPpTag[call_number]
- Call-ID: [call_id]
- [last_CSeq:]
- Contact: <sip:user1@[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
- ]]>
- </send>
-</scenario>
diff --git a/tests/channels/SIP/ami/sip_notify/call_id/sipp/caller.xml b/tests/channels/SIP/ami/sip_notify/call_id/sipp/caller.xml
deleted file mode 100644
index 1ffa500..0000000
--- a/tests/channels/SIP/ami/sip_notify/call_id/sipp/caller.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Notify Request with Call-ID">
-
- <send retrans="500">
- <![CDATA[
- INVITE sip:callee at voxbone.com SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: caller <sip:caller at voxbone.com>;tag=[call_number]
- To: callee <sip:callee at voxbone.com:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:sipp@[local_ip]:[local_port]
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[local_ip_type] [local_ip]
- t=0 0
- m=audio 9000 RTP/AVP 8
- a=rtpmap:8 PCMU/8000
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="200">
- <action>
- <ereg regexp=";tag=.*"
- search_in="hdr"
- header="To:"
- check_it="true"
- assign_to="1"/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
- ACK sip:callee at voxbone.com SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: caller <sip:caller at voxbone.com>;tag=[call_number]
- To: callee <sip:callee at voxbone.com:[remote_port]>[$1]
- Call-ID: [call_id]
- CSeq: 2 ACK
- Contact: sip:sipp@[local_ip]:[local_port]
- Content-Length: 0
- ]]>
- </send>
-
- <send>
- <![CDATA[
- BYE sip:callee at voxbone.com SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: caller <sip:caller at voxbone.com>;tag=[call_number]
- To: callee <sip:callee at voxbone.com:[remote_port]>[$1]
- Call-ID: [call_id]
- CSeq: 3 BYE
- Contact: sip:sipp@[local_ip]:[local_port]
- Content-Length: 0
- ]]>
- </send>
-
- <recv response="487"> <!-- no RTP -->
- </recv>
-</scenario>
diff --git a/tests/channels/SIP/ami/sip_notify/call_id/test-config.yaml b/tests/channels/SIP/ami/sip_notify/call_id/test-config.yaml
deleted file mode 100644
index 4ed7627..0000000
--- a/tests/channels/SIP/ami/sip_notify/call_id/test-config.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-info:
- summary: 'Test SIPNotify AMI Action for Call-ID'
- description: |
- This Tests the AMI Action SIPNotify in order to make sure
- that Call-ID header can be specified.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: sipp.SIPpTestCase
- modules:
- -
- config-section: ami-config
- typename: 'pluggable_modules.EventActionModule'
-
-test-object-config:
- fail-on-any: True
- test-iterations:
- -
- scenarios:
- - { 'key-args': { 'scenario': 'caller.xml', '-i': '127.0.0.1', '-p': '5062', '-trace_msg': '-pause_msg_ign' } }
- - { 'key-args': { 'scenario': 'callee.xml', '-i': '127.0.0.1', '-p': '5063', '-trace_msg': '-pause_msg_ign' } }
-
-ami-config:
- -
- ami-events:
- type: 'headermatch'
- conditions:
- match:
- Event: 'VarSet'
- Channel: 'SIP/callee-.*'
- Variable: 'SIPCALLID'
- ami-actions:
- action:
- Action: 'SIPnotify'
- Channel: '{channel}'
- Variable: 'Event=talk'
- Call-ID: '{value}'
-
-properties:
- minversion: [ '13.20.0', '15.3.0' ]
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'chan_sip'
- tags:
- - SIP
-
diff --git a/tests/channels/SIP/ami/sip_notify/tests.yaml b/tests/channels/SIP/ami/sip_notify/tests.yaml
index 750f6d6..b1a3008 100644
--- a/tests/channels/SIP/ami/sip_notify/tests.yaml
+++ b/tests/channels/SIP/ami/sip_notify/tests.yaml
@@ -2,4 +2,3 @@
tests:
- test: 'custom_headers'
- test: 'content'
- - test: 'call_id'
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/configs/ast1/extensions.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/configs/ast1/extensions.conf
deleted file mode 100644
index a52330b..0000000
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[default]
-exten => playback,1,Answer()
-same => n,Playback(hello-world)
-same => n,Hangup()
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/configs/ast1/pjsip.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/configs/ast1/pjsip.conf
deleted file mode 100644
index e41c733..0000000
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-[global]
-type=global
-endpoint_identifier_order=username,ip
-
-[local-transport-template](!)
-type=transport
-bind=127.0.0.1
-
-[local-transport6-template](!)
-type=transport
-bind=[::1]
-
-[local-transport-udp](local-transport-template)
-protocol=udp
-
-[local-transport-udp6](local-transport6-template)
-protocol=udp
-
-[endpoint-template-ipv4](!)
-type=endpoint
-context=default
-allow=!all,ulaw,alaw
-media_address=127.0.0.1
-identify_by=ip
-
-[endpoint-template-ipv6](!)
-type=endpoint
-context=default
-allow=!all,ulaw,alaw
-media_address=[::1]
-rtp_ipv6=yes
-identify_by=ip
-
-[alice-ipv4-udp](endpoint-template-ipv4)
-
-[alice-ipv6-udp](endpoint-template-ipv6)
-
-[unknown](endpoint-template-ipv4)
-context=does-not-exist
-
-[identify-template](!)
-type=identify
-
-[alice-identify-ipv4](identify-template)
-endpoint=alice-ipv4-udp
-match=127.0.0.1
-
-[alice-identify-ipv6](identify-template)
-endpoint=alice-ipv6-udp
-match=[::1]
-
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/sipp/playback_with_initial_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/sipp/playback_with_initial_sdp.xml
deleted file mode 100644
index ea7d68a..0000000
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/sipp/playback_with_initial_sdp.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="INVITE to playback with SDP in initial INVITE">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:unknown@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
- Max-Forwards: 70
- Subject: Test
- User-Agent: Test
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=phoneA 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio 6000 RTP/AVP 0
- a=rtpmap:0 PCMU/8000
-
- ]]>
- </send>
-
- <recv response="100"
- optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:unknown@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
- Max-Forwards: 70
- Subject: Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/test-config.yaml
deleted file mode 100644
index a7061f1..0000000
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host_only/test-config.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-testinfo:
- summary: 'Tests incoming calls without authentication matching only on IP address'
- description: |
- 'Run a SIPp scenario that sends various calls to res_pjsip, which should be matched only on IP address'
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- reactor-timeout: 80
- fail-on-any: False
- test-iterations:
- # IPv4 & UDP
- -
- scenarios:
- - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061'} }
- # IPv6 & UDP
- -
- scenarios:
- - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5061'} }
-
-properties:
- minversion: [ '13.19.0', '15.2.0' ]
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- - asterisk : 'res_pjsip_session'
- - asterisk : 'chan_pjsip'
- - asterisk : 'res_pjsip_endpoint_identifier_ip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml
index 68e17f6..ed1244b 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml
@@ -1,6 +1,5 @@
tests:
- test: 'ident_by_host'
- - test: 'ident_by_host_only'
- test: 'ident_by_user'
- test: 'ident_by_user_drop_options'
- test: 'ident_by_header'
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_channel2/configs/ast1/extensions.conf b/tests/channels/pjsip/dialplan_functions/pjsip_channel2/configs/ast1/extensions.conf
deleted file mode 100644
index 9a96461..0000000
--- a/tests/channels/pjsip/dialplan_functions/pjsip_channel2/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[globals]
-ruri_user = 1234
-ruri_full = sip:${ruri_user}@127.0.0.1:5060\;transport=UDP\;lr
-
-[default]
-exten = _XXXX,1,NoOp()
-same = n,NoOp(EXTEN is "${EXTEN}")
-same = n,NoOp(CALLERID(dnid) is "${CALLERID(dnid)}")
-same = n,NoOp(CHANNEL(pjsip,request_uri) is "${CHANNEL(pjsip,request_uri)}")
-
-same = n,Answer()
-
-same = n(exten),NoOp()
-same = n,GotoIf($["${ruri_user}"="${EXTEN}"]?dnid)
-same = n,UserEvent(Failure,Result:EXTEN is "${EXTEN}" expected "${ruri_user}")
-
-same = n(dnid),NoOp()
-same = n,GotoIf($["${ruri_user}"="${CALLERID(dnid)}"]?ruri)
-same = n,UserEvent(Failure,Result:CALLERID(dnid) is "${CALLERID(dnid)}" expected "${ruri_user}")
-
-same = n(ruri),NoOp()
-same = n,GotoIf($["${ruri_full}"="${CHANNEL(pjsip,request_uri)}"]?done)
-same = n,UserEvent(Failure,Result:CHANNEL(pjsip,request_uri) is "${CHANNEL(pjsip,request_uri)}" expected "${ruri_full}")
-
-same = n(done),NoOp()
-same = n,UserEvent(Done)
-same = n,Hangup()
-
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_channel2/configs/ast1/pjsip.conf b/tests/channels/pjsip/dialplan_functions/pjsip_channel2/configs/ast1/pjsip.conf
deleted file mode 100644
index 30b28ed..0000000
--- a/tests/channels/pjsip/dialplan_functions/pjsip_channel2/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[transport-udp]
-type = transport
-protocol = udp
-bind = 0.0.0.0
-
-[alice]
-type = endpoint
-context = default
-allow = !all,ulaw
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_channel2/sipp/incoming.xml b/tests/channels/pjsip/dialplan_functions/pjsip_channel2/sipp/incoming.xml
deleted file mode 100644
index 671741f..0000000
--- a/tests/channels/pjsip/dialplan_functions/pjsip_channel2/sipp/incoming.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="INVITE with different Request-URI and To URI's">
- <send retrans="500">
- <![CDATA[
- INVITE sip:1234@[remote_ip]:[remote_port];transport=[transport];lr SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [service] <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:4321@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: <sip:[service]@[local_ip]:[local_port];transport=[transport]>
- Max-Forwards: 70
- Subject: Test
- User-Agent: Test
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=phoneA 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio 6000 RTP/AVP 0
- a=rtpmap:0 PCMU/8000
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- </recv>
-
- <send>
- <![CDATA[
- ACK sip:1234@[remote_ip]:[remote_port];transport=[transport];lr SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: [service] <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:4321@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: <sip:[service]@[local_ip]:[local_port];transport=[transport]>
- Max-Forwards: 70
- Subject: Test
- Content-Length: 0
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[service]@[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
- ]]>
- </send>
-
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_channel2/test-config.yaml b/tests/channels/pjsip/dialplan_functions/pjsip_channel2/test-config.yaml
deleted file mode 100644
index bc1a537..0000000
--- a/tests/channels/pjsip/dialplan_functions/pjsip_channel2/test-config.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-testinfo:
- summary: 'Test PJSIP channel for CALLERID(dnid) and CHANNEL(pjsip,request_uri)'
- description: |
- 'Run a SIPp scenario that places a call from endpoint alice to check
- that the CALLERID(dnid) and CHANNEL(pjsip,request_uri) are set to
- expected values.'
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
- modules:
- -
- config-section: ami-config
- typename: 'ami.AMIEventModule'
-
-test-object-config:
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'incoming.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-ami-config:
- -
- type: 'headermatch'
- id: '0'
- conditions:
- match:
- Event: 'Newchannel'
- Channel: 'PJSIP/alice-.*'
- count: '1'
- -
- type: 'headermatch'
- id: '0'
- conditions:
- match:
- Event: 'UserEvent'
- Channel: 'PJSIP/alice-.*'
- UserEvent: 'Failure'
- count: '0'
- -
- type: 'headermatch'
- id: '0'
- conditions:
- match:
- Event: 'UserEvent'
- Channel: 'PJSIP/alice-.*'
- UserEvent: 'Done'
- count: '1'
-
-properties:
- minversion: ['13.19.0', '15.2.0']
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'app_dial'
- - asterisk : 'app_userevent'
- - asterisk : 'func_callerid'
- - asterisk : 'func_channel'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/dialplan_functions/tests.yaml b/tests/channels/pjsip/dialplan_functions/tests.yaml
index a2e26a0..0fa231a 100644
--- a/tests/channels/pjsip/dialplan_functions/tests.yaml
+++ b/tests/channels/pjsip/dialplan_functions/tests.yaml
@@ -3,7 +3,6 @@
- test: 'chan_is_avail'
- test: 'pjsip_aor'
- test: 'pjsip_channel'
- - test: 'pjsip_channel2'
- test: 'pjsip_contact'
- test: 'pjsip_dtmfmode'
- test: 'pjsip_endpoint'
diff --git a/tests/channels/pjsip/identify/header_ordering_header_ip/configs/ast1/extensions.conf b/tests/channels/pjsip/identify/header_ordering_header_ip/configs/ast1/extensions.conf
deleted file mode 100644
index bed05dd..0000000
--- a/tests/channels/pjsip/identify/header_ordering_header_ip/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[default]
-
-[header]
-exten = echo,1,NoOp()
-same = n,Answer()
-same = n,UserEvent(Header)
-same = n,Hangup()
-
-[ip]
-exten = echo,1,NoOp()
-same = n,Answer()
-same = n,UserEvent(Ip)
-same = n,Hangup()
-
diff --git a/tests/channels/pjsip/identify/header_ordering_header_ip/configs/ast1/pjsip.conf b/tests/channels/pjsip/identify/header_ordering_header_ip/configs/ast1/pjsip.conf
deleted file mode 100644
index 2c4dfae..0000000
--- a/tests/channels/pjsip/identify/header_ordering_header_ip/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-[global]
-type=global
-endpoint_identifier_order=header,ip
-debug=yes
-
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-template](!)
-type=transport
-bind=127.0.0.1
-
-[local-transport-udp](local-transport-template)
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-allow=!all,ulaw,alaw
-
-[alice-header](endpoint-template)
-identify_by=header
-context=header
-
-[alice-ip](endpoint-template)
-identify_by=ip
-context=ip
-
-[identify-template](!)
-type=identify
-
-[alice-header-identify](identify-template)
-endpoint=alice-header
-match_header=X-ASTERISK-TOKEN: e7657250-07fa-11e7-92f8-1b946c0c7e84
-
-[alice-ip-identify](identify-template)
-endpoint=alice-ip
-match=127.0.0.1
diff --git a/tests/channels/pjsip/identify/header_ordering_header_ip/sipp/nominal.xml b/tests/channels/pjsip/identify/header_ordering_header_ip/sipp/nominal.xml
deleted file mode 100644
index e42011f..0000000
--- a/tests/channels/pjsip/identify/header_ordering_header_ip/sipp/nominal.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="INVITE to echo with SDP in initial INVITE">
- <send retrans="500">
- <![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
- Max-Forwards: 70
- Subject: Test
- X-ASTERISK-TOKEN: [ident_key]
- User-Agent: Test
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=phoneA 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio 6000 RTP/AVP 0
- a=rtpmap:0 PCMU/8000
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- </recv>
-
- <send>
- <![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
- Max-Forwards: 70
- Subject: Test
- X-ASTERISK-TOKEN: [ident_key]
- Content-Length: 0
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Content-Length: 0
- ]]>
- </send>
-</scenario>
-
diff --git a/tests/channels/pjsip/identify/header_ordering_header_ip/test-config.yaml b/tests/channels/pjsip/identify/header_ordering_header_ip/test-config.yaml
deleted file mode 100644
index 0c91298..0000000
--- a/tests/channels/pjsip/identify/header_ordering_header_ip/test-config.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-testinfo:
- summary: 'Tests incoming calls identified by header and source IP'
- description: |
- This test covers sending calls to an Asterisk instance
- identifiable by a custom header and by a source IP address.
- It is expected that the requests are accepted by the correct
- endpoint determined by endpoint_identifier_order.
- This test expects the call to be accepted by the header identifier.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
- modules:
- -
- config-section: ami-config
- typename: 'ami.AMIEventModule'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: True
- test-iterations:
- # IPv4 & UDP
- -
- scenarios:
- - { 'key-args': {'scenario': 'nominal.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 's'},
- 'ordered-args': ['-key', 'ident_key', 'e7657250-07fa-11e7-92f8-1b946c0c7e84'] }
-
-ami-config:
- -
- type: 'headermatch'
- id: '0'
- conditions:
- match:
- Event: 'UserEvent'
- UserEvent: 'Header'
- count: '1'
- -
- type: 'headermatch'
- id: '0'
- conditions:
- match:
- Event: 'UserEvent'
- UserEvent: 'Ip'
- count: '0'
-
-properties:
- minversion: ['13.20.0', '15.3.0']
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'app_userevent'
- - asterisk : 'res_pjsip'
- - asterisk : 'res_pjsip_endpoint_identifier_ip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/identify/header_ordering_ip_header/configs/ast1/extensions.conf b/tests/channels/pjsip/identify/header_ordering_ip_header/configs/ast1/extensions.conf
deleted file mode 100644
index bed05dd..0000000
--- a/tests/channels/pjsip/identify/header_ordering_ip_header/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[default]
-
-[header]
-exten = echo,1,NoOp()
-same = n,Answer()
-same = n,UserEvent(Header)
-same = n,Hangup()
-
-[ip]
-exten = echo,1,NoOp()
-same = n,Answer()
-same = n,UserEvent(Ip)
-same = n,Hangup()
-
diff --git a/tests/channels/pjsip/identify/header_ordering_ip_header/configs/ast1/pjsip.conf b/tests/channels/pjsip/identify/header_ordering_ip_header/configs/ast1/pjsip.conf
deleted file mode 100644
index 3ae78ac..0000000
--- a/tests/channels/pjsip/identify/header_ordering_ip_header/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-[global]
-type=global
-endpoint_identifier_order=ip,header
-debug=yes
-
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-template](!)
-type=transport
-bind=127.0.0.1
-
-[local-transport-udp](local-transport-template)
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-allow=!all,ulaw,alaw
-
-[alice-header](endpoint-template)
-identify_by=header
-context=header
-
-[alice-ip](endpoint-template)
-identify_by=ip
-context=ip
-
-[identify-template](!)
-type=identify
-
-[alice-header-identify](identify-template)
-endpoint=alice-header
-match_header=X-ASTERISK-TOKEN: e7657250-07fa-11e7-92f8-1b946c0c7e84
-
-[alice-ip-identify](identify-template)
-endpoint=alice-ip
-match=127.0.0.1
diff --git a/tests/channels/pjsip/identify/header_ordering_ip_header/sipp/nominal.xml b/tests/channels/pjsip/identify/header_ordering_ip_header/sipp/nominal.xml
deleted file mode 100644
index e42011f..0000000
--- a/tests/channels/pjsip/identify/header_ordering_ip_header/sipp/nominal.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="INVITE to echo with SDP in initial INVITE">
- <send retrans="500">
- <![CDATA[
- INVITE sip:echo@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
- Max-Forwards: 70
- Subject: Test
- X-ASTERISK-TOKEN: [ident_key]
- User-Agent: Test
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=phoneA 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio 6000 RTP/AVP 0
- a=rtpmap:0 PCMU/8000
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- </recv>
-
- <send>
- <![CDATA[
- ACK sip:echo@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]>
- Max-Forwards: 70
- Subject: Test
- X-ASTERISK-TOKEN: [ident_key]
- Content-Length: 0
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Content-Length: 0
- ]]>
- </send>
-</scenario>
-
diff --git a/tests/channels/pjsip/identify/header_ordering_ip_header/test-config.yaml b/tests/channels/pjsip/identify/header_ordering_ip_header/test-config.yaml
deleted file mode 100644
index 0dc4167..0000000
--- a/tests/channels/pjsip/identify/header_ordering_ip_header/test-config.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-testinfo:
- summary: 'Tests incoming calls identified by header and source IP'
- description: |
- This test covers sending calls to an Asterisk instance
- identifiable by a custom header and by a source IP address.
- It is expected that the requests are accepted by the correct
- endpoint determined by endpoint_identifier_order.
- This test expects the call to be accepted by the ip identifier.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
- modules:
- -
- config-section: ami-config
- typename: 'ami.AMIEventModule'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: True
- test-iterations:
- # IPv4 & UDP
- -
- scenarios:
- - { 'key-args': {'scenario': 'nominal.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 's'},
- 'ordered-args': ['-key', 'ident_key', 'e7657250-07fa-11e7-92f8-1b946c0c7e84'] }
-
-ami-config:
- -
- type: 'headermatch'
- id: '0'
- conditions:
- match:
- Event: 'UserEvent'
- UserEvent: 'Header'
- count: '0'
- -
- type: 'headermatch'
- id: '0'
- conditions:
- match:
- Event: 'UserEvent'
- UserEvent: 'Ip'
- count: '1'
-
-properties:
- minversion: ['13.20.0', '15.3.0']
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'app_userevent'
- - asterisk : 'res_pjsip'
- - asterisk : 'res_pjsip_endpoint_identifier_ip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/identify/tests.yaml b/tests/channels/pjsip/identify/tests.yaml
index 60215c3..43969c1 100644
--- a/tests/channels/pjsip/identify/tests.yaml
+++ b/tests/channels/pjsip/identify/tests.yaml
@@ -2,6 +2,4 @@
tests:
- test: 'header'
- test: 'header_or_ip'
- - test: 'header_ordering_header_ip'
- - test: 'header_ordering_ip_header'
- test: 'ordering'
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/configs/ast1/extensions.conf
deleted file mode 100644
index 6955acb..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/configs/ast1/pjsip.conf
deleted file mode 100644
index a76b8bd..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_video_streams=10
-bundle=yes
-
-[alice](endpoint-template)
-allow=!all,g722,ulaw,alaw,h264,h263
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/sipp/uac-multiple-video-with-audio.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/sipp/uac-multiple-video-with-audio.xml
deleted file mode 100644
index cd6d2e7..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/sipp/uac-multiple-video-with-audio.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec Test
- 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
- a=group:BUNDLE audio video
- m=audio 6000 RTP/AVP 9 0 8 101
- a=rtpmap:9 G722/8000
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:101 telephone-event/8000
- a=fmtp:101 0-16
- a=ptime:20
- a=maxptime:20
- a=sendrecv
- a=mid:audio
- a=rtcp-mux
- a=ssrc:1 cname:alice
- m=video 6001 RTP/AVP 99 34
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
- a=mid:video
- a=rtcp-mux
- a=ssrc:2 cname:bob
- m=video 6002 RTP/AVP 99
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=sendrecv
- a=mid:video
- a=rtcp-mux
- a=ssrc:3 cname:charlie
- m=video 6003 RTP/AVP 34
- a=rtpmap:34 H263/90000
- a=sendrecv
- a=mid:video
- a=rtcp-mux
- a=ssrc:4 cname:david
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="a=group:BUNDLE audio video"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="a=mid:audio"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="a=mid:video"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec Test
- Content-Length: 0
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
- ]]>
- </send>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/test-config.yaml
deleted file mode 100644
index 51cf1e5..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/bundled/test-config.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-testinfo:
- summary: 'Test offers with multiple video streams/one audio stream and bundled'
- description: |
- This tests inbound offers that contain multiple video
- media streams and a single audio stream with bundle enabled.
- Asterisk should accept all the streams in a single bundle group.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-video-with-audio.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/configs/ast1/extensions.conf
deleted file mode 100644
index 6955acb..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/configs/ast1/pjsip.conf
deleted file mode 100644
index a38e90e..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_audio_streams=10
-
-[alice](endpoint-template)
-allow=!all,g722,ulaw,alaw,h264,h263
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/sipp/uac-multiple-audio-with-video.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/sipp/uac-multiple-audio-with-video.xml
deleted file mode 100644
index 838a4e4..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/sipp/uac-multiple-audio-with-video.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec test
- 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 6000 RTP/AVP 9 0 8 101
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- a=rtpmap:101 telephone-event/8000
- a=fmtp:101 0-16
- m=audio 6001 RTP/AVP 9
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:9 G722/8000
- m=audio 6002 RTP/AVP 9 0 8
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- m=video 6000 RTP/AVP 99 34
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8 101+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8+..*"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="4"/>
- <test assign_to="4" variable="4" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice-codec-match@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/test-config.yaml
deleted file mode 100644
index bd7774d..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-audio/test-config.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-testinfo:
- summary: 'Test offers with multiple audio streams/one video stream'
- description: |
- This tests inbound offers that contain multiple audio
- media streams and a single video stream. Asterisk should
- accept all the streams.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-audio-with-video.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/configs/ast1/extensions.conf
deleted file mode 100644
index 6955acb..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/configs/ast1/pjsip.conf
deleted file mode 100644
index 6e71cca..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_video_streams=10
-
-[alice](endpoint-template)
-allow=!all,g722,ulaw,alaw,h264,h263
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/sipp/uac-multiple-video-with-audio.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/sipp/uac-multiple-video-with-audio.xml
deleted file mode 100644
index 3433cce..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/sipp/uac-multiple-video-with-audio.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec Test
- 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 6000 RTP/AVP 9 0 8 101
- a=rtpmap:9 G722/8000
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:101 telephone-event/8000
- a=fmtp:101 0-16
- a=ptime:20
- a=maxptime:20
- a=sendrecv
- m=video 6001 RTP/AVP 99 34
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
- m=video 6002 RTP/AVP 99
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=sendrecv
- m=video 6003 RTP/AVP 34
- a=rtpmap:34 H263/90000
- a=sendrecv
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8 101+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99+..*"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 34+..*"
- search_in="body" check_it="true" assign_to="4"/>
- <test assign_to="4" variable="4" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/test-config.yaml
deleted file mode 100644
index 0d4b113..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/multiple-video/test-config.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-testinfo:
- summary: 'Test offers with multiple video streams/one audio stream'
- description: |
- This tests inbound offers that contain multiple video
- media streams and a single audio stream. Asterisk should
- accept all the streams.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-video-with-audio.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/tests.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/tests.yaml
deleted file mode 100644
index 1a143f3..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/accept/tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Enter tests here in the order they should be considered for execution:
-tests:
- - test: 'bundled'
- - test: 'multiple-audio'
- - test: 'multiple-video'
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/tests.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/tests.yaml
index a59c1bf..01b4e88 100644
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/tests.yaml
+++ b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio-video/tests.yaml
@@ -1,4 +1,3 @@
# Enter tests here in the order they should be considered for execution:
tests:
- dir: 'decline'
- - dir: 'accept'
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/configs/ast1/extensions.conf
deleted file mode 100644
index 6955acb..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/configs/ast1/pjsip.conf
deleted file mode 100644
index b12c1a5..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_audio_streams=20
-
-[alice](endpoint-template)
-allow=!all,g722,ulaw,alaw
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/sipp/uac-multiple-audio.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/sipp/uac-multiple-audio.xml
deleted file mode 100644
index 1703fab..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/sipp/uac-multiple-audio.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec test
- 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 6000 RTP/AVP 9 0 8 101
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- a=rtpmap:101 telephone-event/8000
- a=fmtp:101 0-16
- m=audio 6001 RTP/AVP 9
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:9 G722/8000
- m=audio 6002 RTP/AVP 9 0 8
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8 101+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8+..*"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice-codec-match@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/test-config.yaml
deleted file mode 100644
index 7301ede..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/accept/test-config.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-testinfo:
- summary: 'Test offers with multiple audio streams'
- description: |
- This tests inbound offers that contain multiple audio
- media streams. Asterisk should accept all of the audio
- streams.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-audio.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/configs/ast1/extensions.conf
deleted file mode 100644
index 84e6575..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,StreamEcho(3,audio)
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/configs/ast1/pjsip.conf
deleted file mode 100644
index b12c1a5..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_audio_streams=20
-
-[alice](endpoint-template)
-allow=!all,g722,ulaw,alaw
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/sipp/uac-multiple-audio.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/sipp/uac-multiple-audio.xml
deleted file mode 100644
index 2c89d1b..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/sipp/uac-multiple-audio.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec test
- 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 6000 RTP/AVP 9 0 8 101
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- a=rtpmap:101 telephone-event/8000
- a=fmtp:101 0-16
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8 101+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice-codec-match@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="INVITE">
- <action>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8 101+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8+..*"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send retrans="500">
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=- 1324901698 1324901698 IN IP4 [local_ip]
- s=-
- c=IN IP4 [local_ip]
- t=0 0
- m=audio 6000 RTP/AVP 9 0 8 101
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- a=rtpmap:101 telephone-event/8000
- a=fmtp:101 0-16
- m=audio 6000 RTP/AVP 9 0 8
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- m=audio 6000 RTP/AVP 9 0 8
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- ]]>
- </send>
-
- <recv request="ACK" rtd="true" crlf="true">
- </recv>
-
- <send retrans="500">
- <![CDATA[
-
- BYE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 2 BYE
- Contact: <sip:test@[local_ip]:[local_port]>
- Max-Forwards: 70
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="200" crlf="true">
- </recv>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/test-config.yaml
deleted file mode 100644
index 0c677a8..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/add/test-config.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-testinfo:
- summary: 'Test adding of multiple audio streams'
- description: |
- This tests the addition of multiple audio streams once
- a call has been established.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-audio.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/configs/ast1/extensions.conf
deleted file mode 100644
index 9b21754..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,StreamEcho(1,audio)
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/configs/ast1/pjsip.conf
deleted file mode 100644
index 850d5e8..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_audio_streams=10
-
-[alice](endpoint-template)
-allow=!all,g722,ulaw,alaw
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/sipp/uac-multiple-audio.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/sipp/uac-multiple-audio.xml
deleted file mode 100644
index 7b84ab1..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/sipp/uac-multiple-audio.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec test
- 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 6000 RTP/AVP 9 0 8 101
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- a=rtpmap:101 telephone-event/8000
- a=fmtp:101 0-16
- m=audio 6001 RTP/AVP 9
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:9 G722/8000
- m=audio 6002 RTP/AVP 9 0 8
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8 101+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice-codec-match@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="INVITE">
- <action>
- <ereg regexp="m=audio [0-9]{1,5} RTP/AVP 9 0 8 101+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=audio 0 RTP/AVP 9+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=audio 0 RTP/AVP 9 0 8+..*"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send retrans="500">
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=- 1324901698 1324901698 IN IP4 [local_ip]
- s=-
- c=IN IP4 [local_ip]
- t=0 0
- m=audio 6000 RTP/AVP 9 0 8 101
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:0 PCMU/8000
- a=rtpmap:8 PCMA/8000
- a=rtpmap:9 G722/8000
- a=rtpmap:101 telephone-event/8000
- a=fmtp:101 0-16
- m=audio 0 RTP/AVP 9
- m=audio 0 RTP/AVP 9 0 8
- ]]>
- </send>
-
- <recv request="ACK" rtd="true" crlf="true">
- </recv>
-
- <send retrans="500">
- <![CDATA[
-
- BYE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 2 BYE
- Contact: <sip:test@[local_ip]:[local_port]>
- Max-Forwards: 70
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="200" crlf="true">
- </recv>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/test-config.yaml
deleted file mode 100644
index c1703b1..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/remove/test-config.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-testinfo:
- summary: 'Test removing of multiple audio streams'
- description: |
- This tests the removal of multiple audio streams once
- a call has been established.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-audio.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/tests.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/tests.yaml
index 024b05a..9d63b36 100644
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/tests.yaml
+++ b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/audio/tests.yaml
@@ -1,6 +1,3 @@
# Enter tests here in the order they should be considered for execution:
tests:
- test: 'decline'
- - test: 'accept'
- - test: 'add'
- - test: 'remove'
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/configs/ast1/extensions.conf
deleted file mode 100644
index 6955acb..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/configs/ast1/pjsip.conf
deleted file mode 100644
index 98cdb90..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_video_streams=10
-
-[alice](endpoint-template)
-allow=!all,h264,h263
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/sipp/uac-multiple-video.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/sipp/uac-multiple-video.xml
deleted file mode 100644
index 7865de2..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/sipp/uac-multiple-video.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec test
- 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=video 6001 RTP/AVP 99 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
- m=video 6002 RTP/AVP 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:34 H263/90000
- a=sendrecv
- m=video 6003 RTP/AVP 99
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=sendrecv
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 34+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99+..*"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice-codec-match@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="BYE">
- </recv>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/test-config.yaml
deleted file mode 100644
index 8eae8ed..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/accept/test-config.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-testinfo:
- summary: 'Test offers with multiple video streams'
- description: |
- This tests inbound offers that contain multiple video
- media streams. Asterisk should accept all the video
- streams.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-video.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/configs/ast1/extensions.conf
deleted file mode 100644
index 3db7659..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,StreamEcho(3,video)
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/configs/ast1/pjsip.conf
deleted file mode 100644
index 98cdb90..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_video_streams=10
-
-[alice](endpoint-template)
-allow=!all,h264,h263
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/sipp/uac-multiple-video.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/sipp/uac-multiple-video.xml
deleted file mode 100644
index 8e4ba16..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/sipp/uac-multiple-video.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec test
- 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=video 6001 RTP/AVP 99 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice-codec-match@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="INVITE">
- <action>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send retrans="500">
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=- 1324901698 1324901698 IN IP4 [local_ip]
- s=-
- c=IN IP4 [local_ip]
- t=0 0
- m=video 6001 RTP/AVP 99 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
- m=video 6001 RTP/AVP 99 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
- m=video 6001 RTP/AVP 99 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
- ]]>
- </send>
-
- <recv request="ACK" rtd="true" crlf="true">
- </recv>
-
- <send retrans="500">
- <![CDATA[
-
- BYE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 2 BYE
- Contact: <sip:test@[local_ip]:[local_port]>
- Max-Forwards: 70
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="200" crlf="true">
- </recv>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/test-config.yaml
deleted file mode 100644
index 0a1c1f8..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/add/test-config.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-testinfo:
- summary: 'Test adding of multiple video streams'
- description: |
- This tests the addition of multiple video streams once
- a call has been established.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-video.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/configs/ast1/extensions.conf
deleted file mode 100644
index 1bfc935..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-
-exten => answer,1,NoOp()
- same => n,Answer()
- same => n,StreamEcho(1,video)
- same => n,Hangup()
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/configs/ast1/pjsip.conf
deleted file mode 100644
index 98cdb90..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[system]
-type=system
-timer_t1=100
-timer_b=6400
-
-[local-transport-udp]
-type=transport
-bind=127.0.0.1
-protocol=udp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-media_address=127.0.0.1
-max_video_streams=10
-
-[alice](endpoint-template)
-allow=!all,h264,h263
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/sipp/uac-multiple-video.xml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/sipp/uac-multiple-video.xml
deleted file mode 100644
index 8e98dcb..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/sipp/uac-multiple-video.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:test@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Codec test
- 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=video 6001 RTP/AVP 99 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
- m=video 6001 RTP/AVP 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:34 H263/90000
- a=sendrecv
- m=video 6001 RTP/AVP 99
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=sendrecv
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="181" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="200" rtd="true">
- <action>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 34+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:alice-codec-match@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="INVITE">
- <action>
- <ereg regexp="m=video [0-9]{1,5} RTP/AVP 99 34+..*"
- search_in="body" check_it="true" assign_to="1"/>
- <test assign_to="1" variable="1" compare="equal" value=""/>
- <ereg regexp="m=video 0 RTP/AVP 34+..*"
- search_in="body" check_it="true" assign_to="2"/>
- <test assign_to="2" variable="2" compare="equal" value=""/>
- <ereg regexp="m=video 0 RTP/AVP 99+..*"
- search_in="body" check_it="true" assign_to="3"/>
- <test assign_to="3" variable="3" compare="equal" value=""/>
- </action>
- </recv>
-
- <send retrans="500">
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:];tag=[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=- 1324901698 1324901698 IN IP4 [local_ip]
- s=-
- c=IN IP4 [local_ip]
- t=0 0
- m=video 6001 RTP/AVP 99 34
- c=IN IP[media_ip_type] [media_ip]
- a=rtpmap:99 H264/90000
- a=rtpmap:34 H263/90000
- a=sendrecv
- m=video 0 RTP/AVP 34
- m=video 0 RTP/AVP 99
- ]]>
- </send>
-
- <recv request="ACK" rtd="true" crlf="true">
- </recv>
-
- <send retrans="500">
- <![CDATA[
-
- BYE sip:answer@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: alice <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 2 BYE
- Contact: <sip:test@[local_ip]:[local_port]>
- Max-Forwards: 70
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="200" crlf="true">
- </recv>
-
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/test-config.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/test-config.yaml
deleted file mode 100644
index bc7c2db..0000000
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/remove/test-config.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-testinfo:
- summary: 'Test removing of multiple video streams'
- description: |
- This tests the removal of multiple video streams once
- a call has been established.
-
-test-modules:
- test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
-
-test-object-config:
- memcheck-delay-stop: 7
- fail-on-any: False
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'uac-multiple-video.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
-
-properties:
- minversion: '15.0.0'
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'res_pjsip'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/tests.yaml b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/tests.yaml
index 024b05a..9d63b36 100644
--- a/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/tests.yaml
+++ b/tests/channels/pjsip/sdp_offer_answer/incoming/nominal/multiple-media-stream/video/tests.yaml
@@ -1,6 +1,3 @@
# Enter tests here in the order they should be considered for execution:
tests:
- test: 'decline'
- - test: 'accept'
- - test: 'add'
- - test: 'remove'
diff --git a/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/configs/ast1/pjsip.conf
deleted file mode 100644
index d1ceff6..0000000
--- a/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[global]
-type = global
-debug = yes
-
-[transport]
-type = transport
-protocol = udp
-bind = 127.0.0.1
-
-[sipp]
-type = endpoint
-rewrite_contact = yes
-aors = sipp
-
-[sipp]
-type = aor
-mailboxes = sipp
diff --git a/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/sipp/subscribe.xml
deleted file mode 100644
index b9bad30..0000000
--- a/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/sipp/subscribe.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="NAT NOTIFY">
- <send retrans="500">
- <![CDATA[
-
- SUBSCRIBE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: sut <sip:[service]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 SUBSCRIBE
- Contact: sip:sipp at 192.168.0.1:12345
- Max-Forwards: 70
- Subject: Performance Test
- Event: message-summary
- Supported: eventlist
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Accept: application/simple-message-summary
- Expires: 3600
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="100"
- optional="true">
- </recv>
-
- <recv response="200" rtd="true" />
-
-</scenario>
diff --git a/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/test-config.yaml b/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/test-config.yaml
deleted file mode 100644
index 6093e9d..0000000
--- a/tests/channels/pjsip/subscriptions/large_number_of_accept_headers/test-config.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-testinfo:
- summary: 'Ensure that sending a large number of Accept headers in a SUBSCRIBE does not crash'
- description: |
- 'This test runs a SIPp scenario that sends a SUBSCRIBE with a large number of Accept headers.
- If the subscription is successful then the test passes. If a crash occurs then the test fails.'
-
-test-modules:
- test-object:
- config-section: sipp-config
- typename: 'sipp.SIPpTestCase'
-
-sipp-config:
- reactor-timeout: 30
- fail-on-any: True
- test-iterations:
- -
- scenarios:
- - {'key-args': { 'scenario': 'subscribe.xml', '-s': 'sipp' }}
-properties:
- minversion: [ '13.19.2', '15.2.2' ]
- dependencies:
- - python: 'twisted'
- - python: 'starpy'
- - asterisk: 'res_pjsip'
- - asterisk: 'res_pjsip_pubsub'
- - asterisk: 'res_pjsip_mwi'
- tags:
- - pjsip
diff --git a/tests/channels/pjsip/subscriptions/presence/tests.yaml b/tests/channels/pjsip/subscriptions/presence/tests.yaml
index 96684a6..9123536 100644
--- a/tests/channels/pjsip/subscriptions/presence/tests.yaml
+++ b/tests/channels/pjsip/subscriptions/presence/tests.yaml
@@ -10,4 +10,3 @@
- test: 'presencestate_repeat'
- test: 'presencestate_repeat_okay'
- test: 'dialog_info_xml'
- - dir: 'verify_bodies'
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py b/tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py
deleted file mode 100644
index 143ea42..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/presence.py
+++ /dev/null
@@ -1,421 +0,0 @@
-#!/usr/bin/env python
-"""Pluggable module for tests that verify NOTIFY bodies.
-
-Copyright (C) 2015, Digium, Inc.
-John Bigelow <jbigelow at digium.com>
-
-This program is free software, distributed under the terms of
-the GNU General Public License Version 2.
-"""
-
-import sys
-import logging
-import xml.etree.ElementTree as ET
-import re
-
-sys.path.append('lib/python')
-
-from pcap import VOIPListener
-from twisted.internet import reactor
-
-LOGGER = logging.getLogger(__name__)
-
-
-class BodyCheck(VOIPListener):
- """SIP notify listener and expected results generator.
-
- A test module that observes incoming SIP notifies and generates the
- expected results for the body of each.
- """
- def __init__(self, module_config, test_object):
- """Constructor
-
- Arguments:
- module_config Dictionary containing test configuration
- test_object The test object for the running test.
- """
- self.set_pcap_defaults(module_config)
- VOIPListener.__init__(self, module_config, test_object)
-
- self.test_object = test_object
- self.token = test_object.create_fail_token("Haven't handled all "
- "expected NOTIFY packets.")
- self.expected_config = module_config['expected_body']
- self.expected_notifies = int(module_config['expected_notifies'])
- self.body_type = module_config['expected_body_type']
- self.notify_count = 0
-
- if self.body_type.upper() not in ('PIDF', 'XPIDF'):
- msg = "Body type of '{0}' not supported."
- raise Exception(msg.format(self.body_type))
-
- if self.expected_config.get('namespaces') is not None:
- if self.expected_config['namespaces'].get('default') is None:
- msg = "Namespaces configuration does not include a 'default'."
- raise Exception(msg)
-
- # Add calback for SIP packets
- self.add_callback('SIP', self.packet_handler)
-
- def gen_expected_data(self):
- """Generate expected data results.
-
- Generates a single dictionary containing the expected results for a
- body.
-
- Returns:
- Dictionary of expected results.
- """
- expected_data = {}
- # Use full tags if we have namespaces.
- if self.expected_config.get('namespaces') is not None:
- full_tags = self.gen_full_tags()
- else:
- full_tags = self.expected_config['tags']
-
- # Get expected attributes corresponding to the notify body received.
- attribs = self.expected_config['attributes'][self.notify_count - 1]
-
- text = self.expected_config.get('text')
- # Get expected text corresponding to the notify body received.
- if text is not None:
- text = text[self.notify_count - 1]
-
- # Build dict of the expected results
- for full_tag in full_tags:
- expected_data[full_tag] = {}
- for tag in attribs.keys():
- if tag not in full_tag:
- continue
- expected_data[full_tag]['attribs'] = attribs[tag]
- try:
- for tag in text.keys():
- if tag not in full_tag:
- continue
- expected_data[full_tag]['text'] = text[tag]
- except AttributeError:
- pass
-
- return expected_data
-
- def gen_full_tags(self):
- """Generate fully qualified element tags.
-
- This generates fully qualified element tags by prefixing the tag name
- with it's corresponding namespace that is enclosed in curly braces.
- This is so our expected tags will properly match ElementTree tags.
-
- The format for an Element tag is: {<namespace>}<tag name>
-
- Returns:
- List of full tag names.
- """
- full_tags = []
- namespaces = self.expected_config['namespaces']
-
- for tag in self.expected_config['tags']:
- try:
- prefix, tag = tag.split(':')
- namespace = '{' + namespaces[prefix] + '}'
- except ValueError:
- namespace = '{' + namespaces['default'] + '}'
- except KeyError as keyerr:
- msg = "Key {0} not found in namespace configuration for tag."
- raise Exception(msg.format(keyerr))
-
- full_tags.append("{0}{1}".format(namespace, tag))
-
- return full_tags
-
- def set_pcap_defaults(self, module_config):
- """Set default PcapListener config that isn't explicitly overridden.
-
- Arguments:
- module_config Dict of module configuration
- """
- pcap_defaults = {'device': 'lo', 'snaplen': 2000,
- 'bpf-filter': 'udp port 5061', 'debug-packets': False,
- 'buffer-size': 4194304, 'register-observer': True}
- for name, value in pcap_defaults.items():
- module_config[name] = module_config.get(name, value)
-
- def packet_handler(self, packet):
- """Handle incoming SIP packets and verify contents.
-
- Check to see if a packet is a NOTIFY packet with the expected body
- type. If so then verify the body in the packet against the expected
- results.
-
- Arguments:
- packet Incoming SIP Packet
- """
-
- LOGGER.debug('Received SIP packet')
-
- if 'NOTIFY' not in packet.request_line:
- LOGGER.debug('Ignoring packet, not a NOTIFY.')
- return
-
- if packet.body.packet_type != self.body_type.upper():
- msg = "Ignoring packet, NOTIFY does not contain a '{0}' body type."
- LOGGER.warn(msg.format(self.body_type.upper()))
- return
-
- self.notify_count += 1
-
- # Generate dict of expected results for this notify body and validate
- # the body using it.
- expected = self.gen_expected_data()
- validator = Validator(self.test_object, packet, expected)
- if not validator.verify_body():
- LOGGER.error('Body validation failed.')
- return
-
- info_msg = "Body #{0} validated successfully."
- LOGGER.info(info_msg.format(self.notify_count))
-
- if self.notify_count == self.expected_notifies:
- self.test_object.remove_fail_token(self.token)
- self.test_object.set_passed(True)
- self.test_object.stop_reactor()
-
-
-class Validator(object):
- """Validate a PIDF/XPIDF body against a set of expected data."""
- def __init__(self, test_object, packet, expected_data):
- """Constructor
-
- Arguments:
- test_object The test object for the running test.
- packet A packet containing a SIP NOTIFY with a pidf or xpidf body.
- """
- super(Validator, self).__init__()
- self.test_object = test_object
- self.packet = packet
- self.body_types = ('PIDF', 'XPIDF')
- self.expected_data = expected_data
-
- def verify_body(self):
- """Verify a PIDF/XPIDF body.
-
- This uses XML ElementTree to parse the PIDF/XPIDF body. It verifies
- that the XML is not malformed and verifies the elements match what is
- expected. This will fail the test and stop the reactor if the body type
- is not recognized or if the body could not be parsed.
-
- Returns:
- True if body type is supported, body is successfully parsed, and body
- matches what is expected. False otherwise.
- """
- if self.packet.body.packet_type not in self.body_types:
- msg = "Unrecognized body type of '{0}'"
- self.fail_test(msg.format(self.packet.body.packet_type))
- return False
-
- # Attempt to parse the body
- try:
- root = ET.fromstring(self.packet.body.xml)
- except Exception as ex:
- self.fail_test("Exception when parsing body XML: %s" % ex)
- return False
-
- # Verify top-level elements and their children
- for element in root.findall('.'):
- if not self.verify_element(element):
- return False
-
- return True
-
- def verify_element(self, element):
- """Verify the element matches what is expected.
-
- This verifies the tag, attributes, text, and extra text of an element.
- If child elements are found this will call back into itself to verify
- them.
-
- Arguments:
- element Element object.
-
- Returns:
- True if the element matches what is expected. False otherwise.
- """
- # Verify tag, attributes, text, and extra text of the element.
- if not self.verify_tag(element):
- return False
- if not self.verify_attributes(element):
- return False
- if not self.verify_text(element):
- return False
- if not self.verify_extra_text(element):
- return False
-
- # Find child elements
- children = element.findall('*')
- if not children:
- return True
-
- # Verify child elements.
- for child in children:
- if not self.verify_element(child):
- return False
-
- return True
-
- def verify_tag(self, element):
- """Verify element tag is expected.
-
- This will fail the test and stop the reactor if the element tag is not
- expected.
-
- Arguments:
- element Element object.
-
- Returns:
- True if element tag is in expected tags. False otherwise.
- """
- LOGGER.debug("Checking tag: '{0}'".format(element.tag))
- if element.tag in self.expected_data.keys():
- return True
-
- self.fail_test("Unexpected tag: '{0}'.".format(element.tag))
-
- return False
-
- def verify_attributes(self, element):
- """Verify element attributes.
-
- Ensure the element contains only the attributes that are expected and
- the attribute values match what are expected. This will fail the test
- and stop the reactor if conditions are not met.
-
- Arguments:
- element Element object.
-
- Returns:
- True if attributes not expected and none found, expected attribute
- values match found attribute values. Otherwise False.
- """
- expected = self.expected_data[element.tag].get('attribs')
- LOGGER.debug("Checking attributes.")
-
- # If attributes are not expected and none are in the element then
- # there's nothing more to do.
- if not element.keys() and expected is None:
- msg = "Attributes not expected and none found."
- LOGGER.debug(msg.format())
- return True
-
- # Check if we expect attributes but element doesn't have any.
- if not element.keys() and expected is not None:
- msg = "Expected attributes not found: {0}"
- self.fail_test(msg.format(', '.join(expected.keys())))
- return False
-
- # Check if we don't expect attributes but element has some.
- if element.keys() and expected is None:
- msg = "Unexpected attributes found: {0}"
- self.fail_test(msg.format(', '.join(element.keys())))
- return False
-
- # Ensure all expected attributes exist in the element.
- not_found = [ex for ex in expected.keys() if ex not in element.keys()]
- if not_found:
- msg = "Expected attributes not found in element: {0}"
- self.fail_test(msg.format(', '.join(not_found)))
- return False
-
- for xml_attrib in element.keys():
- LOGGER.debug("Checking attribute: '{0}'".format(xml_attrib))
- # Check if we don't expect attributes this particular attribute for
- # this element.
- if expected.get(xml_attrib) is None:
- msg = "Unexpected attribute found: '{0}'"
- self.fail_test(msg.format(xml_attrib))
- return False
-
- if not re.match(expected[xml_attrib], element.get(xml_attrib)):
- msg = "Attribute '{0}' value '{1}' does not match '{2}'"
- self.fail_test(msg.format(xml_attrib, element.get(xml_attrib),
- expected[xml_attrib]))
- return False
-
- return True
-
- def verify_text(self, element):
- """Verify element text.
-
- Ensure the element text matches the expected text. This will fail the
- test and stop the reactor if conditions are not met.
-
- Arguments:
- element Element object.
-
- Returns:
- True if element text matches expected text. Otherwise False.
- """
- expected = self.expected_data[element.tag].get('text', '')
- element_text = element.text
-
- # Set to empty string if None so we can strip it and try to match it.
- if element_text is None:
- element_text = ''
- element_text = element_text.strip()
-
- LOGGER.debug("Checking text: '{0}'".format(element_text))
- # Check if we don't expect any text or we don't expect this particular
- # text for this element.
- if element_text and not expected:
- msg = "Unexpected text found: '{0}'"
- self.fail_test(msg.format(element_text))
- return False
-
- # Check if we expect text but element doesn't have any.
- if not element_text and expected:
- msg = "Expected text not found: '{0}'"
- self.fail_test(msg.format(expected))
- return False
-
- if not re.match(expected, element_text):
- msg = "Element text '{0}' does not match '{1}'"
- self.fail_test(msg.format(element_text, expected))
- return False
-
- return True
-
- def verify_extra_text(self, element):
- """Verify extra text is not present in element.
-
- Ensure there is no extra text in the element. This will fail the test
- and stop the reactor if extra text is found.
-
- Arguments:
- element Element object.
-
- Returns:
- True if extra text was not found or only whitespace was found.
- Otherwise False.
- """
- LOGGER.debug("Checking for extra text.")
- if element.tail is None:
- return True
-
- # Ignore any whitespace
- extra_text = str(element.tail)
- extra_text = extra_text.strip()
- if not extra_text:
- return True
-
- msg = "Unexpected extra text found on element '%s': '%s'"
- self.fail_test(msg.format(element.tag, extra_text))
-
- return False
-
- def fail_test(self, message):
- """Mark the test as failed and stop the reactor
-
- Arguments:
- message Reason for the test failure
- """
- LOGGER.error(message)
- self.test_object.set_passed(False)
- self.test_object.stop_reactor()
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/tests.yaml b/tests/channels/pjsip/subscriptions/presence/verify_bodies/tests.yaml
deleted file mode 100644
index 2345db0..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/tests.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enter tests here in the order they should be considered for execution:
-tests:
- - test: 'verify_pidf'
- - test: 'verify_xpidf'
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/configs/ast1/extensions.conf b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/configs/ast1/extensions.conf
deleted file mode 100644
index b8dcca3..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[default]
-exten => bob,hint,Custom:bob
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/configs/ast1/pjsip.conf
deleted file mode 100644
index 2e71a90..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[global]
-type=global
-debug=no
-
-[local-transport]
-type=transport
-bind = 127.0.0.1
-
-[alice]
-type=endpoint
-context=default
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/sipp/subscribe.xml
deleted file mode 100644
index 8c335b8..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/sipp/subscribe.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Subscribe">
- <send retrans="500">
- <![CDATA[
-
- SUBSCRIBE sip:bob@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "alice" <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: <sip:bob@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 SUBSCRIBE
- Contact: "alice" <sip:alice@[local_ip]:[local_port]>
- Expires: 600
- Max-Forwards: 70
- Event: presence
- Supported: replaces, 100rel, timer, norefersub
- Accept: application/pidf+xml
- Allow-Events: presence, message-summary, refer
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="200" rtd="true" />
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
-</scenario>
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml
deleted file mode 100644
index 1c81712..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_pidf/test-config.yaml
+++ /dev/null
@@ -1,261 +0,0 @@
-testinfo:
- summary: 'Ensure NOTIFY bodies for pidf+xml subscriptions are correct.'
- description: |
- 'A SIPp instance subscribes to "bob" using pidf+xml. Upon the
- first TestEvent indicating that there is an active subscription, the
- state of "Custom:bob" is changed. Each AMI event indicating that a
- state change occurred triggers another state change until all states
- have been set. The SIPp scenario expects to receive a NOTIFY message
- for each state and simply responds to them.
-
- A test module is used to verify each NOTIFY body that it finds while
- listening for SIP packets. The module parses the body and verifies the
- tags, attributes, and text for each element using the specified
- configuration. If the body is not able to be parsed(IE. malformed XML)
- or any component of the body does not match what is expected, the test
- fails.'
-
-properties:
- minversion: ['13.19.0', '15.2.0']
- dependencies:
- - buildoption: 'TEST_FRAMEWORK'
- - sipp :
- version : 'v3.0'
- - python: 'twisted'
- - python: 'starpy'
- - python: 'yappcap'
- - asterisk: 'res_pjsip'
- - asterisk: 'res_pjsip_exten_state'
- - asterisk: 'res_pjsip_pidf_body_generator'
- tags:
- - pjsip
-
-test-modules:
- add-relative-to-search-path: ['..']
- test-object:
- config-section: sipp-config
- typename: 'sipp.SIPpTestCase'
- modules:
- -
- config-section: test-config
- typename: 'presence.BodyCheck'
- -
- config-section: ami-config
- typename: 'pluggable_modules.EventActionModule'
-
-sipp-config:
- reactor-timeout: 30
- fail-on-any: True
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'subscribe.xml', '-p': '5061'},
- 'ordered-args': ['-timeout_error'] }
-
-test-config:
- # Expected number of NOTIFY messages with the expected body type.
- expected_notifies: '7'
- # Expected body type.
- expected_body_type: 'pidf'
- # Expected body.
- expected_body:
- # Expected namespaces for PIDF bodies.
- namespaces:
- default: 'urn:ietf:params:xml:ns:pidf'
- pp: 'urn:ietf:params:xml:ns:pidf:data-model'
- ep: 'urn:ietf:params:xml:ns:pidf:rpid'
- # All expected element tag names for PIDF bodies.
- tags:
- ['presence', 'note', 'tuple', 'status', 'basic', 'contact',
- 'pp:person', 'ep:activities', 'ep:on-the-phone']
- # Regex patterns for element attributes for each body in order. Some
- # attribute values of elements differ for each body depending on the
- # body type and state changes. Therefore we list them in the order that
- # matches the state changes. For this test the attribute values should
- # be the same for all bodies.
- attributes:
- -
- presence:
- entity: '^sip:bob at 127.0.0.1(:5060)?$'
- tuple:
- id: '^bob$'
- contact:
- priority: '^1$'
- -
- presence:
- entity: '^sip:bob at 127.0.0.1(:5060)?$'
- tuple:
- id: '^bob$'
- contact:
- priority: '^1$'
- -
- presence:
- entity: '^sip:bob at 127.0.0.1(:5060)?$'
- tuple:
- id: '^bob$'
- contact:
- priority: '^1$'
- -
- presence:
- entity: '^sip:bob at 127.0.0.1(:5060)?$'
- tuple:
- id: '^bob$'
- contact:
- priority: '^1$'
- -
- presence:
- entity: '^sip:bob at 127.0.0.1(:5060)?$'
- tuple:
- id: '^bob$'
- contact:
- priority: '^1$'
- -
- presence:
- entity: '^sip:bob at 127.0.0.1(:5060)?$'
- tuple:
- id: '^bob$'
- contact:
- priority: '^1$'
- -
- presence:
- entity: '^sip:bob at 127.0.0.1(:5060)?$'
- tuple:
- id: '^bob$'
- contact:
- priority: '^1$'
- # Regex patterns for element text for each body in order. Some text
- # of elements differ for each body depending on the body type and state
- # changes. Therefore we list them in the order that matches the state
- # changes.
- text:
- -
- note: 'Ready'
- basic: 'open'
- contact: '^sip:alice at 127.0.0.1(:5060)?$'
- -
- note: 'Ringing'
- basic: 'open'
- contact: '^sip:alice at 127.0.0.1(:5060)?$'
- -
- note: 'On the phone'
- basic: 'open'
- contact: '^sip:alice at 127.0.0.1(:5060)?$'
- -
- note: 'On hold'
- basic: 'open'
- contact: '^sip:alice at 127.0.0.1(:5060)?$'
- -
- note: 'On the phone'
- basic: 'open'
- contact: '^sip:alice at 127.0.0.1(:5060)?$'
- -
- note: 'Unavailable'
- basic: 'closed'
- contact: '^sip:alice at 127.0.0.1(:5060)?$'
- -
- note: 'Ready'
- basic: 'open'
- contact: '^sip:alice at 127.0.0.1(:5060)?$'
-
-ami-config:
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'TestEvent'
- State: 'SUBSCRIPTION_STATE_SET'
- StateText: 'ACTIVE'
- Endpoint: 'alice'
- count: '>1'
- trigger-on-count: True
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'RINGING'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Ringing'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'INUSE'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'InUse'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'ONHOLD'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Hold'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'BUSY'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Busy'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'UNAVAILABLE'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Unavailable'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'NOT_INUSE'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Idle'
- count: '1'
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/configs/ast1/extensions.conf b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/configs/ast1/extensions.conf
deleted file mode 100644
index b8dcca3..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[default]
-exten => bob,hint,Custom:bob
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/configs/ast1/pjsip.conf
deleted file mode 100644
index 2e71a90..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[global]
-type=global
-debug=no
-
-[local-transport]
-type=transport
-bind = 127.0.0.1
-
-[alice]
-type=endpoint
-context=default
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/sipp/subscribe.xml b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/sipp/subscribe.xml
deleted file mode 100644
index d359595..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/sipp/subscribe.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Subscribe">
- <send retrans="500">
- <![CDATA[
-
- SUBSCRIBE sip:bob@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "alice" <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: <sip:bob@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 SUBSCRIBE
- Contact: "alice" <sip:alice@[local_ip]:[local_port]>
- Expires: 600
- Max-Forwards: 70
- Event: presence
- Supported: replaces, 100rel, timer, norefersub
- Accept: application/xpidf+xml
- Allow-Events: presence, message-summary, refer
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="200" rtd="true" />
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="NOTIFY" crlf="true"/>
-
- <send>
- <![CDATA[
-
- SIP/2.0 200 OK
- [last_Via:]
- [last_From:]
- [last_To:]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
-</scenario>
diff --git a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml b/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml
deleted file mode 100644
index a7cc47f..0000000
--- a/tests/channels/pjsip/subscriptions/presence/verify_bodies/verify_xpidf/test-config.yaml
+++ /dev/null
@@ -1,265 +0,0 @@
-testinfo:
- summary: 'Ensure NOTIFY bodies for xpidf+xml subscriptions are correct.'
- description: |
- 'A SIPp instance subscribes to "bob" using xpidf+xml. Upon the
- first TestEvent indicating that there is an active subscription, the
- state of "Custom:bob" is changed. Each AMI event indicating that a
- state change occurred triggers another state change until all states
- have been set. The SIPp scenario expects to receive a NOTIFY message
- for each state and simply responds to them.
-
- A test module is used to verify each NOTIFY body that it finds while
- listening for SIP packets. The module parses the body and verifies the
- tags, attributes, and text for each element using the specified
- configuration. If the body is not able to be parsed(IE. malformed XML)
- or any component of the body does not match what is expected, the test
- fails.'
-
-properties:
- minversion: ['13.19.0', '15.2.0']
- dependencies:
- - buildoption: 'TEST_FRAMEWORK'
- - sipp :
- version : 'v3.0'
- - python: 'twisted'
- - python: 'starpy'
- - python: 'yappcap'
- - asterisk: 'res_pjsip'
- - asterisk: 'res_pjsip_exten_state'
- - asterisk: 'res_pjsip_xpidf_body_generator'
- tags:
- - pjsip
-
-test-modules:
- add-relative-to-search-path: ['..']
- test-object:
- config-section: sipp-config
- typename: 'sipp.SIPpTestCase'
- modules:
- -
- config-section: test-config
- typename: 'presence.BodyCheck'
- -
- config-section: ami-config
- typename: 'pluggable_modules.EventActionModule'
-
-sipp-config:
- reactor-timeout: 30
- fail-on-any: True
- test-iterations:
- -
- scenarios:
- - { 'key-args': {'scenario': 'subscribe.xml', '-p': '5061'},
- 'ordered-args': ['-timeout_error'] }
-
-test-config:
- # Expected number of NOTIFY messages with the expected body type.
- expected_notifies: '7'
- # Expected body type.
- expected_body_type: 'xpidf'
- # Expected body.
- expected_body:
- # All expected element tag names for XPIDF bodies.
- tags:
- ['presence', 'presentity', 'atom', 'address', 'status',
- 'msnsubstatus']
- # Regex patterns for element attributes for each body in order. Some
- # attribute values of elements differ for each body depending on the
- # body type and state changes. Therefore we list them in the order that
- # matches the state changes. For this test some attribute values will
- # differ between all bodies.
- attributes:
- -
- presentity:
- uri: '^sip:bob at 127.0.0.1(:5060)?;method=SUBSCRIBE$'
- atom:
- atomid: '^[a-z0-9-]+$'
- id: '^bob$'
- address:
- uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
- priority: '^0\.80000$'
- status:
- status: '^open$'
- msnsubstatus:
- substatus: '^online$'
- -
- presentity:
- uri: '^sip:bob at 127.0.0.1(:5060)?;method=SUBSCRIBE$'
- atom:
- atomid: '^[a-z0-9-]+$'
- id: '^bob$'
- address:
- uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
- priority: '^0\.80000$'
- status:
- status: '^inuse$'
- msnsubstatus:
- substatus: '^onthephone$'
- -
- presentity:
- uri: '^sip:bob at 127.0.0.1(:5060)?;method=SUBSCRIBE$'
- atom:
- atomid: '^[a-z0-9-]+$'
- id: '^bob$'
- address:
- uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
- priority: '^0\.80000$'
- status:
- status: '^inuse$'
- msnsubstatus:
- substatus: '^onthephone$'
- -
- presentity:
- uri: '^sip:bob at 127.0.0.1(:5060)?;method=SUBSCRIBE$'
- atom:
- atomid: '^[a-z0-9-]+$'
- id: '^bob$'
- address:
- uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
- priority: '^0\.80000$'
- status:
- status: '^inuse$'
- msnsubstatus:
- substatus: '^onthephone$'
- -
- presentity:
- uri: '^sip:bob at 127.0.0.1(:5060)?;method=SUBSCRIBE$'
- atom:
- atomid: '^[a-z0-9-]+$'
- id: '^bob$'
- address:
- uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
- priority: '^0\.80000$'
- status:
- status: '^inuse$'
- msnsubstatus:
- substatus: '^onthephone$'
- -
- presentity:
- uri: '^sip:bob at 127.0.0.1(:5060)?;method=SUBSCRIBE$'
- atom:
- atomid: '^[a-z0-9-]+$'
- id: '^bob$'
- address:
- uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
- priority: '^0\.80000$'
- status:
- status: '^closed$'
- msnsubstatus:
- substatus: '^offline$'
- -
- presentity:
- uri: '^sip:bob at 127.0.0.1(:5060)?;method=SUBSCRIBE$'
- atom:
- atomid: '^[a-z0-9-]+$'
- id: '^bob$'
- address:
- uri: '^sip:alice at 127.0.0.1(:5060)?;user=ip$'
- priority: '^0\.80000$'
- status:
- status: '^open$'
- msnsubstatus:
- substatus: '^online$'
-
-ami-config:
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'TestEvent'
- State: 'SUBSCRIPTION_STATE_SET'
- StateText: 'ACTIVE'
- Endpoint: 'alice'
- count: '>1'
- trigger-on-count: True
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'RINGING'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Ringing'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'INUSE'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'InUse'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'ONHOLD'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Hold'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'BUSY'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Busy'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'UNAVAILABLE'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Unavailable'
- count: '1'
- ami-actions:
- action:
- action: 'SetVar'
- variable: 'DEVICE_STATE(Custom:bob)'
- value: 'NOT_INUSE'
- -
- ami-events:
- id: '0'
- conditions:
- match:
- Event: 'ExtensionStatus'
- Exten: 'bob'
- Hint: 'Custom:bob'
- StatusText: 'Idle'
- count: '1'
diff --git a/tests/channels/pjsip/subscriptions/tests.yaml b/tests/channels/pjsip/subscriptions/tests.yaml
index 5377eb0..deebc2a 100644
--- a/tests/channels/pjsip/subscriptions/tests.yaml
+++ b/tests/channels/pjsip/subscriptions/tests.yaml
@@ -11,4 +11,3 @@
- test: 'subscribe_context'
- test: 'unallowed'
- test: 'unknown_event_package'
- - test: 'large_number_of_accept_headers'
--
To view, visit https://gerrit.asterisk.org/8488
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: 14
Gerrit-MessageType: merged
Gerrit-Change-Id: I975f02422c8b4fe70d270be862e2d76d6d95ff31
Gerrit-Change-Number: 8488
Gerrit-PatchSet: 2
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180314/1a5178bc/attachment-0001.html>
More information about the asterisk-code-review
mailing list