[Asterisk-code-review] Pre work for upcoming pjsip auth tests (testsuite[16])

Friendly Automation asteriskteam at digium.com
Wed May 12 08:53:26 CDT 2021 

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/testsuite/+/15881 )

Change subject: Pre work for upcoming pjsip auth tests
......................................................................

Pre work for upcoming pjsip auth tests

 * Moved pjsip/auth_security_events test under new directory
   tree pjsip/auth/uas

 * Added sipp.dtd in contrib/sipp to aid intelligent
   xml editors.

Change-Id: I4d37eefd8078461f24de2444d853ec050fa93854
---
A contrib/sipp/sipp.dtd
A tests/channels/pjsip/auth/tests.yaml
R tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/manager.users.conf.inc
R tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/pjsip.conf
R tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_fail.xml
R tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_pass.xml
R tests/channels/pjsip/auth/uas/auth_security_events/test-config.yaml
A tests/channels/pjsip/auth/uas/tests.yaml
M tests/channels/pjsip/tests.yaml
9 files changed, 137 insertions(+), 1 deletion(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/contrib/sipp/sipp.dtd b/contrib/sipp/sipp.dtd
new file mode 100644
index 0000000..e839071
--- /dev/null
+++ b/contrib/sipp/sipp.dtd
@@ -0,0 +1,132 @@
+<!ELEMENT scenario ( CallLengthRepartition | ResponseTimeRepartition | Reference | send | recv | pause | nop | sendCmd | recvCmd | label | timewait)* >
+<!ATTLIST scenario name CDATA #IMPLIED >
+
+<!-- BEGIN message commands -->
+
+<!ENTITY % messageCmdCommon '
+  start_rtd NMTOKEN #IMPLIED
+  rtd NMTOKEN #IMPLIED
+  repeat_rtd (true|false) #IMPLIED
+  crlf (true|false) #IMPLIED
+  next NMTOKEN #IMPLIED
+  test NMTOKEN #IMPLIED
+  chance NMTOKEN #IMPLIED
+  condexec NMTOKEN #IMPLIED
+  condexec_inverse NMTOKEN #IMPLIED
+  counter NMTOKEN #IMPLIED
+  '>
+
+<!ELEMENT send (#PCDATA|action)* >
+<!ATTLIST send %messageCmdCommon; >
+<!ATTLIST send retrans NMTOKEN #IMPLIED >
+<!ATTLIST send lost NMTOKEN #IMPLIED >
+<!ATTLIST send start_txn NMTOKEN #IMPLIED >
+<!ATTLIST send ack_txn NMTOKEN #IMPLIED >
+
+<!ELEMENT recv ( action? ) >
+<!ATTLIST recv %messageCmdCommon; >
+<!ATTLIST recv response NMTOKEN #IMPLIED >
+<!ATTLIST recv request CDATA #IMPLIED >
+<!ATTLIST recv optional (true|false) #IMPLIED >
+<!ATTLIST recv ignosesdp (true|false) #IMPLIED >
+<!ATTLIST recv rrs (true|false) #IMPLIED >
+<!ATTLIST recv auth (true|false) #IMPLIED >
+<!ATTLIST recv lost NMTOKEN #IMPLIED >
+<!ATTLIST recv timeout NMTOKEN #IMPLIED >
+<!ATTLIST recv ontimeout NMTOKEN #IMPLIED >
+<!ATTLIST recv regexp_match (true|false) #IMPLIED >
+<!ATTLIST recv response_txn NMTOKEN #IMPLIED >
+
+<!ELEMENT pause EMPTY >
+<!ATTLIST pause %messageCmdCommon; >
+<!ATTLIST pause milliseconds NMTOKEN #IMPLIED >
+<!ATTLIST pause variable NMTOKEN #IMPLIED >
+<!ATTLIST pause distribution NMTOKEN #IMPLIED >
+<!ATTLIST pause sanity_check (true|false) #IMPLIED >
+
+<!ELEMENT nop ( action? ) >
+<!ATTLIST nop %messageCmdCommon; >
+<!ATTLIST nop display CDATA #IMPLIED >
+
+<!ELEMENT sendCmd ( #PCDATA ) >
+<!ATTLIST sendCmd %messageCmdCommon; >
+<!ATTLIST sendCmd dest NMTOKEN #IMPLIED >
+
+<!ELEMENT recvCmd ( action? ) >
+<!ATTLIST recvCmd %messageCmdCommon; >
+<!ATTLIST recvCmd src NMTOKEN #IMPLIED >
+
+<!-- END message commands -->
+
+<!ELEMENT label ( #PCDATA ) >
+<!ATTLIST label id NMTOKEN #IMPLIED >
+
+<!ELEMENT ResponseTimeRepartition EMPTY >
+<!ATTLIST ResponseTimeRepartition value CDATA #REQUIRED >
+
+<!ELEMENT CallLengthRepartition EMPTY >
+<!ATTLIST CallLengthRepartition value CDATA #REQUIRED >
+
+<!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 )+ >
+
+<!-- BEGIN actions -->
+
+<!ELEMENT ereg EMPTY >
+<!ATTLIST ereg assign_to CDATA #REQUIRED >
+<!ATTLIST ereg check_it (true|false) "false" >
+<!ATTLIST ereg header NMTOKEN #IMPLIED >
+<!ATTLIST ereg regexp CDATA #REQUIRED >
+<!ATTLIST ereg search_in (msg|hdr) "msg" >
+<!ATTLIST ereg start_line (true|false) #IMPLIED >
+
+<!ELEMENT log EMPTY >
+<!ATTLIST log message CDATA #REQUIRED >
+
+<!ELEMENT warning EMPTY >
+<!ATTLIST warning message CDATA #REQUIRED >
+
+<!ELEMENT exec EMPTY >
+<!-- one of command or int_cmd must be present -->
+<!ATTLIST exec command CDATA #IMPLIED >
+<!ATTLIST exec int_cmd (stop_now|stop_gracefully|stop_call) "stop_call" >
+<!ATTLIST exec play_pcap CDATA #IMPLIED >
+<!ATTLIST exec play_pcap_audio CDATA #IMPLIED >
+<!ATTLIST exec rtp_stream CDATA #IMPLIED >
+<!ATTLIST exec rtp_echo CDATA #IMPLIED >
+
+<!ELEMENT rtp_echo EMPTY >
+<!ATTLIST rtp_echo value CDATA #REQUIRED >
+
+<!ELEMENT strcmp EMPTY >
+<!ATTLIST strcmp assign_to CDATA #REQUIRED >
+<!ATTLIST strcmp value CDATA #REQUIRED >
+<!ATTLIST strcmp variable CDATA #REQUIRED >
+
+<!ELEMENT test EMPTY >
+<!ATTLIST test assign_to CDATA #REQUIRED >
+<!ATTLIST test compare CDATA #REQUIRED >
+<!ATTLIST test value CDATA #REQUIRED >
+<!ATTLIST test variable CDATA #REQUIRED >
+
+<!ELEMENT assign EMPTY >
+<!ATTLIST assign assign_to CDATA #REQUIRED >
+<!ATTLIST assign variable CDATA #REQUIRED >
+
+<!ELEMENT urldecode EMPTY >
+<!ATTLIST urldecode variable CDATA #REQUIRED >
+
+<!ELEMENT urlencode EMPTY >
+<!ATTLIST urlencode variable CDATA #REQUIRED >
+
+<!ELEMENT verifyauth EMPTY >
+<!ATTLIST verifyauth assign_to CDATA #REQUIRED >
+<!ATTLIST verifyauth username CDATA #REQUIRED >
+<!ATTLIST verifyauth password CDATA #REQUIRED >
+
+<!-- END actions -->
+
+<!ELEMENT timewait EMPTY >
+<!ATTLIST timewait milliseconds CDATA #REQUIRED >
+
+<!ELEMENT Reference EMPTY >
+<!ATTLIST Reference variables CDATA #REQUIRED >
diff --git a/tests/channels/pjsip/auth/tests.yaml b/tests/channels/pjsip/auth/tests.yaml
new file mode 100644
index 0000000..5ab2b6a
--- /dev/null
+++ b/tests/channels/pjsip/auth/tests.yaml
@@ -0,0 +1,2 @@
+tests:
+    - dir: 'uas'
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
similarity index 100%
rename from tests/channels/pjsip/auth_security_events/configs/ast1/manager.users.conf.inc
rename to tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/manager.users.conf.inc
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
similarity index 100%
rename from tests/channels/pjsip/auth_security_events/configs/ast1/pjsip.conf
rename to tests/channels/pjsip/auth/uas/auth_security_events/configs/ast1/pjsip.conf
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
similarity index 100%
rename from tests/channels/pjsip/auth_security_events/sipp/register_fail.xml
rename to tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_fail.xml
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
similarity index 100%
rename from tests/channels/pjsip/auth_security_events/sipp/register_pass.xml
rename to tests/channels/pjsip/auth/uas/auth_security_events/sipp/register_pass.xml
diff --git a/tests/channels/pjsip/auth_security_events/test-config.yaml b/tests/channels/pjsip/auth/uas/auth_security_events/test-config.yaml
similarity index 100%
rename from tests/channels/pjsip/auth_security_events/test-config.yaml
rename to tests/channels/pjsip/auth/uas/auth_security_events/test-config.yaml
diff --git a/tests/channels/pjsip/auth/uas/tests.yaml b/tests/channels/pjsip/auth/uas/tests.yaml
new file mode 100644
index 0000000..115b38c
--- /dev/null
+++ b/tests/channels/pjsip/auth/uas/tests.yaml
@@ -0,0 +1,2 @@
+tests:
+    - test: 'auth_security_events'
diff --git a/tests/channels/pjsip/tests.yaml b/tests/channels/pjsip/tests.yaml
index 919a0f9..280a4a0 100644
--- a/tests/channels/pjsip/tests.yaml
+++ b/tests/channels/pjsip/tests.yaml
@@ -1,6 +1,7 @@
 # Enter tests here in the order they should be considered for execution:
 tests:
     - dir: 'ami'
+    - dir: 'auth'
     - dir: 'basic_calls'
     - dir: 'config_wizard'
     - dir: 'configuration'
@@ -34,7 +35,6 @@
     - test: 'accountcode'
     - test: 'acl_call'
     - test: 'allow_overlap'
-    - test: 'auth_security_events'
     - test: 'call_pickup'
     - test: 'dtmf_incompatible'
     - test: 'forward_loop'

-- 
To view, visit https://gerrit.asterisk.org/c/testsuite/+/15881
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: testsuite
Gerrit-Branch: 16
Gerrit-Change-Id: I4d37eefd8078461f24de2444d853ec050fa93854
Gerrit-Change-Number: 15881
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210512/d3a00cb4/attachment-0001.html>

More information about the asterisk-code-review mailing list