<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/testsuite/+/15881">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;">Pre work for upcoming pjsip auth tests<br><br> * Moved pjsip/auth_security_events test under new directory<br> tree pjsip/auth/uas<br><br> * Added sipp.dtd in contrib/sipp to aid intelligent<br> xml editors.<br><br>Change-Id: I4d37eefd8078461f24de2444d853ec050fa93854<br>---<br>A contrib/sipp/sipp.dtd<br>A tests/channels/pjsip/auth/tests.yaml<br>R tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/manager.users.conf.inc<br>R tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/pjsip.conf<br>R tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_fail.xml<br>R tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_pass.xml<br>R tests/channels/pjsip/auth/uas/auth_security_events/test-config.yaml<br>A tests/channels/pjsip/auth/uas/tests.yaml<br>M tests/channels/pjsip/tests.yaml<br>9 files changed, 137 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/sipp/sipp.dtd b/contrib/sipp/sipp.dtd</span><br><span>new file mode 100644</span><br><span>index 0000000..e839071</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/sipp/sipp.dtd</span><br><span>@@ -0,0 +1,132 @@</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT scenario ( CallLengthRepartition | ResponseTimeRepartition | Reference | send | recv | pause | nop | sendCmd | recvCmd | label | timewait)* ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST scenario name CDATA #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!-- BEGIN message commands --></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ENTITY % messageCmdCommon '</span><br><span style="color: hsl(120, 100%, 40%);">+ start_rtd NMTOKEN #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ rtd NMTOKEN #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat_rtd (true|false) #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ crlf (true|false) #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ next NMTOKEN #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ test NMTOKEN #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ chance NMTOKEN #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ condexec NMTOKEN #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ condexec_inverse NMTOKEN #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ counter NMTOKEN #IMPLIED</span><br><span style="color: hsl(120, 100%, 40%);">+ '></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT send (#PCDATA|action)* ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST send %messageCmdCommon; ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST send retrans NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST send lost NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST send start_txn NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST send ack_txn NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT recv ( action? ) ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv %messageCmdCommon; ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv response NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv request CDATA #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv optional (true|false) #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv ignosesdp (true|false) #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv rrs (true|false) #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv auth (true|false) #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv lost NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv timeout NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv ontimeout NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv regexp_match (true|false) #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recv response_txn NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT pause EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST pause %messageCmdCommon; ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST pause milliseconds NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST pause variable NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST pause distribution NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST pause sanity_check (true|false) #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT nop ( action? ) ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST nop %messageCmdCommon; ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST nop display CDATA #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT sendCmd ( #PCDATA ) ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST sendCmd %messageCmdCommon; ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST sendCmd dest NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT recvCmd ( action? ) ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recvCmd %messageCmdCommon; ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST recvCmd src NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!-- END message commands --></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT label ( #PCDATA ) ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST label id NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT ResponseTimeRepartition EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST ResponseTimeRepartition value CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT CallLengthRepartition EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST CallLengthRepartition value CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT action ( add | assign | assignstr | closecon | divide | ereg | error | exec | gettimeofday | index | insert | jump | log | lookup | multiply | pauserestore | replace | rtp_echo | sample | setdest | strcmp | subtract | test | todouble | trim | urldecode | urlencode | verifyauth | warning )+ ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!-- BEGIN actions --></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT ereg EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST ereg assign_to CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST ereg check_it (true|false) "false" ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST ereg header NMTOKEN #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST ereg regexp CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST ereg search_in (msg|hdr) "msg" ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST ereg start_line (true|false) #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT log EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST log message CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT warning EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST warning message CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT exec EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!-- one of command or int_cmd must be present --></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST exec command CDATA #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST exec int_cmd (stop_now|stop_gracefully|stop_call) "stop_call" ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST exec play_pcap CDATA #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST exec play_pcap_audio CDATA #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST exec rtp_stream CDATA #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST exec rtp_echo CDATA #IMPLIED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT rtp_echo EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST rtp_echo value CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT strcmp EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST strcmp assign_to CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST strcmp value CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST strcmp variable CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT test EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST test assign_to CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST test compare CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST test value CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST test variable CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT assign EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST assign assign_to CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST assign variable CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT urldecode EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST urldecode variable CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT urlencode EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST urlencode variable CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT verifyauth EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST verifyauth assign_to CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST verifyauth username CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST verifyauth password CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!-- END actions --></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT timewait EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST timewait milliseconds CDATA #REQUIRED ></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!ELEMENT Reference EMPTY ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ATTLIST Reference variables CDATA #REQUIRED ></span><br><span>diff --git a/tests/channels/pjsip/auth/tests.yaml b/tests/channels/pjsip/auth/tests.yaml</span><br><span>new file mode 100644</span><br><span>index 0000000..5ab2b6a</span><br><span>--- /dev/null</span><br><span>+++ b/tests/channels/pjsip/auth/tests.yaml</span><br><span>@@ -0,0 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+tests:</span><br><span style="color: hsl(120, 100%, 40%);">+ - dir: 'uas'</span><br><span>diff --git a/tests/channels/pjsip/auth_security_events/configs/ast1/manager.users.conf.inc b/tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/manager.users.conf.inc</span><br><span>similarity index 100%</span><br><span>rename from tests/channels/pjsip/auth_security_events/configs/ast1/manager.users.conf.inc</span><br><span>rename to tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/manager.users.conf.inc</span><br><span>diff --git a/tests/channels/pjsip/auth_security_events/configs/ast1/pjsip.conf b/tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/pjsip.conf</span><br><span>similarity index 100%</span><br><span>rename from tests/channels/pjsip/auth_security_events/configs/ast1/pjsip.conf</span><br><span>rename to tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/pjsip.conf</span><br><span>diff --git a/tests/channels/pjsip/auth_security_events/sipp/register_fail.xml b/tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_fail.xml</span><br><span>similarity index 100%</span><br><span>rename from tests/channels/pjsip/auth_security_events/sipp/register_fail.xml</span><br><span>rename to tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_fail.xml</span><br><span>diff --git a/tests/channels/pjsip/auth_security_events/sipp/register_pass.xml b/tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_pass.xml</span><br><span>similarity index 100%</span><br><span>rename from tests/channels/pjsip/auth_security_events/sipp/register_pass.xml</span><br><span>rename to tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_pass.xml</span><br><span>diff --git a/tests/channels/pjsip/auth_security_events/test-config.yaml b/tests/channels/pjsip/auth/uas/auth_security_events/test-config.yaml</span><br><span>similarity index 100%</span><br><span>rename from tests/channels/pjsip/auth_security_events/test-config.yaml</span><br><span>rename to tests/channels/pjsip/auth/uas/auth_security_events/test-config.yaml</span><br><span>diff --git a/tests/channels/pjsip/auth/uas/tests.yaml b/tests/channels/pjsip/auth/uas/tests.yaml</span><br><span>new file mode 100644</span><br><span>index 0000000..115b38c</span><br><span>--- /dev/null</span><br><span>+++ b/tests/channels/pjsip/auth/uas/tests.yaml</span><br><span>@@ -0,0 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+tests:</span><br><span style="color: hsl(120, 100%, 40%);">+ - test: 'auth_security_events'</span><br><span>diff --git a/tests/channels/pjsip/tests.yaml b/tests/channels/pjsip/tests.yaml</span><br><span>index 919a0f9..280a4a0 100644</span><br><span>--- a/tests/channels/pjsip/tests.yaml</span><br><span>+++ b/tests/channels/pjsip/tests.yaml</span><br><span>@@ -1,6 +1,7 @@</span><br><span> # Enter tests here in the order they should be considered for execution:</span><br><span> tests:</span><br><span> - dir: 'ami'</span><br><span style="color: hsl(120, 100%, 40%);">+ - dir: 'auth'</span><br><span> - dir: 'basic_calls'</span><br><span> - dir: 'config_wizard'</span><br><span> - dir: 'configuration'</span><br><span>@@ -34,7 +35,6 @@</span><br><span> - test: 'accountcode'</span><br><span> - test: 'acl_call'</span><br><span> - test: 'allow_overlap'</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'auth_security_events'</span><br><span> - test: 'call_pickup'</span><br><span> - test: 'dtmf_incompatible'</span><br><span> - test: 'forward_loop'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/testsuite/+/15881">change 15881</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/+/15881"/><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: I4d37eefd8078461f24de2444d853ec050fa93854 </div>
<div style="display:none"> Gerrit-Change-Number: 15881 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.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>