<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9045">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins2: Verified
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Update app/voicemail tests to use chan_pjsip instead of chan_sip<br><br>This required a small change to the voicemail.py library but otherwise<br>sip_to_pjsip.py took care of converting all of the sip.conf files.<br>Then it was just a matter of adjusting the dial strings in the run-test<br>files.<br><br>Change-Id: I2722aa6b670e500063a497371f7a7749d59e13e5<br>---<br>M lib/python/asterisk/voicemail.py<br>M tests/apps/dial/dial_answer/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_answer/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_answer/configs/ast1/sip.conf<br>M tests/apps/dial/dial_answer/test-config.yaml<br>M tests/apps/dial/dial_busy/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_busy/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_busy/configs/ast1/sip.conf<br>M tests/apps/dial/dial_busy/test-config.yaml<br>M tests/apps/dial/dial_congestion/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_congestion/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_congestion/configs/ast1/sip.conf<br>M tests/apps/dial/dial_congestion/test-config.yaml<br>M tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/sip.conf<br>M tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml<br>M tests/apps/dial/dial_hangup/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_hangup/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_hangup/configs/ast1/sip.conf<br>M tests/apps/dial/dial_hangup/test-config.yaml<br>M tests/apps/dial/dial_no_answer/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_no_answer/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_no_answer/configs/ast1/sip.conf<br>M tests/apps/dial/dial_no_answer/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/sip.conf<br>M tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml<br>M tests/apps/dial/dial_timeout/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_timeout/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_timeout/configs/ast1/sip.conf<br>M tests/apps/dial/dial_timeout/test-config.yaml<br>M tests/apps/dial/dial_unavail/configs/ast1/extensions.conf<br>A tests/apps/dial/dial_unavail/configs/ast1/pjsip.conf<br>D tests/apps/dial/dial_unavail/configs/ast1/sip.conf<br>M tests/apps/dial/dial_unavail/test-config.yaml<br>A tests/apps/voicemail/authenticate_extensions/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/authenticate_extensions/configs/ast1/sip.conf<br>A tests/apps/voicemail/authenticate_extensions/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/authenticate_extensions/configs/ast2/sip.conf<br>M tests/apps/voicemail/authenticate_extensions/run-test<br>M tests/apps/voicemail/authenticate_extensions/test-config.yaml<br>A tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/sip.conf<br>A tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/sip.conf<br>M tests/apps/voicemail/authenticate_invalid_mailbox/run-test<br>M tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml<br>A tests/apps/voicemail/authenticate_invalid_password/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/authenticate_invalid_password/configs/ast1/sip.conf<br>A tests/apps/voicemail/authenticate_invalid_password/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/authenticate_invalid_password/configs/ast2/sip.conf<br>M tests/apps/voicemail/authenticate_invalid_password/run-test<br>M tests/apps/voicemail/authenticate_invalid_password/test-config.yaml<br>A tests/apps/voicemail/authenticate_nominal/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/authenticate_nominal/configs/ast1/sip.conf<br>A tests/apps/voicemail/authenticate_nominal/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/authenticate_nominal/configs/ast2/sip.conf<br>M tests/apps/voicemail/authenticate_nominal/run-test<br>M tests/apps/voicemail/authenticate_nominal/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_callback/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_callback/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_callback/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_callback/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_callback/run-test<br>M tests/apps/voicemail/check_voicemail_callback/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_delete/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_delete/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_delete/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_delete/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_delete/run-test<br>M tests/apps/voicemail/check_voicemail_delete/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_dialout/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_dialout/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_dialout/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_dialout/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_dialout/run-test<br>M tests/apps/voicemail/check_voicemail_dialout/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_envelope/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_envelope/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_envelope/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_envelope/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_envelope/run-test<br>M tests/apps/voicemail/check_voicemail_envelope/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_forward/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_forward/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_forward/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_forward/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_forward/run-test<br>M tests/apps/voicemail/check_voicemail_forward/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_forward_hangup/run-test<br>M tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test<br>M tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_new_user/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_new_user/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_new_user/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_new_user/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_new_user/run-test<br>M tests/apps/voicemail/check_voicemail_new_user/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_new_user_hangup/run-test<br>M tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_nominal/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_nominal/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_nominal/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_nominal/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_nominal/run-test<br>M tests/apps/voicemail/check_voicemail_nominal/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_options_change_password/run-test<br>M tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test<br>M tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_options_record_busy/run-test<br>M tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_options_record_name/run-test<br>M tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_options_record_temp/run-test<br>M tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_options_record_unavail/run-test<br>M tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_reply/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_reply/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_reply/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_reply/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_reply/run-test<br>M tests/apps/voicemail/check_voicemail_reply/test-config.yaml<br>A tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/sip.conf<br>A tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/sip.conf<br>M tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test<br>M tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml<br>A tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/sip.conf<br>A tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/sip.conf<br>M tests/apps/voicemail/leave_voicemail_contexts/run-test<br>M tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml<br>A tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/sip.conf<br>A tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/sip.conf<br>M tests/apps/voicemail/leave_voicemail_external_notification/run-test<br>M tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml<br>A tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/sip.conf<br>A tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/sip.conf<br>M tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>M tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml<br>A tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/sip.conf<br>A tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/sip.conf<br>M tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test<br>M tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml<br>A tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf<br>A tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf<br>M tests/apps/voicemail/leave_voicemail_nominal/run-test<br>A tests/apps/voicemail/leave_voicemail_priority/configs/ast1/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_priority/configs/ast1/sip.conf<br>A tests/apps/voicemail/leave_voicemail_priority/configs/ast2/pjsip.conf<br>D tests/apps/voicemail/leave_voicemail_priority/configs/ast2/sip.conf<br>M tests/apps/voicemail/leave_voicemail_priority/run-test<br>M tests/apps/voicemail/leave_voicemail_priority/test-config.yaml<br>240 files changed, 3,304 insertions(+), 1,232 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/lib/python/asterisk/voicemail.py b/lib/python/asterisk/voicemail.py<br>index 22ae949..283650b 100644<br>--- a/lib/python/asterisk/voicemail.py<br>+++ b/lib/python/asterisk/voicemail.py<br>@@ -86,7 +86,7 @@<br> <br>     # The default expected channel to be used to send info to the voicemail<br>     # server<br>-    default_sender_channel = "SIP/ast1-00000000"<br>+    default_sender_channel = "PJSIP/ast1-00000000"<br> <br>     def __init__(self):<br>         """Constructor"""<br>diff --git a/tests/apps/dial/dial_answer/configs/ast1/extensions.conf b/tests/apps/dial/dial_answer/configs/ast1/extensions.conf<br>index 82f03cc..0ac0ce9 100644<br>--- a/tests/apps/dial/dial_answer/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_answer/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-   same => n,Dial(SIP/charlie,,b(default^apply_handler^1))<br>+   same => n,Dial(PJSIP/charlie,,b(default^apply_handler^1))<br>  same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_answer/configs/ast1/pjsip.conf b/tests/apps/dial/dial_answer/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..8f0ec1b<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_answer/configs/ast1/pjsip.conf<br>@@ -0,0 +1,35 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_answer/configs/ast1/sip.conf b/tests/apps/dial/dial_answer/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 24fce14..0000000<br>--- a/tests/apps/dial/dial_answer/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,10 +0,0 @@<br>-[general]<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_answer/test-config.yaml b/tests/apps/dial/dial_answer/test-config.yaml<br>index be6916b..191156d 100644<br>--- a/tests/apps/dial/dial_answer/test-config.yaml<br>+++ b/tests/apps/dial/dial_answer/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -28,9 +28,6 @@<br>         config-section: sipp-config<br>         typename: 'sipp.SIPpTestCase'<br>     modules:<br>-        -<br>-            config-section: 'cdr-config-12'<br>-            typename: 'cdr.CDRModule'<br>         -<br>             config-section: ami-config-13-5<br>             typename: 'ami.AMIEventModule'<br>@@ -58,7 +55,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'ANSWERED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -73,7 +70,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 200 OK'<br>@@ -84,7 +81,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -103,7 +100,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -113,7 +110,7 @@<br>                 DestLinkedid: '.*'<br>                 CallerIDNum: '<unknown>'<br>                 CallerIDName: '<unknown>'<br>-                ConnectedLineNum: '<unknown>'<br>+                ConnectedLineNum: 's'<br>                 ConnectedLineName: '<unknown>'<br>                 DialStatus: 'ANSWER'<br>         count: '1'<br>diff --git a/tests/apps/dial/dial_busy/configs/ast1/extensions.conf b/tests/apps/dial/dial_busy/configs/ast1/extensions.conf<br>index 43ddf35..361c9f3 100644<br>--- a/tests/apps/dial/dial_busy/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_busy/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-      same => n,Dial(SIP/bob,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob,,b(default^apply_handler^1))<br>      same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_busy/configs/ast1/pjsip.conf b/tests/apps/dial/dial_busy/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..733ddf4<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_busy/configs/ast1/pjsip.conf<br>@@ -0,0 +1,35 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>diff --git a/tests/apps/dial/dial_busy/configs/ast1/sip.conf b/tests/apps/dial/dial_busy/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 2c1d1e1..0000000<br>--- a/tests/apps/dial/dial_busy/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,10 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>diff --git a/tests/apps/dial/dial_busy/test-config.yaml b/tests/apps/dial/dial_busy/test-config.yaml<br>index ef4a525..ffa7b16 100644<br>--- a/tests/apps/dial/dial_busy/test-config.yaml<br>+++ b/tests/apps/dial/dial_busy/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -48,7 +48,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'BUSY'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -65,7 +65,7 @@<br>                 UserEvent: 'HangupCause'<br>         requirements:<br>             match:<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>                 TechCause: 'SIP 486 Busy Here'<br>                 AsteriskCause: 'User busy'<br>         count: '1'<br>@@ -74,7 +74,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -93,7 +93,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_congestion/configs/ast1/extensions.conf b/tests/apps/dial/dial_congestion/configs/ast1/extensions.conf<br>index 43ddf35..361c9f3 100644<br>--- a/tests/apps/dial/dial_congestion/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_congestion/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>- same => n,Dial(SIP/bob,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob,,b(default^apply_handler^1))<br>      same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_congestion/configs/ast1/pjsip.conf b/tests/apps/dial/dial_congestion/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..733ddf4<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_congestion/configs/ast1/pjsip.conf<br>@@ -0,0 +1,35 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>diff --git a/tests/apps/dial/dial_congestion/configs/ast1/sip.conf b/tests/apps/dial/dial_congestion/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 2c1d1e1..0000000<br>--- a/tests/apps/dial/dial_congestion/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,10 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>diff --git a/tests/apps/dial/dial_congestion/test-config.yaml b/tests/apps/dial/dial_congestion/test-config.yaml<br>index 86a8f96..c493481 100644<br>--- a/tests/apps/dial/dial_congestion/test-config.yaml<br>+++ b/tests/apps/dial/dial_congestion/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -47,7 +47,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'FAILED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -61,7 +61,7 @@<br>                 UserEvent: 'HangupCause'<br>         requirements:<br>             match:<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>                 TechCause: 'SIP 503 Service Unavailable'<br>                 AsteriskCause: 'Circuit/channel congestion'<br>         count: '1'<br>@@ -70,7 +70,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -87,7 +87,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/extensions.conf b/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/extensions.conf<br>index f06e920..1be2b61 100644<br>--- a/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/extensions.conf<br>@@ -9,7 +9,7 @@<br> <br> exten => s,1,NoOp()<br>     same => n,Set(FEATUREMAP(disconnect)=2)<br>-   same => n,Dial(SIP/bob,,Hb(default^apply_handler^1))<br>+      same => n,Dial(PJSIP/bob,,Hb(default^apply_handler^1))<br>     same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/pjsip.conf b/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..733ddf4<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/pjsip.conf<br>@@ -0,0 +1,35 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>diff --git a/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/sip.conf b/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 2c1d1e1..0000000<br>--- a/tests/apps/dial/dial_dtmf_hangup_cancel/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,10 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>diff --git a/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml b/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml<br>index 7908e27..43a0ebd 100644<br>--- a/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml<br>+++ b/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml<br>@@ -15,7 +15,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'pbx_config'<br>@@ -50,7 +50,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'NO ANSWER'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -64,7 +64,7 @@<br>                 UserEvent: 'HangupCause'<br>         requirements:<br>             match:<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>                 TechCause: 'SIP 180 Ringing'<br>                 AsteriskCause: 'Normal Clearing'<br>         count: '1'<br>@@ -73,7 +73,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         callbackModule: 'send_dtmf'<br>         callbackMethod: 'send_dtmf'<br>     -<br>@@ -81,7 +81,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_hangup/configs/ast1/extensions.conf b/tests/apps/dial/dial_hangup/configs/ast1/extensions.conf<br>index 82f03cc..0ac0ce9 100644<br>--- a/tests/apps/dial/dial_hangup/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_hangup/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-       same => n,Dial(SIP/charlie,,b(default^apply_handler^1))<br>+   same => n,Dial(PJSIP/charlie,,b(default^apply_handler^1))<br>  same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_hangup/configs/ast1/pjsip.conf b/tests/apps/dial/dial_hangup/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..8f0ec1b<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_hangup/configs/ast1/pjsip.conf<br>@@ -0,0 +1,35 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_hangup/configs/ast1/sip.conf b/tests/apps/dial/dial_hangup/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 24fce14..0000000<br>--- a/tests/apps/dial/dial_hangup/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,10 +0,0 @@<br>-[general]<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_hangup/test-config.yaml b/tests/apps/dial/dial_hangup/test-config.yaml<br>index 7600b7e..f10eb55 100644<br>--- a/tests/apps/dial/dial_hangup/test-config.yaml<br>+++ b/tests/apps/dial/dial_hangup/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -49,7 +49,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'NO ANSWER'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -63,7 +63,7 @@<br>                 UserEvent: 'HangupCause'<br>         requirements:<br>             match:<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>                 TechCause: 'SIP 180 Ringing'<br>                 AsteriskCause: 'Normal Clearing'<br>         count: '1'<br>@@ -72,7 +72,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         callbackModule: 'hangup'<br>         callbackMethod: 'send_hangup'<br>     -<br>@@ -80,7 +80,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_no_answer/configs/ast1/extensions.conf b/tests/apps/dial/dial_no_answer/configs/ast1/extensions.conf<br>index 43ddf35..361c9f3 100644<br>--- a/tests/apps/dial/dial_no_answer/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_no_answer/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>- same => n,Dial(SIP/bob,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob,,b(default^apply_handler^1))<br>      same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_no_answer/configs/ast1/pjsip.conf b/tests/apps/dial/dial_no_answer/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..733ddf4<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_no_answer/configs/ast1/pjsip.conf<br>@@ -0,0 +1,35 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>diff --git a/tests/apps/dial/dial_no_answer/configs/ast1/sip.conf b/tests/apps/dial/dial_no_answer/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 2c1d1e1..0000000<br>--- a/tests/apps/dial/dial_no_answer/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,10 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>diff --git a/tests/apps/dial/dial_no_answer/test-config.yaml b/tests/apps/dial/dial_no_answer/test-config.yaml<br>index 1d6cebe..4a8b103 100644<br>--- a/tests/apps/dial/dial_no_answer/test-config.yaml<br>+++ b/tests/apps/dial/dial_no_answer/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -47,7 +47,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'BUSY'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -61,7 +61,7 @@<br>                 UserEvent: 'HangupCause'<br>         requirements:<br>             match:<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>                 TechCause: 'SIP 480 Temporarily Unavailable'<br>                 AsteriskCause: 'User alerting'<br>         count: '1'<br>@@ -70,7 +70,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -87,7 +87,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/extensions.conf<br>index 8039df3..fc09819 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>- same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml<br>index 51b708e..4877881 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -47,7 +47,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'BUSY'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -57,7 +57,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'BUSY'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -69,7 +69,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 486 Busy Here'<br>@@ -81,7 +81,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 486 Busy Here'<br>@@ -92,7 +92,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -107,7 +107,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -122,7 +122,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -137,7 +137,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/extensions.conf<br>index 4f92912..c165d88 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/extensions.conf<br>@@ -9,7 +9,7 @@<br> <br> exten => s,1,NoOp()<br>      same => n,Set(FEATUREMAP(disconnect)=2)<br>-   same => n,Dial(SIP/bob&SIP/charlie,,Hb(default^apply_handler^1))<br>+      same => n,Dial(PJSIP/bob&PJSIP/charlie,,Hb(default^apply_handler^1))<br>   same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml<br>index 7b1f7d1..01b3d6d 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml<br>@@ -15,7 +15,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -51,7 +51,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'NO ANSWER'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -61,7 +61,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'NO ANSWER'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -73,7 +73,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 180 Ringing'<br>@@ -84,7 +84,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         callbackModule: 'send_dtmf'<br>         callbackMethod: 'send_dtmf'<br>     -<br>@@ -92,7 +92,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -109,7 +109,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -127,7 +127,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 180 Ringing'<br>@@ -138,7 +138,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -155,7 +155,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/extensions.conf<br>index 8039df3..fc09819 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-    same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml<br>index 2cb9485..1b3c8a9 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -47,7 +47,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'FAILED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -57,7 +57,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'FAILED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -69,7 +69,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 503 Service Unavailable'<br>@@ -81,7 +81,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 503 Service Unavailable'<br>@@ -92,7 +92,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -107,7 +107,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -122,7 +122,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -137,7 +137,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/extensions.conf<br>index 8039df3..fc09819 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>- same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml<br>index 2978626..6e465ac 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -47,7 +47,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'BUSY'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -57,7 +57,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'BUSY'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -69,7 +69,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 480 Temporarily Unavailable'<br>@@ -81,7 +81,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 480 Temporarily Unavailable'<br>@@ -92,7 +92,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -107,7 +107,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -122,7 +122,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -137,7 +137,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/extensions.conf<br>index 8039df3..fc09819 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-       same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml<br>index bbb11fc..a79b675 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -47,7 +47,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'FAILED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -57,7 +57,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'FAILED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -69,7 +69,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 420 Bad Extension'<br>@@ -81,7 +81,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 420 Bad Extension'<br>@@ -92,7 +92,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -107,7 +107,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -122,7 +122,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -137,7 +137,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf<br>index 07cfa21..d18d260 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-   same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml<br>index 5e1bc48..4752971 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml<br>@@ -15,7 +15,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -50,7 +50,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'NO ANSWER'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -60,7 +60,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'ANSWERED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -75,7 +75,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 180 Ringing'<br>@@ -87,7 +87,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 200 OK'<br>@@ -98,7 +98,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -117,7 +117,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -136,7 +136,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -155,7 +155,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf<br>index 07cfa21..d18d260 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-   same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml<br>index 776e76d..93e5439 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -48,7 +48,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'BUSY'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -58,7 +58,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'ANSWERED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -70,7 +70,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 486 Busy Here'<br>@@ -82,7 +82,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 200 OK'<br>@@ -93,7 +93,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -108,7 +108,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -123,7 +123,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -138,7 +138,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf<br>index 07cfa21..d18d260 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-  same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml<br>index 3cb2889..0c2d5c6 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -48,7 +48,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'FAILED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -58,7 +58,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'ANSWERED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -70,7 +70,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 503 Service Unavailable'<br>@@ -82,7 +82,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 200 OK'<br>@@ -93,7 +93,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -108,7 +108,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -123,7 +123,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -138,7 +138,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/extensions.conf<br>index 07cfa21..d18d260 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-      same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml<br>index 3b69ac7..d7118c5 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml<br>@@ -14,7 +14,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -49,7 +49,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'BUSY'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -59,7 +59,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'ANSWERED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -71,7 +71,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 480 Temporarily Unavailable'<br>@@ -83,7 +83,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 200 OK'<br>@@ -94,7 +94,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -109,7 +109,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -124,7 +124,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -139,7 +139,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/extensions.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/extensions.conf<br>index 07cfa21..d18d260 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-      same => n,Dial(SIP/bob&SIP/charlie,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob&PJSIP/charlie,,b(default^apply_handler^1))<br>    same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/pjsip.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..653c3a0<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/pjsip.conf<br>@@ -0,0 +1,54 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+[charlie]<br>+port = 5067<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>+[charlie]<br>+type = aor<br>+contact = sip:127.0.0.1:5067<br>+<br>+[charlie]<br>+type = identify<br>+endpoint = charlie<br>+match = 127.0.0.1<br>+<br>+[charlie]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = charlie<br>+<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/sip.conf b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 149cdaf..0000000<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,19 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>-<br>-[charlie]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5067<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>\ No newline at end of file<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml<br>index a898bee..deb08f1 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -48,7 +48,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'FAILED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -58,7 +58,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/charlie-.{8}'<br>+                dchannel: 'PJSIP/charlie-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'ANSWERED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -70,7 +70,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 420 Bad Extension'<br>@@ -82,7 +82,7 @@<br>             match:<br>                 Event: 'UserEvent'<br>                 UserEvent: 'HangupCause'<br>-                HangupChannel: 'SIP/charlie-.*'<br>+                HangupChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 TechCause: 'SIP 200 OK'<br>@@ -93,7 +93,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -108,7 +108,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -123,7 +123,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -138,7 +138,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/charlie-.*'<br>+                DestChannel: 'PJSIP/charlie-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_timeout/configs/ast1/extensions.conf b/tests/apps/dial/dial_timeout/configs/ast1/extensions.conf<br>index 34e768e..36f2fc4 100644<br>--- a/tests/apps/dial/dial_timeout/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_timeout/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-  same => n,Dial(SIP/bob,2,b(default^apply_handler^1))<br>+      same => n,Dial(PJSIP/bob,2,b(default^apply_handler^1))<br>     same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_timeout/configs/ast1/pjsip.conf b/tests/apps/dial/dial_timeout/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..733ddf4<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_timeout/configs/ast1/pjsip.conf<br>@@ -0,0 +1,35 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>diff --git a/tests/apps/dial/dial_timeout/configs/ast1/sip.conf b/tests/apps/dial/dial_timeout/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 2c1d1e1..0000000<br>--- a/tests/apps/dial/dial_timeout/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,10 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>diff --git a/tests/apps/dial/dial_timeout/test-config.yaml b/tests/apps/dial/dial_timeout/test-config.yaml<br>index ce16bbe..d4a3459 100644<br>--- a/tests/apps/dial/dial_timeout/test-config.yaml<br>+++ b/tests/apps/dial/dial_timeout/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -48,7 +48,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'NO ANSWER'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -62,7 +62,7 @@<br>                 UserEvent: 'HangupCause'<br>         requirements:<br>             match:<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>                 TechCause: 'SIP 180 Ringing'<br>                 AsteriskCause: 'Normal Clearing'<br>         count: '1'<br>@@ -71,7 +71,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/dial/dial_unavail/configs/ast1/extensions.conf b/tests/apps/dial/dial_unavail/configs/ast1/extensions.conf<br>index 43ddf35..361c9f3 100644<br>--- a/tests/apps/dial/dial_unavail/configs/ast1/extensions.conf<br>+++ b/tests/apps/dial/dial_unavail/configs/ast1/extensions.conf<br>@@ -1,7 +1,7 @@<br> [default]<br> <br> exten => s,1,NoOp()<br>-        same => n,Dial(SIP/bob,,b(default^apply_handler^1))<br>+       same => n,Dial(PJSIP/bob,,b(default^apply_handler^1))<br>      same => n,Hangup()<br> <br> exten => apply_handler,1,NoOp()<br>diff --git a/tests/apps/dial/dial_unavail/configs/ast1/pjsip.conf b/tests/apps/dial/dial_unavail/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..733ddf4<br>--- /dev/null<br>+++ b/tests/apps/dial/dial_unavail/configs/ast1/pjsip.conf<br>@@ -0,0 +1,35 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[bob]<br>+port = 5066<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 0.0.0.0<br>+<br>+[bob]<br>+type = aor<br>+contact = sip:127.0.0.1:5066<br>+<br>+[bob]<br>+type = identify<br>+endpoint = bob<br>+match = 127.0.0.1<br>+<br>+[bob]<br>+type = endpoint<br>+context = default<br>+disallow = all<br>+allow = ulaw<br>+aors = bob<br>+<br>diff --git a/tests/apps/dial/dial_unavail/configs/ast1/sip.conf b/tests/apps/dial/dial_unavail/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 2c1d1e1..0000000<br>--- a/tests/apps/dial/dial_unavail/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,10 +0,0 @@<br>-[general]<br>-<br>-[bob]<br>-context=default<br>-type=peer<br>-host=127.0.0.1<br>-port=5066<br>-insecure=invite<br>-disallow=all<br>-allow=ulaw<br>diff --git a/tests/apps/dial/dial_unavail/test-config.yaml b/tests/apps/dial/dial_unavail/test-config.yaml<br>index dd683b0..1ab86e1 100644<br>--- a/tests/apps/dial/dial_unavail/test-config.yaml<br>+++ b/tests/apps/dial/dial_unavail/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_stack'<br>         - asterisk : 'app_userevent'<br>         - asterisk : 'cdr_csv'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>         - asterisk : 'func_channel'<br>         - asterisk : 'func_hangupcause'<br>         - asterisk : 'func_strings'<br>@@ -47,7 +47,7 @@<br>                 dcontext: 'default'<br>                 callerid: '"" <>'<br>                 channel: 'Local/s@default-.{8};2'<br>-                dchannel: 'SIP/bob-.{8}'<br>+                dchannel: 'PJSIP/bob-.{8}'<br>                 lastapp: 'Dial'<br>                 disposition: 'FAILED'<br>                 amaflags: 'DOCUMENTATION'<br>@@ -61,7 +61,7 @@<br>                 UserEvent: 'HangupCause'<br>         requirements:<br>             match:<br>-                HangupChannel: 'SIP/bob-.*'<br>+                HangupChannel: 'PJSIP/bob-.*'<br>                 TechCause: 'SIP 420 Bad Extension'<br>                 AsteriskCause: 'No route to destination'<br>         count: '1'<br>@@ -70,7 +70,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialBegin'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>@@ -87,7 +87,7 @@<br>         conditions:<br>             match:<br>                 Event: 'DialEnd'<br>-                DestChannel: 'SIP/bob-.*'<br>+                DestChannel: 'PJSIP/bob-.*'<br>         requirements:<br>             match:<br>                 Channel: 'Local/s@default-.*'<br>diff --git a/tests/apps/voicemail/authenticate_extensions/configs/ast1/pjsip.conf b/tests/apps/voicemail/authenticate_extensions/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/authenticate_extensions/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/authenticate_extensions/configs/ast1/sip.conf b/tests/apps/voicemail/authenticate_extensions/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 16b8af0..0000000<br>--- a/tests/apps/voicemail/authenticate_extensions/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/authenticate_extensions/configs/ast2/pjsip.conf b/tests/apps/voicemail/authenticate_extensions/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/authenticate_extensions/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/authenticate_extensions/configs/ast2/sip.conf b/tests/apps/voicemail/authenticate_extensions/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/authenticate_extensions/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/authenticate_extensions/run-test b/tests/apps/voicemail/authenticate_extensions/run-test<br>index 602da32..8f19b43 100755<br>--- a/tests/apps/voicemail/authenticate_extensions/run-test<br>+++ b/tests/apps/voicemail/authenticate_extensions/run-test<br>@@ -136,15 +136,15 @@<br> <br>     def executeTest(self, ami):<br>         if self.test_counter == 0:<br>-            logger.debug("Originating call to sip/ast/9000")<br>-            df = ami.originate("sip/ast1/9000", "voicemailCaller", "wait", 1)<br>+            logger.debug("Originating call to PJSIP/9000@ast1")<br>+            df = ami.originate("PJSIP/9000@ast1", "voicemailCaller", "wait", 1)<br>             df.addErrback(self.handle_originate_failure)<br>         else:<br>-            self.sender_channel = "SIP/ast1-00000001"<br>+            self.sender_channel = "PJSIP/ast1-00000001"<br>             startObject = LoginWithoutMailbox(self.test_state_controller, self)<br>             self.test_state_controller.change_state(startObject)<br>-            logger.debug("Originating call to sip/ast/9000")<br>-            df = ami.originate("sip/ast1/9000", "voicemailCaller", "wait", 1)<br>+            logger.debug("Originating call to PJSIP/9000@ast1")<br>+            df = ami.originate("PJSIP/9000@ast1", "voicemailCaller", "wait", 1)<br>             df.addErrback(self.handle_originate_failure)<br> <br>     def user_event(self, ami, event):<br>diff --git a/tests/apps/voicemail/authenticate_extensions/test-config.yaml b/tests/apps/voicemail/authenticate_extensions/test-config.yaml<br>index 859004e..466669a 100644<br>--- a/tests/apps/voicemail/authenticate_extensions/test-config.yaml<br>+++ b/tests/apps/voicemail/authenticate_extensions/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_voicemail'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/pjsip.conf b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/sip.conf b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 16b8af0..0000000<br>--- a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/pjsip.conf b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/sip.conf b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/run-test b/tests/apps/voicemail/authenticate_invalid_mailbox/run-test<br>index 17095be..7997005 100755<br>--- a/tests/apps/voicemail/authenticate_invalid_mailbox/run-test<br>+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/run-test<br>@@ -65,7 +65,7 @@<br>     def __init__(self):<br>         super(AuthenticateInvalidMailbox, self).__init__()<br>         self.create_asterisk(2)<br>-        self.channel = "sip/ast1/9000"<br>+        self.channel = "PJSIP/9000@ast1"<br> <br>     def ami_connect(self, ami):<br>         super(AuthenticateInvalidMailbox, self).ami_connect(ami)<br>diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml b/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml<br>index ceaf166..13bf03f 100644<br>--- a/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml<br>+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_voicemail'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/pjsip.conf b/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/sip.conf b/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 16b8af0..0000000<br>--- a/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/pjsip.conf b/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/sip.conf b/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/authenticate_invalid_password/run-test b/tests/apps/voicemail/authenticate_invalid_password/run-test<br>index ec389b9..06d2368 100755<br>--- a/tests/apps/voicemail/authenticate_invalid_password/run-test<br>+++ b/tests/apps/voicemail/authenticate_invalid_password/run-test<br>@@ -135,15 +135,15 @@<br> <br>     def executeTest(self, ami):<br>         if self.test_counter == 0:<br>-            logger.debug("Originating call to sip/ast/9000")<br>-            df = ami.originate("sip/ast1/9000", "voicemailCaller", "wait", 1)<br>+            logger.debug("Originating call to PJSIP/9000@ast1")<br>+            df = ami.originate("PJSIP/9000@ast1", "voicemailCaller", "wait", 1)<br>             df.addErrback(self.handle_originate_failure)<br>         else:<br>-            self.sender_channel = "SIP/ast1-00000001"<br>+            self.sender_channel = "PJSIP/ast1-00000001"<br>             startObject = LoginWithoutMailbox(self.test_state_controller, self)<br>             self.test_state_controller.change_state(startObject)<br>-            logger.debug("Originating call to sip/ast/9001")<br>-            df = ami.originate("sip/ast1/9001", "voicemailCaller", "wait", 1)<br>+            logger.debug("Originating call to PJSIP/9001@ast1")<br>+            df = ami.originate("PJSIP/9001@ast1", "voicemailCaller", "wait", 1)<br>             df.addErrback(self.handle_originate_failure)<br> <br>     def user_event(self, ami, event):<br>diff --git a/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml b/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml<br>index 73deb42..0834058 100644<br>--- a/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml<br>+++ b/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_voicemail'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/authenticate_nominal/configs/ast1/pjsip.conf b/tests/apps/voicemail/authenticate_nominal/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/authenticate_nominal/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/authenticate_nominal/configs/ast1/sip.conf b/tests/apps/voicemail/authenticate_nominal/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 16b8af0..0000000<br>--- a/tests/apps/voicemail/authenticate_nominal/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/authenticate_nominal/configs/ast2/pjsip.conf b/tests/apps/voicemail/authenticate_nominal/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/authenticate_nominal/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/authenticate_nominal/configs/ast2/sip.conf b/tests/apps/voicemail/authenticate_nominal/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/authenticate_nominal/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/authenticate_nominal/run-test b/tests/apps/voicemail/authenticate_nominal/run-test<br>index 49b182f..36c633b 100755<br>--- a/tests/apps/voicemail/authenticate_nominal/run-test<br>+++ b/tests/apps/voicemail/authenticate_nominal/run-test<br>@@ -106,9 +106,9 @@<br>         and test controller object type<br>         """<br>         self.credentials = [<br>-            ("9000", "1234", "SIP/ast1-00000000", LoginWithMailbox),<br>-            ("9001", "0", "SIP/ast1-00000001", LoginWithoutMailbox),<br>-            ("9002", "1234567890", "SIP/ast1-00000002", LoginWithoutMailbox)]<br>+            ("9000", "1234", "PJSIP/ast1-00000000", LoginWithMailbox),<br>+            ("9001", "0", "PJSIP/ast1-00000001", LoginWithoutMailbox),<br>+            ("9002", "1234567890", "PJSIP/ast1-00000002", LoginWithoutMailbox)]<br>         self.create_asterisk(2)<br>         self.test_counter = 0<br> <br>@@ -139,8 +139,8 @@<br>         self.test_state_controller.change_state(startObject)<br>         self.sender_channel = tuple[2]<br> <br>-        logger.debug("Originating call to sip/ast1/" + tuple[0])<br>-        df = self.ami_sender.originate("sip/ast1/" + tuple[0], "voicemailCaller", "wait", 1)<br>+        logger.debug("Originating call to PJSIP/" + tuple[0] + "@ast1")<br>+        df = self.ami_sender.originate("PJSIP/" + tuple[0] + "@ast1", "voicemailCaller", "wait", 1)<br>         df.addErrback(self.handle_originate_failure)<br>         self.test_counter += 1<br> <br>diff --git a/tests/apps/voicemail/authenticate_nominal/test-config.yaml b/tests/apps/voicemail/authenticate_nominal/test-config.yaml<br>index 213496d..f0f6521 100644<br>--- a/tests/apps/voicemail/authenticate_nominal/test-config.yaml<br>+++ b/tests/apps/voicemail/authenticate_nominal/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_callback/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_callback/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_callback/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_callback/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_callback/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_callback/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_callback/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_callback/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_callback/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_callback/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_callback/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_callback/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_callback/run-test b/tests/apps/voicemail/check_voicemail_callback/run-test<br>index 62f8e0e..8bc7dc4 100755<br>--- a/tests/apps/voicemail/check_voicemail_callback/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_callback/run-test<br>@@ -203,7 +203,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_callback/test-config.yaml b/tests/apps/voicemail/check_voicemail_callback/test-config.yaml<br>index f62ea87..7c7e112 100644<br>--- a/tests/apps/voicemail/check_voicemail_callback/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_callback/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_delete/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_delete/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_delete/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_delete/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_delete/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_delete/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_delete/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_delete/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_delete/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_delete/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_delete/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_delete/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_delete/run-test b/tests/apps/voicemail/check_voicemail_delete/run-test<br>index 1c20a1e..4a9d525 100755<br>--- a/tests/apps/voicemail/check_voicemail_delete/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_delete/run-test<br>@@ -185,7 +185,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_delete/test-config.yaml b/tests/apps/voicemail/check_voicemail_delete/test-config.yaml<br>index 2defc46..29e02e9 100644<br>--- a/tests/apps/voicemail/check_voicemail_delete/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_delete/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_dialout/run-test b/tests/apps/voicemail/check_voicemail_dialout/run-test<br>index a36821c..fac4222 100755<br>--- a/tests/apps/voicemail/check_voicemail_dialout/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_dialout/run-test<br>@@ -195,7 +195,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml b/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml<br>index b462b81..9d682f9 100644<br>--- a/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_envelope/run-test b/tests/apps/voicemail/check_voicemail_envelope/run-test<br>index 62123cf..bc6e0d5 100755<br>--- a/tests/apps/voicemail/check_voicemail_envelope/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_envelope/run-test<br>@@ -238,7 +238,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml b/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml<br>index 4ec2025..939ab88 100644<br>--- a/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_forward/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_forward/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_forward/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_forward/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_forward/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_forward/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_forward/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_forward/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_forward/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_forward/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_forward/run-test b/tests/apps/voicemail/check_voicemail_forward/run-test<br>index 3c572dd..3dd2aec 100755<br>--- a/tests/apps/voicemail/check_voicemail_forward/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_forward/run-test<br>@@ -218,7 +218,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_forward/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward/test-config.yaml<br>index 1d8cadc..acd7785 100644<br>--- a/tests/apps/voicemail/check_voicemail_forward/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_forward/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/run-test b/tests/apps/voicemail/check_voicemail_forward_hangup/run-test<br>index 855886f..2836fb1 100755<br>--- a/tests/apps/voicemail/check_voicemail_forward_hangup/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/run-test<br>@@ -225,7 +225,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml<br>index 10cca13..f0971ff 100644<br>--- a/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test b/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test<br>index 61e5131..2dbc408 100755<br>--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test<br>@@ -234,7 +234,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml<br>index 6069fb0..ab48613 100644<br>--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user/run-test b/tests/apps/voicemail/check_voicemail_new_user/run-test<br>index 1124fb1..e3c3bad 100755<br>--- a/tests/apps/voicemail/check_voicemail_new_user/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_new_user/run-test<br>@@ -202,7 +202,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml b/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml<br>index 0565758..1c4d32d 100644<br>--- a/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml<br>@@ -14,7 +14,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/run-test b/tests/apps/voicemail/check_voicemail_new_user_hangup/run-test<br>index 7616a56..03e6136 100755<br>--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/run-test<br>@@ -198,7 +198,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml b/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml<br>index b705781..2c2ed55 100644<br>--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_nominal/run-test b/tests/apps/voicemail/check_voicemail_nominal/run-test<br>index 728d8aa..0066f03 100755<br>--- a/tests/apps/voicemail/check_voicemail_nominal/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_nominal/run-test<br>@@ -265,7 +265,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml b/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml<br>index 28be740..6089973 100644<br>--- a/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - python : 'starpy'<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/run-test b/tests/apps/voicemail/check_voicemail_options_change_password/run-test<br>index 1cf5d82..37f91d0 100755<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password/run-test<br>@@ -185,7 +185,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml<br>index c4c532f..b157464 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml<br>@@ -14,7 +14,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test<br>index a691945..5c6b8d9 100755<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test<br>@@ -182,7 +182,7 @@<br>     """<br> <br>     testParentDir = "tests/apps/voicemail"  # parent directory the test is in<br>-    channel = "sip/ast1/8052"  # channel to connect to that acts as vm server<br>+    channel = "PJSIP/8052@ast1"  # channel to connect to that acts as vm server<br> <br>     def __init__(self):<br>         super(CheckVoicemailChangePassword, self).__init__()<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml<br>index 22e0aa9..bfd8156 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml<br>@@ -15,7 +15,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/run-test b/tests/apps/voicemail/check_voicemail_options_record_busy/run-test<br>index 5731b91..3d96c09 100755<br>--- a/tests/apps/voicemail/check_voicemail_options_record_busy/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/run-test<br>@@ -174,7 +174,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml<br>index 496bca0..de47837 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/run-test b/tests/apps/voicemail/check_voicemail_options_record_name/run-test<br>index de527a6..8749c8e 100755<br>--- a/tests/apps/voicemail/check_voicemail_options_record_name/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_name/run-test<br>@@ -174,7 +174,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml<br>index 6fb31b8..1b5dcac 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/run-test b/tests/apps/voicemail/check_voicemail_options_record_temp/run-test<br>index 74224bb..846e4a6 100755<br>--- a/tests/apps/voicemail/check_voicemail_options_record_temp/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/run-test<br>@@ -239,7 +239,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml<br>index 6fb31b8..1b5dcac 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/run-test b/tests/apps/voicemail/check_voicemail_options_record_unavail/run-test<br>index a998130..10f71d4 100755<br>--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/run-test<br>@@ -174,7 +174,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml<br>index d5cdc37..b852f21 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_reply/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_reply/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_reply/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_reply/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_reply/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_reply/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_reply/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_reply/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_reply/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_reply/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_reply/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_reply/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_reply/run-test b/tests/apps/voicemail/check_voicemail_reply/run-test<br>index 6835138..c918826 100755<br>--- a/tests/apps/voicemail/check_voicemail_reply/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_reply/run-test<br>@@ -218,7 +218,7 @@<br>     """<br>     The channel to connect to that acts as the voicemail server<br>     """<br>-    channel = "sip/ast1/8052"<br>+    channel = "PJSIP/8052@ast1"<br> <br>     """<br>     The voicemail manager object<br>diff --git a/tests/apps/voicemail/check_voicemail_reply/test-config.yaml b/tests/apps/voicemail/check_voicemail_reply/test-config.yaml<br>index b3f6809..9979e6c 100644<br>--- a/tests/apps/voicemail/check_voicemail_reply/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_reply/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..4d1eac8<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast1<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 1d6df41..0000000<br>--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,13 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast1<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..66698dd<br>--- /dev/null<br>+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+context = voicemailCaller<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/sip.conf<br>deleted file mode 100644<br>index b0d2cd0..0000000<br>--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-context = voicemailCaller<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test b/tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test<br>index 7027bf8..4be96de 100755<br>--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test<br>+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test<br>@@ -213,11 +213,6 @@<br>     testParentDir = "tests/apps/voicemail"<br> <br>     """<br>-    The channel to connect to that acts as the voicemail server<br>-    """<br>-    channel = "sip/ast1/"<br>-<br>-    """<br>     The voicemail manager object<br>     """<br>     voicemailManager = None<br>@@ -284,8 +279,8 @@<br>                     self.stop_reactor()<br> <br>         else:<br>-            logger.debug("Originating call to " + self.channel)<br>-            df = ami.originate(self.channel + "8052", "voicemailCaller", "wait", 1)<br>+            logger.debug("Originating call to PJSIP/8052@ast1")<br>+            df = ami.originate("PJSIP/8052@ast1", "voicemailCaller", "wait", 1)<br>             df.addErrback(self.handle_originate_failure)<br>             self.leaveVoicemail()<br> <br>@@ -299,9 +294,9 @@<br>         self.stop_reactor()<br> <br>     def leaveVoicemail(self):<br>-        logger.debug("Originating call to " + self.channel + "1234")<br>+        logger.debug("Originating call to PJSIP/1234@ast1")<br>         self.ast[self.ami_sender.id].cli_exec("dialplan set global TALK_AUDIO " + self.audioFile)<br>-        df = self.ami_sender.originate(self.channel + "1234", "voicemailCaller", "leaveVoicemail", 1)<br>+        df = self.ami_sender.originate("PJSIP/1234@ast1", "voicemailCaller", "leaveVoicemail", 1)<br>         df.addErrback(self.handle_originate_failure)<br> <br>     def user_event(self, ami, event):<br>diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml b/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml<br>index c1e3d91..1f86f3f 100644<br>--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml<br>@@ -17,7 +17,7 @@<br>         - asterisk : 'app_voicemail'<br>         - asterisk : 'app_senddtmf'<br>         - asterisk : 'app_playback'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 0d703fb..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_contexts/run-test b/tests/apps/voicemail/leave_voicemail_contexts/run-test<br>index 169512e..4897686 100755<br>--- a/tests/apps/voicemail/leave_voicemail_contexts/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_contexts/run-test<br>@@ -132,12 +132,12 @@<br>         self.reset_timeout()<br>         if self.testCounter < 5:<br>             # The first 5 tests start out in extension 9000<br>-            self.ami_sender.originate(channel = "sip/ast1/9000",<br>+            self.ami_sender.originate(channel = "PJSIP/9000@ast1",<br>                 context = "voicemailCaller",<br>                 exten = "wait",<br>                 priority= 1).addErrback(self.handle_originate_failure)<br>         elif self.testCounter < len(self.expectedValues):<br>-            self.ami_sender.originate(channel = "sip/ast1/1234",<br>+            self.ami_sender.originate(channel = "PJSIP/1234@ast1",<br>                 context = "voicemailCaller",<br>                 exten = "wait",<br>                 priority = 1).addErrback(self.handle_originate_failure)<br>diff --git a/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml b/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml<br>index 95bc2a3..63fe6d8 100644<br>--- a/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml<br>@@ -10,7 +10,7 @@<br>         - python : 'starpy'<br>         - asterisk: 'app_voicemail'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 0d703fb..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/run-test b/tests/apps/voicemail/leave_voicemail_external_notification/run-test<br>index 0ab2710..4497be6 100755<br>--- a/tests/apps/voicemail/leave_voicemail_external_notification/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_external_notification/run-test<br>@@ -144,23 +144,23 @@<br>     def executeTest(self):<br>         if self.testCounter == 0:<br>             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 1234")<br>-            df = self.senderAmi.originate("sip/ast1/1234", "sendvoicemail", "1234", 1)<br>+            df = self.senderAmi.originate("PJSIP/1234@ast1", "sendvoicemail", "1234", 1)<br>             df.addErrback(self.handle_originate_failure)<br>         elif self.testCounter == 1:<br>             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 9000")<br>-            df = self.senderAmi.originate("sip/ast1/9000", "sendvoicemail", "1234", 1)<br>+            df = self.senderAmi.originate("PJSIP/9000@ast1", "sendvoicemail", "1234", 1)<br>             df.addErrback(self.handle_originate_failure)<br>         elif self.testCounter == 2:<br>             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 9001")<br>-            df = self.senderAmi.originate("sip/ast1/9001", "sendvoicemail", "1234", 1)<br>+            df = self.senderAmi.originate("PJSIP/9001@ast1", "sendvoicemail", "1234", 1)<br>             df.addErrback(self.handle_originate_failure)<br>         elif self.testCounter == 3:<br>             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 9002")<br>-            df = self.senderAmi.originate("sip/ast1/9002", "sendvoicemail", "1234", 1)<br>+            df = self.senderAmi.originate("PJSIP/9002@ast1", "sendvoicemail", "1234", 1)<br>             df.addErrback(self.handle_originate_failure)<br>         elif self.testCounter == 4:<br>             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 9003")<br>-            df = self.senderAmi.originate("sip/ast1/9003", "sendvoicemail", "1234", 1)<br>+            df = self.senderAmi.originate("PJSIP/9003@ast1", "sendvoicemail", "1234", 1)<br>             df.addErrback(self.handle_originate_failure)<br> <br>         self.testCounter += 1<br>diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml b/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml<br>index b6bfe25..4f15d61 100644<br>--- a/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml<br>@@ -13,7 +13,7 @@<br>         - python : 'starpy'<br>         - asterisk: 'app_voicemail'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 0d703fb..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/run-test b/tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>index a88164e..d604fe2 100755<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>@@ -129,8 +129,8 @@<br> <br>     def originate_call(self):<br>         extension = self.extensions[self.test_counter]<br>-        logger.info("Originating call to sip/ast1/" + str(extension))<br>-        df = self.ami_sender.originate("sip/ast1/" + str(extension), "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>+        logger.info("Originating call to PJSIP/" + str(extension)) + "@ast1"<br>+        df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>         df.addErrback(self.handle_originate_failure)<br> <br>     def user_event(self, ami, event):<br>@@ -152,7 +152,7 @@<br>         else:<br>             """ Originate the next call and reset the state machine """<br>             self.test_counter += 1<br>-            self.sender_channel = "SIP/ast1-0000000" + str(self.test_counter)<br>+            self.sender_channel = "PJSIP/ast1-0000000" + str(self.test_counter)<br>             self.test_state_controller.change_state(StartVoiceMailState(self.test_state_controller, self))<br>             self.originate_call()<br> <br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml b/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml<br>index ad9ada2..0afafa7 100644<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - python : 'starpy'<br>         - asterisk: 'app_voicemail'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 0d703fb..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test<br>index 55eb3f0..2263f80 100755<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test<br>@@ -129,8 +129,8 @@<br> <br>     def originate_call(self):<br>         extension = self.extensions[self.test_counter]<br>-        logger.info("Originating call to sip/ast1/" + str(extension))<br>-        df = self.ami_sender.originate("sip/ast1/" + str(extension), "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>+        logger.info("Originating call to PJSIP/" + str(extension) + "@ast1")<br>+        df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>         df.addErrback(self.handle_originate_failure)<br> <br>     def user_event(self, ami, event):<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml<br>index b720063..41f0078 100644<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml<br>@@ -12,7 +12,7 @@<br>         - python : 'starpy'<br>         - asterisk: 'app_voicemail'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..ed09b27<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/pjsip.conf<br>@@ -0,0 +1,119 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+[ast3]<br>+qualify = no<br>+<br>+[ast4]<br>+qualify = no<br>+<br>+[ast5]<br>+qualify = no<br>+<br>+[ast6]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>+[ast3]<br>+type = aor<br>+contact = sip:127.0.0.3<br>+<br>+[ast3]<br>+type = identify<br>+endpoint = ast3<br>+match = 127.0.0.3<br>+<br>+[ast3]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast3<br>+<br>+[ast4]<br>+type = aor<br>+contact = sip:127.0.0.4<br>+<br>+[ast4]<br>+type = identify<br>+endpoint = ast4<br>+match = 127.0.0.4<br>+<br>+[ast4]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast4<br>+<br>+[ast5]<br>+type = aor<br>+contact = sip:127.0.0.5<br>+<br>+[ast5]<br>+type = identify<br>+endpoint = ast5<br>+match = 127.0.0.5<br>+<br>+[ast5]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast5<br>+<br>+[ast6]<br>+type = aor<br>+contact = sip:127.0.0.6<br>+<br>+[ast6]<br>+type = identify<br>+endpoint = ast6<br>+match = 127.0.0.6<br>+<br>+[ast6]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast6<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 99fe322..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,52 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>-[ast3]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.3<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>-[ast4]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.4<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>-[ast5]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.5<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>-<br>-[ast6]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.6<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_nominal/run-test b/tests/apps/voicemail/leave_voicemail_nominal/run-test<br>index 840f686..651c9d2 100755<br>--- a/tests/apps/voicemail/leave_voicemail_nominal/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_nominal/run-test<br>@@ -127,8 +127,8 @@<br> <br>     def originate_call(self):<br>         extension = self.extensions[self.test_counter]<br>-        logger.info("Originating call to sip/ast1/" + str(extension))<br>-        df = self.ami_sender.originate("sip/ast1/" + str(extension), "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>+        logger.info("Originating call to PJSIP/" + str(extension) + "@ast1")<br>+        df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>         df.addErrback(self.handle_originate_failure)<br> <br>     def user_event(self, ami, event):<br>diff --git a/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/pjsip.conf<br>new file mode 100644<br>index 0000000..1aee750<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/pjsip.conf<br>@@ -0,0 +1,39 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.1<br>+<br>+[ast2]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.1<br>+<br>+[ast2]<br>+type = aor<br>+contact = sip:127.0.0.2<br>+<br>+[ast2]<br>+type = identify<br>+endpoint = ast2<br>+match = 127.0.0.2<br>+<br>+[ast2]<br>+type = endpoint<br>+context = voicemail<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast_server<br>+aors = ast2<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/sip.conf<br>deleted file mode 100644<br>index 0d703fb..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/sip.conf<br>+++ /dev/null<br>@@ -1,12 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.1<br>-<br>-[ast2]<br>-type = friend<br>-context = voicemail<br>-fromuser = ast_server<br>-host = 127.0.0.2<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/pjsip.conf<br>new file mode 100644<br>index 0000000..28f0820<br>--- /dev/null<br>+++ b/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/pjsip.conf<br>@@ -0,0 +1,38 @@<br>+;--<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements start<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+<br>+[general]<br>+bindaddr = 127.0.0.2<br>+<br>+[ast1]<br>+qualify = no<br>+<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+Non mapped elements end<br>+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;<br>+--;<br>+<br>+<br>+[transport-udp]<br>+type = transport<br>+protocol = udp<br>+bind = 127.0.0.2<br>+<br>+[ast1]<br>+type = aor<br>+contact = sip:127.0.0.1<br>+<br>+[ast1]<br>+type = identify<br>+endpoint = ast1<br>+match = 127.0.0.1<br>+<br>+[ast1]<br>+type = endpoint<br>+disallow = all<br>+allow = ulaw<br>+from_user = ast2<br>+aors = ast1<br>+<br>diff --git a/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/sip.conf<br>deleted file mode 100644<br>index 1303790..0000000<br>--- a/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/sip.conf<br>+++ /dev/null<br>@@ -1,11 +0,0 @@<br>-[general]<br>-bindaddr = 127.0.0.2<br>-<br>-[ast1]<br>-type = friend<br>-fromuser = ast2<br>-host = 127.0.0.1<br>-disallow = all<br>-allow = ulaw<br>-qualify = no<br>-insecure = invite<br>diff --git a/tests/apps/voicemail/leave_voicemail_priority/run-test b/tests/apps/voicemail/leave_voicemail_priority/run-test<br>index eee02ff..17451e7 100755<br>--- a/tests/apps/voicemail/leave_voicemail_priority/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_priority/run-test<br>@@ -123,8 +123,8 @@<br> <br>     def originate_call(self):<br>         extension = self.extensions[self.test_counter]<br>-        logger.info("Originating call to sip/ast1/" + str(extension))<br>-        df = self.ami_sender.originate("sip/ast1/" + str(extension), "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>+        logger.info("Originating call to PJSIP/" + str(extension) + "@ast1")<br>+        df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>         df.addErrback(self.handle_originate_failure)<br> <br>     def user_event(self, ami, event):<br>diff --git a/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml b/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml<br>index 8cb33b7..c89d2a1 100644<br>--- a/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml<br>@@ -11,7 +11,7 @@<br>         - python : 'starpy'<br>         - asterisk: 'app_voicemail'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_sip'<br>+        - asterisk : 'chan_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9045">change 9045</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9045"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 15.4 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2722aa6b670e500063a497371f7a7749d59e13e5 </div>
<div style="display:none"> Gerrit-Change-Number: 9045 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>