[asterisk-commits] test/../remove existing: Test new remove existing behaviour. (testsuite[master])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Oct 11 05:34:27 CDT 2017
Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/6639 )
Change subject: test/../remove_existing: Test new remove_existing behaviour.
......................................................................
test/../remove_existing: Test new remove_existing behaviour.
ASTERISK-27192
Change-Id: I5a5931dc6cf94b2f2db47114291b52b5e43e7f56
---
M tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv4.xml
M tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv6.xml
A tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv4.xml
A tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml
M tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/test-config.yaml
5 files changed, 757 insertions(+), 135 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
diff --git a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv4.xml
index ffeb948..9782877 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv4.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv4.xml
@@ -2,71 +2,67 @@
<!DOCTYPE scenario SYSTEM "sipp.dtd">
<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-office at 127.0.0.2:5062>;transport=[transport]
+ Contact: "[service]" <sip:[service]-home at 127.0.0.3:5063>;transport=[transport]
+ Subject: Performance Test
+ Expires: 20
+ Content-Length: 0
+ ]]>
+ </send>
- REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 REGISTER
- Max-Forwards: 70
- Contact: "[service]" <sip:[service]-office at 127.0.0.2:5062>;transport=[transport]
- Contact: "[service]" <sip:[service]-home at 127.0.0.3:5063>;transport=[transport]
- Subject: Performance Test
- Expires: 20
- Content-Length: 0
+ <recv response="200" rtd="true">
+ <action>
+ <!--
+ Ensure the received expires parameters is ~60 as no expiration config options are set with a 5 second tolerance
+ -->
+ <ereg regexp="Contact: <sip:(alice|bob)-office at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ </action>
+ </recv>
- ]]>
- </send>
+ <pause milliseconds="1000"/>
- <recv response="200" rtd="true">
- <action>
- <!--
- Ensure the received expires parameters is ~60 as no expiration config options are set with a 5 second tolerance
- -->
- <ereg regexp="Contact: <sip:(alice|bob)-office at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
- <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
- </action>
- </recv>
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-mobile at 127.0.0.4:5064>;transport=[transport]
+ Contact: "[service]" <sip:[service]-pc at 127.0.0.5:5065>;transport=[transport]
+ Subject: Performance Test
+ Expires: 20
+ Content-Length: 0
+ ]]>
+ </send>
- <pause milliseconds="1000"/>
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the new contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(alice|bob)-mobile at 127.0.0.4:5064>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="3"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-pc at 127.0.0.5:5065>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4" />
+ <!-- Ensure the old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(alice|bob)-office at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="5" />
+ <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="6" />
+ </action>
+ </recv>
- <send retrans="500">
- <![CDATA[
-
- REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 REGISTER
- Max-Forwards: 70
- Contact: "[service]" <sip:[service]-mobile at 127.0.0.4:5064>;transport=[transport]
- Contact: "[service]" <sip:[service]-pc at 127.0.0.5:5065>;transport=[transport]
- Subject: Performance Test
- Expires: 20
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="200" rtd="true">
- <action>
- <!-- Ensure the new contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(alice|bob)-mobile at 127.0.0.4:5064>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="3"/>
- <ereg regexp="Contact: <sip:(alice|bob)-pc at 127.0.0.5:5065>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4" />
- <!-- Ensure the old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(alice|bob)-office at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="5" />
- <ereg regexp="Contact: <sip:(alice|bob)-home at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="6" />
- </action>
- </recv>
- <Reference variables="1" />
- <Reference variables="2" />
- <Reference variables="3" />
- <Reference variables="4" />
- <Reference variables="5" />
- <Reference variables="6" />
-
+ <Reference variables="1" />
+ <Reference variables="2" />
+ <Reference variables="3" />
+ <Reference variables="4" />
+ <Reference variables="5" />
+ <Reference variables="6" />
</scenario>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv6.xml
index e02c68b..f380b0a 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv6.xml
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-noauth-ipv6.xml
@@ -2,71 +2,67 @@
<!DOCTYPE scenario SYSTEM "sipp.dtd">
<scenario name="Basic Sipstone UAC">
- <send retrans="500">
- <![CDATA[
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-office@[customip1]:5062>;transport=[transport]
+ Contact: "[service]" <sip:[service]-home@[customip2]:5063>;transport=[transport]
+ Subject: Performance Test
+ Expires: 20
+ Content-Length: 0
+ ]]>
+ </send>
- REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 REGISTER
- Max-Forwards: 70
- Contact: "[service]" <sip:[service]-office@[customip1]:5062>;transport=[transport]
- Contact: "[service]" <sip:[service]-home@[customip2]:5063>;transport=[transport]
- Subject: Performance Test
- Expires: 20
- Content-Length: 0
+ <recv response="200" rtd="true">
+ <action>
+ <!--
+ Ensure the received expires parameters is ~60 as no expiration config options are set with a 5 second tolerance
+ -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-office at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
+ </action>
+ </recv>
- ]]>
- </send>
+ <pause milliseconds="1000"/>
- <recv response="200" rtd="true">
- <action>
- <!--
- Ensure the received expires parameters is ~60 as no expiration config options are set with a 5 second tolerance
- -->
- <ereg regexp="Contact: <sip:(charlie|carol)-office at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2" />
- </action>
- </recv>
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-mobile@[customip3]:5064>;transport=[transport]
+ Contact: "[service]" <sip:[service]-pc@[customip4]:5065>;transport=[transport]
+ Subject: Performance Test
+ Expires: 20
+ Content-Length: 0
+ ]]>
+ </send>
- <pause milliseconds="1000"/>
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the new contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-mobile at .::4.:5064>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="3"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-pc at .::5.:5065>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4" />
+ <!-- Ensure the old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-office at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="5" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="6" />
+ </action>
+ </recv>
- <send retrans="500">
- <![CDATA[
-
- REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
- To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 REGISTER
- Max-Forwards: 70
- Contact: "[service]" <sip:[service]-mobile@[customip3]:5064>;transport=[transport]
- Contact: "[service]" <sip:[service]-pc@[customip4]:5065>;transport=[transport]
- Subject: Performance Test
- Expires: 20
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv response="200" rtd="true">
- <action>
- <!-- Ensure the new contacts are present and that the expires is correct with a 5 second tolerance -->
- <ereg regexp="Contact: <sip:(charlie|carol)-mobile at .::4.:5064>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="3"/>
- <ereg regexp="Contact: <sip:(charlie|carol)-pc at .::5.:5065>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4" />
- <!-- Ensure the old contacts are *not* present -->
- <ereg regexp="Contact: <sip:(charlie|carol)-office at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="5" />
- <ereg regexp="Contact: <sip:(charlie|carol)-home at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="6" />
- </action>
- </recv>
- <Reference variables="1" />
- <Reference variables="2" />
- <Reference variables="3" />
- <Reference variables="4" />
- <Reference variables="5" />
- <Reference variables="6" />
-
+ <Reference variables="1" />
+ <Reference variables="2" />
+ <Reference variables="3" />
+ <Reference variables="4" />
+ <Reference variables="5" />
+ <Reference variables="6" />
</scenario>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv4.xml b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv4.xml
new file mode 100644
index 0000000..c88bb6f
--- /dev/null
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv4.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<scenario name="Basic Sipstone UAC">
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-1
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-1 at 127.0.0.2:5062>;transport=[transport]
+ Subject: Performance Test
+ Expires: 60
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-2
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-2 at 127.0.0.3:5063>;transport=[transport]
+ Subject: Performance Test
+ Expires: 70
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="3"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-3
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-3 at 127.0.0.4:5064>;transport=[transport]
+ Subject: Performance Test
+ Expires: 80
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="5"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="6"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-4
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-4 at 127.0.0.5:5065>;transport=[transport]
+ Subject: Performance Test
+ Expires: 90
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="7"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="8"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>;expires=(90|8[5-9])" search_in="msg" check_it="true" assign_to="9"/>
+ <!-- Ensure the expected old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="10" />
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-5
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-4 at 127.0.0.5:5065>;transport=[transport];expires=0
+ Contact: "[service]" <sip:[service]-5 at 127.0.0.6:5066>;transport=[transport];expires=100
+ Contact: "[service]" <sip:[service]-6 at 127.0.0.7:5067>;transport=[transport];expires=110
+ Subject: Performance Test
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="11"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>;expires=(100|9[5-9])" search_in="msg" check_it="true" assign_to="12"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="13"/>
+ <!-- Ensure the expected old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="14" />
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="15"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="16"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-6
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-7 at 127.0.0.8:5068>;transport=[transport]
+ Contact: "[service]" <sip:[service]-8 at 127.0.0.9:5069>;transport=[transport]
+ Subject: Performance Test
+ Expires: 110
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="17"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-7 at 127.0.0.8:5068>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="18"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-8 at 127.0.0.9:5069>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="19"/>
+ <!-- Ensure the expected old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="20" />
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="21"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>" search_in="msg" check_it_inverse="true" assign_to="22"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="23"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>" search_in="msg" check_it_inverse="true" assign_to="24"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-7
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-9 at 127.0.0.10:5070>;transport=[transport]
+ Contact: "[service]" <sip:[service]-10 at 127.0.0.10:5071>;transport=[transport]
+ Contact: "[service]" <sip:[service]-11 at 127.0.0.10:5072>;transport=[transport]
+ Contact: "[service]" <sip:[service]-12 at 127.0.0.10:5073>;transport=[transport]
+ Subject: Performance Test
+ Expires: 110
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="403" rtd="true">
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-8
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: *
+ Subject: Performance Test
+ Expires: 0
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(alice|bob)-1 at 127.0.0.2:5062>" search_in="msg" check_it_inverse="true" assign_to="25" />
+ <ereg regexp="Contact: <sip:(alice|bob)-2 at 127.0.0.3:5063>" search_in="msg" check_it_inverse="true" assign_to="26"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-3 at 127.0.0.4:5064>" search_in="msg" check_it_inverse="true" assign_to="27"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-4 at 127.0.0.5:5065>" search_in="msg" check_it_inverse="true" assign_to="28"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-5 at 127.0.0.6:5066>" search_in="msg" check_it_inverse="true" assign_to="29"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-6 at 127.0.0.7:5067>" search_in="msg" check_it_inverse="true" assign_to="30"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-7 at 127.0.0.8:5068>" search_in="msg" check_it_inverse="true" assign_to="31"/>
+ <ereg regexp="Contact: <sip:(alice|bob)-8 at 127.0.0.9:5069>" search_in="msg" check_it_inverse="true" assign_to="32"/>
+ </action>
+ </recv>
+
+ <Reference variables="1" />
+ <Reference variables="2" />
+ <Reference variables="3" />
+ <Reference variables="4" />
+ <Reference variables="5" />
+ <Reference variables="6" />
+ <Reference variables="7" />
+ <Reference variables="8" />
+ <Reference variables="9" />
+ <Reference variables="10" />
+ <Reference variables="11" />
+ <Reference variables="12" />
+ <Reference variables="13" />
+ <Reference variables="14" />
+ <Reference variables="15" />
+ <Reference variables="16" />
+ <Reference variables="17" />
+ <Reference variables="18" />
+ <Reference variables="19" />
+ <Reference variables="20" />
+ <Reference variables="21" />
+ <Reference variables="22" />
+ <Reference variables="23" />
+ <Reference variables="24" />
+ <Reference variables="25" />
+ <Reference variables="26" />
+ <Reference variables="27" />
+ <Reference variables="28" />
+ <Reference variables="29" />
+ <Reference variables="30" />
+ <Reference variables="31" />
+ <Reference variables="32" />
+</scenario>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml
new file mode 100644
index 0000000..c065406
--- /dev/null
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/sipp/register-v13.18-ipv6.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<scenario name="Basic Sipstone UAC">
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-1
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-1@[customip1]:5062>;transport=[transport]
+ Subject: Performance Test
+ Expires: 60
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="1"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-2
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-2@[customip2]:5063>;transport=[transport]
+ Subject: Performance Test
+ Expires: 70
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="2"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="3"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-3
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-3@[customip3]:5064>;transport=[transport]
+ Subject: Performance Test
+ Expires: 80
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>;expires=(60|5[5-9])" search_in="msg" check_it="true" assign_to="4"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="5"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="6"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-4
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-4@[customip4]:5065>;transport=[transport]
+ Subject: Performance Test
+ Expires: 90
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>;expires=(70|6[5-9])" search_in="msg" check_it="true" assign_to="7"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="8"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>;expires=(90|8[5-9])" search_in="msg" check_it="true" assign_to="9"/>
+ <!-- Ensure the expected old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="10" />
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-5
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-4@[customip4]:5065>;transport=[transport];expires=0
+ Contact: "[service]" <sip:[service]-5@[customip5]:5066>;transport=[transport];expires=100
+ Contact: "[service]" <sip:[service]-6@[customip6]:5067>;transport=[transport];expires=110
+ Subject: Performance Test
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>;expires=(80|7[5-9])" search_in="msg" check_it="true" assign_to="11"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>;expires=(100|9[5-9])" search_in="msg" check_it="true" assign_to="12"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="13"/>
+ <!-- Ensure the expected old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="14" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="15"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="16"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-6
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-7@[customip7]:5068>;transport=[transport]
+ Contact: "[service]" <sip:[service]-8@[customip8]:5069>;transport=[transport]
+ Subject: Performance Test
+ Expires: 110
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected contacts are present and that the expires is correct with a 5 second tolerance -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="17"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-7 at .::8.:5068>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="18"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-8 at .::9.:5069>;expires=(110|10[5-9])" search_in="msg" check_it="true" assign_to="19"/>
+ <!-- Ensure the expected old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="20" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="21"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>" search_in="msg" check_it_inverse="true" assign_to="22"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="23"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>" search_in="msg" check_it_inverse="true" assign_to="24"/>
+ </action>
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-7
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: "[service]" <sip:[service]-9@[customip9]:5070>;transport=[transport]
+ Contact: "[service]" <sip:[service]-10@[customip9]:5071>;transport=[transport]
+ Contact: "[service]" <sip:[service]-11@[customip9]:5072>;transport=[transport]
+ Contact: "[service]" <sip:[service]-12@[customip9]:5073>;transport=[transport]
+ Subject: Performance Test
+ Expires: 110
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="403" rtd="true">
+ </recv>
+
+ <send retrans="500">
+ <![CDATA[
+ REGISTER sip:[remote_ip]:[remote_port] SIP/2.0
+ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+ From: "[service]" <sip:[service]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]-8
+ To: "[service]" <sip:[service]@[remote_ip]:[remote_port]>
+ Call-ID: [call_id]
+ CSeq: 1 REGISTER
+ Max-Forwards: 70
+ Contact: *
+ Subject: Performance Test
+ Expires: 0
+ Content-Length: 0
+ ]]>
+ </send>
+
+ <recv response="200" rtd="true">
+ <action>
+ <!-- Ensure the expected old contacts are *not* present -->
+ <ereg regexp="Contact: <sip:(charlie|carol)-1 at .::2.:5062>" search_in="msg" check_it_inverse="true" assign_to="25" />
+ <ereg regexp="Contact: <sip:(charlie|carol)-2 at .::3.:5063>" search_in="msg" check_it_inverse="true" assign_to="26"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-3 at .::4.:5064>" search_in="msg" check_it_inverse="true" assign_to="27"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-4 at .::5.:5065>" search_in="msg" check_it_inverse="true" assign_to="28"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-5 at .::6.:5066>" search_in="msg" check_it_inverse="true" assign_to="29"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-6 at .::7.:5067>" search_in="msg" check_it_inverse="true" assign_to="30"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-7 at .::8.:5068>" search_in="msg" check_it_inverse="true" assign_to="31"/>
+ <ereg regexp="Contact: <sip:(charlie|carol)-8 at .::9.:5069>" search_in="msg" check_it_inverse="true" assign_to="32"/>
+ </action>
+ </recv>
+
+ <Reference variables="1" />
+ <Reference variables="2" />
+ <Reference variables="3" />
+ <Reference variables="4" />
+ <Reference variables="5" />
+ <Reference variables="6" />
+ <Reference variables="7" />
+ <Reference variables="8" />
+ <Reference variables="9" />
+ <Reference variables="10" />
+ <Reference variables="11" />
+ <Reference variables="12" />
+ <Reference variables="13" />
+ <Reference variables="14" />
+ <Reference variables="15" />
+ <Reference variables="16" />
+ <Reference variables="17" />
+ <Reference variables="18" />
+ <Reference variables="19" />
+ <Reference variables="20" />
+ <Reference variables="21" />
+ <Reference variables="22" />
+ <Reference variables="23" />
+ <Reference variables="24" />
+ <Reference variables="25" />
+ <Reference variables="26" />
+ <Reference variables="27" />
+ <Reference variables="28" />
+ <Reference variables="29" />
+ <Reference variables="30" />
+ <Reference variables="31" />
+ <Reference variables="32" />
+</scenario>
diff --git a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/test-config.yaml b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/test-config.yaml
index abe40f8..a97c71e 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/test-config.yaml
+++ b/tests/channels/pjsip/registration/inbound/nominal/config_options/remove_existing/test-config.yaml
@@ -1,22 +1,51 @@
testinfo:
summary: 'Register contacts to test the remove_existing option'
description: |
- 'Using all combinations of IPv4/IPv6 and UDP/TCP, run SIPp scenarios
+ 'Old remove_exising behaviour:
+ All existing AOR contacts are removed and replaced with the new
+ registration contacts when remove_existing is enabled. The number
+ of contacts cannot go over the max_contacts setting.
+
+ Using all combinations of IPv4/IPv6 and UDP/TCP, run SIPp scenarios
that register two contacts per AOR. Then register two different
contacts for the same AORs. This ensures that with the remove_existing
pjsip.conf configuration option enabled, the first two contacts are
- removed and the new contacts are added.'
+ removed and the new contacts are added.
+
+ New remove_existing behavour:
+ Any existing AOR contacts not affected by the new registration and
+ expire the soonest are removed if they push the number of contacts
+ over the max_contacts setting. A single registration still cannot
+ try to add more contacts than the max_contacts setting. The number
+ of contacts cannot go over the max_contacts setting.
+
+ Using all combinations of IPv4/IPv6 and UDP/TCP, run SIPp scenarios
+ that register contacts in a series of registrations per transport.
+ This ensures that with the remove_existing pjsip.conf configuration
+ option enabled, the contacts are removed and the new contacts are
+ added as expected.'
test-modules:
test-object:
- config-section: test-object-config
- typename: 'sipp.SIPpTestCase'
+ -
+ maxversion: ['13.18.0', '14.7.0', '15.1.0']
+ config-section: test-object-config-v12
+ typename: 'sipp.SIPpTestCase'
+ -
+ minversion: ['13.18.0', '14.7.0', '15.1.0']
+ config-section: test-object-config-v13.18.0
+ typename: 'sipp.SIPpTestCase'
modules:
-
- config-section: 'ami-config'
+ maxversion: ['13.18.0', '14.7.0', '15.1.0']
+ config-section: 'ami-config-v12'
+ typename: 'ami.AMIEventModule'
+ -
+ minversion: ['13.18.0', '14.7.0', '15.1.0']
+ config-section: 'ami-config-v13.18.0'
typename: 'ami.AMIEventModule'
-test-object-config:
+test-object-config-v12:
fail-on-any: False
test-iterations:
-
@@ -28,16 +57,16 @@
- { 'key-args': {'scenario': 'register-noauth-ipv4.xml', '-i': '127.0.0.1', '-p': '5061', '-t': 't1', '-s': 'bob'} }
# IPv6 & UDP
- { 'key-args': {'scenario': 'register-noauth-ipv6.xml',
- 'target': '[::1]', '-i': '[::1]', '-p': '5061', '-s': 'charlie'},
+ 'target': '[::1]', '-i': '[::1]', '-p': '5061', '-s': 'charlie'},
'ordered-args': ['-key', 'customip1', '[::2]', '-key', 'customip2', '[::3]',
- '-key', 'customip3', '[::4]', '-key', 'customip4', '[::5]'] }
+ '-key', 'customip3', '[::4]', '-key', 'customip4', '[::5]'] }
# IPv6 & TCP
- { 'key-args': {'scenario': 'register-noauth-ipv6.xml',
- 'target': '[::1]', '-i': '[::1]', '-p': '5061', '-t': 't1', '-s': 'carol'},
+ 'target': '[::1]', '-i': '[::1]', '-p': '5061', '-t': 't1', '-s': 'carol'},
'ordered-args': ['-key', 'customip1', '[::2]', '-key', 'customip2', '[::3]',
- '-key', 'customip3', '[::4]', '-key', 'customip4', '[::5]'] }
+ '-key', 'customip3', '[::4]', '-key', 'customip4', '[::5]'] }
-ami-config:
+ami-config-v12:
-
type: 'headermatch'
id: '0'
@@ -247,6 +276,107 @@
Expiration: '60'
count: '1'
+test-object-config-v13.18.0:
+ fail-on-any: False
+ test-iterations:
+ -
+ scenarios:
+ # IPv4 & UDP
+ - { 'key-args': {'scenario': 'register-v13.18-ipv4.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice'} }
+
+ # IPv4 & TCP
+ - { 'key-args': {'scenario': 'register-v13.18-ipv4.xml', '-i': '127.0.0.1', '-p': '5061', '-t': 't1', '-s': 'bob'} }
+ # IPv6 & UDP
+ - { 'key-args': {'scenario': 'register-v13.18-ipv6.xml',
+ 'target': '[::1]', '-i': '[::1]', '-p': '5061', '-s': 'charlie'},
+ 'ordered-args': ['-key', 'customip1', '[::2]', '-key', 'customip2', '[::3]',
+ '-key', 'customip3', '[::4]', '-key', 'customip4', '[::5]',
+ '-key', 'customip5', '[::6]', '-key', 'customip6', '[::7]',
+ '-key', 'customip7', '[::8]', '-key', 'customip8', '[::9]',
+ '-key', 'customip9', '[::10]'] }
+ # IPv6 & TCP
+ - { 'key-args': {'scenario': 'register-v13.18-ipv6.xml',
+ 'target': '[::1]', '-i': '[::1]', '-p': '5061', '-t': 't1', '-s': 'carol'},
+ 'ordered-args': ['-key', 'customip1', '[::2]', '-key', 'customip2', '[::3]',
+ '-key', 'customip3', '[::4]', '-key', 'customip4', '[::5]',
+ '-key', 'customip5', '[::6]', '-key', 'customip6', '[::7]',
+ '-key', 'customip7', '[::8]', '-key', 'customip8', '[::9]',
+ '-key', 'customip9', '[::10]'] }
+
+ami-config-v13.18.0:
+ -
+ type: 'headermatch'
+ id: '0'
+ conditions:
+ match:
+ Event: 'TestEvent'
+ State: 'AOR_CONTACT_ADDED'
+ AOR: 'alice'
+ count: '8'
+ -
+ type: 'headermatch'
+ id: '0'
+ conditions:
+ match:
+ Event: 'TestEvent'
+ State: 'AOR_CONTACT_REMOVED'
+ AOR: 'alice'
+ count: '8'
+ -
+ type: 'headermatch'
+ id: '0'
+ conditions:
+ match:
+ Event: 'TestEvent'
+ State: 'AOR_CONTACT_ADDED'
+ AOR: 'bob'
+ count: '8'
+ -
+ type: 'headermatch'
+ id: '0'
+ conditions:
+ match:
+ Event: 'TestEvent'
+ State: 'AOR_CONTACT_REMOVED'
+ AOR: 'bob'
+ count: '8'
+ -
+ type: 'headermatch'
+ id: '0'
+ conditions:
+ match:
+ Event: 'TestEvent'
+ State: 'AOR_CONTACT_ADDED'
+ AOR: 'charlie'
+ count: '8'
+ -
+ type: 'headermatch'
+ id: '0'
+ conditions:
+ match:
+ Event: 'TestEvent'
+ State: 'AOR_CONTACT_REMOVED'
+ AOR: 'charlie'
+ count: '8'
+ -
+ type: 'headermatch'
+ id: '0'
+ conditions:
+ match:
+ Event: 'TestEvent'
+ State: 'AOR_CONTACT_ADDED'
+ AOR: 'carol'
+ count: '8'
+ -
+ type: 'headermatch'
+ id: '0'
+ conditions:
+ match:
+ Event: 'TestEvent'
+ State: 'AOR_CONTACT_REMOVED'
+ AOR: 'carol'
+ count: '8'
+
properties:
minversion: '12.0.0'
dependencies:
--
To view, visit https://gerrit.asterisk.org/6639
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a5931dc6cf94b2f2db47114291b52b5e43e7f56
Gerrit-Change-Number: 6639
Gerrit-PatchSet: 2
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20171011/e2087d6a/attachment-0001.html>
More information about the asterisk-commits
mailing list