[Asterisk-code-review] channels/pjsip/subscriptions/rls: Rework RLS verification te... (testsuite[master])

Anonymous Coward asteriskteam at digium.com
Tue Nov 24 08:28:19 CST 2015 

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

Change subject: channels/pjsip/subscriptions/rls: Rework RLS verification tests for VOIPProxy
......................................................................


channels/pjsip/subscriptions/rls: Rework RLS verification tests for VOIPProxy

There are two changes that all tests that use the RLS pluggable modules for
NOTIFY request verification required once the RLSTest class inherited from
VOIPProxy:

(1) All SIPp scenarios must send to the proxy at 127.0.0.1:5061, as opposed to
    Asterisk's address. Since the SIPp scenarios previously bound to 5061, they
    now bind to 5062.
(2) PJSIP must be told to rewrite the contact for the sipp endpoint. Otherwise,
    it will send the NOTIFY request directly to the SIPp scenario, bypassing
    the proxy and the NOTIFY request validator.

Finally, since all tests no longer use a live pcap capture to verify NOTIFY
requests, yappcap has been removed as a dependency.

ASTERISK-25430 #close

Change-Id: I6bc206b77f860352b0d2673c6a05b2f555e633b3
---
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/no_list_resources_exist/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/subscription_establishment/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/configs/ast1/pjsip.conf
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_wo_list_support/test-config.yaml
95 files changed, 93 insertions(+), 92 deletions(-)

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



diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/configs/ast1/pjsip.conf
index 8f2d3cf..9ed1788 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/configs/ast1/pjsip.conf
@@ -17,6 +17,7 @@
 
 [sipp]
 type = endpoint
+rewrite_contact = yes
 
 [alice]
 type = aor
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml
index 229da31..bf8c68a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml
@@ -19,7 +19,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -50,7 +49,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/configs/ast1/pjsip.conf
index 8f2d3cf..9ed1788 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/configs/ast1/pjsip.conf
@@ -17,6 +17,7 @@
 
 [sipp]
 type = endpoint
+rewrite_contact = yes
 
 [alice]
 type = aor
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml
index 8bf223d..2b364bc 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml
@@ -13,7 +13,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -44,7 +43,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/configs/ast1/pjsip.conf
index 8f2d3cf..9ed1788 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/configs/ast1/pjsip.conf
@@ -17,6 +17,7 @@
 
 [sipp]
 type = endpoint
+rewrite_contact = yes
 
 [alice]
 type = aor
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml
index 02ccefb..27d790c 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml
@@ -15,7 +15,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -46,7 +45,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list', '-d': '3000'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list', '-d': '3000'} }
 
 test-config:
     stop-test-after-notifys: False
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf
index 8f2d3cf..9ed1788 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf
@@ -17,6 +17,7 @@
 
 [sipp]
 type = endpoint
+rewrite_contact = yes
 
 [alice]
 type = aor
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml
index e5bc39e..126c0a2 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml
@@ -13,7 +13,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -44,7 +43,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/configs/ast1/pjsip.conf
index 8f2d3cf..9ed1788 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/configs/ast1/pjsip.conf
@@ -17,6 +17,7 @@
 
 [sipp]
 type = endpoint
+rewrite_contact = yes
 
 [alice]
 type = aor
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml
index 5a9c755..833e906 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml
@@ -15,7 +15,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -46,7 +45,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list', '-d': '3000'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list', '-d': '3000'} }
 
 test-config:
     stop-test-after-notifys: False
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/configs/ast1/pjsip.conf
index 952ed97..f5d33f8 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/configs/ast1/pjsip.conf
@@ -22,6 +22,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml
index 5425313..5633c4e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -41,7 +40,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf
index 10f0aff..a67adcb 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf
@@ -21,6 +21,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml
index 5a2354b..3af5e19 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml
@@ -28,7 +28,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -54,7 +53,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/configs/ast1/pjsip.conf
index e2c0afc..71ac890 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/configs/ast1/pjsip.conf
@@ -22,6 +22,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml
index 0cac3c3..b7b19dd 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -41,7 +40,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf
index 10f0aff..a67adcb 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf
@@ -21,6 +21,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml
index ba52c53..fd7d44d 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml
@@ -15,7 +15,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -41,7 +40,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf
index 10f0aff..f088329 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf
@@ -21,8 +21,10 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
+
 [local]
 type=transport
 protocol=udp
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml
index 45875d3..0a0af30 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml
@@ -15,7 +15,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -42,7 +41,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/configs/ast1/pjsip.conf
index 4d249c7..67073a8 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/configs/ast1/pjsip.conf
@@ -18,3 +18,4 @@
 [sipp]
 type = endpoint
 context = default
+rewrite_contact = true
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml
index fafac44..abe484a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml
@@ -19,7 +19,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -48,7 +47,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     stop-test-after-notifys: False
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/configs/ast1/pjsip.conf
index 4d249c7..67073a8 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/configs/ast1/pjsip.conf
@@ -18,3 +18,4 @@
 [sipp]
 type = endpoint
 context = default
+rewrite_contact = true
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml
index e978669..6ec511b 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml
@@ -13,7 +13,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -40,7 +39,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/configs/ast1/pjsip.conf
index 4d249c7..67073a8 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/configs/ast1/pjsip.conf
@@ -18,3 +18,4 @@
 [sipp]
 type = endpoint
 context = default
+rewrite_contact = true
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml
index b862b27..6a51b4b 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml
@@ -15,7 +15,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -42,7 +41,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list', '-d': '3000'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list', '-d': '3000'} }
 
 test-config:
     stop-test-after-notifys: False
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf
index 4d249c7..67073a8 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/configs/ast1/pjsip.conf
@@ -18,3 +18,4 @@
 [sipp]
 type = endpoint
 context = default
+rewrite_contact = true
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml
index ba63fb4..45bde1f 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml
@@ -13,7 +13,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -40,7 +39,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/configs/ast1/pjsip.conf
index 4d249c7..67073a8 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/configs/ast1/pjsip.conf
@@ -18,3 +18,4 @@
 [sipp]
 type = endpoint
 context = default
+rewrite_contact = true
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml
index d5446c7..0b7488b 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml
@@ -15,7 +15,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -42,7 +41,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list', '-d': '3000'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list', '-d': '3000'} }
 
 test-config:
     stop-test-after-notifys: False
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/configs/ast1/pjsip.conf
index f6900d4..7a06b32 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/configs/ast1/pjsip.conf
@@ -15,6 +15,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml
index 541e33f..ce1d28a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -38,7 +37,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf
index 27068c1..cf5b781 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf
@@ -14,6 +14,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml
index 10a9ff4..0daf0ea 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml
@@ -27,7 +27,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -51,7 +50,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/configs/ast1/pjsip.conf
index fa1ed6d..93cab0a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/configs/ast1/pjsip.conf
@@ -15,6 +15,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml
index c9989a4..259fcb9 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml
@@ -15,7 +15,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -39,7 +38,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf
index 27068c1..cf5b781 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf
@@ -14,6 +14,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml
index 4010042..4a9c19a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml
@@ -15,7 +15,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -39,7 +38,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf
index 27068c1..cf5b781 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf
@@ -14,6 +14,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml
index e824eee..9bdc7f3 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml
@@ -16,7 +16,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -40,7 +39,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/no_list_resources_exist/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/no_list_resources_exist/test-config.yaml
index 55caeb7..d0b76c2 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/no_list_resources_exist/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/no_list_resources_exist/test-config.yaml
@@ -10,7 +10,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf
index 8c1ec34..224182e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf
@@ -22,6 +22,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml
index 0f68b57..57d05fd 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml
@@ -10,7 +10,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -36,7 +35,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/configs/ast1/pjsip.conf
index 021024a..7dc2a7e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/configs/ast1/pjsip.conf
@@ -18,6 +18,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml
index 17c4e95..d4566e4 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml
@@ -11,7 +11,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -37,7 +36,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf
index 0f0d3cf..b378e78 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf
@@ -14,6 +14,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml
index 8e9035a..5c4b819 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml
@@ -10,7 +10,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -34,7 +33,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/configs/ast1/pjsip.conf
index 27068c1..cf5b781 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/configs/ast1/pjsip.conf
@@ -14,6 +14,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml
index cf51b04..87b70a2 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml
@@ -11,7 +11,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -35,7 +34,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/configs/ast1/pjsip.conf
index efcdd74..a8e7120 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/configs/ast1/pjsip.conf
@@ -22,6 +22,7 @@
 
 [sipp]
 type = endpoint
+rewrite_contact = true
 
 [alice]
 type = aor
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml
index 149094a..33ea863 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml
@@ -45,7 +45,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list_a'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list_a'} }
 
 test-config:
     list-name: 'mail_list_a'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/configs/ast1/pjsip.conf
index fc054e0..839a6d6 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/configs/ast1/pjsip.conf
@@ -33,6 +33,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml
index 202320a..844ad61 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -41,7 +40,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/configs/ast1/pjsip.conf
index fc054e0..839a6d6 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/configs/ast1/pjsip.conf
@@ -33,6 +33,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml
index ffcab9f..1e22d40 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -41,7 +40,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf
index fc054e0..839a6d6 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/configs/ast1/pjsip.conf
@@ -33,6 +33,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml
index ccd2001..b4cc03c 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml
@@ -29,7 +29,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -55,7 +54,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/configs/ast1/pjsip.conf
index 691fd67..e0f84ee 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/configs/ast1/pjsip.conf
@@ -31,6 +31,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml
index ec99e76..a648f78 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -41,7 +40,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/configs/ast1/pjsip.conf
index 691fd67..e0f84ee 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/configs/ast1/pjsip.conf
@@ -31,6 +31,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml
index 7111d97..8468372 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -41,7 +40,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf
index 691fd67..e0f84ee 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/configs/ast1/pjsip.conf
@@ -31,6 +31,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml
index 08eb1b4..e0aef9a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml
@@ -15,7 +15,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -41,7 +40,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/subscription_establishment/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/subscription_establishment/configs/ast1/pjsip.conf
index fc054e0..839a6d6 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/subscription_establishment/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/subscription_establishment/configs/ast1/pjsip.conf
@@ -33,6 +33,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf
index fc054e0..839a6d6 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/configs/ast1/pjsip.conf
@@ -33,6 +33,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml
index 54e7c11..855892e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml
@@ -16,7 +16,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -43,7 +42,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/configs/ast1/pjsip.conf
index 14522bb..e7a4407 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/configs/ast1/pjsip.conf
@@ -24,3 +24,4 @@
 [sipp]
 type = endpoint
 context = default
+rewrite_contact = true
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml
index f633b7e..7b536b7 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml
@@ -15,7 +15,6 @@
         - buildoption: 'TEST_FRAMEWORK'
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -42,7 +41,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list_a'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list_a'} }
 
 test-config:
     list-name: 'pres_list_a'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/configs/ast1/pjsip.conf
index 8382811..e375603 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/configs/ast1/pjsip.conf
@@ -21,6 +21,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml
index 77bf85e..01c15d0 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -38,7 +37,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/configs/ast1/pjsip.conf
index 8382811..e375603 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/configs/ast1/pjsip.conf
@@ -21,6 +21,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml
index 92e17a5..def61d8 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -38,7 +37,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf
index a362aba..4bec255 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/configs/ast1/pjsip.conf
@@ -19,6 +19,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml
index aa405e0..625d177 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml
@@ -28,7 +28,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -52,7 +51,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/configs/ast1/pjsip.conf
index 86c6329..56a99aa 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/configs/ast1/pjsip.conf
@@ -28,6 +28,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml
index 80a0542..22cbbb1 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml
@@ -9,7 +9,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -33,7 +32,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/configs/ast1/pjsip.conf
index b4b66cc..1b0d158 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/configs/ast1/pjsip.conf
@@ -21,6 +21,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml
index c1c9f66..655e868 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml
@@ -15,7 +15,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -39,7 +38,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/configs/ast1/pjsip.conf
index b4b66cc..1b0d158 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/configs/ast1/pjsip.conf
@@ -21,6 +21,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml
index 38f6dec..7dc25bf 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml
@@ -15,7 +15,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -39,7 +38,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf
index a362aba..4bec255 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/configs/ast1/pjsip.conf
@@ -19,6 +19,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml
index 3100564..30ba404 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml
@@ -15,7 +15,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -39,7 +38,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf
index a362aba..4bec255 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/configs/ast1/pjsip.conf
@@ -19,6 +19,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml
index d0c5a76..4ae0d4c 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml
@@ -16,7 +16,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -40,7 +39,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf
index a7dc6db..ded2118 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/configs/ast1/pjsip.conf
@@ -34,6 +34,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml
index 275712f..1302293 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml
@@ -31,7 +31,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -58,7 +57,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'mail_list'} }
 
 test-config:
     list-name: 'mail_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/configs/ast1/pjsip.conf
index 29e57aa..c3ce45d 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/configs/ast1/pjsip.conf
@@ -32,6 +32,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml
index 45ddead..6fec709 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml
@@ -30,7 +30,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -57,7 +56,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'carol'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'carol'} }
 
 test-config:
     list-name: 'carol'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/configs/ast1/pjsip.conf
index 9bbb7c5..7458396 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/configs/ast1/pjsip.conf
@@ -36,6 +36,7 @@
 type = endpoint
 context = default
 aors=sipp
+rewrite_contact = true
 transport=local
 
 [local]
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/test-config.yaml
index 700936f..00dabd6 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_wo_list_support/test-config.yaml
@@ -14,7 +14,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf
index 3602599..ef93393 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/configs/ast1/pjsip.conf
@@ -21,6 +21,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml
index ec23387..67dd8ca 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml
@@ -32,7 +32,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -56,7 +55,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'pres_list'} }
 
 test-config:
     list-name: 'pres_list'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/configs/ast1/pjsip.conf b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/configs/ast1/pjsip.conf
index 10c0e9f..fdcdf87 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/configs/ast1/pjsip.conf
@@ -19,6 +19,7 @@
 context = default
 aors=sipp
 transport=local
+rewrite_contact = true
 
 [local]
 type=transport
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml
index f750a40..438aa5e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml
@@ -28,7 +28,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'
@@ -52,7 +51,7 @@
     test-iterations:
         -
             scenarios:
-                - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'carol'} }
+                - { 'target': '127.0.0.1:5061', 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5062', '-s': 'carol'} }
 
 test-config:
     list-name: 'carol'
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_wo_list_support/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_wo_list_support/test-config.yaml
index 8689be9..ddaac22 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_wo_list_support/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_wo_list_support/test-config.yaml
@@ -13,7 +13,6 @@
     dependencies:
         - python: 'twisted'
         - python: 'starpy'
-        - python: 'yappcap'
         - python: 'lxml'
         - asterisk: 'res_pjsip'
         - asterisk: 'res_pjsip_pubsub'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6bc206b77f860352b0d2673c6a05b2f555e633b3
Gerrit-PatchSet: 3
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan <mjordan at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>

More information about the asterisk-code-review mailing list