<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/testsuite/+/19860">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">testsuite: re-configure tests for chan_pjsip<br><br>Modify existing tests that used chan_sip to use<br>chan_pjsip.<br><br>ASTERISK-30292<br><br>Change-Id: I75960f1af9d7544c01dd00981626c02869fc1f51<br>---<br>A configs/bridge/ast1/pjsip.conf<br>R configs/bridge/ast1/pjsip_sip-alice.conf<br>R configs/bridge/ast1/pjsip_sip-bob.conf<br>D configs/bridge/ast1/sip.conf<br>A configs/bridge/ast2/pjsip.conf<br>R configs/bridge/ast2/pjsip_sip-uut.conf<br>D configs/bridge/ast2/sip.conf<br>A configs/bridge/ast3/pjsip.conf<br>R configs/bridge/ast3/pjsip_sip-uut.conf<br>D configs/bridge/ast3/sip.conf<br>M lib/python/asterisk/asterisk.py<br>M lib/python/asterisk/bridge_test_case.py<br>M tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf<br>A tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/pjsip.conf<br>D tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/sip.conf<br>M tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml<br>A tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/pjsip.conf<br>D tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/sip.conf<br>M tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml<br>A tests/apps/confbridge/confbridge_nominal/configs/ast1/pjsip.conf<br>D tests/apps/confbridge/confbridge_nominal/configs/ast1/sip.conf<br>A tests/apps/confbridge/confbridge_nominal/configs/ast2/pjsip.conf<br>D tests/apps/confbridge/confbridge_nominal/configs/ast2/sip.conf<br>M tests/apps/confbridge/confbridge_nominal/run-test<br>M tests/apps/confbridge/confbridge_nominal/test-config.yaml<br>A tests/apps/confbridge/confbridge_start_muted/configs/ast1/pjsip.conf<br>D tests/apps/confbridge/confbridge_start_muted/configs/ast1/sip.conf<br>M tests/apps/confbridge/confbridge_start_muted/test-config.yaml<br>A tests/apps/directory/directory_attendant_exit/configs/ast1/pjsip.conf<br>D tests/apps/directory/directory_attendant_exit/configs/ast1/sip.conf<br>A tests/apps/directory/directory_attendant_exit/configs/ast2/pjsip.conf<br>D tests/apps/directory/directory_attendant_exit/configs/ast2/sip.conf<br>M tests/apps/directory/directory_attendant_exit/run-test<br>M tests/apps/directory/directory_attendant_exit/test-config.yaml<br>A tests/apps/directory/directory_context_operator_exit/configs/ast1/pjsip.conf<br>D tests/apps/directory/directory_context_operator_exit/configs/ast1/sip.conf<br>A tests/apps/directory/directory_context_operator_exit/configs/ast2/pjsip.conf<br>D tests/apps/directory/directory_context_operator_exit/configs/ast2/sip.conf<br>M tests/apps/directory/directory_context_operator_exit/run-test<br>M tests/apps/directory/directory_context_operator_exit/test-config.yaml<br>A tests/apps/directory/directory_operator_exit/configs/ast1/pjsip.conf<br>D tests/apps/directory/directory_operator_exit/configs/ast1/sip.conf<br>A tests/apps/directory/directory_operator_exit/configs/ast2/pjsip.conf<br>D tests/apps/directory/directory_operator_exit/configs/ast2/sip.conf<br>M tests/apps/directory/directory_operator_exit/run-test<br>M tests/apps/directory/directory_operator_exit/test-config.yaml<br>D tests/apps/incomplete/sip_incomplete/configs/ast1/extensions.conf<br>D tests/apps/incomplete/sip_incomplete/configs/ast1/sip.conf<br>D tests/apps/incomplete/sip_incomplete/run-test<br>D tests/apps/incomplete/sip_incomplete/sipp/receiver1.xml<br>D tests/apps/incomplete/sip_incomplete/sipp/sender1.xml<br>D tests/apps/incomplete/sip_incomplete/test-config.yaml<br>D tests/apps/incomplete/tests.yaml<br>A tests/apps/queues/ringinuse_and_pause/configs/ast1/pjsip.conf<br>D tests/apps/queues/ringinuse_and_pause/configs/ast1/sip.conf<br>M tests/apps/queues/ringinuse_and_pause/test-config.yaml<br>M tests/apps/queues/ringinuse_and_pause/test.lua<br>A tests/apps/queues/set_penalty/configs/ast1/pjsip.conf<br>M tests/apps/queues/set_penalty/configs/ast1/queues.conf<br>D tests/apps/queues/set_penalty/configs/ast1/sip.conf<br>M tests/apps/queues/set_penalty/run-test<br>M tests/apps/queues/set_penalty/test-config.yaml<br>A tests/apps/sendtext/basic/configs/ast1/pjsip.conf<br>D tests/apps/sendtext/basic/configs/ast1/sip.conf<br>M tests/apps/sendtext/basic/test-config.yaml<br>M tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf<br>M tests/bridge/atxfer_fail_blonde/test-config.yaml<br>M tests/bridge/atxfer_nominal/configs/ast1/extensions.conf<br>A tests/bridge/atxfer_nominal/configs/ast1/pjsip_sip-alice.conf<br>D tests/bridge/atxfer_nominal/configs/ast1/sip-alice.conf<br>A tests/bridge/atxfer_nominal/configs/ast4/pjsip.conf<br>D tests/bridge/atxfer_nominal/configs/ast4/sip.conf<br>M tests/bridge/atxfer_nominal/test-config.yaml<br>M tests/bridge/atxfer_setup/configs/ast1/extensions.conf<br>M tests/bridge/atxfer_setup/test-config.yaml<br>M tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf<br>A tests/bridge/atxfer_threeway_nominal/configs/ast1/pjsip_sip-alice.conf<br>D tests/bridge/atxfer_threeway_nominal/configs/ast1/sip-alice.conf<br>A tests/bridge/atxfer_threeway_nominal/configs/ast4/pjsip.conf<br>D tests/bridge/atxfer_threeway_nominal/configs/ast4/sip.conf<br>M tests/bridge/atxfer_threeway_nominal/test-config.yaml<br>M tests/bridge/automixmon/configs/ast1/extensions.conf<br>M tests/bridge/automixmon/test-config.yaml<br>M tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf<br>M tests/bridge/automixmon_bridgefeatures/test-config.yaml<br>M tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf<br>A tests/bridge/blindxfer_nominal/configs/ast1/pjsip_sip-alice.conf<br>D tests/bridge/blindxfer_nominal/configs/ast1/sip-alice.conf<br>A tests/bridge/blindxfer_nominal/configs/ast4/pjsip.conf<br>D tests/bridge/blindxfer_nominal/configs/ast4/sip.conf<br>M tests/bridge/blindxfer_nominal/test-config.yaml<br>M tests/bridge/blindxfer_setup/configs/ast1/extensions.conf<br>M tests/bridge/blindxfer_setup/test-config.yaml<br>M tests/bridge/blonde_nominal/configs/ast1/extensions.conf<br>A tests/bridge/blonde_nominal/configs/ast1/pjsip_sip-alice.conf<br>D tests/bridge/blonde_nominal/configs/ast1/sip-alice.conf<br>A tests/bridge/blonde_nominal/configs/ast4/pjsip.conf<br>M tests/bridge/blonde_nominal/test-config.yaml<br>M tests/bridge/connected_line_update/configs/ast1/extensions.conf<br>A tests/bridge/connected_line_update/configs/ast1/pjsip_sip-alice.conf<br>A tests/bridge/connected_line_update/configs/ast1/pjsip_sip-bob.conf<br>D tests/bridge/connected_line_update/configs/ast1/sip-alice.conf<br>D tests/bridge/connected_line_update/configs/ast1/sip-bob.conf<br>A tests/bridge/connected_line_update/configs/ast2/pjsip_sip-uut.conf<br>D tests/bridge/connected_line_update/configs/ast2/sip-uut.conf<br>A tests/bridge/connected_line_update/configs/ast3/pjsip_sip-uut.conf<br>D tests/bridge/connected_line_update/configs/ast3/sip-uut.conf<br>M tests/bridge/connected_line_update/test-config.yaml<br>M tests/bridge/dial_LS_options/configs/ast1/extensions.conf<br>M tests/bridge/dial_LS_options/test-config.yaml<br>M tests/bridge/disconnect/configs/ast1/extensions.conf<br>M tests/bridge/disconnect/test-config.yaml<br>M tests/bridge/parkcall/configs/ast1/extensions.conf<br>M tests/bridge/parkcall/test-config.yaml<br>M tests/bridge/parkcall_blindxfer/Hangup.py<br>M tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf<br>M tests/bridge/parkcall_blindxfer/test-config.yaml<br>M tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf<br>M tests/bridge/parkcall_bridgefeatures/test-config.yaml<br>M tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py<br>M tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf<br>M tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml<br>M tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py<br>M tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf<br>M tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml<br>M tests/bridge/simple_bridge/configs/ast1/extensions.conf<br>M tests/bridge/simple_bridge/test-config.yaml<br>M tests/bridge/transfer_capabilities/configs/ast1/extensions.conf<br>M tests/bridge/transfer_capabilities/test-config.yaml<br>M tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf<br>M tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml<br>M tests/bridge/transfer_failure/configs/ast1/extensions.conf<br>M tests/bridge/transfer_failure/test-config.yaml<br>M tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf<br>A tests/cdr/app_dial_G_flag/configs/ast1/pjsip.conf<br>D tests/cdr/app_dial_G_flag/configs/ast1/sip.conf<br>M tests/cdr/app_dial_G_flag/test-config.yaml<br>M tests/cdr/app_dial_G_flag/test.lua<br>M tests/cdr/app_queue/configs/ast1/modules.conf.inc<br>A tests/cdr/app_queue/configs/ast1/pjsip.conf<br>M tests/cdr/app_queue/configs/ast1/queues.conf<br>D tests/cdr/app_queue/configs/ast1/sip.conf<br>M tests/cdr/app_queue/test-config.yaml<br>M tests/cdr/app_queue/test.lua<br>M tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/extensions.conf<br>A tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/pjsip.conf<br>D tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/sip.conf<br>M tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml<br>A tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/pjsip.conf<br>D tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/sip.conf<br>M tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/extensions.conf<br>A tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/pjsip.conf<br>D tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/sip.conf<br>M tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml<br>A tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/pjsip.conf<br>D tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/sip.conf<br>M tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/extensions.conf<br>A tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/pjsip.conf<br>D tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/sip.conf<br>M tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml<br>M tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/extensions.conf<br>A tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/pjsip.conf<br>D tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/sip.conf<br>M tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml<br>M tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/extensions.conf<br>A tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/pjsip.conf<br>D tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/sip.conf<br>M tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml<br>A tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/pjsip.conf<br>D tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/sip.conf<br>M tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf<br>A tests/cdr/console_dial_sip_answer/configs/ast1/pjsip.conf<br>D tests/cdr/console_dial_sip_answer/configs/ast1/sip.conf<br>M tests/cdr/console_dial_sip_answer/test-config.yaml<br>A tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/pjsip.conf<br>D tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/sip.conf<br>M tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf<br>A tests/cdr/console_dial_sip_busy/configs/ast1/pjsip.conf<br>D tests/cdr/console_dial_sip_busy/configs/ast1/sip.conf<br>M tests/cdr/console_dial_sip_busy/test-config.yaml<br>A tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/pjsip.conf<br>D tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/sip.conf<br>M tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf<br>A tests/cdr/console_dial_sip_congestion/configs/ast1/pjsip.conf<br>D tests/cdr/console_dial_sip_congestion/configs/ast1/sip.conf<br>M tests/cdr/console_dial_sip_congestion/test-config.yaml<br>A tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/pjsip.conf<br>D tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/sip.conf<br>M tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf<br>A tests/cdr/console_dial_sip_transfer/configs/ast1/pjsip.conf<br>D tests/cdr/console_dial_sip_transfer/configs/ast1/sip.conf<br>M tests/cdr/console_dial_sip_transfer/test-config.yaml<br>M tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf<br>A tests/cdr/originate-cdr-disposition/configs/ast1/pjsip.conf<br>D tests/cdr/originate-cdr-disposition/configs/ast1/sip.conf<br>M tests/cdr/originate-cdr-disposition/test-config.yaml<br>M tests/channels/local/local_app/configs/ast1/extensions.conf<br>A tests/channels/local/local_app/configs/ast1/pjsip.conf<br>D tests/channels/local/local_app/configs/ast1/sip.conf<br>M tests/channels/local/local_app/test-config.yaml<br>M tests/channels/local/local_call/configs/ast1/extensions.conf<br>A tests/channels/local/local_call/configs/ast1/pjsip.conf<br>D tests/channels/local/local_call/configs/ast1/sip.conf<br>M tests/channels/local/local_call/test-config.yaml<br>M tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf<br>A tests/channels/local/local_holding_bridge/configs/ast1/pjsip.conf<br>D tests/channels/local/local_holding_bridge/configs/ast1/sip.conf<br>M tests/channels/local/local_holding_bridge/test-config.yaml<br>M tests/channels/local/local_optimize_away/configs/ast1/extensions.conf<br>A tests/channels/local/local_optimize_away/configs/ast1/pjsip.conf<br>D tests/channels/local/local_optimize_away/configs/ast1/sip.conf<br>M tests/channels/local/local_optimize_away/test-config.yaml<br>M tests/feature_call_pickup/configs/ast1/extensions.conf<br>A tests/feature_call_pickup/configs/ast1/pjsip.conf<br>D tests/feature_call_pickup/configs/ast1/sip.conf<br>M tests/feature_call_pickup/configs/ast2/extensions.conf<br>A tests/feature_call_pickup/configs/ast2/pjsip.conf<br>D tests/feature_call_pickup/configs/ast2/sip.conf<br>M tests/feature_call_pickup/run-test<br>M tests/feature_call_pickup/test-config.yaml<br>M tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf<br>A tests/funcs/func_jitterbuffer/configs/ast1/pjsip.conf<br>D tests/funcs/func_jitterbuffer/configs/ast1/sip.conf<br>M tests/funcs/func_jitterbuffer/test-config.yaml<br>M tests/manager/bridge_actions/configs/ast1/extensions.conf<br>M tests/manager/bridge_actions/test-config.yaml<br>M tests/masquerade/configs/ast1/extensions.conf<br>A tests/masquerade/configs/ast1/pjsip.conf<br>D tests/masquerade/configs/ast1/sip.conf<br>A tests/masquerade/configs/ast2/pjsip.conf<br>D tests/masquerade/configs/ast2/sip.conf<br>M tests/masquerade/run-test<br>M tests/masquerade/test-config.yaml<br>A tests/pbx/merge_contexts/configs/ast1/pjsip.conf<br>D tests/pbx/merge_contexts/configs/ast1/sip.conf<br>A tests/pbx/merge_contexts/configs/ast2/pjsip.conf<br>D tests/pbx/merge_contexts/configs/ast2/sip.conf<br>M tests/pbx/merge_contexts/run-test<br>M tests/pbx/merge_contexts/test-config.yaml<br>A tests/pbx/pbx_lua_background/configs/ast1/pjsip.conf<br>D tests/pbx/pbx_lua_background/configs/ast1/sip.conf<br>A tests/pbx/pbx_lua_background/configs/ast2/pjsip.conf<br>D tests/pbx/pbx_lua_background/configs/ast2/sip.conf<br>M tests/pbx/pbx_lua_background/run-test<br>M tests/pbx/pbx_lua_background/test-config.yaml<br>A tests/pbx/pbx_lua_goto/configs/ast1/pjsip.conf<br>D tests/pbx/pbx_lua_goto/configs/ast1/sip.conf<br>A tests/pbx/pbx_lua_goto/configs/ast2/pjsip.conf<br>D tests/pbx/pbx_lua_goto/configs/ast2/sip.conf<br>M tests/pbx/pbx_lua_goto/run-test<br>M tests/pbx/pbx_lua_goto/test-config.yaml<br>D tests/phoneprov/res_phoneprov/cfgbase.txt<br>D tests/phoneprov/res_phoneprov/cfgex.txt<br>D tests/phoneprov/res_phoneprov/configs/ast1/phoneprov.conf<br>D tests/phoneprov/res_phoneprov/configs/ast1/users.conf<br>D tests/phoneprov/res_phoneprov/run-test<br>D tests/phoneprov/res_phoneprov/test-config.yaml<br>M tests/phoneprov/tests.yaml<br>M tests/redirecting/forwardername/configs/ast1/extensions.conf<br>A tests/redirecting/forwardername/configs/ast1/pjsip.conf<br>M tests/redirecting/forwardername/configs/ast1/queues.conf<br>D tests/redirecting/forwardername/configs/ast1/sip.conf<br>M tests/redirecting/forwardername/test-config.yaml<br>A tests/regressions/M18882/configs/ast1/pjsip.conf<br>D tests/regressions/M18882/configs/ast1/sip.conf<br>M tests/regressions/M18882/run-test<br>M tests/regressions/M18882/test-config.yaml<br>A tests/udptl/configs/ast1/pjsip.conf<br>D tests/udptl/configs/ast1/sip.conf<br>A tests/udptl/configs/ast2/pjsip.conf<br>D tests/udptl/configs/ast2/sip.conf<br>M tests/udptl/run-test<br>M tests/udptl/test-config.yaml<br>A tests/udptl_v6/configs/ast1/pjsip.conf<br>A tests/udptl_v6/configs/ast2/pjsip.conf<br>M tests/udptl_v6/run-test<br>M tests/udptl_v6/test-config.yaml<br>277 files changed, 1,880 insertions(+), 1,581 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/60/19860/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configs/bridge/ast1/pjsip.conf b/configs/bridge/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..6319bc4</span><br><span>--- /dev/null</span><br><span>+++ b/configs/bridge/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,40 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include "pjsip_sip-alice.conf"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "pjsip_sip-bob.conf"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[alice]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[alice]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = alice</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[alice]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+callerid = Alice <1234></span><br><span style="color: hsl(120, 100%, 40%);">+send_pai = yes</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = alice</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[bob]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5062</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[bob]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = bob</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5062</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[bob]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+callerid = Bob <4321></span><br><span style="color: hsl(120, 100%, 40%);">+send_pai = yes</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = bob</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/configs/bridge/ast1/sip-alice.conf b/configs/bridge/ast1/pjsip_sip-alice.conf</span><br><span>similarity index 100%</span><br><span>rename from configs/bridge/ast1/sip-alice.conf</span><br><span>rename to configs/bridge/ast1/pjsip_sip-alice.conf</span><br><span>diff --git a/configs/bridge/ast1/sip-bob.conf b/configs/bridge/ast1/pjsip_sip-bob.conf</span><br><span>similarity index 100%</span><br><span>rename from configs/bridge/ast1/sip-bob.conf</span><br><span>rename to configs/bridge/ast1/pjsip_sip-bob.conf</span><br><span>diff --git a/configs/bridge/ast1/sip.conf b/configs/bridge/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index db81976..0000000</span><br><span>--- a/configs/bridge/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,19 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1:5060</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include sip-alice.conf</span><br><span style="color: hsl(0, 100%, 40%);">-#include sip-bob.conf</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[alice](alice-extra)</span><br><span style="color: hsl(0, 100%, 40%);">-sendrpid=pai</span><br><span style="color: hsl(0, 100%, 40%);">-callerid=Alice <1234></span><br><span style="color: hsl(0, 100%, 40%);">-type = peer</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5061</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[bob](bob-extra)</span><br><span style="color: hsl(0, 100%, 40%);">-sendrpid=pai</span><br><span style="color: hsl(0, 100%, 40%);">-callerid=Bob <4321></span><br><span style="color: hsl(0, 100%, 40%);">-type = peer</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5062</span><br><span>diff --git a/configs/bridge/ast2/pjsip.conf b/configs/bridge/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d0a6e54</span><br><span>--- /dev/null</span><br><span>+++ b/configs/bridge/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include "pjsip_sip-uut.conf"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = uut</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = uut</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/configs/bridge/ast2/sip-uut.conf b/configs/bridge/ast2/pjsip_sip-uut.conf</span><br><span>similarity index 100%</span><br><span>rename from configs/bridge/ast2/sip-uut.conf</span><br><span>rename to configs/bridge/ast2/pjsip_sip-uut.conf</span><br><span>diff --git a/configs/bridge/ast2/sip.conf b/configs/bridge/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 01b44de..0000000</span><br><span>--- a/configs/bridge/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1:5061</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include sip-uut.conf</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[uut](uut-extra)</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5060</span><br><span>diff --git a/configs/bridge/ast3/pjsip.conf b/configs/bridge/ast3/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..1276385</span><br><span>--- /dev/null</span><br><span>+++ b/configs/bridge/ast3/pjsip.conf</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include "pjsip_sip-uut.conf"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5062</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = uut</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = uut</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/configs/bridge/ast3/sip-uut.conf b/configs/bridge/ast3/pjsip_sip-uut.conf</span><br><span>similarity index 100%</span><br><span>rename from configs/bridge/ast3/sip-uut.conf</span><br><span>rename to configs/bridge/ast3/pjsip_sip-uut.conf</span><br><span>diff --git a/configs/bridge/ast3/sip.conf b/configs/bridge/ast3/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 8d2c480..0000000</span><br><span>--- a/configs/bridge/ast3/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1:5062</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include sip-uut.conf</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[uut](uut-extra)</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5060</span><br><span>diff --git a/lib/python/asterisk/asterisk.py b/lib/python/asterisk/asterisk.py</span><br><span>index b32e760..5a74990 100644</span><br><span>--- a/lib/python/asterisk/asterisk.py</span><br><span>+++ b/lib/python/asterisk/asterisk.py</span><br><span>@@ -743,15 +743,15 @@</span><br><span> instance, install_config() will use the sub-directories version in place</span><br><span> of the top-level version.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- For example, testsuite is running a test against 1.4 (branch-1.4):</span><br><span style="color: hsl(120, 100%, 40%);">+ For example, testsuite is running a test against 18.9 (branch-18.9):</span><br><span> </span><br><span> configs/manager.conf</span><br><span style="color: hsl(0, 100%, 40%);">- configs/sip.conf</span><br><span style="color: hsl(0, 100%, 40%);">- configs/branch-1.4/sip.conf</span><br><span style="color: hsl(120, 100%, 40%);">+ configs/pjsip.conf</span><br><span style="color: hsl(120, 100%, 40%);">+ configs/branch-18.9/pjsip.conf</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- Because the sip.conf file exists in the branch-1.4 directory, it will</span><br><span style="color: hsl(0, 100%, 40%);">- be used in place of the top-level sip.conf. As for the manager.conf</span><br><span style="color: hsl(0, 100%, 40%);">- file, because it does not exists in the branch-1.4 direcory, the</span><br><span style="color: hsl(120, 100%, 40%);">+ Because the pjsip.conf file exists in the branch-18.9 directory, it will</span><br><span style="color: hsl(120, 100%, 40%);">+ be used in place of the top-level pjsip.conf. As for the manager.conf</span><br><span style="color: hsl(120, 100%, 40%);">+ file, because it does not exists in the branch-18.9 direcory, the</span><br><span> top-level manager.conf will be used.</span><br><span> </span><br><span> Keyword Arguments:</span><br><span>diff --git a/lib/python/asterisk/bridge_test_case.py b/lib/python/asterisk/bridge_test_case.py</span><br><span>index 155b3a1..d88d286 100644</span><br><span>--- a/lib/python/asterisk/bridge_test_case.py</span><br><span>+++ b/lib/python/asterisk/bridge_test_case.py</span><br><span>@@ -126,7 +126,7 @@</span><br><span> """AMI connect handler"""</span><br><span> </span><br><span> self.connections += 1</span><br><span style="color: hsl(0, 100%, 40%);">- self.ast[ami.id].cli_exec("sip set debug on")</span><br><span style="color: hsl(120, 100%, 40%);">+ self.ast[ami.id].cli_exec("pjsip set debug on")</span><br><span> self.ast[ami.id].cli_exec("iax2 set debug on")</span><br><span> self.ast[ami.id].cli_exec("xmpp set debug on")</span><br><span> if (ami.id == 0):</span><br><span>diff --git a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf</span><br><span>index 3e5b8ec..ed25366 100644</span><br><span>--- a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf</span><br><span>+++ b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf</span><br><span>@@ -15,7 +15,7 @@</span><br><span> exten => generate,n,Echo()</span><br><span> </span><br><span> exten => chanspytest,1,MixMonitor(${TESTAUDIO1}.gsm)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => chanspytest,n,ChanSpy(SIP,q)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => chanspytest,n,ChanSpy(PJSIP,q)</span><br><span> exten => chanspytest,n,StopMixMonitor()</span><br><span> </span><br><span> exten => detect_audio,1,Answer()</span><br><span>diff --git a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/pjsip.conf b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..dc0a784</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,56 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 0.0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_a]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5065</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_a]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = end_a</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_a]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+aors = end_a</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_b]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5066</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_b]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = end_b</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_b]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+aors = end_b</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_c]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5067</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_c]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = end_c</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[end_c]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+aors = end_c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/sip.conf b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index c9bcb00..0000000</span><br><span>--- a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,29 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[end_a]</span><br><span style="color: hsl(0, 100%, 40%);">-context=test</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5065</span><br><span style="color: hsl(0, 100%, 40%);">-insecure=invite</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[end_b]</span><br><span style="color: hsl(0, 100%, 40%);">-context=test</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5066</span><br><span style="color: hsl(0, 100%, 40%);">-insecure=invite</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[end_c]</span><br><span style="color: hsl(0, 100%, 40%);">-context=test</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5067</span><br><span style="color: hsl(0, 100%, 40%);">-insecure=invite</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=ulaw</span><br><span>diff --git a/tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml b/tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml</span><br><span>index 91a8b88..5c250cc 100644</span><br><span>--- a/tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml</span><br><span>+++ b/tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml</span><br><span>@@ -1,4 +1,5 @@</span><br><span> testinfo:</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'pjsua requirement, see ASTERISK-30292'</span><br><span> summary: 'Test Chanspy with MixMonitor'</span><br><span> description: |</span><br><span> 'This test verifies basic functionality of using both ChanSpy</span><br><span>@@ -19,7 +20,7 @@</span><br><span> - asterisk : 'app_mixmonitor'</span><br><span> - asterisk : 'app_playback'</span><br><span> - asterisk : 'app_talkdetect'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> - asterisk : 'pbx_config'</span><br><span> - asterisk : 'res_agi'</span><br><span> - asterisk : 'res_musiconhold'</span><br><span>diff --git a/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/pjsip.conf b/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..c21b728</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = confbridge</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = g722</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/sip.conf b/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index a3c3b3a..0000000</span><br><span>--- a/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2_g722]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-context = confbridge</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2_g722</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = g722</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span>diff --git a/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml b/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml</span><br><span>index 6e99a38..296e685 100644</span><br><span>--- a/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml</span><br><span>+++ b/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml</span><br><span>@@ -379,6 +379,6 @@</span><br><span> - asterisk : 'app_confbridge'</span><br><span> - asterisk : 'app_senddtmf'</span><br><span> - asterisk : 'app_playback'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> </span><br><span> </span><br><span>diff --git a/tests/apps/confbridge/confbridge_nominal/configs/ast1/pjsip.conf b/tests/apps/confbridge/confbridge_nominal/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..c21b728</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/confbridge/confbridge_nominal/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = confbridge</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = g722</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/confbridge/confbridge_nominal/configs/ast1/sip.conf b/tests/apps/confbridge/confbridge_nominal/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index a3c3b3a..0000000</span><br><span>--- a/tests/apps/confbridge/confbridge_nominal/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2_g722]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-context = confbridge</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2_g722</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = g722</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span>diff --git a/tests/apps/confbridge/confbridge_nominal/configs/ast2/pjsip.conf b/tests/apps/confbridge/confbridge_nominal/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..ff58d25</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/confbridge/confbridge_nominal/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,23 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = caller</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+allow = g722</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/confbridge/confbridge_nominal/configs/ast2/sip.conf b/tests/apps/confbridge/confbridge_nominal/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 956dc04..0000000</span><br><span>--- a/tests/apps/confbridge/confbridge_nominal/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-context = caller</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast1</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-allow = g722</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span>diff --git a/tests/apps/confbridge/confbridge_nominal/run-test b/tests/apps/confbridge/confbridge_nominal/run-test</span><br><span>index 33decae..a789447 100755</span><br><span>--- a/tests/apps/confbridge/confbridge_nominal/run-test</span><br><span>+++ b/tests/apps/confbridge/confbridge_nominal/run-test</span><br><span>@@ -187,7 +187,8 @@</span><br><span> </span><br><span> self.reactor_timeout = 30</span><br><span> self.create_asterisk(ConfBridgeNominal.asterisk_instances)</span><br><span style="color: hsl(0, 100%, 40%);">- self.ami_1_originates = ["sip/ast1/parameterless", "sip/ast1/user_profile", "sip/ast1/admin_profile"]</span><br><span style="color: hsl(120, 100%, 40%);">+ #self.ami_1_originates = ["pjsip/ast1/parameterless", "pjsip/ast1/user_profile", "pjsip/ast1/admin_profile"]</span><br><span style="color: hsl(120, 100%, 40%);">+ self.ami_1_originates = ["pjsip/parameterless@ast1", "pjsip/user_profile@ast1", "pjsip/admin_profile@ast1"]</span><br><span> self.__amis_connected = 0</span><br><span> self.__user_events_confbridge = 0</span><br><span> self.__user_events_hangup = 0</span><br><span>diff --git a/tests/apps/confbridge/confbridge_nominal/test-config.yaml b/tests/apps/confbridge/confbridge_nominal/test-config.yaml</span><br><span>index dd51564..3759ad3 100644</span><br><span>--- a/tests/apps/confbridge/confbridge_nominal/test-config.yaml</span><br><span>+++ b/tests/apps/confbridge/confbridge_nominal/test-config.yaml</span><br><span>@@ -18,5 +18,5 @@</span><br><span> - asterisk : 'app_playback'</span><br><span> - asterisk : 'app_senddtmf'</span><br><span> - asterisk : 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> - asterisk : 'pbx_config'</span><br><span>diff --git a/tests/apps/confbridge/confbridge_start_muted/configs/ast1/pjsip.conf b/tests/apps/confbridge/confbridge_start_muted/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..c21b728</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/confbridge/confbridge_start_muted/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2_g722]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = confbridge</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = g722</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2_g722</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/confbridge/confbridge_start_muted/configs/ast1/sip.conf b/tests/apps/confbridge/confbridge_start_muted/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index a3c3b3a..0000000</span><br><span>--- a/tests/apps/confbridge/confbridge_start_muted/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2_g722]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-context = confbridge</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2_g722</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = g722</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span>diff --git a/tests/apps/confbridge/confbridge_start_muted/test-config.yaml b/tests/apps/confbridge/confbridge_start_muted/test-config.yaml</span><br><span>index 1995dc7..28f41ad 100644</span><br><span>--- a/tests/apps/confbridge/confbridge_start_muted/test-config.yaml</span><br><span>+++ b/tests/apps/confbridge/confbridge_start_muted/test-config.yaml</span><br><span>@@ -183,5 +183,5 @@</span><br><span> - asterisk: 'app_playback'</span><br><span> - asterisk: 'app_senddtmf'</span><br><span> - asterisk: 'app_verbose'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> - asterisk: 'pbx_config'</span><br><span>diff --git a/tests/apps/directory/directory_attendant_exit/configs/ast1/pjsip.conf b/tests/apps/directory/directory_attendant_exit/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..a91ca93</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/directory/directory_attendant_exit/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/directory/directory_attendant_exit/configs/ast1/sip.conf b/tests/apps/directory/directory_attendant_exit/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index e41bb65..0000000</span><br><span>--- a/tests/apps/directory/directory_attendant_exit/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast1</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/directory/directory_attendant_exit/configs/ast2/pjsip.conf b/tests/apps/directory/directory_attendant_exit/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5e3c8c8</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/directory/directory_attendant_exit/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = directory</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/directory/directory_attendant_exit/configs/ast2/sip.conf b/tests/apps/directory/directory_attendant_exit/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index b7a283d..0000000</span><br><span>--- a/tests/apps/directory/directory_attendant_exit/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2</span><br><span style="color: hsl(0, 100%, 40%);">-context = directory</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/directory/directory_attendant_exit/run-test b/tests/apps/directory/directory_attendant_exit/run-test</span><br><span>index 91eebcc..c0a13f9 100755</span><br><span>--- a/tests/apps/directory/directory_attendant_exit/run-test</span><br><span>+++ b/tests/apps/directory/directory_attendant_exit/run-test</span><br><span>@@ -28,7 +28,7 @@</span><br><span> if ami.id == 0:</span><br><span> print("sending a call from ast1 to ast2")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- df = ami.originate("sip/ast2/1234", "senddtmf", "1234", 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ df = ami.originate("PJSIP/1234@ast2", "senddtmf", "1234", 1)</span><br><span> </span><br><span> def handle_failure(reason):</span><br><span> print("error sending originate:")</span><br><span>diff --git a/tests/apps/directory/directory_attendant_exit/test-config.yaml b/tests/apps/directory/directory_attendant_exit/test-config.yaml</span><br><span>index e115ed8..3910e0b 100644</span><br><span>--- a/tests/apps/directory/directory_attendant_exit/test-config.yaml</span><br><span>+++ b/tests/apps/directory/directory_attendant_exit/test-config.yaml</span><br><span>@@ -11,7 +11,7 @@</span><br><span> - asterisk : 'app_directory'</span><br><span> - asterisk : 'app_senddtmf'</span><br><span> - asterisk : 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> - asterisk : 'pbx_config'</span><br><span> tags:</span><br><span> - directory</span><br><span>diff --git a/tests/apps/directory/directory_context_operator_exit/configs/ast1/pjsip.conf b/tests/apps/directory/directory_context_operator_exit/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..a91ca93</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/directory/directory_context_operator_exit/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/directory/directory_context_operator_exit/configs/ast1/sip.conf b/tests/apps/directory/directory_context_operator_exit/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index e41bb65..0000000</span><br><span>--- a/tests/apps/directory/directory_context_operator_exit/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast1</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/directory/directory_context_operator_exit/configs/ast2/pjsip.conf b/tests/apps/directory/directory_context_operator_exit/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5e3c8c8</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/directory/directory_context_operator_exit/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = directory</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/directory/directory_context_operator_exit/configs/ast2/sip.conf b/tests/apps/directory/directory_context_operator_exit/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index b7a283d..0000000</span><br><span>--- a/tests/apps/directory/directory_context_operator_exit/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2</span><br><span style="color: hsl(0, 100%, 40%);">-context = directory</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/directory/directory_context_operator_exit/run-test b/tests/apps/directory/directory_context_operator_exit/run-test</span><br><span>index 91eebcc..c0a13f9 100755</span><br><span>--- a/tests/apps/directory/directory_context_operator_exit/run-test</span><br><span>+++ b/tests/apps/directory/directory_context_operator_exit/run-test</span><br><span>@@ -28,7 +28,7 @@</span><br><span> if ami.id == 0:</span><br><span> print("sending a call from ast1 to ast2")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- df = ami.originate("sip/ast2/1234", "senddtmf", "1234", 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ df = ami.originate("PJSIP/1234@ast2", "senddtmf", "1234", 1)</span><br><span> </span><br><span> def handle_failure(reason):</span><br><span> print("error sending originate:")</span><br><span>diff --git a/tests/apps/directory/directory_context_operator_exit/test-config.yaml b/tests/apps/directory/directory_context_operator_exit/test-config.yaml</span><br><span>index 3b10986..3843ebf 100644</span><br><span>--- a/tests/apps/directory/directory_context_operator_exit/test-config.yaml</span><br><span>+++ b/tests/apps/directory/directory_context_operator_exit/test-config.yaml</span><br><span>@@ -11,7 +11,7 @@</span><br><span> - asterisk : 'app_directory'</span><br><span> - asterisk : 'app_senddtmf'</span><br><span> - asterisk : 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> - asterisk : 'pbx_config'</span><br><span> tags:</span><br><span> - directory</span><br><span>diff --git a/tests/apps/directory/directory_operator_exit/configs/ast1/pjsip.conf b/tests/apps/directory/directory_operator_exit/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..a91ca93</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/directory/directory_operator_exit/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/directory/directory_operator_exit/configs/ast1/sip.conf b/tests/apps/directory/directory_operator_exit/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index e41bb65..0000000</span><br><span>--- a/tests/apps/directory/directory_operator_exit/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast1</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/directory/directory_operator_exit/configs/ast2/pjsip.conf b/tests/apps/directory/directory_operator_exit/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5e3c8c8</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/directory/directory_operator_exit/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = directory</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/directory/directory_operator_exit/configs/ast2/sip.conf b/tests/apps/directory/directory_operator_exit/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index b7a283d..0000000</span><br><span>--- a/tests/apps/directory/directory_operator_exit/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2</span><br><span style="color: hsl(0, 100%, 40%);">-context = directory</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/directory/directory_operator_exit/run-test b/tests/apps/directory/directory_operator_exit/run-test</span><br><span>index 91eebcc..642b0ea 100755</span><br><span>--- a/tests/apps/directory/directory_operator_exit/run-test</span><br><span>+++ b/tests/apps/directory/directory_operator_exit/run-test</span><br><span>@@ -28,7 +28,7 @@</span><br><span> if ami.id == 0:</span><br><span> print("sending a call from ast1 to ast2")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- df = ami.originate("sip/ast2/1234", "senddtmf", "1234", 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ df = ami.originate("pjsip/1234@ast2", "senddtmf", "1234", 1)</span><br><span> </span><br><span> def handle_failure(reason):</span><br><span> print("error sending originate:")</span><br><span>diff --git a/tests/apps/directory/directory_operator_exit/test-config.yaml b/tests/apps/directory/directory_operator_exit/test-config.yaml</span><br><span>index 90bd85c..52a894f 100644</span><br><span>--- a/tests/apps/directory/directory_operator_exit/test-config.yaml</span><br><span>+++ b/tests/apps/directory/directory_operator_exit/test-config.yaml</span><br><span>@@ -11,7 +11,7 @@</span><br><span> - asterisk : 'app_directory'</span><br><span> - asterisk : 'app_senddtmf'</span><br><span> - asterisk : 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> - asterisk : 'pbx_config'</span><br><span> tags:</span><br><span> - directory</span><br><span>diff --git a/tests/apps/incomplete/sip_incomplete/configs/ast1/extensions.conf b/tests/apps/incomplete/sip_incomplete/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index 5a73c42..0000000</span><br><span>--- a/tests/apps/incomplete/sip_incomplete/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,43 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[default]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-; Note that in this case, the Incomplete application should just be a pass through</span><br><span style="color: hsl(0, 100%, 40%);">-; for the SIP channel. It should ignore it and immediately forward the 484 response</span><br><span style="color: hsl(0, 100%, 40%);">-; back to the device. The Incomplete application should return to the dialplan without</span><br><span style="color: hsl(0, 100%, 40%);">-; hanging up on the caller.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1234,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/external,300)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Verbose(1, DIALSTATUS=${DIALSTATUS}, HANGUPCAUSE=${HANGUPCAUSE})</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,GotoIf($[${HANGUPCAUSE} = 28]?pass:fail)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n(fail),UserEvent(TestResult,result: fail, status: HANGUPCAUSE had invalid value ${HANGUPCAUSE})</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Wait(2)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n(pass),Incomplete(n)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Verbose(1, No other option dialed and extension allowed to pass Incomplete; failing)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(TestResult,result: fail, status: Failed to transition to extension 12345)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Wait(2)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 12345,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(TestResult,result: pass, status: entered into alternate extension 12345)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Wait(2)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => t,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Verbose(1, Entered into timeout)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(TestResult,result: fail, status: timedout from Incomplete application)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Wait(2)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => i,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Verbose(1, Entered into invalid)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n(fail),UserEvent(TestResult,result: fail, status: entered invalid extension when alternate extension 12345 existed in dialplan)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Wait(2)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => e,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Verbose(1, Entered into exception)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n(fail),UserEvent(TestResult,result: fail, status: entered exception extension when alternate extension 12345 existed in dialplan)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Wait(2)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span>diff --git a/tests/apps/incomplete/sip_incomplete/configs/ast1/sip.conf b/tests/apps/incomplete/sip_incomplete/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 24fad9c..0000000</span><br><span>--- a/tests/apps/incomplete/sip_incomplete/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,17 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-;This is the inbound peer that</span><br><span style="color: hsl(0, 100%, 40%);">-;will attempt to call the external</span><br><span style="color: hsl(0, 100%, 40%);">-;peer</span><br><span style="color: hsl(0, 100%, 40%);">-[inbound]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5061</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-;This is the peer dialed for</span><br><span style="color: hsl(0, 100%, 40%);">-;all outbound calls</span><br><span style="color: hsl(0, 100%, 40%);">-[external]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5062</span><br><span>diff --git a/tests/apps/incomplete/sip_incomplete/run-test b/tests/apps/incomplete/sip_incomplete/run-test</span><br><span>deleted file mode 100755</span><br><span>index 8bef418..0000000</span><br><span>--- a/tests/apps/incomplete/sip_incomplete/run-test</span><br><span>+++ /dev/null</span><br><span>@@ -1,88 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(0, 100%, 40%);">-'''</span><br><span style="color: hsl(0, 100%, 40%);">-Copyright (C) 2011, Digium, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">-Matt Jordan <mjordan@digium.com></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-This program is free software, distributed under the terms of</span><br><span style="color: hsl(0, 100%, 40%);">-the GNU General Public License Version 2.</span><br><span style="color: hsl(0, 100%, 40%);">-'''</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-import sys</span><br><span style="color: hsl(0, 100%, 40%);">-import os</span><br><span style="color: hsl(0, 100%, 40%);">-import logging</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-sys.path.append("lib/python")</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-from asterisk.test_case import TestCase</span><br><span style="color: hsl(0, 100%, 40%);">-from asterisk.sipp import SIPpScenario</span><br><span style="color: hsl(0, 100%, 40%);">-from twisted.internet import reactor</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-logger = logging.getLogger(__name__)</span><br><span style="color: hsl(0, 100%, 40%);">-TEST_DIR = os.path.dirname(os.path.realpath(__file__))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Sender_Scenario = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'scenario' : 'sender1.xml',</span><br><span style="color: hsl(0, 100%, 40%);">- '-p' : '5061'</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-Receiver_Scenario = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'scenario' : 'receiver1.xml',</span><br><span style="color: hsl(0, 100%, 40%);">- '-p' : '5062'</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-class SipIncompleteTest(TestCase):</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- TestCase.__init__(self)</span><br><span style="color: hsl(0, 100%, 40%);">- self.create_asterisk()</span><br><span style="color: hsl(0, 100%, 40%);">- self.receiverTest = SIPpScenario(TEST_DIR, Receiver_Scenario)</span><br><span style="color: hsl(0, 100%, 40%);">- self.senderTest = SIPpScenario(TEST_DIR, Sender_Scenario)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def ami_connect(self, ami):</span><br><span style="color: hsl(0, 100%, 40%);">- TestCase.ami_connect(self, ami)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.ast[ami.id].cli_exec("sip set debug on")</span><br><span style="color: hsl(0, 100%, 40%);">- ami.registerEvent('UserEvent', self.user_event)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- logger.debug("Starting SIP scenarios")</span><br><span style="color: hsl(0, 100%, 40%);">- self.receiverTest.run(self)</span><br><span style="color: hsl(0, 100%, 40%);">- self.senderTest.run(self)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def user_event(self, ami, event):</span><br><span style="color: hsl(0, 100%, 40%);">- if event['userevent'] != 'TestResult':</span><br><span style="color: hsl(0, 100%, 40%);">- return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if event['result'] == "pass":</span><br><span style="color: hsl(0, 100%, 40%);">- self.passed = True</span><br><span style="color: hsl(0, 100%, 40%);">- logger.info("Test successfully exited")</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- logger.warn("Test did not successfully exit:")</span><br><span style="color: hsl(0, 100%, 40%);">- logger.warn("result: %s" % (event['result'],))</span><br><span style="color: hsl(0, 100%, 40%);">- logger.warn("status: %s" % (event['status'],))</span><br><span style="color: hsl(0, 100%, 40%);">- self.passed = False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.stop_reactor()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def run(self):</span><br><span style="color: hsl(0, 100%, 40%);">- TestCase.run(self)</span><br><span style="color: hsl(0, 100%, 40%);">- self.create_ami_factory()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def main():</span><br><span style="color: hsl(0, 100%, 40%);">- test = SipIncompleteTest()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test.start_asterisk()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- reactor.run()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test.stop_asterisk()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if test.passed:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if __name__ == "__main__":</span><br><span style="color: hsl(0, 100%, 40%);">- sys.exit(main())</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# vim:sw=4:ts=4:expandtab:textwidth=79</span><br><span>diff --git a/tests/apps/incomplete/sip_incomplete/sipp/receiver1.xml b/tests/apps/incomplete/sip_incomplete/sipp/receiver1.xml</span><br><span>deleted file mode 100644</span><br><span>index 65e514a..0000000</span><br><span>--- a/tests/apps/incomplete/sip_incomplete/sipp/receiver1.xml</span><br><span>+++ /dev/null</span><br><span>@@ -1,48 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(0, 100%, 40%);">-<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<scenario name="Incomplete Address Responder"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv request="INVITE" crlf="true" /></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- Simulate an attempt to reach the extension that was dialed in --></span><br><span style="color: hsl(0, 100%, 40%);">- <!-- The INVITE. After 500 ms, send back a 484 Number incomplete --></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- SIP/2.0 100 Trying</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_To:];tag=[pid]SIPpTag01[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: <sip:[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <pause milliseconds="500" /></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- SIP/2.0 484 Number incomplete</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Via:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_From:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_To:];tag=[pid]SIPpTag01[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_Call-ID:]</span><br><span style="color: hsl(0, 100%, 40%);">- [last_CSeq:]</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: <sip:[local_ip]:[local_port];transport=[transport]></span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv request="ACK"</span><br><span style="color: hsl(0, 100%, 40%);">- rtd="true"</span><br><span style="color: hsl(0, 100%, 40%);">- crlf="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</scenario></span><br><span>diff --git a/tests/apps/incomplete/sip_incomplete/sipp/sender1.xml b/tests/apps/incomplete/sip_incomplete/sipp/sender1.xml</span><br><span>deleted file mode 100644</span><br><span>index 9702111..0000000</span><br><span>--- a/tests/apps/incomplete/sip_incomplete/sipp/sender1.xml</span><br><span>+++ /dev/null</span><br><span>@@ -1,133 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-<?xml version="1.0" encoding="ISO-8859-1" ?></span><br><span style="color: hsl(0, 100%, 40%);">-<!DOCTYPE scenario SYSTEM "sipp.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-<scenario name="Incomplete Address Sender"></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- The initial call attempts to dial extension 1234. This --></span><br><span style="color: hsl(0, 100%, 40%);">- <!-- will communicate with the receiver1 SIPp scenario, which --></span><br><span style="color: hsl(0, 100%, 40%);">- <!-- will return 484 Address Incomplete. The sender will then --></span><br><span style="color: hsl(0, 100%, 40%);">- <!-- attempt again with 12345, which should cause the test to --></span><br><span style="color: hsl(0, 100%, 40%);">- <!-- complete successfully --></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- INVITE sip:1234@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: inbound <sip:wienerschnitzel@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: 1234 <1234@[remote_ip]:[remote_port]></span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 1 INVITE</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:kartoffelsalat@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: Channel Param Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Type: application/sdp</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: [len]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- v=0</span><br><span style="color: hsl(0, 100%, 40%);">- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- s=-</span><br><span style="color: hsl(0, 100%, 40%);">- c=IN IP[media_ip_type] [media_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- t=0 0</span><br><span style="color: hsl(0, 100%, 40%);">- m=audio 6000 RTP/AVP 0 101</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:0 PCMU/8000</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:101 telephone-event/8000</span><br><span style="color: hsl(0, 100%, 40%);">- m=video 6002 RTP/AVP 34</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:34 H263/90000</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="100" optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="484" rtd="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ACK sip:1234@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: inbound <sip:wienerschnitzel@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: 1234 <sip:1234@[remote_ip]:[remote_port]>[peer_tag_param]</span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 1 ACK</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:kartoffelsalat@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- Pause to simulate the caller figuring out the next digit to dial --></span><br><span style="color: hsl(0, 100%, 40%);">- <pause milliseconds="750" /></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send retrans="500"></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- INVITE sip:12345@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: inbound <sip:wienerschnitzel@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: 12345 <12345@[remote_ip]:[remote_port]></span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 1 INVITE</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:kartoffelsalat@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- User-Agent: Channel Param Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Type: application/sdp</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: [len]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- v=0</span><br><span style="color: hsl(0, 100%, 40%);">- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- s=-</span><br><span style="color: hsl(0, 100%, 40%);">- c=IN IP[media_ip_type] [media_ip]</span><br><span style="color: hsl(0, 100%, 40%);">- t=0 0</span><br><span style="color: hsl(0, 100%, 40%);">- m=audio 6000 RTP/AVP 0 101</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:0 PCMU/8000</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:101 telephone-event/8000</span><br><span style="color: hsl(0, 100%, 40%);">- m=video 6002 RTP/AVP 34</span><br><span style="color: hsl(0, 100%, 40%);">- a=rtpmap:34 H263/90000</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="100" optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="180" optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="183" optional="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <recv response="603" rtd="true"></span><br><span style="color: hsl(0, 100%, 40%);">- </recv></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <send></span><br><span style="color: hsl(0, 100%, 40%);">- <![CDATA[</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ACK sip:test@[remote_ip]:[remote_port] SIP/2.0</span><br><span style="color: hsl(0, 100%, 40%);">- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]</span><br><span style="color: hsl(0, 100%, 40%);">- From: test1 <sip:wienerschnitzel@[local_ip]:[local_port]>;tag=[call_number]</span><br><span style="color: hsl(0, 100%, 40%);">- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]</span><br><span style="color: hsl(0, 100%, 40%);">- Call-ID: [call_id]</span><br><span style="color: hsl(0, 100%, 40%);">- CSeq: 1 ACK</span><br><span style="color: hsl(0, 100%, 40%);">- Contact: sip:kartoffelsalat@[local_ip]:[local_port]</span><br><span style="color: hsl(0, 100%, 40%);">- Max-Forwards: 70</span><br><span style="color: hsl(0, 100%, 40%);">- Subject: Performance Test</span><br><span style="color: hsl(0, 100%, 40%);">- Content-Length: 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ]]></span><br><span style="color: hsl(0, 100%, 40%);">- </send></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- definition of the response time repartition table (unit is ms) --></span><br><span style="color: hsl(0, 100%, 40%);">- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- <!-- definition of the call length repartition table (unit is ms) --></span><br><span style="color: hsl(0, 100%, 40%);">- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</scenario></span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/apps/incomplete/sip_incomplete/test-config.yaml b/tests/apps/incomplete/sip_incomplete/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index 94757b3..0000000</span><br><span>--- a/tests/apps/incomplete/sip_incomplete/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,24 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Test for SIP channel handling the Incomplete application notifications'</span><br><span style="color: hsl(0, 100%, 40%);">- description: |</span><br><span style="color: hsl(0, 100%, 40%);">- The test exercises SIP handling of the 484 Address Incomplete response in the presence</span><br><span style="color: hsl(0, 100%, 40%);">- of the Incomplete application. The Incomplete application will queue up a control frame</span><br><span style="color: hsl(0, 100%, 40%);">- that notifies the SIP channel driver that it is waiting for more digits. The SIP channel</span><br><span style="color: hsl(0, 100%, 40%);">- driver will interpret that to mean that it should inform the dialing device that the address</span><br><span style="color: hsl(0, 100%, 40%);">- was incomplete, at which point it will attempt to dial a new extension. The test succeeds</span><br><span style="color: hsl(0, 100%, 40%);">- if the new extension is dialed; it fails if any other extension is reached or if the new</span><br><span style="color: hsl(0, 100%, 40%);">- extension is not dialed.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - sipp :</span><br><span style="color: hsl(0, 100%, 40%);">- version : 'v3.0'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'app_verbose'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'pbx_config'</span><br><span style="color: hsl(0, 100%, 40%);">- tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(0, 100%, 40%);">- - apps</span><br><span style="color: hsl(0, 100%, 40%);">- - incomplete</span><br><span>diff --git a/tests/apps/incomplete/tests.yaml b/tests/apps/incomplete/tests.yaml</span><br><span>deleted file mode 100644</span><br><span>index 66f2428..0000000</span><br><span>--- a/tests/apps/incomplete/tests.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-# Enter tests here in the order they should be considered for execution:</span><br><span style="color: hsl(0, 100%, 40%);">-tests:</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'sip_incomplete'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/queues/ringinuse_and_pause/configs/ast1/pjsip.conf b/tests/apps/queues/ringinuse_and_pause/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..4d2bcd3</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/queues/ringinuse_and_pause/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,24 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[global]</span><br><span style="color: hsl(120, 100%, 40%);">+type = global</span><br><span style="color: hsl(120, 100%, 40%);">+debug = yes</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[member]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[member]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = member</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[member]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test_context</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+aors = member</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/queues/ringinuse_and_pause/configs/ast1/sip.conf b/tests/apps/queues/ringinuse_and_pause/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 59c3a25..0000000</span><br><span>--- a/tests/apps/queues/ringinuse_and_pause/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-sipdebug=yes</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1:5060</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite=no</span><br><span style="color: hsl(0, 100%, 40%);">-videosupport=yes</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[member]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5061</span><br><span style="color: hsl(0, 100%, 40%);">-context = test_context</span><br><span style="color: hsl(0, 100%, 40%);">-call-limit=3</span><br><span>diff --git a/tests/apps/queues/ringinuse_and_pause/test-config.yaml b/tests/apps/queues/ringinuse_and_pause/test-config.yaml</span><br><span>index f8d9d71..4263140 100644</span><br><span>--- a/tests/apps/queues/ringinuse_and_pause/test-config.yaml</span><br><span>+++ b/tests/apps/queues/ringinuse_and_pause/test-config.yaml</span><br><span>@@ -19,6 +19,6 @@</span><br><span> - app : 'asttest'</span><br><span> - sipp :</span><br><span> version : 'v3.0'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - queues</span><br><span>diff --git a/tests/apps/queues/ringinuse_and_pause/test.lua b/tests/apps/queues/ringinuse_and_pause/test.lua</span><br><span>index 60d93a9..dbc3193 100644</span><br><span>--- a/tests/apps/queues/ringinuse_and_pause/test.lua</span><br><span>+++ b/tests/apps/queues/ringinuse_and_pause/test.lua</span><br><span>@@ -52,7 +52,7 @@</span><br><span> local instance = ast.new()</span><br><span> instance:load_config("configs/ast1/extensions.conf")</span><br><span> instance:load_config("configs/ast1/queues.conf")</span><br><span style="color: hsl(0, 100%, 40%);">- instance:load_config("configs/ast1/sip.conf")</span><br><span style="color: hsl(120, 100%, 40%);">+ instance:load_config("configs/ast1/pjsip.conf")</span><br><span> instance:generate_manager_conf()</span><br><span> instance:spawn()</span><br><span> return instance</span><br><span>diff --git a/tests/apps/queues/set_penalty/configs/ast1/pjsip.conf b/tests/apps/queues/set_penalty/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..37500bd</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/queues/set_penalty/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,32 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[mem1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+max_contacts = 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[mem1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+aors = mem1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[mem2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+max_contacts = 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[mem2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+aors = mem2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[mem3]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+max_contacts = 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[mem3]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+aors = mem3</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/queues/set_penalty/configs/ast1/queues.conf b/tests/apps/queues/set_penalty/configs/ast1/queues.conf</span><br><span>index f3f9bee..7917d03 100644</span><br><span>--- a/tests/apps/queues/set_penalty/configs/ast1/queues.conf</span><br><span>+++ b/tests/apps/queues/set_penalty/configs/ast1/queues.conf</span><br><span>@@ -1,14 +1,14 @@</span><br><span> [general]</span><br><span> </span><br><span> [queue1]</span><br><span style="color: hsl(0, 100%, 40%);">-member => sip/mem1</span><br><span style="color: hsl(0, 100%, 40%);">-member => sip/mem2</span><br><span style="color: hsl(0, 100%, 40%);">-member => sip/mem3</span><br><span style="color: hsl(120, 100%, 40%);">+member => pjsip/mem1</span><br><span style="color: hsl(120, 100%, 40%);">+member => pjsip/mem2</span><br><span style="color: hsl(120, 100%, 40%);">+member => pjsip/mem3</span><br><span> </span><br><span> [queue2]</span><br><span style="color: hsl(0, 100%, 40%);">-member => sip/mem2</span><br><span style="color: hsl(0, 100%, 40%);">-member => sip/mem3</span><br><span style="color: hsl(120, 100%, 40%);">+member => pjsip/mem2</span><br><span style="color: hsl(120, 100%, 40%);">+member => pjsip/mem3</span><br><span> </span><br><span> [queue3]</span><br><span style="color: hsl(0, 100%, 40%);">-member => sip/mem3</span><br><span style="color: hsl(0, 100%, 40%);">-member => sip/mem1</span><br><span style="color: hsl(120, 100%, 40%);">+member => pjsip/mem3</span><br><span style="color: hsl(120, 100%, 40%);">+member => pjsip/mem1</span><br><span>diff --git a/tests/apps/queues/set_penalty/configs/ast1/sip.conf b/tests/apps/queues/set_penalty/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 4152a95..0000000</span><br><span>--- a/tests/apps/queues/set_penalty/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,15 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[mem1]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=dynamic</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[mem2]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=dynamic</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[mem3]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=dynamic</span><br><span>diff --git a/tests/apps/queues/set_penalty/run-test b/tests/apps/queues/set_penalty/run-test</span><br><span>index f05773a..7382167 100755</span><br><span>--- a/tests/apps/queues/set_penalty/run-test</span><br><span>+++ b/tests/apps/queues/set_penalty/run-test</span><br><span>@@ -16,7 +16,7 @@</span><br><span> logger = logging.getLogger(__name__)</span><br><span> </span><br><span> """</span><br><span style="color: hsl(0, 100%, 40%);">-Creates an Asterisk instance with some premade queues containing some premade sip peers as members</span><br><span style="color: hsl(120, 100%, 40%);">+Creates an Asterisk instance with some premade queues containing some premade pjsip peers as members</span><br><span> and changes penalties by using CLI commands and manager actions.</span><br><span> </span><br><span> Tests against regression such as the one discussed in https://reviewboard.asterisk.org/r/1609/</span><br><span>@@ -43,7 +43,7 @@</span><br><span> #Evaluates events according to the expectations of a given state and advances the state when finished.</span><br><span> def state_receive(self, event, ami):</span><br><span> if (self.state == 1):</span><br><span style="color: hsl(0, 100%, 40%);">- if (event['queue'] == "queue1" and event['interface'] == "sip/mem1" and event['penalty'] == "1"):</span><br><span style="color: hsl(120, 100%, 40%);">+ if (event['queue'] == "queue1" and event['interface'] == "pjsip/mem1" and event['penalty'] == "1"):</span><br><span> logger.info("state 1: Successfully Completed")</span><br><span> self.state_advance(ami)</span><br><span> </span><br><span>@@ -52,11 +52,11 @@</span><br><span> self.stop_reactor()</span><br><span> </span><br><span> elif (self.state == 2):</span><br><span style="color: hsl(0, 100%, 40%);">- if (event['queue'] == "queue1" and event['interface'] == "sip/mem2" and event['penalty'] == "2"):</span><br><span style="color: hsl(120, 100%, 40%);">+ if (event['queue'] == "queue1" and event['interface'] == "pjsip/mem2" and event['penalty'] == "2"):</span><br><span> logger.info("state 2: verified condition 1")</span><br><span> self.state_passed_flags = self.state_passed_flags | 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- elif (event['queue'] == "queue2" and event['interface'] == "sip/mem2" and event['penalty'] == '2'):</span><br><span style="color: hsl(120, 100%, 40%);">+ elif (event['queue'] == "queue2" and event['interface'] == "pjsip/mem2" and event['penalty'] == '2'):</span><br><span> logger.info("state 2: verified condition 2")</span><br><span> self.state_passed_flags = self.state_passed_flags | 2</span><br><span> </span><br><span>@@ -69,15 +69,15 @@</span><br><span> self.state_advance(ami)</span><br><span> </span><br><span> elif (self.state == 3):</span><br><span style="color: hsl(0, 100%, 40%);">- if (event['queue'] == "queue1" and event['interface'] == "sip/mem3" and event['penalty'] == '3'):</span><br><span style="color: hsl(120, 100%, 40%);">+ if (event['queue'] == "queue1" and event['interface'] == "pjsip/mem3" and event['penalty'] == '3'):</span><br><span> logger.info("state 3: verified condition 1")</span><br><span> self.state_passed_flags = self.state_passed_flags | 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- elif (event['queue'] == "queue2" and event['interface'] == "sip/mem3" and event['penalty'] == '3'):</span><br><span style="color: hsl(120, 100%, 40%);">+ elif (event['queue'] == "queue2" and event['interface'] == "pjsip/mem3" and event['penalty'] == '3'):</span><br><span> logger.info("state 3: verified condition 2")</span><br><span> self.state_passed_flags = self.state_passed_flags | 2</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- elif (event['queue'] == "queue3" and event['interface'] == "sip/mem3" and event['penalty'] == '3'):</span><br><span style="color: hsl(120, 100%, 40%);">+ elif (event['queue'] == "queue3" and event['interface'] == "pjsip/mem3" and event['penalty'] == '3'):</span><br><span> logger.info("state 3: verified condition 3")</span><br><span> self.state_passed_flags = self.state_passed_flags | 4</span><br><span> </span><br><span>@@ -90,7 +90,7 @@</span><br><span> self.state_advance(ami)</span><br><span> </span><br><span> elif (self.state == 4):</span><br><span style="color: hsl(0, 100%, 40%);">- if (event['queue'] == "queue3" and event['interface'] == "sip/mem1" and event['penalty'] == '4'):</span><br><span style="color: hsl(120, 100%, 40%);">+ if (event['queue'] == "queue3" and event['interface'] == "pjsip/mem1" and event['penalty'] == '4'):</span><br><span> logger.info("state 4: Successfully Completed")</span><br><span> self.state_advance(ami)</span><br><span> </span><br><span>@@ -106,17 +106,17 @@</span><br><span> </span><br><span> #state specific:</span><br><span> if (self.state == 1): #state 1 - cli command with specific queue on mem1</span><br><span style="color: hsl(0, 100%, 40%);">- ami.command('queue set penalty 1 on sip/mem1 in queue1')</span><br><span style="color: hsl(120, 100%, 40%);">+ ami.command('queue set penalty 1 on pjsip/mem1 in queue1')</span><br><span> </span><br><span> elif (self.state == 2): #state 2 - cli command with unspecified queue on mem2</span><br><span style="color: hsl(0, 100%, 40%);">- ami.command('queue set penalty 2 on sip/mem2')</span><br><span style="color: hsl(120, 100%, 40%);">+ ami.command('queue set penalty 2 on pjsip/mem2')</span><br><span> </span><br><span> elif (self.state == 3): #state 3 - manager action queuePenalty with unspecified queue on mem3</span><br><span style="color: hsl(0, 100%, 40%);">- message = {'action': 'queuepenalty', 'penalty': '3', 'interface': 'sip/mem3'}</span><br><span style="color: hsl(120, 100%, 40%);">+ message = {'action': 'queuepenalty', 'penalty': '3', 'interface': 'pjsip/mem3'}</span><br><span> ami.sendMessage(message)</span><br><span> </span><br><span> elif (self.state == 4): #state 4 - mamager action queuePenalty with specific queue on mem1</span><br><span style="color: hsl(0, 100%, 40%);">- message = {'action': 'queuepenalty', 'penalty': '4', 'interface': 'sip/mem1', 'queue': 'queue3'}</span><br><span style="color: hsl(120, 100%, 40%);">+ message = {'action': 'queuepenalty', 'penalty': '4', 'interface': 'pjsip/mem1', 'queue': 'queue3'}</span><br><span> ami.sendMessage(message)</span><br><span> </span><br><span> #states exhausted:</span><br><span>diff --git a/tests/apps/queues/set_penalty/test-config.yaml b/tests/apps/queues/set_penalty/test-config.yaml</span><br><span>index 5640e9d..1df5a1f 100644</span><br><span>--- a/tests/apps/queues/set_penalty/test-config.yaml</span><br><span>+++ b/tests/apps/queues/set_penalty/test-config.yaml</span><br><span>@@ -10,6 +10,6 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'app_queue'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - queues</span><br><span>diff --git a/tests/apps/sendtext/basic/configs/ast1/pjsip.conf b/tests/apps/sendtext/basic/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..1dd41c6</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/sendtext/basic/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,28 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[global]</span><br><span style="color: hsl(120, 100%, 40%);">+type = global</span><br><span style="color: hsl(120, 100%, 40%);">+debug = yes</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[alice]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[alice]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = alice</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[alice]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+force_rport = yes</span><br><span style="color: hsl(120, 100%, 40%);">+rewrite_contact = yes</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+aors = alice</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/apps/sendtext/basic/configs/ast1/sip.conf b/tests/apps/sendtext/basic/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 1d3f646..0000000</span><br><span>--- a/tests/apps/sendtext/basic/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,17 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-allowguest=no</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-sipdebug=yes</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[alice]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify=no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure=port,invite</span><br><span style="color: hsl(0, 100%, 40%);">-nat=force_rport</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5061</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/sendtext/basic/test-config.yaml b/tests/apps/sendtext/basic/test-config.yaml</span><br><span>index aa903a9..64e663b 100644</span><br><span>--- a/tests/apps/sendtext/basic/test-config.yaml</span><br><span>+++ b/tests/apps/sendtext/basic/test-config.yaml</span><br><span>@@ -8,7 +8,7 @@</span><br><span> dependencies:</span><br><span> - app : 'sipp'</span><br><span> - asterisk : 'app_sendtext'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - sip</span><br><span> </span><br><span>diff --git a/tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf b/tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf</span><br><span>index 28b9198..25b5b92 100644</span><br><span>--- a/tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf</span><br><span>@@ -1,9 +1,9 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_atxfer,1,Dial(SIP/test_call@bob,,T)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_atxfer,1,Dial(PJSIP/test_call@bob,,T)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_atxfer,1,Dial(SIP/test_call@bob,,t)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_atxfer,1,Dial(PJSIP/test_call@bob,,t)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => 123,1,NoOp(This is the transfer target aka Charlie)</span><br><span>diff --git a/tests/bridge/atxfer_fail_blonde/test-config.yaml b/tests/bridge/atxfer_fail_blonde/test-config.yaml</span><br><span>index c9b2f87..d78cb2d 100644</span><br><span>--- a/tests/bridge/atxfer_fail_blonde/test-config.yaml</span><br><span>+++ b/tests/bridge/atxfer_fail_blonde/test-config.yaml</span><br><span>@@ -24,7 +24,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_atxfer@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -41,7 +41,7 @@</span><br><span> match:</span><br><span> Event: CEL</span><br><span> EventName: ATTENDEDTRANSFER</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/alice-00000000'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/alice-00000000'</span><br><span> # hangup the transfer destination</span><br><span> ami-actions:</span><br><span> -</span><br><span>@@ -58,7 +58,7 @@</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span> - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span> testconditions:</span><br><span>diff --git a/tests/bridge/atxfer_nominal/configs/ast1/extensions.conf b/tests/bridge/atxfer_nominal/configs/ast1/extensions.conf</span><br><span>index 77d554d..9b324dc 100644</span><br><span>--- a/tests/bridge/atxfer_nominal/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/atxfer_nominal/configs/ast1/extensions.conf</span><br><span>@@ -1,11 +1,11 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_atxfer,1,Dial(SIP/test_call@bob,,T)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_atxfer,1,Dial(PJSIP/test_call@bob,,T)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_atxfer,1,Dial(SIP/test_call@bob,,t)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_atxfer,1,Dial(PJSIP/test_call@bob,,t)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => 123,1,NoOp(This is our transfer target)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/transfer@charlie,,Tt)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/transfer@charlie,,Tt)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/atxfer_nominal/configs/ast1/pjsip_sip-alice.conf b/tests/bridge/atxfer_nominal/configs/ast1/pjsip_sip-alice.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..3b312cc</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/atxfer_nominal/configs/ast1/pjsip_sip-alice.conf</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[alice-extra](!)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = charlie</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+callerid = Charlie <5678></span><br><span style="color: hsl(120, 100%, 40%);">+send_pai = yes</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = charlie</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/bridge/atxfer_nominal/configs/ast1/sip-alice.conf b/tests/bridge/atxfer_nominal/configs/ast1/sip-alice.conf</span><br><span>deleted file mode 100644</span><br><span>index 559e86e..0000000</span><br><span>--- a/tests/bridge/atxfer_nominal/configs/ast1/sip-alice.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,8 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[alice-extra](!)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[charlie]</span><br><span style="color: hsl(0, 100%, 40%);">-sendrpid=pai</span><br><span style="color: hsl(0, 100%, 40%);">-callerid=Charlie <5678></span><br><span style="color: hsl(0, 100%, 40%);">-type = peer</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5063</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/bridge/atxfer_nominal/configs/ast4/pjsip.conf b/tests/bridge/atxfer_nominal/configs/ast4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..914ebe9</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/atxfer_nominal/configs/ast4/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = uut</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = uut</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/bridge/atxfer_nominal/configs/ast4/sip.conf b/tests/bridge/atxfer_nominal/configs/ast4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 9a3df35..0000000</span><br><span>--- a/tests/bridge/atxfer_nominal/configs/ast4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1:5063</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[uut]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5060</span><br><span>diff --git a/tests/bridge/atxfer_nominal/test-config.yaml b/tests/bridge/atxfer_nominal/test-config.yaml</span><br><span>index 4ea65e5..79513e8 100644</span><br><span>--- a/tests/bridge/atxfer_nominal/test-config.yaml</span><br><span>+++ b/tests/bridge/atxfer_nominal/test-config.yaml</span><br><span>@@ -42,7 +42,7 @@</span><br><span> asterisk-instances: 4</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_atxfer@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -50,7 +50,7 @@</span><br><span> success: 'true'</span><br><span> exten: '123'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_atxfer@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'bob'</span><br><span>@@ -66,6 +66,6 @@</span><br><span> - asterisk: 'app_dial'</span><br><span> - asterisk: 'app_echo'</span><br><span> - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/atxfer_setup/configs/ast1/extensions.conf b/tests/bridge/atxfer_setup/configs/ast1/extensions.conf</span><br><span>index bf110ad..931a397 100644</span><br><span>--- a/tests/bridge/atxfer_setup/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/atxfer_setup/configs/ast1/extensions.conf</span><br><span>@@ -1,11 +1,11 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_atxfer,1,Dial(SIP/test_call@bob,,Th)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_atxfer,1,Dial(PJSIP/test_call@bob,,Th)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => alice_atxfer2,1,Set(BRIDGE_FEATURES=T)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,h)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,h)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_atxfer,1,Dial(SIP/test_call@bob,,tH)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_atxfer,1,Dial(PJSIP/test_call@bob,,tH)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/atxfer_setup/test-config.yaml b/tests/bridge/atxfer_setup/test-config.yaml</span><br><span>index 6867d8f..f27400e 100644</span><br><span>--- a/tests/bridge/atxfer_setup/test-config.yaml</span><br><span>+++ b/tests/bridge/atxfer_setup/test-config.yaml</span><br><span>@@ -20,7 +20,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_atxfer@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -32,7 +32,7 @@</span><br><span> what: 'atxfer'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_atxfer2@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_atxfer2@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -44,7 +44,7 @@</span><br><span> what: 'atxfer'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_atxfer@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -304,6 +304,6 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf</span><br><span>index f221bc4..55bce92 100644</span><br><span>--- a/tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf</span><br><span>@@ -1,11 +1,11 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_atxfer,1,Dial(SIP/test_call@bob,,T)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_atxfer,1,Dial(PJSIP/test_call@bob,,T)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_atxfer,1,Dial(SIP/test_call@bob,,t)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_atxfer,1,Dial(PJSIP/test_call@bob,,t)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => 123,1,NoOp(This is our transfer target)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/transfer@charlie,,Tt)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/transfer@charlie,,Tt)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast1/pjsip_sip-alice.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast1/pjsip_sip-alice.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..189d7b3</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/atxfer_threeway_nominal/configs/ast1/pjsip_sip-alice.conf</span><br><span>@@ -0,0 +1,17 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[alice-extra](!)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = charlie</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+callerid = Charlie <5678></span><br><span style="color: hsl(120, 100%, 40%);">+send_pai = yes</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = charlie</span><br><span>diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast1/sip-alice.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast1/sip-alice.conf</span><br><span>deleted file mode 100644</span><br><span>index 589c988..0000000</span><br><span>--- a/tests/bridge/atxfer_threeway_nominal/configs/ast1/sip-alice.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[alice-extra](!)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[charlie]</span><br><span style="color: hsl(0, 100%, 40%);">-sendrpid=pai</span><br><span style="color: hsl(0, 100%, 40%);">-callerid=Charlie <5678></span><br><span style="color: hsl(0, 100%, 40%);">-type = peer</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5063</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast4/pjsip.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..b453c61</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/atxfer_threeway_nominal/configs/ast4/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = uut</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = uut</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast4/sip.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 9a3df35..0000000</span><br><span>--- a/tests/bridge/atxfer_threeway_nominal/configs/ast4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1:5063</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[uut]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5060</span><br><span>diff --git a/tests/bridge/atxfer_threeway_nominal/test-config.yaml b/tests/bridge/atxfer_threeway_nominal/test-config.yaml</span><br><span>index 9f737cf..c5656c3 100644</span><br><span>--- a/tests/bridge/atxfer_threeway_nominal/test-config.yaml</span><br><span>+++ b/tests/bridge/atxfer_threeway_nominal/test-config.yaml</span><br><span>@@ -23,7 +23,7 @@</span><br><span> asterisk-instances: 4</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_atxfer@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -35,7 +35,7 @@</span><br><span> what: 'atxferthreeway'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_atxfer@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'bob'</span><br><span>@@ -65,10 +65,10 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'AttendedTransfer'</span><br><span style="color: hsl(0, 100%, 40%);">- OrigTransfererChannel: 'SIP/alice-*'</span><br><span style="color: hsl(120, 100%, 40%);">+ OrigTransfererChannel: 'PJSIP/alice-*'</span><br><span> OrigTransfererConnectedLineNum: '5678'</span><br><span> OrigTransfererConnectedLineName: 'Charlie'</span><br><span style="color: hsl(0, 100%, 40%);">- SecondTransfererChannel: 'SIP/alice-*'</span><br><span style="color: hsl(120, 100%, 40%);">+ SecondTransfererChannel: 'PJSIP/alice-*'</span><br><span> SecondTransfererConnectedLineNum: '5678'</span><br><span> SecondTransfererConnectedLineName: 'Charlie'</span><br><span> DestType: 'Threeway'</span><br><span>@@ -82,10 +82,10 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'AttendedTransfer'</span><br><span style="color: hsl(0, 100%, 40%);">- OrigTransfererChannel: 'SIP/bob-*'</span><br><span style="color: hsl(120, 100%, 40%);">+ OrigTransfererChannel: 'PJSIP/bob-*'</span><br><span> OrigTransfererConnectedLineNum: '5678'</span><br><span> OrigTransfererConnectedLineName: 'Charlie'</span><br><span style="color: hsl(0, 100%, 40%);">- SecondTransfererChannel: 'SIP/bob-*'</span><br><span style="color: hsl(120, 100%, 40%);">+ SecondTransfererChannel: 'PJSIP/bob-*'</span><br><span> SecondTransfererConnectedLineNum: '5678'</span><br><span> SecondTransfererConnectedLineName: 'Charlie'</span><br><span> DestType: 'Threeway'</span><br><span>@@ -100,10 +100,10 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'VarSet'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/charlie-*'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/charlie-*'</span><br><span> ChannelState: '6'</span><br><span> Variable: 'BRIDGEPEER'</span><br><span style="color: hsl(0, 100%, 40%);">- Value: '(SIP/bob-.{8},SIP/alice-.{8}|SIP/alice-.{8},SIP/bob-.{8})'</span><br><span style="color: hsl(120, 100%, 40%);">+ Value: '(PJSIP/bob-.{8},PJSIP/alice-.{8}|PJSIP/alice-.{8},PJSIP/bob-.{8})'</span><br><span> </span><br><span> properties:</span><br><span> dependencies:</span><br><span>@@ -112,6 +112,6 @@</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span> - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/automixmon/configs/ast1/extensions.conf b/tests/bridge/automixmon/configs/ast1/extensions.conf</span><br><span>index afe6a6f..a08320a 100644</span><br><span>--- a/tests/bridge/automixmon/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/automixmon/configs/ast1/extensions.conf</span><br><span>@@ -1,7 +1,7 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_automixmon,1,Dial(SIP/test_call@bob,,Xh)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_automixmon,1,Dial(PJSIP/test_call@bob,,Xh)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_automixmon,1,Dial(SIP/test_call@bob,,xH)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_automixmon,1,Dial(PJSIP/test_call@bob,,xH)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/automixmon/test-config.yaml b/tests/bridge/automixmon/test-config.yaml</span><br><span>index d4b0840..195d51e 100644</span><br><span>--- a/tests/bridge/automixmon/test-config.yaml</span><br><span>+++ b/tests/bridge/automixmon/test-config.yaml</span><br><span>@@ -20,7 +20,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_automixmon@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_automixmon@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> - # mixmonitor start</span><br><span>@@ -41,7 +41,7 @@</span><br><span> what: 'automixmon'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_automixmon@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_automixmon@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> - # mixmonitor start</span><br><span>@@ -237,6 +237,6 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf b/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf</span><br><span>index 47cba43..de07658 100644</span><br><span>--- a/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf</span><br><span>@@ -1,9 +1,9 @@</span><br><span> [default]</span><br><span> </span><br><span> exten => alice_automixmon,1,Set(BRIDGE_FEATURES=X)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,h)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,h)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => bob_automixmon,1,Set(BRIDGE_FEATURES=x)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,H)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,H)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/automixmon_bridgefeatures/test-config.yaml b/tests/bridge/automixmon_bridgefeatures/test-config.yaml</span><br><span>index aa9d175..7b93d52 100644</span><br><span>--- a/tests/bridge/automixmon_bridgefeatures/test-config.yaml</span><br><span>+++ b/tests/bridge/automixmon_bridgefeatures/test-config.yaml</span><br><span>@@ -19,7 +19,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_automixmon@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_automixmon@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> - # mixmonitor start</span><br><span>@@ -40,7 +40,7 @@</span><br><span> what: 'automixmon'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_automixmon@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_automixmon@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> - # mixmonitor start</span><br><span>@@ -235,6 +235,6 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf b/tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf</span><br><span>index 041f0de..2758da8 100644</span><br><span>--- a/tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf</span><br><span>@@ -1,11 +1,11 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_blindxfer,1,Dial(SIP/test_call@bob,,T)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_blindxfer,1,Dial(PJSIP/test_call@bob,,T)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_blindxfer,1,Dial(SIP/test_call@bob,,t)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_blindxfer,1,Dial(PJSIP/test_call@bob,,t)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => 123,1,NoOp(This is our transfer target)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/transfer@charlie,,Tt)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/transfer@charlie,,Tt)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/blindxfer_nominal/configs/ast1/pjsip_sip-alice.conf b/tests/bridge/blindxfer_nominal/configs/ast1/pjsip_sip-alice.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..3b312cc</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/blindxfer_nominal/configs/ast1/pjsip_sip-alice.conf</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[alice-extra](!)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = charlie</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+callerid = Charlie <5678></span><br><span style="color: hsl(120, 100%, 40%);">+send_pai = yes</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = charlie</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/bridge/blindxfer_nominal/configs/ast1/sip-alice.conf b/tests/bridge/blindxfer_nominal/configs/ast1/sip-alice.conf</span><br><span>deleted file mode 100644</span><br><span>index 559e86e..0000000</span><br><span>--- a/tests/bridge/blindxfer_nominal/configs/ast1/sip-alice.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,8 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[alice-extra](!)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[charlie]</span><br><span style="color: hsl(0, 100%, 40%);">-sendrpid=pai</span><br><span style="color: hsl(0, 100%, 40%);">-callerid=Charlie <5678></span><br><span style="color: hsl(0, 100%, 40%);">-type = peer</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5063</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/bridge/blindxfer_nominal/configs/ast4/pjsip.conf b/tests/bridge/blindxfer_nominal/configs/ast4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..b453c61</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/blindxfer_nominal/configs/ast4/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = uut</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = uut</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/bridge/blindxfer_nominal/configs/ast4/sip.conf b/tests/bridge/blindxfer_nominal/configs/ast4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 9a3df35..0000000</span><br><span>--- a/tests/bridge/blindxfer_nominal/configs/ast4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1:5063</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[uut]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5060</span><br><span>diff --git a/tests/bridge/blindxfer_nominal/test-config.yaml b/tests/bridge/blindxfer_nominal/test-config.yaml</span><br><span>index 50e555e..5bfe337 100644</span><br><span>--- a/tests/bridge/blindxfer_nominal/test-config.yaml</span><br><span>+++ b/tests/bridge/blindxfer_nominal/test-config.yaml</span><br><span>@@ -42,7 +42,7 @@</span><br><span> asterisk-instances: 4</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_blindxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_blindxfer@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -50,7 +50,7 @@</span><br><span> success: 'true'</span><br><span> exten: '123'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_blindxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_blindxfer@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'bob'</span><br><span>@@ -66,6 +66,6 @@</span><br><span> - asterisk: 'app_dial'</span><br><span> - asterisk: 'app_echo'</span><br><span> - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/blindxfer_setup/configs/ast1/extensions.conf b/tests/bridge/blindxfer_setup/configs/ast1/extensions.conf</span><br><span>index c0b4c65..5cd71d9 100644</span><br><span>--- a/tests/bridge/blindxfer_setup/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/blindxfer_setup/configs/ast1/extensions.conf</span><br><span>@@ -1,11 +1,11 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_blindxfer,1,Dial(SIP/test_call@bob,,Th)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_blindxfer,1,Dial(PJSIP/test_call@bob,,Th)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => alice_blindxfer2,1,Set(BRIDGE_FEATURES=T)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,h)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,h)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_blindxfer,1,Dial(SIP/test_call@bob,,tH)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_blindxfer,1,Dial(PJSIP/test_call@bob,,tH)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/blindxfer_setup/test-config.yaml b/tests/bridge/blindxfer_setup/test-config.yaml</span><br><span>index 735da9f..e2e1fa3 100644</span><br><span>--- a/tests/bridge/blindxfer_setup/test-config.yaml</span><br><span>+++ b/tests/bridge/blindxfer_setup/test-config.yaml</span><br><span>@@ -20,7 +20,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_blindxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_blindxfer@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -32,7 +32,7 @@</span><br><span> what: 'blindxfer'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_blindxfer2@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_blindxfer2@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -44,7 +44,7 @@</span><br><span> what: 'blindxfer'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_blindxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_blindxfer@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -304,6 +304,6 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/blonde_nominal/configs/ast1/extensions.conf b/tests/bridge/blonde_nominal/configs/ast1/extensions.conf</span><br><span>index 77d554d..9b324dc 100644</span><br><span>--- a/tests/bridge/blonde_nominal/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/blonde_nominal/configs/ast1/extensions.conf</span><br><span>@@ -1,11 +1,11 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_atxfer,1,Dial(SIP/test_call@bob,,T)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_atxfer,1,Dial(PJSIP/test_call@bob,,T)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_atxfer,1,Dial(SIP/test_call@bob,,t)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_atxfer,1,Dial(PJSIP/test_call@bob,,t)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => 123,1,NoOp(This is our transfer target)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/transfer@charlie,,Tt)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/transfer@charlie,,Tt)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/blonde_nominal/configs/ast1/pjsip_sip-alice.conf b/tests/bridge/blonde_nominal/configs/ast1/pjsip_sip-alice.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..3b312cc</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/blonde_nominal/configs/ast1/pjsip_sip-alice.conf</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[alice-extra](!)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = charlie</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[charlie]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+callerid = Charlie <5678></span><br><span style="color: hsl(120, 100%, 40%);">+send_pai = yes</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = charlie</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/bridge/blonde_nominal/configs/ast1/sip-alice.conf b/tests/bridge/blonde_nominal/configs/ast1/sip-alice.conf</span><br><span>deleted file mode 100644</span><br><span>index 559e86e..0000000</span><br><span>--- a/tests/bridge/blonde_nominal/configs/ast1/sip-alice.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,8 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[alice-extra](!)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[charlie]</span><br><span style="color: hsl(0, 100%, 40%);">-sendrpid=pai</span><br><span style="color: hsl(0, 100%, 40%);">-callerid=Charlie <5678></span><br><span style="color: hsl(0, 100%, 40%);">-type = peer</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5063</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/bridge/blonde_nominal/configs/ast4/pjsip.conf b/tests/bridge/blonde_nominal/configs/ast4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..b453c61</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/blonde_nominal/configs/ast4/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5063</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = uut</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[uut]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = uut</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/bridge/blonde_nominal/test-config.yaml b/tests/bridge/blonde_nominal/test-config.yaml</span><br><span>index 9d28396..812e250 100644</span><br><span>--- a/tests/bridge/blonde_nominal/test-config.yaml</span><br><span>+++ b/tests/bridge/blonde_nominal/test-config.yaml</span><br><span>@@ -29,7 +29,7 @@</span><br><span> asterisk-instances: 4</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_atxfer@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -37,7 +37,7 @@</span><br><span> success: 'true'</span><br><span> exten: '123'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_atxfer@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_atxfer@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'bob'</span><br><span>@@ -52,6 +52,6 @@</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span> - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast1/extensions.conf b/tests/bridge/connected_line_update/configs/ast1/extensions.conf</span><br><span>index d54a1c0..129f832 100644</span><br><span>--- a/tests/bridge/connected_line_update/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/connected_line_update/configs/ast1/extensions.conf</span><br><span>@@ -10,6 +10,6 @@</span><br><span> [default]</span><br><span> </span><br><span> exten => simple_bridge,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast1/pjsip_sip-alice.conf b/tests/bridge/connected_line_update/configs/ast1/pjsip_sip-alice.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..97841ed</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/connected_line_update/configs/ast1/pjsip_sip-alice.conf</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[alice-extra](!)</span><br><span style="color: hsl(120, 100%, 40%);">+send_pai=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_connected_line=true</span><br><span style="color: hsl(120, 100%, 40%);">+send_connected_line=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_id_inbound=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_id_outbound=true</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast1/pjsip_sip-bob.conf b/tests/bridge/connected_line_update/configs/ast1/pjsip_sip-bob.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..0f6f6d1</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/connected_line_update/configs/ast1/pjsip_sip-bob.conf</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[bob-extra](!)</span><br><span style="color: hsl(120, 100%, 40%);">+send_pai=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_connected_line=true</span><br><span style="color: hsl(120, 100%, 40%);">+send_connected_line=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_id_inbound=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_id_outbound=true</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast1/sip-alice.conf b/tests/bridge/connected_line_update/configs/ast1/sip-alice.conf</span><br><span>deleted file mode 100644</span><br><span>index f876215..0000000</span><br><span>--- a/tests/bridge/connected_line_update/configs/ast1/sip-alice.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[alice-extra](!)</span><br><span style="color: hsl(0, 100%, 40%);">-trustrpid=yes</span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast1/sip-bob.conf b/tests/bridge/connected_line_update/configs/ast1/sip-bob.conf</span><br><span>deleted file mode 100644</span><br><span>index e098b3a..0000000</span><br><span>--- a/tests/bridge/connected_line_update/configs/ast1/sip-bob.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[bob-extra](!)</span><br><span style="color: hsl(0, 100%, 40%);">-trustrpid=yes</span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast2/pjsip_sip-uut.conf b/tests/bridge/connected_line_update/configs/ast2/pjsip_sip-uut.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..22c658b</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/connected_line_update/configs/ast2/pjsip_sip-uut.conf</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[uut-extra](!)</span><br><span style="color: hsl(120, 100%, 40%);">+send_pai=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_connected_line=true</span><br><span style="color: hsl(120, 100%, 40%);">+send_connected_line=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_id_inbound=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_id_outbound=true</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast2/sip-uut.conf b/tests/bridge/connected_line_update/configs/ast2/sip-uut.conf</span><br><span>deleted file mode 100644</span><br><span>index 9978755..0000000</span><br><span>--- a/tests/bridge/connected_line_update/configs/ast2/sip-uut.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,3 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[uut-extra](!)</span><br><span style="color: hsl(0, 100%, 40%);">-sendrpid=pai</span><br><span style="color: hsl(0, 100%, 40%);">-trustrpid=yes</span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast3/pjsip_sip-uut.conf b/tests/bridge/connected_line_update/configs/ast3/pjsip_sip-uut.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..22c658b</span><br><span>--- /dev/null</span><br><span>+++ b/tests/bridge/connected_line_update/configs/ast3/pjsip_sip-uut.conf</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[uut-extra](!)</span><br><span style="color: hsl(120, 100%, 40%);">+send_pai=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_connected_line=true</span><br><span style="color: hsl(120, 100%, 40%);">+send_connected_line=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_id_inbound=true</span><br><span style="color: hsl(120, 100%, 40%);">+trust_id_outbound=true</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/bridge/connected_line_update/configs/ast3/sip-uut.conf b/tests/bridge/connected_line_update/configs/ast3/sip-uut.conf</span><br><span>deleted file mode 100644</span><br><span>index 9978755..0000000</span><br><span>--- a/tests/bridge/connected_line_update/configs/ast3/sip-uut.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,3 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[uut-extra](!)</span><br><span style="color: hsl(0, 100%, 40%);">-sendrpid=pai</span><br><span style="color: hsl(0, 100%, 40%);">-trustrpid=yes</span><br><span>diff --git a/tests/bridge/connected_line_update/test-config.yaml b/tests/bridge/connected_line_update/test-config.yaml</span><br><span>index 22e7830..e95b1ad 100644</span><br><span>--- a/tests/bridge/connected_line_update/test-config.yaml</span><br><span>+++ b/tests/bridge/connected_line_update/test-config.yaml</span><br><span>@@ -1,4 +1,5 @@</span><br><span> testinfo:</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'requires further rework for pjsip, see ASTERISK-30292'</span><br><span> summary: 'Connected line update propagation across a bridge'</span><br><span> description: |</span><br><span> 'Set up a bridge between two endpoints and ensure that the initial connected line update moves across the bridge as well as subsequent updates.'</span><br><span>@@ -20,7 +21,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/uut/simple_bridge'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/simple_bridge@uut'</span><br><span> </span><br><span> ami-uut:</span><br><span> -</span><br><span>@@ -86,7 +87,7 @@</span><br><span> - asterisk: 'app_dial'</span><br><span> - asterisk: 'app_stack'</span><br><span> - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> - asterisk: 'func_callerid'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/dial_LS_options/configs/ast1/extensions.conf b/tests/bridge/dial_LS_options/configs/ast1/extensions.conf</span><br><span>index 9ddfb9b..189d765 100644</span><br><span>--- a/tests/bridge/dial_LS_options/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/dial_LS_options/configs/ast1/extensions.conf</span><br><span>@@ -1,25 +1,25 @@</span><br><span> [default]</span><br><span> </span><br><span> exten => no_warning,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,L(10000))</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,L(10000))</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => caller_warning,1,NoOp()</span><br><span> same => n,Set(LIMIT_WARNING_FILE=beep)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,L(10000:5000))</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,L(10000:5000))</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => callee_warning,1,NoOp()</span><br><span> same => n,Set(LIMIT_WARNING_FILE=beep)</span><br><span> same => n,Set(LIMIT_PLAYAUDIO_CALLER=no)</span><br><span> same => n,Set(LIMIT_PLAYAUDIO_CALLEE=yes)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,L(10000:5000))</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,L(10000:5000))</span><br><span> </span><br><span> exten => both_warning,1,NoOp()</span><br><span> same => n,Set(LIMIT_WARNING_FILE=beep)</span><br><span> same => n,Set(LIMIT_PLAYAUDIO_CALLEE=yes)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,L(10000:5000))</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,L(10000:5000))</span><br><span> </span><br><span> exten => no_warning_s,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,S(10))</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,S(10))</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/dial_LS_options/test-config.yaml b/tests/bridge/dial_LS_options/test-config.yaml</span><br><span>index 5d3c3be..2bcb14a 100644</span><br><span>--- a/tests/bridge/dial_LS_options/test-config.yaml</span><br><span>+++ b/tests/bridge/dial_LS_options/test-config.yaml</span><br><span>@@ -17,21 +17,21 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/uut/no_warning'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/no_warning@uut'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/uut/caller_warning'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/caller_warning@uut'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/uut/callee_warning'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/callee_warning@uut'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/uut/both_warning'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/both_warning@uut'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/uut/no_warning_s'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/no_warning_s@uut'</span><br><span> </span><br><span> properties:</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/disconnect/configs/ast1/extensions.conf b/tests/bridge/disconnect/configs/ast1/extensions.conf</span><br><span>index ebe1c20..a33f119 100644</span><br><span>--- a/tests/bridge/disconnect/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/disconnect/configs/ast1/extensions.conf</span><br><span>@@ -1,11 +1,11 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_disconnect,1,Dial(SIP/test_call@bob,,Ht)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_disconnect,1,Dial(PJSIP/test_call@bob,,Ht)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => alice_disconnect2,1,Set(BRIDGE_FEATURES=H)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,t)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,t)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_disconnect,1,Dial(SIP/test_call@bob,,hT)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_disconnect,1,Dial(PJSIP/test_call@bob,,hT)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/disconnect/test-config.yaml b/tests/bridge/disconnect/test-config.yaml</span><br><span>index d238512..853877f 100644</span><br><span>--- a/tests/bridge/disconnect/test-config.yaml</span><br><span>+++ b/tests/bridge/disconnect/test-config.yaml</span><br><span>@@ -19,7 +19,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_disconnect@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_disconnect@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'bob'</span><br><span>@@ -30,7 +30,7 @@</span><br><span> what: 'disconnect'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_disconnect2@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_disconnect2@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'bob'</span><br><span>@@ -41,7 +41,7 @@</span><br><span> what: 'disconnect'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_disconnect@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_disconnect@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -299,6 +299,6 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/parkcall/configs/ast1/extensions.conf b/tests/bridge/parkcall/configs/ast1/extensions.conf</span><br><span>index 45763dc..0de9739 100644</span><br><span>--- a/tests/bridge/parkcall/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/parkcall/configs/ast1/extensions.conf</span><br><span>@@ -1,7 +1,7 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_parkcall,1,Dial(SIP/test_call@bob,,Kh)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_parkcall,1,Dial(PJSIP/test_call@bob,,Kh)</span><br><span> same => n,Hangup</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_parkcall,1,Dial(SIP/test_call@bob,,kH)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_parkcall,1,Dial(PJSIP/test_call@bob,,kH)</span><br><span> same => n,Hangup</span><br><span>diff --git a/tests/bridge/parkcall/test-config.yaml b/tests/bridge/parkcall/test-config.yaml</span><br><span>index 10f4928..ef385e2 100644</span><br><span>--- a/tests/bridge/parkcall/test-config.yaml</span><br><span>+++ b/tests/bridge/parkcall/test-config.yaml</span><br><span>@@ -26,7 +26,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_parkcall@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_parkcall@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'bob'</span><br><span>@@ -38,7 +38,7 @@</span><br><span> success: 'true'</span><br><span> </span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_parkcall@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_parkcall@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -101,7 +101,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span> - parking</span><br><span>diff --git a/tests/bridge/parkcall_blindxfer/Hangup.py b/tests/bridge/parkcall_blindxfer/Hangup.py</span><br><span>index 84edebb..b062803 100755</span><br><span>--- a/tests/bridge/parkcall_blindxfer/Hangup.py</span><br><span>+++ b/tests/bridge/parkcall_blindxfer/Hangup.py</span><br><span>@@ -34,17 +34,17 @@</span><br><span> if parkee is None:</span><br><span> LOGGER.error("Received TestEvent without a channel.\n")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if parkee == 'SIP/alice-00000004':</span><br><span style="color: hsl(120, 100%, 40%);">+ if parkee == 'PJSIP/alice-00000004':</span><br><span> # channel which parking failed for</span><br><span style="color: hsl(0, 100%, 40%);">- LOGGER.info("Hanging up channel: SIP/bob-00000005")</span><br><span style="color: hsl(0, 100%, 40%);">- ami.hangup('SIP/bob-00000005')</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGER.info("Hanging up channel: PJSIP/bob-00000005")</span><br><span style="color: hsl(120, 100%, 40%);">+ ami.hangup('PJSIP/bob-00000005')</span><br><span> # the call that was parked</span><br><span> LOGGER.info("Hanging up channel: Local/fill-park@default-00000000;2")</span><br><span> ami.hangup('Local/fill-park@default-00000000;2')</span><br><span style="color: hsl(0, 100%, 40%);">- elif parkee == 'SIP/alice-00000008':</span><br><span style="color: hsl(120, 100%, 40%);">+ elif parkee == 'PJSIP/alice-00000008':</span><br><span> # channel which parking failed for</span><br><span style="color: hsl(0, 100%, 40%);">- LOGGER.info("Hanging up channel: SIP/bob-00000009")</span><br><span style="color: hsl(0, 100%, 40%);">- ami.hangup('SIP/bob-00000009')</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGGER.info("Hanging up channel: PJSIP/bob-00000009")</span><br><span style="color: hsl(120, 100%, 40%);">+ ami.hangup('PJSIP/bob-00000009')</span><br><span> # the call that was parked</span><br><span> LOGGER.info("Hanging up channel: Local/fill-park@default-00000001;2")</span><br><span> ami.hangup('Local/fill-park@default-00000001;2')</span><br><span>diff --git a/tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf b/tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf</span><br><span>index 1136d75..d4aabce 100644</span><br><span>--- a/tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf</span><br><span>@@ -4,13 +4,13 @@</span><br><span> </span><br><span> ; Dial bob</span><br><span> exten => bob,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/test_call@bob,,T)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/test_call@bob,,T)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => bob-static,1,NoOp()</span><br><span> same => n,Set(PARKINGLOT=parkinglot_static)</span><br><span> same => n,NoOp(CHANNEL TYPE: ${CHANNEL(channeltype)})</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,ExecIf($["${CHANNEL(channeltype)}" = "SIP"]?Goto(bob,1):Goto(echo,1))</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,ExecIf($["${CHANNEL(channeltype)}" = "PJSIP"]?Goto(bob,1):Goto(echo,1))</span><br><span> </span><br><span> ; Create a Local channel and park it to fill up the parking slot</span><br><span> ; for the static lot before calling Bob.</span><br><span>@@ -22,7 +22,7 @@</span><br><span> exten => bob-dynamic,1,NoOp()</span><br><span> same => n,Gosub(dynparkvars,1)</span><br><span> same => n,NoOp(CHANNEL TYPE: ${CHANNEL(channeltype)})</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,ExecIf($["${CHANNEL(channeltype)}" = "SIP"]?Goto(bob,1):Goto(echo,1))</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,ExecIf($["${CHANNEL(channeltype)}" = "PJSIP"]?Goto(bob,1):Goto(echo,1))</span><br><span> </span><br><span> ; Create a Local channel and park it to fill up the parking slot</span><br><span> ; for the dynamically created lot before calling Bob.</span><br><span>diff --git a/tests/bridge/parkcall_blindxfer/test-config.yaml b/tests/bridge/parkcall_blindxfer/test-config.yaml</span><br><span>index b5d5bcf..58e1592 100644</span><br><span>--- a/tests/bridge/parkcall_blindxfer/test-config.yaml</span><br><span>+++ b/tests/bridge/parkcall_blindxfer/test-config.yaml</span><br><span>@@ -23,7 +23,7 @@</span><br><span> test-runs:</span><br><span> # Alice blind xfers Bob to the empty default lot.</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -33,7 +33,7 @@</span><br><span> </span><br><span> # Alice blind xfers Bob to an empty static custom lot.</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob-static@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob-static@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -45,7 +45,7 @@</span><br><span> # create a local channel and park it to prevent bob's channel from being</span><br><span> # parked.</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob-static-full@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob-static-full@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -55,7 +55,7 @@</span><br><span> </span><br><span> # Alice blind xfers Bob to an empty dynamically created lot.</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob-dynamic@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob-dynamic@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -67,7 +67,7 @@</span><br><span> # will create a local channel and park it to prevent bob's channel from</span><br><span> # being parked.</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob-dynamic-full@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob-dynamic-full@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -83,7 +83,7 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'Hangup'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/alice-0000000(0|2|4|6|8)'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/alice-0000000(0|2|4|6|8)'</span><br><span> requirements:</span><br><span> match:</span><br><span> Cause: '16'</span><br><span>@@ -98,10 +98,10 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'ParkedCall'</span><br><span style="color: hsl(0, 100%, 40%);">- ParkeeChannel: 'SIP/bob-00000001'</span><br><span style="color: hsl(120, 100%, 40%);">+ ParkeeChannel: 'PJSIP/bob-00000001'</span><br><span> ParkingSpace: '701'</span><br><span> Parkinglot: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- ParkerDialString: 'SIP/alice'</span><br><span style="color: hsl(120, 100%, 40%);">+ ParkerDialString: 'PJSIP/alice'</span><br><span> callbackModule: 'Hangup'</span><br><span> callbackMethod: 'handle_parkedcall'</span><br><span> count: '1'</span><br><span>@@ -115,10 +115,10 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'ParkedCall'</span><br><span style="color: hsl(0, 100%, 40%);">- ParkeeChannel: 'SIP/bob-00000003'</span><br><span style="color: hsl(120, 100%, 40%);">+ ParkeeChannel: 'PJSIP/bob-00000003'</span><br><span> ParkingSpace: '801'</span><br><span> Parkinglot: 'parkinglot_static'</span><br><span style="color: hsl(0, 100%, 40%);">- ParkerDialString: 'SIP/alice'</span><br><span style="color: hsl(120, 100%, 40%);">+ ParkerDialString: 'PJSIP/alice'</span><br><span> callbackModule: 'Hangup'</span><br><span> callbackMethod: 'handle_parkedcall'</span><br><span> count: '1'</span><br><span>@@ -151,7 +151,7 @@</span><br><span> Type: 'StateChange'</span><br><span> State: 'PLAYBACK'</span><br><span> Message: 'pbx-parkingfailed'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/alice-0000000(4|8)'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/alice-0000000(4|8)'</span><br><span> callbackModule: 'Hangup'</span><br><span> callbackMethod: 'handle_testevent'</span><br><span> count: '2'</span><br><span>@@ -165,10 +165,10 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'ParkedCall'</span><br><span style="color: hsl(0, 100%, 40%);">- ParkeeChannel: 'SIP/bob-00000007'</span><br><span style="color: hsl(120, 100%, 40%);">+ ParkeeChannel: 'PJSIP/bob-00000007'</span><br><span> ParkingSpace: '901'</span><br><span> Parkinglot: 'parkinglot_dynamic'</span><br><span style="color: hsl(0, 100%, 40%);">- ParkerDialString: 'SIP/alice'</span><br><span style="color: hsl(120, 100%, 40%);">+ ParkerDialString: 'PJSIP/alice'</span><br><span> callbackModule: 'Hangup'</span><br><span> callbackMethod: 'handle_parkedcall'</span><br><span> count: '1'</span><br><span>@@ -197,7 +197,7 @@</span><br><span> - asterisk: 'app_dial'</span><br><span> - asterisk: 'app_echo'</span><br><span> - asterisk: 'app_stack'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> - asterisk: 'func_channel'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf b/tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf</span><br><span>index d068a67..d9005a8 100644</span><br><span>--- a/tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf</span><br><span>@@ -1,9 +1,9 @@</span><br><span> [default]</span><br><span> </span><br><span> exten => alice_parkcall,1,Set(BRIDGE_FEATURES=K)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,h)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,h)</span><br><span> same => n,Hangup</span><br><span> </span><br><span> exten => bob_parkcall,1,Set(BRIDGE_FEATURES=k)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,H)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,H)</span><br><span> same => n,Hangup</span><br><span>diff --git a/tests/bridge/parkcall_bridgefeatures/test-config.yaml b/tests/bridge/parkcall_bridgefeatures/test-config.yaml</span><br><span>index 1c0870d..e1bc48f 100644</span><br><span>--- a/tests/bridge/parkcall_bridgefeatures/test-config.yaml</span><br><span>+++ b/tests/bridge/parkcall_bridgefeatures/test-config.yaml</span><br><span>@@ -21,7 +21,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_parkcall@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_parkcall@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'bob'</span><br><span>@@ -33,7 +33,7 @@</span><br><span> success: 'true'</span><br><span> </span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_parkcall@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_parkcall@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -96,7 +96,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> - asterisk: 'res_parking'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py b/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py</span><br><span>index c08628e..6d988bc 100755</span><br><span>--- a/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py</span><br><span>+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py</span><br><span>@@ -23,11 +23,11 @@</span><br><span> self.test_object = test_object</span><br><span> </span><br><span> self.calls = []</span><br><span style="color: hsl(0, 100%, 40%);">- self.calls.append({'test': '1', 'parker': 'SIP/alice',</span><br><span style="color: hsl(120, 100%, 40%);">+ self.calls.append({'test': '1', 'parker': 'PJSIP/alice',</span><br><span> 'lot': 'parkinglot_test1', 'slot': '401'})</span><br><span style="color: hsl(0, 100%, 40%);">- self.calls.append({'test': '2', 'parker': 'SIP/alice',</span><br><span style="color: hsl(120, 100%, 40%);">+ self.calls.append({'test': '2', 'parker': 'PJSIP/alice',</span><br><span> 'lot': 'parkinglot_test2', 'slot': '501'})</span><br><span style="color: hsl(0, 100%, 40%);">- self.calls.append({'test': '3', 'parker': 'SIP/alice',</span><br><span style="color: hsl(120, 100%, 40%);">+ self.calls.append({'test': '3', 'parker': 'PJSIP/alice',</span><br><span> 'lot': 'parkinglot_test3', 'slot': '601'})</span><br><span> self.userevents_received = 0</span><br><span> self.passed_dialplan = 0</span><br><span>@@ -56,7 +56,7 @@</span><br><span> appdata = event.get('appdata')</span><br><span> registrar = event.get('registrar')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if appdata != 'SIP/alice,3':</span><br><span style="color: hsl(120, 100%, 40%);">+ if appdata != 'PJSIP/alice,3':</span><br><span> not_right = True</span><br><span> if registrar != 'res_parking':</span><br><span> not_right = True</span><br><span>diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf b/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf</span><br><span>index dd857da..27ce450 100644</span><br><span>--- a/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf</span><br><span>@@ -1,22 +1,22 @@</span><br><span> [default]</span><br><span> </span><br><span> exten => uncaller,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@alice,,Kh)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@alice,,Kh)</span><br><span> same => n, Hangup</span><br><span> </span><br><span> exten => test1,1,NoOp(BAAA)</span><br><span> same => n,Set(CHANNEL(parkinglot)=parkinglot_test1)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,Kh)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,Kh)</span><br><span> same => n,Hangup</span><br><span> </span><br><span> exten => test2,1,NoOp(BAAB)</span><br><span> same => n,Set(CHANNEL(parkinglot)=parkinglot_test2)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,Kh)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,Kh)</span><br><span> same => n,Hangup</span><br><span> </span><br><span> exten => test3,1,NoOp(BAAC)</span><br><span> same => n,Set(CHANNEL(parkinglot)=parkinglot_test3)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,Kh)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,Kh)</span><br><span> same => n,Hangup</span><br><span> </span><br><span> exten => s,1,NoOp(AAAAC)</span><br><span>diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml b/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml</span><br><span>index 3f2afcf..8f1403d 100644</span><br><span>--- a/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml</span><br><span>+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml</span><br><span>@@ -1,4 +1,5 @@</span><br><span> testinfo:</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'requires further rework for pjsip, see ASTERISK-30292'</span><br><span> summary: 'Test call parking timeouts for comebacktoorigin off'</span><br><span> description: |</span><br><span> 'This test builds on the more generic parkcall test. With comebacktoorigin disabled,</span><br><span>@@ -22,21 +23,21 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test1@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test1@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span> what: 'parkcall'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test2@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test2@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span> what: 'parkcall'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test3@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test3@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -145,7 +146,7 @@</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span> - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> - asterisk: 'func_channel'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py</span><br><span>index 26c62d8..e867745 100755</span><br><span>--- a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py</span><br><span>+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py</span><br><span>@@ -24,11 +24,11 @@</span><br><span> self.test_object = test_object</span><br><span> </span><br><span> self.calls = []</span><br><span style="color: hsl(0, 100%, 40%);">- self.calls.append({'parker': 'SIP/alice', 'lot': 'parkinglot_test1',</span><br><span style="color: hsl(120, 100%, 40%);">+ self.calls.append({'parker': 'PJSIP/alice', 'lot': 'parkinglot_test1',</span><br><span> 'slot': '401', 'status': 'ANSWER', 'post': False})</span><br><span style="color: hsl(0, 100%, 40%);">- self.calls.append({'parker': 'SIP/alice', 'lot': 'parkinglot_test1',</span><br><span style="color: hsl(120, 100%, 40%);">+ self.calls.append({'parker': 'PJSIP/alice', 'lot': 'parkinglot_test1',</span><br><span> 'slot': '402', 'status': 'NOANSWER', 'post': True})</span><br><span style="color: hsl(0, 100%, 40%);">- self.calls.append({'parker': 'SIP/alice', 'lot': 'parkinglot_test1',</span><br><span style="color: hsl(120, 100%, 40%);">+ self.calls.append({'parker': 'PJSIP/alice', 'lot': 'parkinglot_test1',</span><br><span> 'slot': '403', 'status': 'BUSY', 'post': True})</span><br><span> self.current_call = None</span><br><span> self.current_call_post = False</span><br><span>diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf</span><br><span>index d3a8fe2..56a5ac1 100644</span><br><span>--- a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf</span><br><span>@@ -1,7 +1,7 @@</span><br><span> [default]</span><br><span> exten => test,1,NoOp(BAAA)</span><br><span> same => n,Set(CHANNEL(parkinglot)=parkinglot_test1)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,Kh)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,Kh)</span><br><span> same => n,Hangup</span><br><span> </span><br><span> [park-dial]</span><br><span>diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml</span><br><span>index 8615c8c..144c8d0 100644</span><br><span>--- a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml</span><br><span>+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml</span><br><span>@@ -1,4 +1,5 @@</span><br><span> testinfo:</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'requires further rework for pjsip, see ASTERISK-30292'</span><br><span> summary: 'Test call parking timeouts for comebacktoorigin off'</span><br><span> description: |</span><br><span> 'This test builds on the more generic parkcall test. With comebacktoorigin enabled,</span><br><span>@@ -21,21 +22,21 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span> what: 'parkcall'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span> what: 'parkcall'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test@uut'</span><br><span> features:</span><br><span> -</span><br><span> who: 'alice'</span><br><span>@@ -172,7 +173,7 @@</span><br><span> - asterisk: 'app_senddtmf'</span><br><span> - asterisk: 'app_talkdetect'</span><br><span> - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> - asterisk: 'func_channel'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/simple_bridge/configs/ast1/extensions.conf b/tests/bridge/simple_bridge/configs/ast1/extensions.conf</span><br><span>index eca1a10..029bdb5 100644</span><br><span>--- a/tests/bridge/simple_bridge/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/simple_bridge/configs/ast1/extensions.conf</span><br><span>@@ -1,4 +1,4 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => test_call,1,Dial(SIP/test_call@bob,,wW)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => test_call,1,Dial(PJSIP/test_call@bob,,wW)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/simple_bridge/test-config.yaml b/tests/bridge/simple_bridge/test-config.yaml</span><br><span>index 49da8ed..b2acc88 100644</span><br><span>--- a/tests/bridge/simple_bridge/test-config.yaml</span><br><span>+++ b/tests/bridge/simple_bridge/test-config.yaml</span><br><span>@@ -25,10 +25,10 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test_call@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test_call@uut'</span><br><span> hangup: 'alice'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test_call@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test_call@uut'</span><br><span> hangup: 'bob'</span><br><span> </span><br><span> ami-uut-v12:</span><br><span>@@ -49,7 +49,7 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'BridgeEnter'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/alice-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/alice-.*'</span><br><span> requirements:</span><br><span> match:</span><br><span> BridgeUniqueid: '.*-.*-.*'</span><br><span>@@ -72,7 +72,7 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'BridgeEnter'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/bob-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/bob-.*'</span><br><span> requirements:</span><br><span> match:</span><br><span> BridgeUniqueid: '.*-.*-.*'</span><br><span>@@ -94,7 +94,7 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'BridgeLeave'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/alice-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/alice-.*'</span><br><span> requirements:</span><br><span> match:</span><br><span> BridgeUniqueid: '.*-.*-.*'</span><br><span>@@ -117,7 +117,7 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'BridgeLeave'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/bob-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/bob-.*'</span><br><span> requirements:</span><br><span> match:</span><br><span> BridgeUniqueid: '.*-.*-.*'</span><br><span>@@ -362,6 +362,6 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf b/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf</span><br><span>index 300a5ab..d817852 100644</span><br><span>--- a/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf</span><br><span>@@ -1,7 +1,7 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_opt,1,Dial(SIP/test_call@bob,,Th)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_opt,1,Dial(PJSIP/test_call@bob,,Th)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_opt,1,Dial(SIP/test_call@bob,,tH)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_opt,1,Dial(PJSIP/test_call@bob,,tH)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/bridge/transfer_capabilities/test-config.yaml b/tests/bridge/transfer_capabilities/test-config.yaml</span><br><span>index 19b451c..ebb5a32 100644</span><br><span>--- a/tests/bridge/transfer_capabilities/test-config.yaml</span><br><span>+++ b/tests/bridge/transfer_capabilities/test-config.yaml</span><br><span>@@ -11,7 +11,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span> </span><br><span>@@ -33,7 +33,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_opt@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_opt@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -53,7 +53,7 @@</span><br><span> what: 'atxfer'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_opt@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_opt@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>diff --git a/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf b/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf</span><br><span>index 9afe0f9..0d6ae12 100644</span><br><span>--- a/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf</span><br><span>@@ -1,10 +1,10 @@</span><br><span> [default]</span><br><span> </span><br><span> exten => alice_bridge_features,1,Set(BRIDGE_FEATURES=T)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,h)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,h)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => bob_bridge_features,1,Set(BRIDGE_FEATURES=t)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/test_call@bob,,H)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/test_call@bob,,H)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span>diff --git a/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml b/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml</span><br><span>index 0edf62f..cdfc79b 100644</span><br><span>--- a/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml</span><br><span>+++ b/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml</span><br><span>@@ -11,7 +11,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span> </span><br><span>@@ -33,7 +33,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_bridge_features@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_bridge_features@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -53,7 +53,7 @@</span><br><span> what: 'atxfer'</span><br><span> success: 'true'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_bridge_features@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_bridge_features@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>diff --git a/tests/bridge/transfer_failure/configs/ast1/extensions.conf b/tests/bridge/transfer_failure/configs/ast1/extensions.conf</span><br><span>index cec6e34..f70688d 100644</span><br><span>--- a/tests/bridge/transfer_failure/configs/ast1/extensions.conf</span><br><span>+++ b/tests/bridge/transfer_failure/configs/ast1/extensions.conf</span><br><span>@@ -1,14 +1,14 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_blind,1,Dial(SIP/test_call@bob,,T)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_blind,1,Dial(PJSIP/test_call@bob,,T)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => alice_attended,1,Dial(SIP/test_call@bob,,T)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice_attended,1,Dial(PJSIP/test_call@bob,,T)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_blind,1,Dial(SIP/test_call@bob,,t)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_blind,1,Dial(PJSIP/test_call@bob,,t)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => bob_attended,1,Dial(SIP/test_call@bob,,t)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => bob_attended,1,Dial(PJSIP/test_call@bob,,t)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span>diff --git a/tests/bridge/transfer_failure/test-config.yaml b/tests/bridge/transfer_failure/test-config.yaml</span><br><span>index 05e338d..01518b4 100644</span><br><span>--- a/tests/bridge/transfer_failure/test-config.yaml</span><br><span>+++ b/tests/bridge/transfer_failure/test-config.yaml</span><br><span>@@ -10,7 +10,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span> </span><br><span>@@ -32,7 +32,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_blind@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_blind@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -41,7 +41,7 @@</span><br><span> success: 'true'</span><br><span> exten: '77'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/alice_attended@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/alice_attended@uut'</span><br><span> hangup: 'alice'</span><br><span> features:</span><br><span> -</span><br><span>@@ -50,7 +50,7 @@</span><br><span> success: 'true'</span><br><span> exten: '77'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_blind@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_blind@uut'</span><br><span> hangup: 'bob'</span><br><span> features:</span><br><span> -</span><br><span>@@ -59,7 +59,7 @@</span><br><span> success: 'true'</span><br><span> exten: '77'</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/bob_attended@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/bob_attended@uut'</span><br><span> hangup: 'bob'</span><br><span> features:</span><br><span> -</span><br><span>@@ -90,7 +90,7 @@</span><br><span> type: 'cel'</span><br><span> conditions:</span><br><span> match:</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/alice-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/alice-.*'</span><br><span> requirements:</span><br><span> -</span><br><span> match:</span><br><span>diff --git a/tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf b/tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf</span><br><span>index 4512766..97bb0d7 100644</span><br><span>--- a/tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf</span><br><span>@@ -1,7 +1,7 @@</span><br><span> [default]</span><br><span> </span><br><span> exten => s,1,Noop</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,Dial(sip/127.0.0.2,,G(hangup^1))</span><br><span style="color: hsl(120, 100%, 40%);">+exten => s,n,Dial(pjsip/127.0.0.2,,G(hangup^1))</span><br><span> </span><br><span> exten => hangup,1,Noop</span><br><span> exten => hangup,n,Answer</span><br><span>diff --git a/tests/cdr/app_dial_G_flag/configs/ast1/pjsip.conf b/tests/cdr/app_dial_G_flag/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..01209a1</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/app_dial_G_flag/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/app_dial_G_flag/configs/ast1/sip.conf b/tests/cdr/app_dial_G_flag/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index d719906..0000000</span><br><span>--- a/tests/cdr/app_dial_G_flag/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1:5060</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/app_dial_G_flag/test-config.yaml b/tests/cdr/app_dial_G_flag/test-config.yaml</span><br><span>index 562c294..0195241 100644</span><br><span>--- a/tests/cdr/app_dial_G_flag/test-config.yaml</span><br><span>+++ b/tests/cdr/app_dial_G_flag/test-config.yaml</span><br><span>@@ -13,7 +13,7 @@</span><br><span> - app : 'asttest'</span><br><span> - sipp :</span><br><span> version : 'v3.0'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - SIP</span><br><span> - CDR</span><br><span>diff --git a/tests/cdr/app_dial_G_flag/test.lua b/tests/cdr/app_dial_G_flag/test.lua</span><br><span>index 9526b79..5183910 100644</span><br><span>--- a/tests/cdr/app_dial_G_flag/test.lua</span><br><span>+++ b/tests/cdr/app_dial_G_flag/test.lua</span><br><span>@@ -37,7 +37,7 @@</span><br><span> print("starting asterisk")</span><br><span> a = ast.new()</span><br><span> a:load_config("configs/ast1/extensions.conf")</span><br><span style="color: hsl(0, 100%, 40%);">-a:load_config("configs/ast1/sip.conf")</span><br><span style="color: hsl(120, 100%, 40%);">+a:load_config("configs/ast1/pjsip.conf")</span><br><span> a:generate_manager_conf()</span><br><span> a:spawn()</span><br><span> </span><br><span>diff --git a/tests/cdr/app_queue/configs/ast1/modules.conf.inc b/tests/cdr/app_queue/configs/ast1/modules.conf.inc</span><br><span>index 8e029d2..4acbb6c 100644</span><br><span>--- a/tests/cdr/app_queue/configs/ast1/modules.conf.inc</span><br><span>+++ b/tests/cdr/app_queue/configs/ast1/modules.conf.inc</span><br><span>@@ -1,3 +1,3 @@</span><br><span> load => res_musiconhold.so</span><br><span style="color: hsl(0, 100%, 40%);">-load => chan_sip.so</span><br><span style="color: hsl(120, 100%, 40%);">+load => chan_pjsip.so</span><br><span> load => app_queue.so</span><br><span>diff --git a/tests/cdr/app_queue/configs/ast1/pjsip.conf b/tests/cdr/app_queue/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..01209a1</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/app_queue/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/app_queue/configs/ast1/queues.conf b/tests/cdr/app_queue/configs/ast1/queues.conf</span><br><span>index 2a719be..daf66c8 100644</span><br><span>--- a/tests/cdr/app_queue/configs/ast1/queues.conf</span><br><span>+++ b/tests/cdr/app_queue/configs/ast1/queues.conf</span><br><span>@@ -4,7 +4,7 @@</span><br><span> joinempty = yes</span><br><span> </span><br><span> [one-member]</span><br><span style="color: hsl(0, 100%, 40%);">-member = SIP/answered@127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+member = PJSIP/answered@127.0.0.2</span><br><span> </span><br><span> [zero-members-exit-empty]</span><br><span> joinempty = no</span><br><span>diff --git a/tests/cdr/app_queue/configs/ast1/sip.conf b/tests/cdr/app_queue/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 160d1e2..0000000</span><br><span>--- a/tests/cdr/app_queue/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,6 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1:5060</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite = no</span><br><span style="color: hsl(0, 100%, 40%);">-pedantic = no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/app_queue/test-config.yaml b/tests/cdr/app_queue/test-config.yaml</span><br><span>index 6a23c76..56519b8 100644</span><br><span>--- a/tests/cdr/app_queue/test-config.yaml</span><br><span>+++ b/tests/cdr/app_queue/test-config.yaml</span><br><span>@@ -13,8 +13,8 @@</span><br><span> - app : 'asttest'</span><br><span> - sipp :</span><br><span> version : 'v3.0'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - queue</span><br><span> - CDR</span><br><span>diff --git a/tests/cdr/app_queue/test.lua b/tests/cdr/app_queue/test.lua</span><br><span>index 175b61b..9019708 100644</span><br><span>--- a/tests/cdr/app_queue/test.lua</span><br><span>+++ b/tests/cdr/app_queue/test.lua</span><br><span>@@ -92,7 +92,7 @@</span><br><span> -- start asterisk</span><br><span> print("starting asterisk")</span><br><span> a = ast.new()</span><br><span style="color: hsl(0, 100%, 40%);">-a:load_config("configs/ast1/sip.conf")</span><br><span style="color: hsl(120, 100%, 40%);">+a:load_config("configs/ast1/pjsip.conf")</span><br><span> a:load_config("configs/ast1/extensions.conf")</span><br><span> a:load_config("configs/ast1/cdr.conf")</span><br><span> a:load_config("configs/ast1/queues.conf")</span><br><span>diff --git a/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/extensions.conf b/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/extensions.conf</span><br><span>index 989340f..e94d973 100644</span><br><span>--- a/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/extensions.conf</span><br><span>@@ -7,7 +7,7 @@</span><br><span> [default]</span><br><span> exten => 1,1,NoOp(Dial something that should fail)</span><br><span> exten => 1,n,Set(CDR(accountcode)=cdrtest_local)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1,n,Dial(SIP/test/2)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 1,n,Dial(PJSIP/2@test)</span><br><span> exten => 1,n,Playback(silence/3)</span><br><span> exten => 1,n,ForkCDR(e)</span><br><span> exten => 1,n,Playback(silence/4)</span><br><span>diff --git a/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/pjsip.conf b/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..072bdb2</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test_context</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/sip.conf b/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 52cda20..0000000</span><br><span>--- a/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span style="color: hsl(0, 100%, 40%);">-context=test_context</span><br><span>diff --git a/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml b/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml</span><br><span>index 9198a01..f2329c1 100644</span><br><span>--- a/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml</span><br><span>+++ b/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml</span><br><span>@@ -43,7 +43,7 @@</span><br><span> destination: '1'</span><br><span> dcontext: 'default'</span><br><span> channel: 'Local/1@default-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test-.*'</span><br><span> disposition: 'NO ANSWER'</span><br><span> -</span><br><span> accountcode: 'cdrtest_local'</span><br><span>@@ -68,7 +68,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span> - CDR</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/pjsip.conf b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..2aa548c</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5070</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/sip.conf b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index db3fa67..0000000</span><br><span>--- a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,11 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite=no</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5070</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/extensions.conf b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/extensions.conf</span><br><span>index 7964365..6d72f8b 100644</span><br><span>--- a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/extensions.conf</span><br><span>@@ -7,12 +7,12 @@</span><br><span> [default]</span><br><span> exten => 1,1,NoOp(Dial something that should fail)</span><br><span> exten => 1,n,Set(CDR(accountcode)=cdrtest_local)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1,n,Dial(SIP/test/2)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 1,n,Dial(PJSIP/2@test)</span><br><span> exten => 1,n,Goto(${DIALSTATUS})</span><br><span> exten => 1,n,Hangup</span><br><span> exten => 1,n(BUSY),NoOp()</span><br><span> exten => 1,n,ForkCDR</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1,n,Dial(SIP/test/3)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 1,n,Dial(PJSIP/3@test)</span><br><span> exten => 1,n,Hangup</span><br><span> </span><br><span> exten => 2,1,NoOp()</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/pjsip.conf b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/sip.conf b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index abffb74..0000000</span><br><span>--- a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml</span><br><span>index 08b3adf..95724bc 100644</span><br><span>--- a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml</span><br><span>+++ b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml</span><br><span>@@ -38,29 +38,29 @@</span><br><span> accountcode: 'cdrtest_local'</span><br><span> destination: '1'</span><br><span> lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- lastarg: 'SIP/test/2'</span><br><span style="color: hsl(120, 100%, 40%);">+ lastarg: 'PJSIP/2@test'</span><br><span> dcontext: 'default'</span><br><span> channel: 'Local/1@default-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test-.*'</span><br><span> disposition: 'BUSY'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span> -</span><br><span> accountcode: 'cdrtest_local'</span><br><span> destination: '1'</span><br><span> lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- lastarg: 'SIP/test/3'</span><br><span style="color: hsl(120, 100%, 40%);">+ lastarg: 'PJSIP/3@test'</span><br><span> dcontext: 'default'</span><br><span> channel: 'Local/1@default-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test-.*'</span><br><span> disposition: 'ANSWERED'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span> -</span><br><span> accountcode: 'cdrtest_local'</span><br><span> destination: '1'</span><br><span> lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- lastarg: 'SIP/test/3'</span><br><span style="color: hsl(120, 100%, 40%);">+ lastarg: 'PJSIP/3@test'</span><br><span> dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test-.*'</span><br><span> channel: 'Local/1@default-.*'</span><br><span> disposition: 'ANSWERED'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span>@@ -70,7 +70,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span> - CDR</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/pjsip.conf b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/sip.conf b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 56ca78f..0000000</span><br><span>--- a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/extensions.conf b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/extensions.conf</span><br><span>index f0454b9..4da3d5c 100644</span><br><span>--- a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/extensions.conf</span><br><span>@@ -9,7 +9,7 @@</span><br><span> exten => 1,n,Set(CDR(accountcode)=cdrtest_local)</span><br><span> exten => 1,n,Playback(silence/3)</span><br><span> exten => 1,n,ForkCDR</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1,n,Dial(SIP/test/2)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 1,n,Dial(PJSIP/2@test)</span><br><span> </span><br><span> exten => 2,1,NoOp()</span><br><span> exten => 2,n,Answer()</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/pjsip.conf b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/sip.conf b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index c0ba7d0..0000000</span><br><span>--- a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml b/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml</span><br><span>index e1adfb2..2f31c5c 100644</span><br><span>--- a/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml</span><br><span>+++ b/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml</span><br><span>@@ -1,8 +1,8 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: CLI exec console dial which calls ForkCDR before dialing via SIP which answers</span><br><span style="color: hsl(120, 100%, 40%);">+ summary: CLI exec console dial which calls ForkCDR before dialing via PJSIP which answers</span><br><span> description: |</span><br><span> 'An Asterisk instance originates a Local channel which will play silence for about</span><br><span style="color: hsl(0, 100%, 40%);">- 3 seconds before using ForkCDR and then dial itself via SIP. The receiving channel</span><br><span style="color: hsl(120, 100%, 40%);">+ 3 seconds before using ForkCDR and then dial itself via PJSIP. The receiving channel</span><br><span> answers and then immediately hangs up. CDRs are tested for expected behavior.'</span><br><span> </span><br><span> test-modules:</span><br><span>@@ -52,7 +52,7 @@</span><br><span> accountcode: 'cdrtest_sip'</span><br><span> destination: '2'</span><br><span> dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test-.*'</span><br><span> disposition: 'ANSWERED'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span> </span><br><span>@@ -61,7 +61,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span> - dial</span><br><span>diff --git a/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/extensions.conf b/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/extensions.conf</span><br><span>index 9b7c502..09f7d2d 100644</span><br><span>--- a/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/extensions.conf</span><br><span>@@ -7,7 +7,7 @@</span><br><span> [default]</span><br><span> exten => 1,1,NoOp()</span><br><span> same => n,Set(CDR(accountcode)=cdrtest_local)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/test/2)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/2@test)</span><br><span> </span><br><span> exten => 2,1,NoOp()</span><br><span> same => n,Congestion()</span><br><span>diff --git a/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/pjsip.conf b/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5e94092</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/sip.conf b/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index e9cea12..0000000</span><br><span>--- a/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,8 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span>diff --git a/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml b/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml</span><br><span>index c3ae774..6b830a6 100644</span><br><span>--- a/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml</span><br><span>+++ b/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml</span><br><span>@@ -1,7 +1,7 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: CLI exec console dial which dials via SIP which returns congestion</span><br><span style="color: hsl(120, 100%, 40%);">+ summary: CLI exec console dial which dials via PJSIP which returns congestion</span><br><span> description: |</span><br><span style="color: hsl(0, 100%, 40%);">- 'Asterisk dials an extension locally which dials with SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ 'Asterisk dials an extension locally which dials with PJSIP</span><br><span> to another extension which does not pick up and sends congestion.'</span><br><span> </span><br><span> test-modules:</span><br><span>@@ -33,7 +33,7 @@</span><br><span> destination: '2'</span><br><span> dcontext: 'default'</span><br><span> callerid: '"Anonymous" <Anonymous>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test-00000001'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test-00000001'</span><br><span> disposition: 'CONGESTION'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span> -</span><br><span>@@ -49,8 +49,8 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - CDR</span><br><span>diff --git a/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/extensions.conf b/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/extensions.conf</span><br><span>index 52a7903..28efb53 100644</span><br><span>--- a/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/extensions.conf</span><br><span>@@ -2,11 +2,11 @@</span><br><span> </span><br><span> [default]</span><br><span> exten = test1,1,Noop</span><br><span style="color: hsl(0, 100%, 40%);">-exten = test1,n,Dial(SIP/test1)</span><br><span style="color: hsl(120, 100%, 40%);">+exten = test1,n,Dial(PJSIP/test1)</span><br><span> </span><br><span> exten = test2,1,Noop</span><br><span style="color: hsl(0, 100%, 40%);">-exten = test2,n,Dial(SIP/test2)</span><br><span style="color: hsl(120, 100%, 40%);">+exten = test2,n,Dial(PJSIP/test2)</span><br><span> </span><br><span> exten = test3,1,Noop</span><br><span style="color: hsl(0, 100%, 40%);">-exten = test3,n,Dial(SIP/test3)</span><br><span style="color: hsl(120, 100%, 40%);">+exten = test3,n,Dial(PJSIP/test3)</span><br><span> </span><br><span>diff --git a/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/pjsip.conf b/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..a535630</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,39 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+max_contacts = 1</span><br><span style="color: hsl(120, 100%, 40%);">+remove_existing = true</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = account1</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+max_contacts = 1</span><br><span style="color: hsl(120, 100%, 40%);">+remove_existing = true</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test3]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+max_contacts = 1</span><br><span style="color: hsl(120, 100%, 40%);">+remove_existing = true</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test3]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = account3</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test3</span><br><span>diff --git a/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/sip.conf b/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 27ec165..0000000</span><br><span>--- a/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,21 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite = no</span><br><span style="color: hsl(0, 100%, 40%);">-pedantic = no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = dynamic</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode = account1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test2]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = dynamic</span><br><span style="color: hsl(0, 100%, 40%);">-;accountcode = account2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test3]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = dynamic</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode = account3</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml b/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml</span><br><span>index 66e13bb..491b143 100644</span><br><span>--- a/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml</span><br><span>+++ b/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml</span><br><span>@@ -1,5 +1,6 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Test account code propagation for SIP blind transfers.'</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'requires further rework for pjsip, see ASTERISK-30292'</span><br><span style="color: hsl(120, 100%, 40%);">+ summary: 'Test account code propagation for PJSIP blind transfers.'</span><br><span> description: |</span><br><span> "This test ensures that when a channel with an account code, dials a</span><br><span> channel without an account code, then transfers the dialed channel to</span><br><span>@@ -15,11 +16,11 @@</span><br><span> version : 'v3.0'</span><br><span> feature : 'TLS'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span> - CDR</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - transfer</span><br><span> </span><br><span> test-modules:</span><br><span>@@ -124,15 +125,15 @@</span><br><span> destination: 'test3'</span><br><span> accountcode: 'account1'</span><br><span> disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test1-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test3-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test1-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test3-.*'</span><br><span> -</span><br><span> source: 'test3'</span><br><span> destination: 'test2'</span><br><span> accountcode: 'account1'</span><br><span> disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test3-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test2-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test3-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test2-.*'</span><br><span> -</span><br><span> file: 'account1'</span><br><span> lines:</span><br><span>@@ -141,14 +142,14 @@</span><br><span> destination: 'test3'</span><br><span> accountcode: 'account1'</span><br><span> disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test1-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test3-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test1-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test3-.*'</span><br><span> -</span><br><span> source: 'test3'</span><br><span> destination: 'test2'</span><br><span> accountcode: 'account1'</span><br><span> disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test3-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test2-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test3-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test2-.*'</span><br><span> </span><br><span> </span><br><span>diff --git a/tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/pjsip.conf b/tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..3c79e34</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/pjsip.conf</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/sip.conf b/tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 718b218..0000000</span><br><span>--- a/tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span style="color: hsl(0, 100%, 40%);">-context=test</span><br><span>diff --git a/tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf b/tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf</span><br><span>index 7ee0e54..fbee9ac 100644</span><br><span>--- a/tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf</span><br><span>@@ -7,7 +7,7 @@</span><br><span> [default]</span><br><span> exten => 1,1,NoOp()</span><br><span> exten => 1,n,Set(CDR(accountcode)=cdrtest_local)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1,n,Dial(SIP/test/2)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 1,n,Dial(PJSIP/2@test)</span><br><span> </span><br><span> [test]</span><br><span> exten => 2,1,NoOp()</span><br><span>diff --git a/tests/cdr/console_dial_sip_answer/configs/ast1/pjsip.conf b/tests/cdr/console_dial_sip_answer/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d7146a0</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/console_dial_sip_answer/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/console_dial_sip_answer/configs/ast1/sip.conf b/tests/cdr/console_dial_sip_answer/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 04ab7d8..0000000</span><br><span>--- a/tests/cdr/console_dial_sip_answer/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span style="color: hsl(0, 100%, 40%);">-context=test</span><br><span>diff --git a/tests/cdr/console_dial_sip_answer/test-config.yaml b/tests/cdr/console_dial_sip_answer/test-config.yaml</span><br><span>index 12ade6c..57425b1 100644</span><br><span>--- a/tests/cdr/console_dial_sip_answer/test-config.yaml</span><br><span>+++ b/tests/cdr/console_dial_sip_answer/test-config.yaml</span><br><span>@@ -42,7 +42,7 @@</span><br><span> accountcode: 'cdrtest_sip'</span><br><span> destination: '2'</span><br><span> dcontext: 'test'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test-.*'</span><br><span> disposition: 'ANSWERED'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span> </span><br><span>@@ -52,7 +52,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span> - CDR</span><br><span>diff --git a/tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/pjsip.conf b/tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/sip.conf b/tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 0e20399..0000000</span><br><span>--- a/tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span>diff --git a/tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf b/tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf</span><br><span>index f3adbc0..ee4e201 100644</span><br><span>--- a/tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf</span><br><span>@@ -7,7 +7,7 @@</span><br><span> [default]</span><br><span> exten => 1,1,NoOp()</span><br><span> exten => 1,n,Set(CDR(accountcode)=cdrtest_local)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1,n,Dial(SIP/2@test)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 1,n,Dial(PJSIP/2@test)</span><br><span> </span><br><span> exten => 2,1,Busy()</span><br><span> exten => 2,n,Hangup()</span><br><span>diff --git a/tests/cdr/console_dial_sip_busy/configs/ast1/pjsip.conf b/tests/cdr/console_dial_sip_busy/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/console_dial_sip_busy/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/console_dial_sip_busy/configs/ast1/sip.conf b/tests/cdr/console_dial_sip_busy/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index abffb74..0000000</span><br><span>--- a/tests/cdr/console_dial_sip_busy/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span>diff --git a/tests/cdr/console_dial_sip_busy/test-config.yaml b/tests/cdr/console_dial_sip_busy/test-config.yaml</span><br><span>index 5015805..79bee03 100644</span><br><span>--- a/tests/cdr/console_dial_sip_busy/test-config.yaml</span><br><span>+++ b/tests/cdr/console_dial_sip_busy/test-config.yaml</span><br><span>@@ -1,7 +1,7 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: CLI exec console dial which dials via SIP which returns busy</span><br><span style="color: hsl(120, 100%, 40%);">+ summary: CLI exec console dial which dials via PJSIP which returns busy</span><br><span> description: |</span><br><span style="color: hsl(0, 100%, 40%);">- 'An Asterisk instance dials itself from a local channel via SIP.</span><br><span style="color: hsl(120, 100%, 40%);">+ 'An Asterisk instance dials itself from a local channel via PJSIP.</span><br><span> The extension sends a busy indication.'</span><br><span> </span><br><span> test-modules:</span><br><span>@@ -33,7 +33,7 @@</span><br><span> destination: '1'</span><br><span> dcontext: 'default'</span><br><span> channel: 'Local/1@default-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test-.*'</span><br><span> disposition: 'BUSY'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span> </span><br><span>@@ -42,10 +42,10 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span> - dial</span><br><span> - CDR</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - chan_local</span><br><span>diff --git a/tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/pjsip.conf b/tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/sip.conf b/tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 56ca78f..0000000</span><br><span>--- a/tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf b/tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf</span><br><span>index 23f8469..088ea40 100644</span><br><span>--- a/tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf</span><br><span>@@ -7,7 +7,7 @@</span><br><span> [default]</span><br><span> exten => 1,1,NoOp()</span><br><span> exten => 1,n,Set(CDR(accountcode)=cdrtest_local)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1,n,Dial(SIP/test/2)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 1,n,Dial(PJSIP/2@test)</span><br><span> </span><br><span> exten => 2,1,NoOp()</span><br><span> exten => 2,n,Congestion()</span><br><span>diff --git a/tests/cdr/console_dial_sip_congestion/configs/ast1/pjsip.conf b/tests/cdr/console_dial_sip_congestion/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/console_dial_sip_congestion/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/console_dial_sip_congestion/configs/ast1/sip.conf b/tests/cdr/console_dial_sip_congestion/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index c0ba7d0..0000000</span><br><span>--- a/tests/cdr/console_dial_sip_congestion/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/console_dial_sip_congestion/test-config.yaml b/tests/cdr/console_dial_sip_congestion/test-config.yaml</span><br><span>index cc2e750..4c64b78 100644</span><br><span>--- a/tests/cdr/console_dial_sip_congestion/test-config.yaml</span><br><span>+++ b/tests/cdr/console_dial_sip_congestion/test-config.yaml</span><br><span>@@ -1,8 +1,8 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: CLI exec console dial which dials via SIP which returns congestion</span><br><span style="color: hsl(120, 100%, 40%);">+ summary: CLI exec console dial which dials via PJSIP which returns congestion</span><br><span> description: |</span><br><span style="color: hsl(0, 100%, 40%);">- 'An Asterisk instance originates a local channel to dial itself via SIP.</span><br><span style="color: hsl(0, 100%, 40%);">- Upon reaching the extension the SIP channel dials, Asterisk will return congestion.'</span><br><span style="color: hsl(120, 100%, 40%);">+ 'An Asterisk instance originates a local channel to dial itself via PJSIP.</span><br><span style="color: hsl(120, 100%, 40%);">+ Upon reaching the extension the PJSIP channel dials, Asterisk will return congestion.'</span><br><span> </span><br><span> test-modules:</span><br><span> test-object:</span><br><span>@@ -33,7 +33,7 @@</span><br><span> destination: '1'</span><br><span> dcontext: 'default'</span><br><span> channel: 'Local/1@default-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test-.*'</span><br><span> disposition: 'FAILED'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span> </span><br><span>@@ -42,10 +42,10 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span> - dial</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - CDR</span><br><span> - chan_local</span><br><span>diff --git a/tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/pjsip.conf b/tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/sip.conf b/tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 56ca78f..0000000</span><br><span>--- a/tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,10 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf b/tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf</span><br><span>index 18b294e..14905ca 100644</span><br><span>--- a/tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf</span><br><span>@@ -7,7 +7,7 @@</span><br><span> [default]</span><br><span> exten => 1,1,NoOp()</span><br><span> exten => 1,n,Set(CDR(accountcode)=cdrtest_local)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 1,n,Dial(SIP/2@test)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 1,n,Dial(PJSIP/2@test)</span><br><span> </span><br><span> exten => 2,1,NoOp()</span><br><span> exten => 2,n,Set(CDR(accountcode)=cdrtest_local2)</span><br><span>diff --git a/tests/cdr/console_dial_sip_transfer/configs/ast1/pjsip.conf b/tests/cdr/console_dial_sip_transfer/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..d21a880</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/console_dial_sip_transfer/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = cdrtest_sip</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/console_dial_sip_transfer/configs/ast1/sip.conf b/tests/cdr/console_dial_sip_transfer/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index abffb74..0000000</span><br><span>--- a/tests/cdr/console_dial_sip_transfer/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-context=default</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-directmedia=no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode=cdrtest_sip</span><br><span>diff --git a/tests/cdr/console_dial_sip_transfer/test-config.yaml b/tests/cdr/console_dial_sip_transfer/test-config.yaml</span><br><span>index f14464d..7ebe7a2 100644</span><br><span>--- a/tests/cdr/console_dial_sip_transfer/test-config.yaml</span><br><span>+++ b/tests/cdr/console_dial_sip_transfer/test-config.yaml</span><br><span>@@ -1,7 +1,7 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: CLI exec console dial which dials via SIP which transfers the call</span><br><span style="color: hsl(120, 100%, 40%);">+ summary: CLI exec console dial which dials via PJSIP which transfers the call</span><br><span> description: |</span><br><span style="color: hsl(0, 100%, 40%);">- 'One Asterisk instance with console dial calls another instance via SIP.</span><br><span style="color: hsl(120, 100%, 40%);">+ 'One Asterisk instance with console dial calls another instance via PJSIP.</span><br><span> the other instance transfers to another extension and the CDRs are</span><br><span> tested for expected behavior.'</span><br><span> </span><br><span>@@ -34,7 +34,7 @@</span><br><span> destination: '1'</span><br><span> dcontext: 'default'</span><br><span> channel: 'Local/1@default-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test-.*'</span><br><span> disposition: 'NO ANSWER'</span><br><span> amaflags: 'DOCUMENTATION'</span><br><span> -</span><br><span>@@ -61,11 +61,11 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - accountcode</span><br><span> - dial</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - CDR</span><br><span> - chan_local</span><br><span> - transfer</span><br><span>diff --git a/tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf b/tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf</span><br><span>index a3da4fe..ac8f705 100644</span><br><span>--- a/tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf</span><br><span>@@ -7,5 +7,5 @@</span><br><span> exten => wait,n,Hangup</span><br><span> </span><br><span> exten => dial,1,Noop</span><br><span style="color: hsl(0, 100%, 40%);">-exten => dial,n,Dial(sip/test2,1)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => dial,n,Dial(pjsip/1@test2)</span><br><span> </span><br><span>diff --git a/tests/cdr/originate-cdr-disposition/configs/ast1/pjsip.conf b/tests/cdr/originate-cdr-disposition/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..a00ee1e</span><br><span>--- /dev/null</span><br><span>+++ b/tests/cdr/originate-cdr-disposition/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,37 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = account1</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.3</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = test2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.3</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[test2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media = no</span><br><span style="color: hsl(120, 100%, 40%);">+accountcode = account2</span><br><span style="color: hsl(120, 100%, 40%);">+allow = !all,ulaw,alaw,gsm</span><br><span style="color: hsl(120, 100%, 40%);">+aors = test2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/cdr/originate-cdr-disposition/configs/ast1/sip.conf b/tests/cdr/originate-cdr-disposition/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index a04b870..0000000</span><br><span>--- a/tests/cdr/originate-cdr-disposition/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,15 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1:5060</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-canreinvite = no</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode = account1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[test2]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.3</span><br><span style="color: hsl(0, 100%, 40%);">-accountcode = account2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/cdr/originate-cdr-disposition/test-config.yaml b/tests/cdr/originate-cdr-disposition/test-config.yaml</span><br><span>index 847adbd..3eaa840 100644</span><br><span>--- a/tests/cdr/originate-cdr-disposition/test-config.yaml</span><br><span>+++ b/tests/cdr/originate-cdr-disposition/test-config.yaml</span><br><span>@@ -1,4 +1,5 @@</span><br><span> testinfo:</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'requires further rework for pjsip, see ASTERISK-30292'</span><br><span> summary: 'Test for proper CDR dispositions when originating calls.'</span><br><span> description: |</span><br><span> "This test verifies that the CDRs generated during originates have the</span><br><span>@@ -14,9 +15,9 @@</span><br><span> - sipp :</span><br><span> version : 'v3.0'</span><br><span> - asterisk : 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - CDR</span><br><span> </span><br><span> test-modules:</span><br><span>@@ -40,40 +41,40 @@</span><br><span> lines:</span><br><span> -</span><br><span> disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test1-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test1-.*'</span><br><span> dchannel: ''</span><br><span> -</span><br><span> disposition: 'BUSY'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test1-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test1-.*'</span><br><span> dchannel: ''</span><br><span> -</span><br><span> disposition: 'FAILED'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test1-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test1-.*'</span><br><span> dchannel: ''</span><br><span> -</span><br><span> disposition: 'NO ANSWER'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test1-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test1-.*'</span><br><span> dchannel: ''</span><br><span> -</span><br><span> disposition: 'NO ANSWER'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'SIP/test1-.*'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'SIP/test2-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ channel: 'PJSIP/test1-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ dchannel: 'PJSIP/test2-.*'</span><br><span> </span><br><span> sequence-originator:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- parameters: { channel: 'sip/test1', context: 'default', exten: 'wait', priority: '1' }</span><br><span style="color: hsl(120, 100%, 40%);">+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'wait', priority: '1' }</span><br><span> ignore-originate-failure: False</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- parameters: { channel: 'sip/test1', context: 'default', exten: 'wait', priority: '1' }</span><br><span style="color: hsl(120, 100%, 40%);">+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'wait', priority: '1' }</span><br><span> ignore-originate-failure: True</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- parameters: { channel: 'sip/test1', context: 'default', exten: 'wait', priority: '1' }</span><br><span style="color: hsl(120, 100%, 40%);">+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'wait', priority: '1' }</span><br><span> ignore-originate-failure: True</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- parameters: { channel: 'sip/test1', context: 'default', exten: 'wait', priority: '1', timeout: 1 }</span><br><span style="color: hsl(120, 100%, 40%);">+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'wait', priority: '1', timeout: 1 }</span><br><span> ignore-originate-failure: True</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- parameters: { channel: 'sip/test1', context: 'default', exten: 'dial', priority: '1' }</span><br><span style="color: hsl(120, 100%, 40%);">+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'dial', priority: '1' }</span><br><span> ignore-originate-failure: True</span><br><span> </span><br><span> </span><br><span>diff --git a/tests/channels/local/local_app/configs/ast1/extensions.conf b/tests/channels/local/local_app/configs/ast1/extensions.conf</span><br><span>index 3692c25..c826e27 100644</span><br><span>--- a/tests/channels/local/local_app/configs/ast1/extensions.conf</span><br><span>+++ b/tests/channels/local/local_app/configs/ast1/extensions.conf</span><br><span>@@ -7,7 +7,7 @@</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => dial_foo,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/foo@asterisk)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/foo@asterisk)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => foo,1,NoOp()</span><br><span>diff --git a/tests/channels/local/local_app/configs/ast1/pjsip.conf b/tests/channels/local/local_app/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5496e8a</span><br><span>--- /dev/null</span><br><span>+++ b/tests/channels/local/local_app/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/channels/local/local_app/configs/ast1/sip.conf b/tests/channels/local/local_app/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 710eb26..0000000</span><br><span>--- a/tests/channels/local/local_app/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[asterisk]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/channels/local/local_app/test-config.yaml b/tests/channels/local/local_app/test-config.yaml</span><br><span>index d9ff9a7..b582206 100644</span><br><span>--- a/tests/channels/local/local_app/test-config.yaml</span><br><span>+++ b/tests/channels/local/local_app/test-config.yaml</span><br><span>@@ -19,7 +19,7 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - chan_local</span><br><span> </span><br><span>diff --git a/tests/channels/local/local_call/configs/ast1/extensions.conf b/tests/channels/local/local_call/configs/ast1/extensions.conf</span><br><span>index 9dd72f4..38f3c1d 100644</span><br><span>--- a/tests/channels/local/local_call/configs/ast1/extensions.conf</span><br><span>+++ b/tests/channels/local/local_call/configs/ast1/extensions.conf</span><br><span>@@ -8,11 +8,11 @@</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => dial_bar,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/bar@asterisk)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/bar@asterisk)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => dial_foo,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/foo@asterisk)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/foo@asterisk)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => foo,1,NoOp()</span><br><span>diff --git a/tests/channels/local/local_call/configs/ast1/pjsip.conf b/tests/channels/local/local_call/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5496e8a</span><br><span>--- /dev/null</span><br><span>+++ b/tests/channels/local/local_call/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/channels/local/local_call/configs/ast1/sip.conf b/tests/channels/local/local_call/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 710eb26..0000000</span><br><span>--- a/tests/channels/local/local_call/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[asterisk]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/channels/local/local_call/test-config.yaml b/tests/channels/local/local_call/test-config.yaml</span><br><span>index 62e4230..b8f839e 100644</span><br><span>--- a/tests/channels/local/local_call/test-config.yaml</span><br><span>+++ b/tests/channels/local/local_call/test-config.yaml</span><br><span>@@ -13,7 +13,7 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - chan_local</span><br><span> </span><br><span>diff --git a/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf b/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf</span><br><span>index 816a8aa..8853363 100644</span><br><span>--- a/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf</span><br><span>+++ b/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf</span><br><span>@@ -7,7 +7,7 @@</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => dial_foo,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/foo@asterisk)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/foo@asterisk)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => foo,1,NoOp()</span><br><span>diff --git a/tests/channels/local/local_holding_bridge/configs/ast1/pjsip.conf b/tests/channels/local/local_holding_bridge/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5496e8a</span><br><span>--- /dev/null</span><br><span>+++ b/tests/channels/local/local_holding_bridge/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/channels/local/local_holding_bridge/configs/ast1/sip.conf b/tests/channels/local/local_holding_bridge/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 710eb26..0000000</span><br><span>--- a/tests/channels/local/local_holding_bridge/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[asterisk]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/channels/local/local_holding_bridge/test-config.yaml b/tests/channels/local/local_holding_bridge/test-config.yaml</span><br><span>index 37207aa..a385caa 100644</span><br><span>--- a/tests/channels/local/local_holding_bridge/test-config.yaml</span><br><span>+++ b/tests/channels/local/local_holding_bridge/test-config.yaml</span><br><span>@@ -14,7 +14,7 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - chan_local</span><br><span> </span><br><span>diff --git a/tests/channels/local/local_optimize_away/configs/ast1/extensions.conf b/tests/channels/local/local_optimize_away/configs/ast1/extensions.conf</span><br><span>index d1c153e..27bff2f 100644</span><br><span>--- a/tests/channels/local/local_optimize_away/configs/ast1/extensions.conf</span><br><span>+++ b/tests/channels/local/local_optimize_away/configs/ast1/extensions.conf</span><br><span>@@ -8,11 +8,11 @@</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => dial_bar,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/bar@asterisk)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/bar@asterisk)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => dial_foo,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/foo@asterisk)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/foo@asterisk)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => foo,1,NoOp()</span><br><span>diff --git a/tests/channels/local/local_optimize_away/configs/ast1/pjsip.conf b/tests/channels/local/local_optimize_away/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..17dee85</span><br><span>--- /dev/null</span><br><span>+++ b/tests/channels/local/local_optimize_away/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 0.0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[asterisk]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/channels/local/local_optimize_away/configs/ast1/sip.conf b/tests/channels/local/local_optimize_away/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 710eb26..0000000</span><br><span>--- a/tests/channels/local/local_optimize_away/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[asterisk]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/channels/local/local_optimize_away/test-config.yaml b/tests/channels/local/local_optimize_away/test-config.yaml</span><br><span>index 83f4f86..afc5a56 100644</span><br><span>--- a/tests/channels/local/local_optimize_away/test-config.yaml</span><br><span>+++ b/tests/channels/local/local_optimize_away/test-config.yaml</span><br><span>@@ -11,7 +11,7 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - chan_local</span><br><span> </span><br><span>diff --git a/tests/feature_call_pickup/configs/ast1/extensions.conf b/tests/feature_call_pickup/configs/ast1/extensions.conf</span><br><span>index bbc2912..25f367b 100644</span><br><span>--- a/tests/feature_call_pickup/configs/ast1/extensions.conf</span><br><span>+++ b/tests/feature_call_pickup/configs/ast1/extensions.conf</span><br><span>@@ -5,7 +5,7 @@</span><br><span> [pickuptest]</span><br><span> exten => dial_faker,1,NoOp()</span><br><span> same => n,Answer()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/faker)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/faker)</span><br><span> </span><br><span> exten => test_fuzz,1,NoOp</span><br><span> same => n,Answer()</span><br><span>diff --git a/tests/feature_call_pickup/configs/ast1/pjsip.conf b/tests/feature_call_pickup/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..8fd656e</span><br><span>--- /dev/null</span><br><span>+++ b/tests/feature_call_pickup/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,39 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sip_receive]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sip_receive]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = sip_receive</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sip_receive]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+pickup_group = 5</span><br><span style="color: hsl(120, 100%, 40%);">+aors = sip_receive</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[faker]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.3</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[faker]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = faker</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.3</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[faker]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+call_group = 5</span><br><span style="color: hsl(120, 100%, 40%);">+aors = faker</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/feature_call_pickup/configs/ast1/sip.conf b/tests/feature_call_pickup/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 2989833..0000000</span><br><span>--- a/tests/feature_call_pickup/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,16 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[sip_receive]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-context = default</span><br><span style="color: hsl(0, 100%, 40%);">-pickupgroup = 5</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[faker]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.3</span><br><span style="color: hsl(0, 100%, 40%);">-context = default</span><br><span style="color: hsl(0, 100%, 40%);">-callgroup = 5</span><br><span>diff --git a/tests/feature_call_pickup/configs/ast2/extensions.conf b/tests/feature_call_pickup/configs/ast2/extensions.conf</span><br><span>index 688b753..76ea907 100644</span><br><span>--- a/tests/feature_call_pickup/configs/ast2/extensions.conf</span><br><span>+++ b/tests/feature_call_pickup/configs/ast2/extensions.conf</span><br><span>@@ -1,6 +1,6 @@</span><br><span> [pickuptest]</span><br><span> exten => test_out,1,NoOp</span><br><span style="color: hsl(0, 100%, 40%);">- same => n, Dial(SIP/sip_send/*8)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n, Dial(PJSIP/*8@sip_send)</span><br><span> </span><br><span> exten => pickup_exten,1,NoOp</span><br><span> same => n, Answer()</span><br><span>diff --git a/tests/feature_call_pickup/configs/ast2/pjsip.conf b/tests/feature_call_pickup/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..c1009ae</span><br><span>--- /dev/null</span><br><span>+++ b/tests/feature_call_pickup/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,21 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sip_send]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sip_send]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = sip_send</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sip_send]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = default</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = sip_send</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/feature_call_pickup/configs/ast2/sip.conf b/tests/feature_call_pickup/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 1736af6..0000000</span><br><span>--- a/tests/feature_call_pickup/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[sip_send]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-context = default</span><br><span>diff --git a/tests/feature_call_pickup/run-test b/tests/feature_call_pickup/run-test</span><br><span>index db2d976..0b7ea39 100755</span><br><span>--- a/tests/feature_call_pickup/run-test</span><br><span>+++ b/tests/feature_call_pickup/run-test</span><br><span>@@ -23,9 +23,9 @@</span><br><span> def __init__(self):</span><br><span> TestCase.__init__(self)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.pickeeChannel = "Local/dial_faker@pickuptest-"</span><br><span style="color: hsl(0, 100%, 40%);">- self.pickerChannel = "SIP/sip_receive-"</span><br><span style="color: hsl(0, 100%, 40%);">- self.targetChannel = "SIP/faker-"</span><br><span style="color: hsl(120, 100%, 40%);">+ self.pickeeChannel = "Local/dial_faker@pickuptest"</span><br><span style="color: hsl(120, 100%, 40%);">+ self.pickerChannel = "PJSIP/sip_receive"</span><br><span style="color: hsl(120, 100%, 40%);">+ self.targetChannel = "PJSIP/faker"</span><br><span> </span><br><span> self.bridge = None</span><br><span> </span><br><span>diff --git a/tests/feature_call_pickup/test-config.yaml b/tests/feature_call_pickup/test-config.yaml</span><br><span>index c649dfc..9790867 100644</span><br><span>--- a/tests/feature_call_pickup/test-config.yaml</span><br><span>+++ b/tests/feature_call_pickup/test-config.yaml</span><br><span>@@ -8,7 +8,7 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - pickup</span><br><span> - features</span><br><span>diff --git a/tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf b/tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf</span><br><span>index a637fe1..987282a 100644</span><br><span>--- a/tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf</span><br><span>+++ b/tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf</span><br><span>@@ -16,7 +16,7 @@</span><br><span> same => n,Verbose(1, ${RECORDED_FILE})</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-; Subroutines used to set the Jitter Buffer on the outbound SIP channel</span><br><span style="color: hsl(120, 100%, 40%);">+; Subroutines used to set the Jitter Buffer on the outbound PJSIP channel</span><br><span> same => n(default_jb),NoOp()</span><br><span> same => n,Set(JITTERBUFFER(${CURRENT_JB_TYPE})=default))</span><br><span> same => n,Return()</span><br><span>@@ -38,11 +38,11 @@</span><br><span> same => n,Wait(2)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-; Extensions that set up the jitter buffers and dial the SIP channel</span><br><span style="color: hsl(120, 100%, 40%);">+; Extensions that set up the jitter buffers and dial the PJSIP channel</span><br><span> exten => default,1,NoOp()</span><br><span> same => n,Set(GLOBAL(CURRENT_TEST_TYPE)=default_jb)</span><br><span> same => n,Set(GLOBAL(CURRENT_JB_TYPE)=${JB_TYPE})</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/ast1)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/ast1)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => all_param,1,NoOp()</span><br><span>@@ -51,7 +51,7 @@</span><br><span> same => n,Set(GLOBAL(CURRENT_RESYNC_THRESHOLD)=${RESYNC_THRESHOLD})</span><br><span> same => n,Set(GLOBAL(CURRENT_TARGET_EXTRA)=${TARGET_EXTRA})</span><br><span> same => n,Set(GLOBAL(CURRENT_JB_TYPE)=${JB_TYPE})</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(SIP/ast1)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(PJSIP/ast1)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> ; Talk detect verification for the recorded file</span><br><span>diff --git a/tests/funcs/func_jitterbuffer/configs/ast1/pjsip.conf b/tests/funcs/func_jitterbuffer/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..58f195d</span><br><span>--- /dev/null</span><br><span>+++ b/tests/funcs/func_jitterbuffer/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 0.0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = sippeer</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/funcs/func_jitterbuffer/configs/ast1/sip.conf b/tests/funcs/func_jitterbuffer/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 67492c6..0000000</span><br><span>--- a/tests/funcs/func_jitterbuffer/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-context=sippeer</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5060</span><br><span>diff --git a/tests/funcs/func_jitterbuffer/test-config.yaml b/tests/funcs/func_jitterbuffer/test-config.yaml</span><br><span>index e313d8f..85a7b75 100644</span><br><span>--- a/tests/funcs/func_jitterbuffer/test-config.yaml</span><br><span>+++ b/tests/funcs/func_jitterbuffer/test-config.yaml</span><br><span>@@ -17,4 +17,4 @@</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_talkdetect'</span><br><span> - asterisk: 'func_jitterbuffer'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span>diff --git a/tests/manager/bridge_actions/configs/ast1/extensions.conf b/tests/manager/bridge_actions/configs/ast1/extensions.conf</span><br><span>index eca1a10..029bdb5 100644</span><br><span>--- a/tests/manager/bridge_actions/configs/ast1/extensions.conf</span><br><span>+++ b/tests/manager/bridge_actions/configs/ast1/extensions.conf</span><br><span>@@ -1,4 +1,4 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => test_call,1,Dial(SIP/test_call@bob,,wW)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => test_call,1,Dial(PJSIP/test_call@bob,,wW)</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/manager/bridge_actions/test-config.yaml b/tests/manager/bridge_actions/test-config.yaml</span><br><span>index cada2ba..af1e99d 100644</span><br><span>--- a/tests/manager/bridge_actions/test-config.yaml</span><br><span>+++ b/tests/manager/bridge_actions/test-config.yaml</span><br><span>@@ -18,7 +18,7 @@</span><br><span> bridge-config:</span><br><span> test-runs:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- originate_channel: 'SIP/test_call@uut'</span><br><span style="color: hsl(120, 100%, 40%);">+ originate_channel: 'PJSIP/test_call@uut'</span><br><span> hangup: 'alice'</span><br><span> </span><br><span> ami-uut:</span><br><span>@@ -28,7 +28,7 @@</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'BridgeEnter'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'SIP/bob-.*'</span><br><span style="color: hsl(120, 100%, 40%);">+ Channel: 'PJSIP/bob-.*'</span><br><span> BridgeType: 'basic'</span><br><span> BridgeTechnology: 'simple_bridge'</span><br><span> callbackModule: 'check_bridge'</span><br><span>@@ -72,6 +72,6 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/masquerade/configs/ast1/extensions.conf b/tests/masquerade/configs/ast1/extensions.conf</span><br><span>index 7c32259..68ea5a2 100644</span><br><span>--- a/tests/masquerade/configs/ast1/extensions.conf</span><br><span>+++ b/tests/masquerade/configs/ast1/extensions.conf</span><br><span>@@ -27,7 +27,7 @@</span><br><span> [last_call]</span><br><span> exten => 8000,1,NoOp(Last call in chain)</span><br><span> exten => 8000,n,UserEvent(last_call,status: EXECUTING ${CHANNEL(name)})</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 8000,n,Dial(SIP/ast2/last_in_chain,30)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => 8000,n,Dial(PJSIP/last_in_chain@ast2,30)</span><br><span> exten => 8000,n,UserEvent(ast1,status: FAILURE Last call continued in dialplan DIALSTATUS=${DIALSTATUS})</span><br><span> exten => 8000,n,Hangup()</span><br><span> </span><br><span>diff --git a/tests/masquerade/configs/ast1/pjsip.conf b/tests/masquerade/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..194f6f3</span><br><span>--- /dev/null</span><br><span>+++ b/tests/masquerade/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,39 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = parkedcalls</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = gsm</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = parkedcalls</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = gsm</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/masquerade/configs/ast1/sip.conf b/tests/masquerade/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 21d35c8..0000000</span><br><span>--- a/tests/masquerade/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,22 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser=ast1</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-context=parkedcalls</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=gsm</span><br><span style="color: hsl(0, 100%, 40%);">-qualify=no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure=invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser=ast2</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-context=parkedcalls</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=gsm</span><br><span style="color: hsl(0, 100%, 40%);">-qualify=no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure=invite</span><br><span>diff --git a/tests/masquerade/configs/ast2/pjsip.conf b/tests/masquerade/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..f29b893</span><br><span>--- /dev/null</span><br><span>+++ b/tests/masquerade/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,39 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = incoming</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = gsm</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = incoming</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = gsm</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/masquerade/configs/ast2/sip.conf b/tests/masquerade/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index c57444c..0000000</span><br><span>--- a/tests/masquerade/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,22 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr=127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser=ast1</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-context=incoming</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=gsm</span><br><span style="color: hsl(0, 100%, 40%);">-qualify=no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure=invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser=ast2</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-context=incoming</span><br><span style="color: hsl(0, 100%, 40%);">-disallow=all</span><br><span style="color: hsl(0, 100%, 40%);">-allow=gsm</span><br><span style="color: hsl(0, 100%, 40%);">-qualify=no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure=invite</span><br><span>diff --git a/tests/masquerade/run-test b/tests/masquerade/run-test</span><br><span>index 9d83aff..b686b96 100755</span><br><span>--- a/tests/masquerade/run-test</span><br><span>+++ b/tests/masquerade/run-test</span><br><span>@@ -37,7 +37,7 @@</span><br><span> self.expected_space = 701</span><br><span> # Use IAX calls</span><br><span> # self.use_sip_calls = False</span><br><span style="color: hsl(0, 100%, 40%);">- # Use SIP calls</span><br><span style="color: hsl(120, 100%, 40%);">+ # Use PJSIP calls</span><br><span> self.use_sip_calls = True</span><br><span> </span><br><span> if self.use_sip_calls:</span><br><span>@@ -98,7 +98,7 @@</span><br><span> LOGGER.info("Fetching parked call at " + str(self.expected_space))</span><br><span> tech_prefix = "IAX2/ast1/"</span><br><span> if self.use_sip_calls:</span><br><span style="color: hsl(0, 100%, 40%);">- tech_prefix = "SIP/ast1/"</span><br><span style="color: hsl(120, 100%, 40%);">+ tech_prefix = "PJSIP/ast1/"</span><br><span> self.ami[1].originate(</span><br><span> channel=tech_prefix + str(self.expected_space),</span><br><span> context="getit", exten="retrieve", priority=1,</span><br><span>diff --git a/tests/masquerade/test-config.yaml b/tests/masquerade/test-config.yaml</span><br><span>index 0428e68..0fea360 100644</span><br><span>--- a/tests/masquerade/test-config.yaml</span><br><span>+++ b/tests/masquerade/test-config.yaml</span><br><span>@@ -7,8 +7,8 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - parking</span><br><span> # - iax2</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span>diff --git a/tests/pbx/merge_contexts/configs/ast1/pjsip.conf b/tests/pbx/merge_contexts/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..08cfce6</span><br><span>--- /dev/null</span><br><span>+++ b/tests/pbx/merge_contexts/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/pbx/merge_contexts/configs/ast1/sip.conf b/tests/pbx/merge_contexts/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 0cac93c..0000000</span><br><span>--- a/tests/pbx/merge_contexts/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast1</span><br><span style="color: hsl(0, 100%, 40%);">-context = test</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/pbx/merge_contexts/configs/ast2/pjsip.conf b/tests/pbx/merge_contexts/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..bccb641</span><br><span>--- /dev/null</span><br><span>+++ b/tests/pbx/merge_contexts/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/pbx/merge_contexts/configs/ast2/sip.conf b/tests/pbx/merge_contexts/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index fbe5906..0000000</span><br><span>--- a/tests/pbx/merge_contexts/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2</span><br><span style="color: hsl(0, 100%, 40%);">-context = test</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/pbx/merge_contexts/run-test b/tests/pbx/merge_contexts/run-test</span><br><span>index 7592073..d87473c 100755</span><br><span>--- a/tests/pbx/merge_contexts/run-test</span><br><span>+++ b/tests/pbx/merge_contexts/run-test</span><br><span>@@ -36,15 +36,15 @@</span><br><span> return reason</span><br><span> </span><br><span> # pbx_ael</span><br><span style="color: hsl(0, 100%, 40%);">- df = ami.originate("sip/ast2/12", "test", "1234", 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ df = ami.originate("PJSIP/12@ast2", "test", "1234", 1)</span><br><span> df.addErrback(handle_failure)</span><br><span> </span><br><span> # pbx_config</span><br><span style="color: hsl(0, 100%, 40%);">- df = ami.originate("sip/ast2/123", "test", "1234", 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ df = ami.originate("PJSIP/123@ast2", "test", "1234", 1)</span><br><span> df.addErrback(handle_failure)</span><br><span> </span><br><span> # pbx_lua</span><br><span style="color: hsl(0, 100%, 40%);">- df = ami.originate("sip/ast2/1234", "test", "1234", 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ df = ami.originate("PJSIP/1234@ast2", "test", "1234", 1)</span><br><span> df.addErrback(handle_failure)</span><br><span> else:</span><br><span> ami.registerEvent('UserEvent', self.test_result)</span><br><span>diff --git a/tests/pbx/merge_contexts/test-config.yaml b/tests/pbx/merge_contexts/test-config.yaml</span><br><span>index 30a5f7e..67324ec 100644</span><br><span>--- a/tests/pbx/merge_contexts/test-config.yaml</span><br><span>+++ b/tests/pbx/merge_contexts/test-config.yaml</span><br><span>@@ -10,6 +10,6 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - dialplan</span><br><span>diff --git a/tests/pbx/pbx_lua_background/configs/ast1/pjsip.conf b/tests/pbx/pbx_lua_background/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..08cfce6</span><br><span>--- /dev/null</span><br><span>+++ b/tests/pbx/pbx_lua_background/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/pbx/pbx_lua_background/configs/ast1/sip.conf b/tests/pbx/pbx_lua_background/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 0cac93c..0000000</span><br><span>--- a/tests/pbx/pbx_lua_background/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast1</span><br><span style="color: hsl(0, 100%, 40%);">-context = test</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/pbx/pbx_lua_background/configs/ast2/pjsip.conf b/tests/pbx/pbx_lua_background/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..bccb641</span><br><span>--- /dev/null</span><br><span>+++ b/tests/pbx/pbx_lua_background/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/pbx/pbx_lua_background/configs/ast2/sip.conf b/tests/pbx/pbx_lua_background/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index fbe5906..0000000</span><br><span>--- a/tests/pbx/pbx_lua_background/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2</span><br><span style="color: hsl(0, 100%, 40%);">-context = test</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/pbx/pbx_lua_background/run-test b/tests/pbx/pbx_lua_background/run-test</span><br><span>index 9680e04..b93d056 100755</span><br><span>--- a/tests/pbx/pbx_lua_background/run-test</span><br><span>+++ b/tests/pbx/pbx_lua_background/run-test</span><br><span>@@ -26,7 +26,7 @@</span><br><span> </span><br><span> print("sending a call from ast1 to ast2")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- df = ami.originate("sip/ast2/1234", "test", "1234", 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ df = ami.originate("PJSIP/1234@ast2", "test", "1234", 1)</span><br><span> </span><br><span> def handle_failure(reason):</span><br><span> print("error sending originate:")</span><br><span>diff --git a/tests/pbx/pbx_lua_background/test-config.yaml b/tests/pbx/pbx_lua_background/test-config.yaml</span><br><span>index 52a2677..2026637 100644</span><br><span>--- a/tests/pbx/pbx_lua_background/test-config.yaml</span><br><span>+++ b/tests/pbx/pbx_lua_background/test-config.yaml</span><br><span>@@ -8,7 +8,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'pbx_lua'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - dialplan</span><br><span> - dialplan_lua</span><br><span>diff --git a/tests/pbx/pbx_lua_goto/configs/ast1/pjsip.conf b/tests/pbx/pbx_lua_goto/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..08cfce6</span><br><span>--- /dev/null</span><br><span>+++ b/tests/pbx/pbx_lua_goto/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast2]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/pbx/pbx_lua_goto/configs/ast1/sip.conf b/tests/pbx/pbx_lua_goto/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 0cac93c..0000000</span><br><span>--- a/tests/pbx/pbx_lua_goto/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast2]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast1</span><br><span style="color: hsl(0, 100%, 40%);">-context = test</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/pbx/pbx_lua_goto/configs/ast2/pjsip.conf b/tests/pbx/pbx_lua_goto/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..bccb641</span><br><span>--- /dev/null</span><br><span>+++ b/tests/pbx/pbx_lua_goto/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[ast1]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = test</span><br><span style="color: hsl(120, 100%, 40%);">+disallow = all</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+from_user = ast2</span><br><span style="color: hsl(120, 100%, 40%);">+aors = ast1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/pbx/pbx_lua_goto/configs/ast2/sip.conf b/tests/pbx/pbx_lua_goto/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index fbe5906..0000000</span><br><span>--- a/tests/pbx/pbx_lua_goto/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[ast1]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-fromuser = ast2</span><br><span style="color: hsl(0, 100%, 40%);">-context = test</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-disallow = all</span><br><span style="color: hsl(0, 100%, 40%);">-allow = ulaw</span><br><span style="color: hsl(0, 100%, 40%);">-qualify = no</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/pbx/pbx_lua_goto/run-test b/tests/pbx/pbx_lua_goto/run-test</span><br><span>index 9680e04..b93d056 100755</span><br><span>--- a/tests/pbx/pbx_lua_goto/run-test</span><br><span>+++ b/tests/pbx/pbx_lua_goto/run-test</span><br><span>@@ -26,7 +26,7 @@</span><br><span> </span><br><span> print("sending a call from ast1 to ast2")</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- df = ami.originate("sip/ast2/1234", "test", "1234", 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ df = ami.originate("PJSIP/1234@ast2", "test", "1234", 1)</span><br><span> </span><br><span> def handle_failure(reason):</span><br><span> print("error sending originate:")</span><br><span>diff --git a/tests/pbx/pbx_lua_goto/test-config.yaml b/tests/pbx/pbx_lua_goto/test-config.yaml</span><br><span>index 6fc1dc3..ac13b98 100644</span><br><span>--- a/tests/pbx/pbx_lua_goto/test-config.yaml</span><br><span>+++ b/tests/pbx/pbx_lua_goto/test-config.yaml</span><br><span>@@ -9,7 +9,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - asterisk : 'pbx_lua'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - dialplan</span><br><span> - dialplan_lua</span><br><span>diff --git a/tests/phoneprov/res_phoneprov/cfgbase.txt b/tests/phoneprov/res_phoneprov/cfgbase.txt</span><br><span>deleted file mode 100644</span><br><span>index 82371d5..0000000</span><br><span>--- a/tests/phoneprov/res_phoneprov/cfgbase.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,15 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-profile_variable: ${PROFILE_VARIABLE}</span><br><span style="color: hsl(0, 100%, 40%);">-context: ${SIPPEER(${CALLERID},context)}</span><br><span style="color: hsl(0, 100%, 40%);">-mac: ${MAC}</span><br><span style="color: hsl(0, 100%, 40%);">-profile: ${PROFILE}</span><br><span style="color: hsl(0, 100%, 40%);">-username: ${USERNAME}</span><br><span style="color: hsl(0, 100%, 40%);">-display_name: ${DISPLAY_NAME}</span><br><span style="color: hsl(0, 100%, 40%);">-secret: ${SECRET}</span><br><span style="color: hsl(0, 100%, 40%);">-server: ${SERVER}</span><br><span style="color: hsl(0, 100%, 40%);">-server_port: ${SERVER_PORT}</span><br><span style="color: hsl(0, 100%, 40%);">-line: ${LINE}</span><br><span style="color: hsl(0, 100%, 40%);">-linekeys: ${LINEKEYS}</span><br><span style="color: hsl(0, 100%, 40%);">-timezone: ${TIMEZONE}</span><br><span style="color: hsl(0, 100%, 40%);">-tzoffset: ${TZOFFSET}</span><br><span style="color: hsl(0, 100%, 40%);">-extension_length: ${EXTENSION_LENGTH}</span><br><span style="color: hsl(0, 100%, 40%);">-${PP_EACH_EXTENSION(${MAC},cfgex.txt)}</span><br><span>diff --git a/tests/phoneprov/res_phoneprov/cfgex.txt b/tests/phoneprov/res_phoneprov/cfgex.txt</span><br><span>deleted file mode 100644</span><br><span>index ac64859..0000000</span><br><span>--- a/tests/phoneprov/res_phoneprov/cfgex.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,3 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-username_${LINE}: ${USERNAME}</span><br><span style="color: hsl(0, 100%, 40%);">-display_name_${LINE}: ${DISPLAY_NAME}</span><br><span style="color: hsl(0, 100%, 40%);">-context_${LINE}: ${SIPPEER(${CALLERID},context)}</span><br><span>diff --git a/tests/phoneprov/res_phoneprov/configs/ast1/phoneprov.conf b/tests/phoneprov/res_phoneprov/configs/ast1/phoneprov.conf</span><br><span>deleted file mode 100644</span><br><span>index 6f79980..0000000</span><br><span>--- a/tests/phoneprov/res_phoneprov/configs/ast1/phoneprov.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,8 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-serverport=41060</span><br><span style="color: hsl(0, 100%, 40%);">-default_profile=profile1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[profile1]</span><br><span style="color: hsl(0, 100%, 40%);">-setvar = PROFILE_VARIABLE = this is a test</span><br><span style="color: hsl(0, 100%, 40%);">-setvar = TIMEZONE = America/Denver</span><br><span style="color: hsl(0, 100%, 40%);">-cfgbase${MAC}.txt => cfgbase.txt,text/plain</span><br><span>diff --git a/tests/phoneprov/res_phoneprov/configs/ast1/users.conf b/tests/phoneprov/res_phoneprov/configs/ast1/users.conf</span><br><span>deleted file mode 100644</span><br><span>index 8fc6679..0000000</span><br><span>--- a/tests/phoneprov/res_phoneprov/configs/ast1/users.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,42 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-localextenlength = 3</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[6000]</span><br><span style="color: hsl(0, 100%, 40%);">-fullname = Joe User 6000</span><br><span style="color: hsl(0, 100%, 40%);">-username = 6000</span><br><span style="color: hsl(0, 100%, 40%);">-email = joe@foo.bar</span><br><span style="color: hsl(0, 100%, 40%);">-secret = 1234</span><br><span style="color: hsl(0, 100%, 40%);">-hasvoicemail = no</span><br><span style="color: hsl(0, 100%, 40%);">-vmsecret = 1234</span><br><span style="color: hsl(0, 100%, 40%);">-hassip = yes</span><br><span style="color: hsl(0, 100%, 40%);">-hasiax = no</span><br><span style="color: hsl(0, 100%, 40%);">-hash323 = no</span><br><span style="color: hsl(0, 100%, 40%);">-hasmanager = no</span><br><span style="color: hsl(0, 100%, 40%);">-callwaiting = no</span><br><span style="color: hsl(0, 100%, 40%);">-context = defctx1</span><br><span style="color: hsl(0, 100%, 40%);">-macaddress = 112233445566</span><br><span style="color: hsl(0, 100%, 40%);">-profile = profile1</span><br><span style="color: hsl(0, 100%, 40%);">-autoprov = yes</span><br><span style="color: hsl(0, 100%, 40%);">-LINEKEYS = 2</span><br><span style="color: hsl(0, 100%, 40%);">-linenumber = 1</span><br><span style="color: hsl(0, 100%, 40%);">-cid_number = 6000</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[6001]</span><br><span style="color: hsl(0, 100%, 40%);">-fullname = Joe User 6001</span><br><span style="color: hsl(0, 100%, 40%);">-username = 6001</span><br><span style="color: hsl(0, 100%, 40%);">-email = joe@foo.bar</span><br><span style="color: hsl(0, 100%, 40%);">-secret = 1234</span><br><span style="color: hsl(0, 100%, 40%);">-hasvoicemail = no</span><br><span style="color: hsl(0, 100%, 40%);">-vmsecret = 1234</span><br><span style="color: hsl(0, 100%, 40%);">-hassip = yes</span><br><span style="color: hsl(0, 100%, 40%);">-hasiax = no</span><br><span style="color: hsl(0, 100%, 40%);">-hash323 = no</span><br><span style="color: hsl(0, 100%, 40%);">-hasmanager = no</span><br><span style="color: hsl(0, 100%, 40%);">-callwaiting = no</span><br><span style="color: hsl(0, 100%, 40%);">-context = defctx2</span><br><span style="color: hsl(0, 100%, 40%);">-macaddress = 112233445566</span><br><span style="color: hsl(0, 100%, 40%);">-profile = profile1</span><br><span style="color: hsl(0, 100%, 40%);">-autoprov = yes</span><br><span style="color: hsl(0, 100%, 40%);">-LINEKEYS = 2</span><br><span style="color: hsl(0, 100%, 40%);">-linenumber = 2</span><br><span style="color: hsl(0, 100%, 40%);">-cid_number = 6001</span><br><span>diff --git a/tests/phoneprov/res_phoneprov/run-test b/tests/phoneprov/res_phoneprov/run-test</span><br><span>deleted file mode 100755</span><br><span>index 0fe5844..0000000</span><br><span>--- a/tests/phoneprov/res_phoneprov/run-test</span><br><span>+++ /dev/null</span><br><span>@@ -1,82 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(0, 100%, 40%);">-"""Test res_phoneprov basic ops</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Copyright (C) 2014, Fairview 5 Engineering, LLC</span><br><span style="color: hsl(0, 100%, 40%);">-George Joseph <george.joseph@fairview5.com></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-This program is free software, distributed under the terms of</span><br><span style="color: hsl(0, 100%, 40%);">-the GNU General Public License Version 2.</span><br><span style="color: hsl(0, 100%, 40%);">-"""</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-import os</span><br><span style="color: hsl(0, 100%, 40%);">-import sys</span><br><span style="color: hsl(0, 100%, 40%);">-import logging</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-from twisted.internet import reactor</span><br><span style="color: hsl(0, 100%, 40%);">-from email.parser import HeaderParser</span><br><span style="color: hsl(0, 100%, 40%);">-from shutil import copy</span><br><span style="color: hsl(0, 100%, 40%);">-from httplib import *</span><br><span style="color: hsl(0, 100%, 40%);">-sys.path.append("lib/python")</span><br><span style="color: hsl(0, 100%, 40%);">-from asterisk.test_case import TestCase</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-LOGGER = logging.getLogger(__name__)</span><br><span style="color: hsl(0, 100%, 40%);">-PATH = os.path.dirname(os.path.realpath(__file__))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-class ResPhoneprovTest(TestCase):</span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- super(ResPhoneprovTest, self).__init__()</span><br><span style="color: hsl(0, 100%, 40%);">- self.reactor_timeout = 15</span><br><span style="color: hsl(0, 100%, 40%);">- self.create_asterisk()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def stop_reactor(self):</span><br><span style="color: hsl(0, 100%, 40%);">- self.con.close()</span><br><span style="color: hsl(0, 100%, 40%);">- super(ResPhoneprovTest, self).stop_reactor()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def run(self):</span><br><span style="color: hsl(0, 100%, 40%);">- super(ResPhoneprovTest, self).run()</span><br><span style="color: hsl(0, 100%, 40%);">- self.passed = True</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- copy("%s/cfgbase.txt" % PATH,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s/var/lib/asterisk/phoneprov/cfgbase.txt" % self.ast[0].base)</span><br><span style="color: hsl(0, 100%, 40%);">- copy("%s/cfgex.txt" % PATH,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s/var/lib/asterisk/phoneprov/cfgex.txt" % self.ast[0].base)</span><br><span style="color: hsl(0, 100%, 40%);">- self.con = HTTPConnection("127.0.0.1:8088")</span><br><span style="color: hsl(0, 100%, 40%);">- self.con.request("GET", "/phoneprov/cfgbase112233445566.txt")</span><br><span style="color: hsl(0, 100%, 40%);">- self.res = self.con.getresponse()</span><br><span style="color: hsl(0, 100%, 40%);">- self.data = self.res.read()</span><br><span style="color: hsl(0, 100%, 40%);">- except:</span><br><span style="color: hsl(0, 100%, 40%);">- self.stop_reactor()</span><br><span style="color: hsl(0, 100%, 40%);">- self.passed = False</span><br><span style="color: hsl(0, 100%, 40%);">- raise</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if self.res.status != 200:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGGER.error("Status code was %d\n%s." % (self.res.status, self.data))</span><br><span style="color: hsl(0, 100%, 40%);">- self.passed = False</span><br><span style="color: hsl(0, 100%, 40%);">- self.stop_reactor()</span><br><span style="color: hsl(0, 100%, 40%);">- return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- response = HeaderParser().parsestr(self.data)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for name, value in self.test_config.config['substitutions'].items():</span><br><span style="color: hsl(0, 100%, 40%);">- if response.get(name) != value:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGGER.error("'%s' was '%s' instead of '%s'" % (name, response.get(name), value))</span><br><span style="color: hsl(0, 100%, 40%);">- self.passed = False</span><br><span style="color: hsl(0, 100%, 40%);">- break</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.passed:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGGER.error(response)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.stop_reactor()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def main():</span><br><span style="color: hsl(0, 100%, 40%);">- test = ResPhoneprovTest()</span><br><span style="color: hsl(0, 100%, 40%);">- reactor.run()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if not test.passed:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if __name__ == "__main__":</span><br><span style="color: hsl(0, 100%, 40%);">- sys.exit(main() or 0)</span><br><span>diff --git a/tests/phoneprov/res_phoneprov/test-config.yaml b/tests/phoneprov/res_phoneprov/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index 1c99dc1..0000000</span><br><span>--- a/tests/phoneprov/res_phoneprov/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,25 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Test res_phoneprov basic ops'</span><br><span style="color: hsl(0, 100%, 40%);">- description: |</span><br><span style="color: hsl(0, 100%, 40%);">- 'Test res_phoneprov basic ops by setting up a user in users.conf and insuring</span><br><span style="color: hsl(0, 100%, 40%);">- that proper template substitution is done.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'twisted'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'httplib'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'email'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'res_phoneprov'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-substitutions:</span><br><span style="color: hsl(0, 100%, 40%);">- profile_variable: "this is a test"</span><br><span style="color: hsl(0, 100%, 40%);">- context: "defctx1"</span><br><span style="color: hsl(0, 100%, 40%);">- username: "6000"</span><br><span style="color: hsl(0, 100%, 40%);">- server: "127.0.0.1"</span><br><span style="color: hsl(0, 100%, 40%);">- server_port: "41060"</span><br><span style="color: hsl(0, 100%, 40%);">- extension_length: "3"</span><br><span style="color: hsl(0, 100%, 40%);">- timezone: "America/Denver"</span><br><span style="color: hsl(0, 100%, 40%);">- context_1: "defctx1"</span><br><span style="color: hsl(0, 100%, 40%);">- context_2: "defctx2"</span><br><span>diff --git a/tests/phoneprov/tests.yaml b/tests/phoneprov/tests.yaml</span><br><span>index e9e983a..0c883de 100644</span><br><span>--- a/tests/phoneprov/tests.yaml</span><br><span>+++ b/tests/phoneprov/tests.yaml</span><br><span>@@ -1,4 +1,3 @@</span><br><span> # Enter tests here in the order they should be considered for execution:</span><br><span> tests:</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'res_phoneprov'</span><br><span> - test: 'res_phoneprov_pjsip'</span><br><span>diff --git a/tests/redirecting/forwardername/configs/ast1/extensions.conf b/tests/redirecting/forwardername/configs/ast1/extensions.conf</span><br><span>index 2d7607e..592ea11 100644</span><br><span>--- a/tests/redirecting/forwardername/configs/ast1/extensions.conf</span><br><span>+++ b/tests/redirecting/forwardername/configs/ast1/extensions.conf</span><br><span>@@ -1,19 +1,19 @@</span><br><span> [default]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => forwarder,1,NoOp(Dial SIP/forwarder)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Dial(SIP/forwarder)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => forwarder,1,NoOp(Dial PJSIP/forwarder)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Dial(PJSIP/forwarder)</span><br><span> same => n,Hangup</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => queue,1,NoOp(Queue SIP/forwarder)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => queue,1,NoOp(Queue PJSIP/forwarder)</span><br><span> same => n,Queue(queue,Rtc)</span><br><span> same => n,Hangup</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-exten => originate,1,NoOp(Originate SIP/forwarder)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => originate,1,NoOp(Originate PJSIP/forwarder)</span><br><span> same => n,Answer</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Originate(SIP/forwarder,app,Playback,hello-world)</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Originate(PJSIP/forwarder,app,Playback,hello-world)</span><br><span> same => n,Hangup</span><br><span> </span><br><span> exten => test_forwardername,1,Answer</span><br><span> same => n,NoOp(FORWARDERNAME is '${FORWARDERNAME}')</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,UserEvent(ForwarderName, Result: ${IF($["${CUT(FORWARDERNAME,-,1-$[${FIELDQTY(FORWARDERNAME,-)} - 1])}" = "SIP/forwarder"]?Success:Failure)})</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,UserEvent(ForwarderName, Result: ${IF($["${CUT(FORWARDERNAME,-,1-$[${FIELDQTY(FORWARDERNAME,-)} - 1])}" = "PJSIP/forwarder"]?Success:Failure)})</span><br><span> same => n,Hangup()</span><br><span>diff --git a/tests/redirecting/forwardername/configs/ast1/pjsip.conf b/tests/redirecting/forwardername/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..05f1f0c</span><br><span>--- /dev/null</span><br><span>+++ b/tests/redirecting/forwardername/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,33 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[caller]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[caller]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = caller</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[caller]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = caller</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[forwarder]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5062</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[forwarder]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = forwarder</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[forwarder]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = forwarder</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/redirecting/forwardername/configs/ast1/queues.conf b/tests/redirecting/forwardername/configs/ast1/queues.conf</span><br><span>index 0890117..6ffe4ae 100644</span><br><span>--- a/tests/redirecting/forwardername/configs/ast1/queues.conf</span><br><span>+++ b/tests/redirecting/forwardername/configs/ast1/queues.conf</span><br><span>@@ -1,4 +1,4 @@</span><br><span> [general]</span><br><span> </span><br><span> [queue]</span><br><span style="color: hsl(0, 100%, 40%);">-member => SIP/forwarder</span><br><span style="color: hsl(120, 100%, 40%);">+member => PJSIP/forwarder</span><br><span>diff --git a/tests/redirecting/forwardername/configs/ast1/sip.conf b/tests/redirecting/forwardername/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 528824f..0000000</span><br><span>--- a/tests/redirecting/forwardername/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-udpbindaddr = 127.0.0.1:5060</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[caller]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5061</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[forwarder]</span><br><span style="color: hsl(0, 100%, 40%);">-type=peer</span><br><span style="color: hsl(0, 100%, 40%);">-host=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port=5062</span><br><span>diff --git a/tests/redirecting/forwardername/test-config.yaml b/tests/redirecting/forwardername/test-config.yaml</span><br><span>index a8149fe..a79ad7f 100644</span><br><span>--- a/tests/redirecting/forwardername/test-config.yaml</span><br><span>+++ b/tests/redirecting/forwardername/test-config.yaml</span><br><span>@@ -55,6 +55,6 @@</span><br><span> - asterisk: 'app_queue'</span><br><span> - asterisk: 'app_originate'</span><br><span> - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk: 'chan_pjsip'</span><br><span> tags:</span><br><span> - bridge</span><br><span>diff --git a/tests/regressions/M18882/configs/ast1/pjsip.conf b/tests/regressions/M18882/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..cc912a5</span><br><span>--- /dev/null</span><br><span>+++ b/tests/regressions/M18882/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,14 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[0004f2040001]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+max_contacts = 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[0004f2040001]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow = ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+aors = 0004f2040001</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/regressions/M18882/configs/ast1/sip.conf b/tests/regressions/M18882/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 1cc6edc..0000000</span><br><span>--- a/tests/regressions/M18882/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,6 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr=127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[0004f2040001]</span><br><span style="color: hsl(0, 100%, 40%);">-type=friend</span><br><span style="color: hsl(0, 100%, 40%);">-host=dynamic</span><br><span>diff --git a/tests/regressions/M18882/run-test b/tests/regressions/M18882/run-test</span><br><span>index afe1ed5..85058b4 100755</span><br><span>--- a/tests/regressions/M18882/run-test</span><br><span>+++ b/tests/regressions/M18882/run-test</span><br><span>@@ -19,7 +19,7 @@</span><br><span> TestCase.__init__(self)</span><br><span> self.create_asterisk()</span><br><span> self.peer = '0004f2040001'</span><br><span style="color: hsl(0, 100%, 40%);">- self.family = 'SIP'</span><br><span style="color: hsl(120, 100%, 40%);">+ self.family = 'PJSIP'</span><br><span> self.key = 'Registry/0004f2040001'</span><br><span> self.value = '172.16.0.100:5300:360:0004f2040001:sip:0004f2040001@172.16.0.100:5300'</span><br><span> self.reload = False</span><br><span>@@ -33,14 +33,11 @@</span><br><span> def ami_dbGet(self, ami):</span><br><span> def onResult(result):</span><br><span> if result != self.value:</span><br><span style="color: hsl(0, 100%, 40%);">- self.ami[0].logoff().addCallbacks(self.ami_logoff)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.ami[0].logoff().addCallbacks(self.ami_logoff)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if self.reload == False:</span><br><span style="color: hsl(0, 100%, 40%);">- self.ast[0].cli_exec('module unload chan_sip')</span><br><span style="color: hsl(0, 100%, 40%);">- self.ast[0].cli_exec('module load chan_sip')</span><br><span> self.reload = True</span><br><span> self.ami_dbGet(ami)</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- self.sipShowPeers()</span><br><span> </span><br><span> self.ami[0].dbGet(self.family, self.key).addCallbacks(onResult)</span><br><span> </span><br><span>diff --git a/tests/regressions/M18882/test-config.yaml b/tests/regressions/M18882/test-config.yaml</span><br><span>index f85e7a8..61fc7f5 100644</span><br><span>--- a/tests/regressions/M18882/test-config.yaml</span><br><span>+++ b/tests/regressions/M18882/test-config.yaml</span><br><span>@@ -1,4 +1,5 @@</span><br><span> testinfo:</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'chan_sip dependancy, '</span><br><span> summary: 'Test loggin in to the Asterisk Manager Interface'</span><br><span> description: |</span><br><span> 'This test provides a basic AMI sanity check. It will log in,</span><br><span>@@ -8,6 +9,6 @@</span><br><span> dependencies:</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span> - AMI</span><br><span>diff --git a/tests/udptl/configs/ast1/pjsip.conf b/tests/udptl/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..3e60ad7</span><br><span>--- /dev/null</span><br><span>+++ b/tests/udptl/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,25 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[global]</span><br><span style="color: hsl(120, 100%, 40%);">+type = global</span><br><span style="color: hsl(120, 100%, 40%);">+debug = yes</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[receiver]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[receiver]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = receiver</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[receiver]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow=!all,ulaw,alaw</span><br><span style="color: hsl(120, 100%, 40%);">+t38_udptl=yes</span><br><span style="color: hsl(120, 100%, 40%);">+context=facks</span><br><span style="color: hsl(120, 100%, 40%);">+media_address=127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = receiver</span><br><span>diff --git a/tests/udptl/configs/ast1/sip.conf b/tests/udptl/configs/ast1/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index ebde45b..0000000</span><br><span>--- a/tests/udptl/configs/ast1/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,11 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1:5060</span><br><span style="color: hsl(0, 100%, 40%);">-t38pt_udptl = yes</span><br><span style="color: hsl(0, 100%, 40%);">-sipdebug = yes</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[receiver]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5061</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-context = facks</span><br><span>diff --git a/tests/udptl/configs/ast2/pjsip.conf b/tests/udptl/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..34744c8</span><br><span>--- /dev/null</span><br><span>+++ b/tests/udptl/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,25 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[global]</span><br><span style="color: hsl(120, 100%, 40%);">+type = global</span><br><span style="color: hsl(120, 100%, 40%);">+debug = yes</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = 127.0.0.1:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sender]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:127.0.0.1:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sender]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = sender</span><br><span style="color: hsl(120, 100%, 40%);">+match = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sender]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+allow=!all,ulaw,alaw</span><br><span style="color: hsl(120, 100%, 40%);">+t38_udptl=yes</span><br><span style="color: hsl(120, 100%, 40%);">+context=facks</span><br><span style="color: hsl(120, 100%, 40%);">+media_address=127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+aors = sender</span><br><span>diff --git a/tests/udptl/configs/ast2/sip.conf b/tests/udptl/configs/ast2/sip.conf</span><br><span>deleted file mode 100644</span><br><span>index 1717186..0000000</span><br><span>--- a/tests/udptl/configs/ast2/sip.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,12 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-bindaddr = 127.0.0.1:5061</span><br><span style="color: hsl(0, 100%, 40%);">-t38pt_udptl = yes</span><br><span style="color: hsl(0, 100%, 40%);">-sipdebug = yes</span><br><span style="color: hsl(0, 100%, 40%);">-faxdetect = yes</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[sender]</span><br><span style="color: hsl(0, 100%, 40%);">-type = friend</span><br><span style="color: hsl(0, 100%, 40%);">-host = 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">-port = 5060</span><br><span style="color: hsl(0, 100%, 40%);">-insecure = invite</span><br><span style="color: hsl(0, 100%, 40%);">-context = facks</span><br><span>diff --git a/tests/udptl/run-test b/tests/udptl/run-test</span><br><span>index 882cf7d..667be1f 100755</span><br><span>--- a/tests/udptl/run-test</span><br><span>+++ b/tests/udptl/run-test</span><br><span>@@ -24,7 +24,7 @@</span><br><span> </span><br><span> def ami_connect(self, ami):</span><br><span> if ami.id == 0:</span><br><span style="color: hsl(0, 100%, 40%);">- self.ami[0].originate(channel = "SIP/666@receiver",</span><br><span style="color: hsl(120, 100%, 40%);">+ self.ami[0].originate(channel = "PJSIP/666@receiver",</span><br><span> application = "SendFax",</span><br><span> data = "tests/udptl/1page.tif")</span><br><span> elif ami.id == 1:</span><br><span>diff --git a/tests/udptl/test-config.yaml b/tests/udptl/test-config.yaml</span><br><span>index 21ec844..519ae54 100644</span><br><span>--- a/tests/udptl/test-config.yaml</span><br><span>+++ b/tests/udptl/test-config.yaml</span><br><span>@@ -1,5 +1,5 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Test T.38 FAX transmission over SIP'</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'requires further rework for pjsip, see ASTERISK-30292'</span><br><span> description: |</span><br><span> 'One Asterisk instance sends a FAX to another Asterisk instance'</span><br><span> issues:</span><br><span>@@ -10,7 +10,7 @@</span><br><span> - python : 'twisted'</span><br><span> - python : 'starpy'</span><br><span> - custom : 'fax'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - fax</span><br><span>diff --git a/tests/udptl_v6/configs/ast1/pjsip.conf b/tests/udptl_v6/configs/ast1/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..bf06659</span><br><span>--- /dev/null</span><br><span>+++ b/tests/udptl_v6/configs/ast1/pjsip.conf</span><br><span>@@ -0,0 +1,25 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[global]</span><br><span style="color: hsl(120, 100%, 40%);">+type = global</span><br><span style="color: hsl(120, 100%, 40%);">+debug = yes</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = [::1]:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[receiver]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:[::1]:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[receiver]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = receiver</span><br><span style="color: hsl(120, 100%, 40%);">+match = ::1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[receiver]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = facks</span><br><span style="color: hsl(120, 100%, 40%);">+aors = receiver</span><br><span style="color: hsl(120, 100%, 40%);">+t38_udptl = yes</span><br><span style="color: hsl(120, 100%, 40%);">+t38_udptl_ec = none</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/udptl_v6/configs/ast2/pjsip.conf b/tests/udptl_v6/configs/ast2/pjsip.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..14d92c5</span><br><span>--- /dev/null</span><br><span>+++ b/tests/udptl_v6/configs/ast2/pjsip.conf</span><br><span>@@ -0,0 +1,25 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[global]</span><br><span style="color: hsl(120, 100%, 40%);">+type = global</span><br><span style="color: hsl(120, 100%, 40%);">+debug = yes</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[transport-udp]</span><br><span style="color: hsl(120, 100%, 40%);">+type = transport</span><br><span style="color: hsl(120, 100%, 40%);">+protocol = udp</span><br><span style="color: hsl(120, 100%, 40%);">+bind = [::1]:5061</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sender]</span><br><span style="color: hsl(120, 100%, 40%);">+type = aor</span><br><span style="color: hsl(120, 100%, 40%);">+contact = sip:[::1]:5060</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sender]</span><br><span style="color: hsl(120, 100%, 40%);">+type = identify</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint = sender</span><br><span style="color: hsl(120, 100%, 40%);">+match = ::1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[sender]</span><br><span style="color: hsl(120, 100%, 40%);">+type = endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context = facks</span><br><span style="color: hsl(120, 100%, 40%);">+aors = sender</span><br><span style="color: hsl(120, 100%, 40%);">+t38_udptl = yes</span><br><span style="color: hsl(120, 100%, 40%);">+t38_udptl_ec = none</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/udptl_v6/run-test b/tests/udptl_v6/run-test</span><br><span>index a64086b..6113b51 100755</span><br><span>--- a/tests/udptl_v6/run-test</span><br><span>+++ b/tests/udptl_v6/run-test</span><br><span>@@ -25,7 +25,7 @@</span><br><span> </span><br><span> def ami_connect(self, ami):</span><br><span> if ami.id == 0:</span><br><span style="color: hsl(0, 100%, 40%);">- self.ami[0].originate(channel = "SIP/666@receiver",</span><br><span style="color: hsl(120, 100%, 40%);">+ self.ami[0].originate(channel = "PJSIP/666@receiver",</span><br><span> application = "SendFax",</span><br><span> data = "tests/udptl_v6/1page.tif")</span><br><span> elif ami.id == 1:</span><br><span>diff --git a/tests/udptl_v6/test-config.yaml b/tests/udptl_v6/test-config.yaml</span><br><span>index bd515bb..0baf573 100644</span><br><span>--- a/tests/udptl_v6/test-config.yaml</span><br><span>+++ b/tests/udptl_v6/test-config.yaml</span><br><span>@@ -1,5 +1,6 @@</span><br><span> testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Test T.38 FAX transmission over SIP'</span><br><span style="color: hsl(120, 100%, 40%);">+ skip: 'requires further rework for pjsip, see ASTERISK-30292'</span><br><span style="color: hsl(120, 100%, 40%);">+ summary: 'Test T.38 FAX transmission over PJSIP'</span><br><span> description: |</span><br><span> 'One Asterisk instance sends a FAX to another Asterisk instance.</span><br><span> This test uses IPv6 addressing.'</span><br><span>@@ -12,7 +13,7 @@</span><br><span> - python : 'starpy'</span><br><span> - custom : 'fax'</span><br><span> - custom : 'ipv6'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'chan_sip'</span><br><span style="color: hsl(120, 100%, 40%);">+ - asterisk : 'chan_pjsip'</span><br><span> tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - SIP</span><br><span style="color: hsl(120, 100%, 40%);">+ - PJSIP</span><br><span> - fax</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/testsuite/+/19860">change 19860</a>. To unsubscribe, or for help writing mail filters, 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/c/testsuite/+/19860"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I75960f1af9d7544c01dd00981626c02869fc1f51 </div>
<div style="display:none"> Gerrit-Change-Number: 19860 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-CC: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>