[Asterisk-code-review] pjsip/contacts: Handle contact id is now aor@@uri hash (testsuite[master])

[Anonymous Coward]

Anonymous Coward #1000019 has submitted this change and it was merged.

Change subject: pjsip/contacts: Handle contact id is now aor@@uri_hash
......................................................................


pjsip/contacts: Handle contact id is now aor@@uri_hash

Needed to update tests to handle the change in contact and
contact_status id from aor@@uri to aor@@uri_hash.

ASTERISK-25595

Change-Id: Ifaf43e2416f6f21a9c2887ec833a6e6d65df0ac4
---
M tests/channels/pjsip/config_wizard/trunk/test-config.yaml
M tests/channels/pjsip/dialplan_functions/pjsip_aor/configs/ast1/extensions.conf
M tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf
M tests/channels/pjsip/statsd/contacts/test-config.yaml
4 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/tests/channels/pjsip/config_wizard/trunk/test-config.yaml b/tests/channels/pjsip/config_wizard/trunk/test-config.yaml
index ba1223a..9a51885 100644
--- a/tests/channels/pjsip/config_wizard/trunk/test-config.yaml
+++ b/tests/channels/pjsip/config_wizard/trunk/test-config.yaml
@@ -143,7 +143,7 @@
                     DefaultExpiration: '3600'
                     MaximumExpiration: '7200'
                     MinimumExpiration: '60'
-                    Contacts: 'trunk1/sip:127.0.0.5:41060,trunk1/sip:127.0.0.6:41070'
+                    Contacts: 'trunk1/sip:127.0.0.[56]:410[67]0,trunk1/sip:127.0.0.[56]:410[67]0'
                     TotalContacts: '2'
                     ContactsRegistered: '0'
                     EndpointName: 'trunk1'
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_aor/configs/ast1/extensions.conf b/tests/channels/pjsip/dialplan_functions/pjsip_aor/configs/ast1/extensions.conf
index 0086c48..c0b6d27 100644
--- a/tests/channels/pjsip/dialplan_functions/pjsip_aor/configs/ast1/extensions.conf
+++ b/tests/channels/pjsip/dialplan_functions/pjsip_aor/configs/ast1/extensions.conf
@@ -28,7 +28,7 @@
 same => n,GoSub(default,test_variable,1(alice,support_path,false))
 
 ; Test Bob's (static contact) properties
-same => n,GoSub(default,test_variable,1(bob,contact,bob@@sip:1000 at 127.0.0.1))
+same => n,GoSub(default,test_variable,1(bob,contact,bob@@b6c3d120cfd9e85addf64ee8943f4eec))
 same => n,GoSub(default,test_variable,1(bob,authenticate_qualify,false))
 same => n,GoSub(default,test_variable,1(bob,default_expiration,3600))
 same => n,GoSub(default,test_variable,1(bob,mailboxes,))
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf b/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf
index 61d47c1..8c19c1a 100644
--- a/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf
+++ b/tests/channels/pjsip/dialplan_functions/pjsip_contact/configs/ast1/extensions.conf
@@ -21,9 +21,9 @@
 same => n,GoSub(default,test_variable,1(alice\;@81363c8ccd1bbe394538018e5bee371f,user_agent,Test))
 
 ; Test Bob's (static contact) properties
-same => n,GoSub(default,test_variable,1(bob@@sip:1000 at 127.0.0.1,uri,sip:1000 at 127.0.0.1))
-same => n,GoSub(default,test_variable,1(bob@@sip:1000 at 127.0.0.1,status,Unknown))
-same => n,GoSub(default,test_variable,1(bob@@sip:1000 at 127.0.0.1,rtt,N/A))
+same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,uri,sip:1000 at 127.0.0.1))
+same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,status,Unknown))
+same => n,GoSub(default,test_variable,1(bob@@b6c3d120cfd9e85addf64ee8943f4eec,rtt,N/A))
 
 same => n,UserEvent(Result, Status: passed)
 same => n,Hangup()
diff --git a/tests/channels/pjsip/statsd/contacts/test-config.yaml b/tests/channels/pjsip/statsd/contacts/test-config.yaml
index 3022e1f..e95122f 100644
--- a/tests/channels/pjsip/statsd/contacts/test-config.yaml
+++ b/tests/channels/pjsip/statsd/contacts/test-config.yaml
@@ -42,7 +42,7 @@
         -
             'PJSIP\.contacts\.states\.Reachable:\+1\|g'
         -
-            'PJSIP\.contacts\.sipp@@sip:127\.0\.0\.1:5061\.rtt:.*\|ms'
+            'PJSIP\.contacts\.sipp@@d0c8ec670653c9643ca96622ef658bbb\.rtt:.*\|ms'
 
 properties:
     minversion: '13.7.0'

-- 
To view, visit https://gerrit.asterisk.org/1757
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaf43e2416f6f21a9c2887ec833a6e6d65df0ac4
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>