<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7897">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only: Remove test.<br><br>The requirement that "ip" must be in the endpoint identify_by list to<br>allow the type=identify method to identify the endpoint is not necessary.<br>The "ip" identifier method can match one and only one endpoint. To even<br>work, the "ip" identifier method configuration must explicitly specify the<br>identified endpoint. Therefore, why bother configuring the type=identify<br>identifier in the first place? The requirement only adds the potential<br>for configuration errors for no benefit. Even worse, those configuration<br>errors cannot be detected when the configuration loads. The requirement<br>was introduced with the ASTERISK_27206 patch.<br><br>* Remove the testsuite test that checks the requirement. Listing the "ip"<br>method in the identify_by value is simply documentation.<br><br>Change-Id: I16f64fdfa56eb4b819e8ed2cc46b6314ed664a72<br>---<br>D tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/configs/ast1/extensions.conf<br>D tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/configs/ast1/pjsip.conf<br>D tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/sipp/playback_with_initial_sdp.xml<br>D tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/test-config.yaml<br>M tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml<br>5 files changed, 0 insertions(+), 170 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/configs/ast1/extensions.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/configs/ast1/extensions.conf<br>deleted file mode 100644<br>index a52330b..0000000<br>--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/configs/ast1/extensions.conf<br>+++ /dev/null<br>@@ -1,4 +0,0 @@<br>-[default]<br>-exten => playback,1,Answer()<br>-same => n,Playback(hello-world)<br>-same => n,Hangup()<br>diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/configs/ast1/pjsip.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/configs/ast1/pjsip.conf<br>deleted file mode 100644<br>index a123c13..0000000<br>--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/configs/ast1/pjsip.conf<br>+++ /dev/null<br>@@ -1,51 +0,0 @@<br>-[local-transport-template](!)<br>-type=transport<br>-bind=127.0.0.1<br>-<br>-[local-transport6-template](!)<br>-type=transport<br>-bind=[::1]<br>-<br>-[local-transport-udp](local-transport-template)<br>-protocol=udp<br>-<br>-[local-transport-udp6](local-transport6-template)<br>-protocol=udp<br>-<br>-[endpoint-template-ipv4](!)<br>-type=endpoint<br>-context=default<br>-allow=!all,ulaw,alaw<br>-media_address=127.0.0.1<br>-identify_by=username<br>-transport=local-transport-udp<br>-<br>-[endpoint-template-ipv6](!)<br>-type=endpoint<br>-context=default<br>-allow=!all,ulaw,alaw<br>-media_address=[::1]<br>-identify_by=username<br>-transport=local-transport-udp6<br>-<br>-[alice-ipv4-udp](endpoint-template-ipv4)<br>-<br>-[alice-ipv6-udp](endpoint-template-ipv6)<br>-<br>-[alice-ipv4-invalid](endpoint-template-ipv4)<br>-context=does-not-exist<br>-<br>-[alice-ipv6-invalid](endpoint-template-ipv6)<br>-context=does-not-exist<br>-<br>-[identify-template](!)<br>-type=identify<br>-<br>-[alice-identify-ipv4](identify-template)<br>-endpoint=alice-ipv4-invalid<br>-match=127.0.0.1<br>-<br>-[alice-identify-ipv6](identify-template)<br>-endpoint=alice-ipv6-invalid<br>-match=[::1]<br>-<br>diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/sipp/playback_with_initial_sdp.xml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/sipp/playback_with_initial_sdp.xml<br>deleted file mode 100644<br>index 790992f..0000000<br>--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/sipp/playback_with_initial_sdp.xml<br>+++ /dev/null<br>@@ -1,81 +0,0 @@<br>-<?xml version="1.0" encoding="ISO-8859-1" ?><br>-<!DOCTYPE scenario SYSTEM "sipp.dtd"><br>-<br>-<scenario name="INVITE to playback with SDP in initial INVITE"><br>- <send retrans="500"><br>- <![CDATA[<br>-<br>- INVITE sip:playback@[remote_ip]:[remote_port] SIP/2.0<br>- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]<br>- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]<br>- To: test <sip:test@[remote_ip]:[remote_port]><br>- Call-ID: [call_id]<br>- CSeq: 1 INVITE<br>- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]><br>- Max-Forwards: 70<br>- Subject: Test<br>- User-Agent: Test<br>- Content-Type: application/sdp<br>- Content-Length: [len]<br>-<br>- v=0<br>- o=phoneA 53655765 2353687637 IN IP[local_ip_type] [local_ip]<br>- s=-<br>- c=IN IP[media_ip_type] [media_ip]<br>- t=0 0<br>- m=audio 6000 RTP/AVP 0<br>- a=rtpmap:0 PCMU/8000<br>-<br>- ]]><br>- </send><br>-<br>- <recv response="100"<br>- optional="true"><br>- </recv><br>-<br>- <recv response="200" rtd="true"><br>- </recv><br>-<br>- <send><br>- <![CDATA[<br>-<br>- ACK sip:playback@[remote_ip]:[remote_port] SIP/2.0<br>- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]<br>- From: test1 <sip:[service]@[local_ip]:[local_port]>;tag=[call_number]<br>- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]<br>- Call-ID: [call_id]<br>- CSeq: 1 ACK<br>- Contact: <sip:test@[local_ip]:[local_port];transport=[transport]><br>- Max-Forwards: 70<br>- Subject: Test<br>- Content-Length: 0<br>-<br>- ]]><br>- </send><br>-<br>- <recv request="BYE"><br>- </recv><br>-<br>- <send><br>- <![CDATA[<br>-<br>- SIP/2.0 200 OK<br>- [last_Via:]<br>- [last_From:]<br>- [last_To:]<br>- [last_Call-ID:]<br>- [last_CSeq:]<br>- Contact: <sip:[local_ip]:[local_port];transport=[transport]><br>- Content-Length: 0<br>-<br>- ]]><br>- </send><br>-<br>- <!-- definition of the response time repartition table (unit is ms) --><br>- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/><br>-<br>- <!-- definition of the call length repartition table (unit is ms) --><br>- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/><br>-<br>-</scenario><br>-<br>diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/test-config.yaml<br>deleted file mode 100644<br>index 7b9e7b5..0000000<br>--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user_only/test-config.yaml<br>+++ /dev/null<br>@@ -1,33 +0,0 @@<br>-testinfo:<br>- summary: 'Tests incoming calls without authentication matching only based on user'<br>- description: |<br>- 'Run a SIPp scenario that sends various calls to res_pjsip, which should be matched using username only'<br>-<br>-test-modules:<br>- test-object:<br>- config-section: test-object-config<br>- typename: 'sipp.SIPpTestCase'<br>-<br>-test-object-config:<br>- fail-on-any: False<br>- test-iterations:<br>- -<br>- scenarios:<br>- # IPv4 & UDP<br>- - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice-ipv4-udp'} }<br>- # IPv6 & UDP<br>- -<br>- scenarios:<br>- - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5061', '-s': 'alice-ipv6-udp'} }<br>-<br>-properties:<br>- minversion: [ '13.19.0', '15.2.0' ]<br>- dependencies:<br>- - sipp :<br>- version : 'v3.0'<br>- - asterisk : 'app_dial'<br>- - asterisk : 'app_echo'<br>- - asterisk : 'app_playback'<br>- - asterisk : 'res_pjsip'<br>- tags:<br>- - pjsip<br>diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml<br>index 722964b..68e17f6 100644<br>--- a/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml<br>+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/tests.yaml<br>@@ -2,6 +2,5 @@<br> - test: 'ident_by_host'<br> - test: 'ident_by_host_only'<br> - test: 'ident_by_user'<br>- - test: 'ident_by_user_only'<br> - test: 'ident_by_user_drop_options'<br> - test: 'ident_by_header'<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7897">change 7897</a>. To unsubscribe, 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/7897"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I16f64fdfa56eb4b819e8ed2cc46b6314ed664a72 </div>
<div style="display:none"> Gerrit-Change-Number: 7897 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>