<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/testsuite/+/15508">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">H.263+: Remove attribute pass-through tests.<br><br>General attribute pass-through is tested via H.264 already.<br>Therefore, testing H.263+ again would just be a duplicate test.<br>Finally, the order of the attributes changed in the H.263+ module.<br><br>Change-Id: Ia45e3f4a003723951c5963dd6a77885447749474<br>---<br>M tests/channels/SIP/SDP_attribute_passthrough/run-test<br>D tests/channels/SIP/SDP_attribute_passthrough/sipp/phone_A_h263_13.xml<br>D tests/channels/SIP/SDP_attribute_passthrough/sipp/phone_B_h263_13.xml<br>M tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/extensions.conf<br>M tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/pjsip.conf<br>M tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/run-test<br>D tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/sipp/phone_A_h263.xml<br>D tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/sipp/phone_B_h263.xml<br>8 files changed, 2 insertions(+), 392 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/channels/SIP/SDP_attribute_passthrough/run-test b/tests/channels/SIP/SDP_attribute_passthrough/run-test</span><br><span>index dfffe2b..5d98f0a 100755</span><br><span>--- a/tests/channels/SIP/SDP_attribute_passthrough/run-test</span><br><span>+++ b/tests/channels/SIP/SDP_attribute_passthrough/run-test</span><br><span>@@ -27,10 +27,8 @@</span><br><span> self.create_asterisk()</span><br><span> self.sipp_phone_a_scenarios = [{'scenario':'phone_A_speex.xml','-i':'127.0.0.2','-p':'5065'},]</span><br><span> self.sipp_phone_b_scenarios = [{'scenario':'phone_B_speex.xml','-i':'127.0.0.3','-p':'5066'},]</span><br><span style="color: hsl(0, 100%, 40%);">- self.sipp_phone_a_scenarios.extend([{'scenario':'phone_A_h263_13.xml','-i':'127.0.0.2','-p':'5061'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'scenario':'phone_A_h264_13.xml','-i':'127.0.0.2','-p':'5062'},])</span><br><span style="color: hsl(0, 100%, 40%);">- self.sipp_phone_b_scenarios.extend([{'scenario':'phone_B_h263_13.xml','-i':'127.0.0.3','-p':'5063'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'scenario':'phone_B_h264_13.xml','-i':'127.0.0.3','-p':'5064'},])</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sipp_phone_a_scenarios.extend([{'scenario':'phone_A_h264_13.xml','-i':'127.0.0.2','-p':'5062'},])</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sipp_phone_b_scenarios.extend([{'scenario':'phone_B_h264_13.xml','-i':'127.0.0.3','-p':'5064'},])</span><br><span> </span><br><span> self.passed = True</span><br><span> self.__test_counter = 0</span><br><span>diff --git a/tests/channels/SIP/SDP_attribute_passthrough/sipp/phone_A_h263_13.xml b/tests/channels/SIP/SDP_attribute_passthrough/sipp/phone_A_h263_13.xml</span><br><span>deleted file mode 100644</span><br><span>index a8c0521..0000000</span><br><span>--- a/tests/channels/SIP/SDP_attribute_passthrough/sipp/phone_A_h263_13.xml</span><br><span>+++ /dev/null</span><br><span>@@ -1,97 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(0, 100%, 40%);">-<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<scenario name="Channel Test"></span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- INVITE sip:test-h263@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: test1 <sip:phoneA@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: test <sip:test@[remote_ip]:[remote_port]></span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 1 INVITE</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:test@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: Channel Param Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Type: application/sdp</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: [len]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- v=0</span><br><span style="color: hsl(0, 100%, 40%);">- o=phoneA 53655765 2353687637 IN IP[local_ip_type] [local_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- s=-</span><br><span style="color: hsl(0, 100%, 40%);">- c=IN IP[media_ip_type] [media_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- t=0 0</span><br><span style="color: hsl(0, 100%, 40%);">- m=audio 6000 RTP/AVP 0</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:0 PCMU/8000</span><br><span style="color: hsl(0, 100%, 40%);">- m=video 6002 RTP/AVP 34</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:34 H263/90000</span><br><span style="color: hsl(0, 100%, 40%);">- a=fmtp:34 SQCIF=1;QCIF=1;CIF=1;CIF4=1;CIF16=1;F=1;I=1;J=1;T=1;K=1;N=1;PAR=255:255;BPP=65535;HRD=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="100"</span><br><span style="color: hsl(0, 100%, 40%);">- optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="180" optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="183" optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="200" rtd="true"></span><br><span style="color: hsl(0, 100%, 40%);">- <action></span><br><span style="color: hsl(0, 100%, 40%);">- <ereg regexp="m=video [0-9]{1,5} RTP/AVP( [0-9]{1,3})+..*a=rtpmap:34 H263/90000.*a=fmtp:34 SQCIF=1;QCIF=1;CIF=1;CIF4=1;CIF16=1;VGA=0;F=1;I=1;J=1;T=1;K=1;N=1;BPP=65535;HRD=1;PAR=255:255"</span><br><span style="color: hsl(0, 100%, 40%);">- search_in="body" check_it="true" assign_to="1"/></span><br><span style="color: hsl(0, 100%, 40%);">- <strcmp assign_to="1" variable="1" value=""/></span><br><span style="color: hsl(0, 100%, 40%);">- </action></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ACK sip:test-h263@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: test1 <sip:phoneA@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]</span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 1 ACK</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:kartoffelsalat@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- BYE sip:test-h263@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: test1 <sip:phoneA@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]</span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 2 BYE</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:kartoffelsalat@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="200" crlf="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- definition of the response time repartition table (unit is ms) --></span><br><span style="color: hsl(0, 100%, 40%);">- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- definition of the call length repartition table (unit is ms) --></span><br><span style="color: hsl(0, 100%, 40%);">- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</scenario></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/channels/SIP/SDP_attribute_passthrough/sipp/phone_B_h263_13.xml b/tests/channels/SIP/SDP_attribute_passthrough/sipp/phone_B_h263_13.xml</span><br><span>deleted file mode 100644</span><br><span>index a132490..0000000</span><br><span>--- a/tests/channels/SIP/SDP_attribute_passthrough/sipp/phone_B_h263_13.xml</span><br><span>+++ /dev/null</span><br><span>@@ -1,89 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(0, 100%, 40%);">-<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<scenario name="Phone B INVITE with H.263 and answer with H.263"></span><br><span style="color: hsl(0, 100%, 40%);">- <Global variables="global_call_id"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv request="INVITE" crlf="true"></span><br><span style="color: hsl(0, 100%, 40%);">- <action></span><br><span style="color: hsl(0, 100%, 40%);">- <ereg regexp=".*"</span><br><span style="color: hsl(0, 100%, 40%);">- header="Call-ID:"</span><br><span style="color: hsl(0, 100%, 40%);">- search_in="hdr"</span><br><span style="color: hsl(0, 100%, 40%);">- check_it="true"</span><br><span style="color: hsl(0, 100%, 40%);">- assign_to="global_call_id"/></span><br><span style="color: hsl(0, 100%, 40%);">- <ereg regexp="m=video [0-9]{1,5} RTP/AVP( [0-9]{1,3})+..*a=rtpmap:34 H263/90000.*a=fmtp:34 SQCIF=1;QCIF=1;CIF=1;CIF4=1;CIF16=1;VGA=0;F=1;I=1;J=1;T=1;K=1;N=1;BPP=65535;HRD=1;PAR=255:255"</span><br><span style="color: hsl(0, 100%, 40%);">- search_in="body" check_it="true" assign_to="1"/></span><br><span style="color: hsl(0, 100%, 40%);">- <strcmp assign_to="1" variable="1" value=""/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- </action></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">- SIP/2.0 100 Trying</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_To:];tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: PolycomSoundPointIP-SPIP_430-UA/3.2.3.1734</span><br><span style="color: hsl(0, 100%, 40%);">- Accept-Language: en</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <pause milliseconds="200"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">- SIP/2.0 200 OK</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_To:];tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">- Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER</span><br><span style="color: hsl(0, 100%, 40%);">- Supported: 100rel,replaces</span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: PolycomSoundPointIP-SPIP_430-UA/3.2.3.1734</span><br><span style="color: hsl(0, 100%, 40%);">- Accept-Language: en</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Type: application/sdp</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: [len]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- v=0</span><br><span style="color: hsl(0, 100%, 40%);">- o=guest3 53655765 2353687637 IN IP[local_ip_type] [local_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- s=-</span><br><span style="color: hsl(0, 100%, 40%);">- c=IN IP[media_ip_type] [media_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- t=0 0</span><br><span style="color: hsl(0, 100%, 40%);">- m=video 6002 RTP/AVP 34</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:34 H263/90000</span><br><span style="color: hsl(0, 100%, 40%);">- a=fmtp:34 SQCIF=1;QCIF=1;CIF=1;CIF4=1;CIF16=1;F=1;I=1;J=1;T=1;K=1;N=1;PAR=255:255;BPP=65535;HRD=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- RECV ACK --></span><br><span style="color: hsl(0, 100%, 40%);">- <recv request="ACK"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv request="BYE"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">- SIP/2.0 200 OK</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_To:];tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">- Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER</span><br><span style="color: hsl(0, 100%, 40%);">- Supported: 100rel,replaces</span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: PolycomSoundPointIP-SPIP_430-UA/3.2.3.1734</span><br><span style="color: hsl(0, 100%, 40%);">- Accept-Language: en</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Type: application/sdp</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</scenario></span><br><span>diff --git a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/extensions.conf b/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/extensions.conf</span><br><span>index 7c5e76c..6f2995f 100644</span><br><span>--- a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/extensions.conf</span><br><span>+++ b/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/extensions.conf</span><br><span>@@ -1,4 +1,3 @@</span><br><span> [default]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => test-h263,1,Dial(PJSIP/phoneB-h263)</span><br><span> exten => test-h264,1,Dial(PJSIP/phoneB-h264)</span><br><span> exten => test-speex,1,Dial(PJSIP/phoneB-speex)</span><br><span>diff --git a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/pjsip.conf b/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/pjsip.conf</span><br><span>index 5598d0d..9946d70 100644</span><br><span>--- a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/pjsip.conf</span><br><span>+++ b/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/configs/ast1/pjsip.conf</span><br><span>@@ -21,20 +21,9 @@</span><br><span> [phoneA](endpoint-template)</span><br><span> disallow=all</span><br><span> allow=ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-allow=h263</span><br><span> allow=h264</span><br><span> allow=speex</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-[phoneB-h263](endpoint-template)</span><br><span style="color: hsl(0, 100%, 40%);">-aors=phoneB-h263</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-allow=h263</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[phoneB-h263]</span><br><span style="color: hsl(0, 100%, 40%);">-type=aor</span><br><span style="color: hsl(0, 100%, 40%);">-contact=sip:127.0.0.3:5063</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> [phoneB-h264](endpoint-template)</span><br><span> aors=phoneB-h264</span><br><span> disallow=all</span><br><span>diff --git a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/run-test b/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/run-test</span><br><span>index 16f0e37..05ddf4d 100755</span><br><span>--- a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/run-test</span><br><span>+++ b/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/run-test</span><br><span>@@ -26,10 +26,8 @@</span><br><span> TestCase.__init__(self)</span><br><span> self.create_asterisk(test_config={'memcheck-delay-stop': 7})</span><br><span> self.sipp_phone_a_scenarios = [{'scenario':'phone_A_speex.xml','-i':'127.0.0.2','-p':'5065'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'scenario':'phone_A_h263.xml','-i':'127.0.0.2','-p':'5061'},</span><br><span> {'scenario':'phone_A_h264.xml','-i':'127.0.0.2','-p':'5062'},]</span><br><span> self.sipp_phone_b_scenarios = [{'scenario':'phone_B_speex.xml','-i':'127.0.0.3','-p':'5066'},</span><br><span style="color: hsl(0, 100%, 40%);">- {'scenario':'phone_B_h263.xml','-i':'127.0.0.3','-p':'5063'},</span><br><span> {'scenario':'phone_B_h264.xml','-i':'127.0.0.3','-p':'5064'},]</span><br><span> </span><br><span> self.passed = True</span><br><span>diff --git a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/sipp/phone_A_h263.xml b/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/sipp/phone_A_h263.xml</span><br><span>deleted file mode 100644</span><br><span>index a8c0521..0000000</span><br><span>--- a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/sipp/phone_A_h263.xml</span><br><span>+++ /dev/null</span><br><span>@@ -1,97 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(0, 100%, 40%);">-<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<scenario name="Channel Test"></span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- INVITE sip:test-h263@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: test1 <sip:phoneA@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: test <sip:test@[remote_ip]:[remote_port]></span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 1 INVITE</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:test@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: Channel Param Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Type: application/sdp</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: [len]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- v=0</span><br><span style="color: hsl(0, 100%, 40%);">- o=phoneA 53655765 2353687637 IN IP[local_ip_type] [local_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- s=-</span><br><span style="color: hsl(0, 100%, 40%);">- c=IN IP[media_ip_type] [media_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- t=0 0</span><br><span style="color: hsl(0, 100%, 40%);">- m=audio 6000 RTP/AVP 0</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:0 PCMU/8000</span><br><span style="color: hsl(0, 100%, 40%);">- m=video 6002 RTP/AVP 34</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:34 H263/90000</span><br><span style="color: hsl(0, 100%, 40%);">- a=fmtp:34 SQCIF=1;QCIF=1;CIF=1;CIF4=1;CIF16=1;F=1;I=1;J=1;T=1;K=1;N=1;PAR=255:255;BPP=65535;HRD=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="100"</span><br><span style="color: hsl(0, 100%, 40%);">- optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="180" optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="183" optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="200" rtd="true"></span><br><span style="color: hsl(0, 100%, 40%);">- <action></span><br><span style="color: hsl(0, 100%, 40%);">- <ereg regexp="m=video [0-9]{1,5} RTP/AVP( [0-9]{1,3})+..*a=rtpmap:34 H263/90000.*a=fmtp:34 SQCIF=1;QCIF=1;CIF=1;CIF4=1;CIF16=1;VGA=0;F=1;I=1;J=1;T=1;K=1;N=1;BPP=65535;HRD=1;PAR=255:255"</span><br><span style="color: hsl(0, 100%, 40%);">- search_in="body" check_it="true" assign_to="1"/></span><br><span style="color: hsl(0, 100%, 40%);">- <strcmp assign_to="1" variable="1" value=""/></span><br><span style="color: hsl(0, 100%, 40%);">- </action></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ACK sip:test-h263@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: test1 <sip:phoneA@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]</span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 1 ACK</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:kartoffelsalat@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- BYE sip:test-h263@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: test1 <sip:phoneA@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]</span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 2 BYE</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:kartoffelsalat@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="200" crlf="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- definition of the response time repartition table (unit is ms) --></span><br><span style="color: hsl(0, 100%, 40%);">- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- definition of the call length repartition table (unit is ms) --></span><br><span style="color: hsl(0, 100%, 40%);">- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</scenario></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/sipp/phone_B_h263.xml b/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/sipp/phone_B_h263.xml</span><br><span>deleted file mode 100644</span><br><span>index 311d1f7..0000000</span><br><span>--- a/tests/channels/pjsip/sdp_offer_answer/attribute_passthrough/speex_h263_h264/sipp/phone_B_h263.xml</span><br><span>+++ /dev/null</span><br><span>@@ -1,91 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(0, 100%, 40%);">-<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<scenario name="Phone B INVITE with H.263 and answer with H.263"></span><br><span style="color: hsl(0, 100%, 40%);">- <Global variables="global_call_id"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv request="INVITE" crlf="true"></span><br><span style="color: hsl(0, 100%, 40%);">- <action></span><br><span style="color: hsl(0, 100%, 40%);">- <ereg regexp=".*"</span><br><span style="color: hsl(0, 100%, 40%);">- header="Call-ID:"</span><br><span style="color: hsl(0, 100%, 40%);">- search_in="hdr"</span><br><span style="color: hsl(0, 100%, 40%);">- check_it="true"</span><br><span style="color: hsl(0, 100%, 40%);">- assign_to="global_call_id"/></span><br><span style="color: hsl(0, 100%, 40%);">- <ereg regexp="m=video [0-9]{1,5} RTP/AVP( [0-9]{1,3})+..*a=rtpmap:34 H263/90000.*a=fmtp:34 SQCIF=1;QCIF=1;CIF=1;CIF4=1;CIF16=1;VGA=0;F=1;I=1;J=1;T=1;K=1;N=1;BPP=65535;HRD=1;PAR=255:255"</span><br><span style="color: hsl(0, 100%, 40%);">- search_in="body" check_it="true" assign_to="1"/></span><br><span style="color: hsl(0, 100%, 40%);">- <strcmp assign_to="1" variable="1" value=""/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- </action></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">- SIP/2.0 100 Trying</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_To:];tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: PolycomSoundPointIP-SPIP_430-UA/3.2.3.1734</span><br><span style="color: hsl(0, 100%, 40%);">- Accept-Language: en</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <pause milliseconds="200"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">- SIP/2.0 200 OK</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_To:];tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">- Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER</span><br><span style="color: hsl(0, 100%, 40%);">- Supported: 100rel,replaces</span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: PolycomSoundPointIP-SPIP_430-UA/3.2.3.1734</span><br><span style="color: hsl(0, 100%, 40%);">- Accept-Language: en</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Type: application/sdp</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: [len]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- v=0</span><br><span style="color: hsl(0, 100%, 40%);">- o=guest3 53655765 2353687637 IN IP[local_ip_type] [local_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- s=-</span><br><span style="color: hsl(0, 100%, 40%);">- c=IN IP[media_ip_type] [media_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- t=0 0</span><br><span style="color: hsl(0, 100%, 40%);">- m=audio 6000 RTP/AVP 0</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:0 PCMU/8000</span><br><span style="color: hsl(0, 100%, 40%);">- m=video 6002 RTP/AVP 34</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:34 H263/90000</span><br><span style="color: hsl(0, 100%, 40%);">- a=fmtp:34 SQCIF=1;QCIF=1;CIF=1;CIF4=1;CIF16=1;F=1;I=1;J=1;T=1;K=1;N=1;PAR=255:255;BPP=65535;HRD=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- RECV ACK --></span><br><span style="color: hsl(0, 100%, 40%);">- <recv request="ACK"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv request="BYE"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">- SIP/2.0 200 OK</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_To:];tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">- Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER</span><br><span style="color: hsl(0, 100%, 40%);">- Supported: 100rel,replaces</span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: PolycomSoundPointIP-SPIP_430-UA/3.2.3.1734</span><br><span style="color: hsl(0, 100%, 40%);">- Accept-Language: en</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Type: application/sdp</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</scenario></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/testsuite/+/15508">change 15508</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/testsuite/+/15508"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: Ia45e3f4a003723951c5963dd6a77885447749474 </div>
<div style="display:none"> Gerrit-Change-Number: 15508 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>