[Asterisk-code-review] testsuite: re-configure tests for chan_pjsip (testsuite[master])
Friendly Automation
asteriskteam at digium.com
Mon Jan 30 06:42:00 CST 2023
Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/testsuite/+/19784 )
Change subject: testsuite: re-configure tests for chan_pjsip
......................................................................
testsuite: re-configure tests for chan_pjsip
Modify existing tests that used chan_sip to use
chan_pjsip.
ASTERISK-30292
Change-Id: I75960f1af9d7544c01dd00981626c02869fc1f51
---
A configs/bridge/ast1/pjsip.conf
R configs/bridge/ast1/pjsip_sip-alice.conf
R configs/bridge/ast1/pjsip_sip-bob.conf
D configs/bridge/ast1/sip.conf
A configs/bridge/ast2/pjsip.conf
R configs/bridge/ast2/pjsip_sip-uut.conf
D configs/bridge/ast2/sip.conf
A configs/bridge/ast3/pjsip.conf
R configs/bridge/ast3/pjsip_sip-uut.conf
D configs/bridge/ast3/sip.conf
M lib/python/asterisk/asterisk.py
M lib/python/asterisk/bridge_test_case.py
M tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf
A tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/pjsip.conf
D tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/sip.conf
M tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml
A tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/pjsip.conf
D tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/sip.conf
M tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml
A tests/apps/confbridge/confbridge_nominal/configs/ast1/pjsip.conf
D tests/apps/confbridge/confbridge_nominal/configs/ast1/sip.conf
A tests/apps/confbridge/confbridge_nominal/configs/ast2/pjsip.conf
D tests/apps/confbridge/confbridge_nominal/configs/ast2/sip.conf
M tests/apps/confbridge/confbridge_nominal/run-test
M tests/apps/confbridge/confbridge_nominal/test-config.yaml
A tests/apps/confbridge/confbridge_start_muted/configs/ast1/pjsip.conf
D tests/apps/confbridge/confbridge_start_muted/configs/ast1/sip.conf
M tests/apps/confbridge/confbridge_start_muted/test-config.yaml
A tests/apps/directory/directory_attendant_exit/configs/ast1/pjsip.conf
D tests/apps/directory/directory_attendant_exit/configs/ast1/sip.conf
A tests/apps/directory/directory_attendant_exit/configs/ast2/pjsip.conf
D tests/apps/directory/directory_attendant_exit/configs/ast2/sip.conf
M tests/apps/directory/directory_attendant_exit/run-test
M tests/apps/directory/directory_attendant_exit/test-config.yaml
A tests/apps/directory/directory_context_operator_exit/configs/ast1/pjsip.conf
D tests/apps/directory/directory_context_operator_exit/configs/ast1/sip.conf
A tests/apps/directory/directory_context_operator_exit/configs/ast2/pjsip.conf
D tests/apps/directory/directory_context_operator_exit/configs/ast2/sip.conf
M tests/apps/directory/directory_context_operator_exit/run-test
M tests/apps/directory/directory_context_operator_exit/test-config.yaml
A tests/apps/directory/directory_operator_exit/configs/ast1/pjsip.conf
D tests/apps/directory/directory_operator_exit/configs/ast1/sip.conf
A tests/apps/directory/directory_operator_exit/configs/ast2/pjsip.conf
D tests/apps/directory/directory_operator_exit/configs/ast2/sip.conf
M tests/apps/directory/directory_operator_exit/run-test
M tests/apps/directory/directory_operator_exit/test-config.yaml
D tests/apps/incomplete/sip_incomplete/configs/ast1/extensions.conf
D tests/apps/incomplete/sip_incomplete/configs/ast1/sip.conf
D tests/apps/incomplete/sip_incomplete/run-test
D tests/apps/incomplete/sip_incomplete/sipp/receiver1.xml
D tests/apps/incomplete/sip_incomplete/sipp/sender1.xml
D tests/apps/incomplete/sip_incomplete/test-config.yaml
D tests/apps/incomplete/tests.yaml
A tests/apps/queues/ringinuse_and_pause/configs/ast1/pjsip.conf
D tests/apps/queues/ringinuse_and_pause/configs/ast1/sip.conf
M tests/apps/queues/ringinuse_and_pause/test-config.yaml
M tests/apps/queues/ringinuse_and_pause/test.lua
A tests/apps/queues/set_penalty/configs/ast1/pjsip.conf
M tests/apps/queues/set_penalty/configs/ast1/queues.conf
D tests/apps/queues/set_penalty/configs/ast1/sip.conf
M tests/apps/queues/set_penalty/run-test
M tests/apps/queues/set_penalty/test-config.yaml
A tests/apps/sendtext/basic/configs/ast1/pjsip.conf
D tests/apps/sendtext/basic/configs/ast1/sip.conf
M tests/apps/sendtext/basic/test-config.yaml
M tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf
M tests/bridge/atxfer_fail_blonde/test-config.yaml
M tests/bridge/atxfer_nominal/configs/ast1/extensions.conf
A tests/bridge/atxfer_nominal/configs/ast1/pjsip_sip-alice.conf
D tests/bridge/atxfer_nominal/configs/ast1/sip-alice.conf
A tests/bridge/atxfer_nominal/configs/ast4/pjsip.conf
D tests/bridge/atxfer_nominal/configs/ast4/sip.conf
M tests/bridge/atxfer_nominal/test-config.yaml
M tests/bridge/atxfer_setup/configs/ast1/extensions.conf
M tests/bridge/atxfer_setup/test-config.yaml
M tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf
A tests/bridge/atxfer_threeway_nominal/configs/ast1/pjsip_sip-alice.conf
D tests/bridge/atxfer_threeway_nominal/configs/ast1/sip-alice.conf
A tests/bridge/atxfer_threeway_nominal/configs/ast4/pjsip.conf
D tests/bridge/atxfer_threeway_nominal/configs/ast4/sip.conf
M tests/bridge/atxfer_threeway_nominal/test-config.yaml
M tests/bridge/automixmon/configs/ast1/extensions.conf
M tests/bridge/automixmon/test-config.yaml
M tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf
M tests/bridge/automixmon_bridgefeatures/test-config.yaml
M tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf
A tests/bridge/blindxfer_nominal/configs/ast1/pjsip_sip-alice.conf
D tests/bridge/blindxfer_nominal/configs/ast1/sip-alice.conf
A tests/bridge/blindxfer_nominal/configs/ast4/pjsip.conf
D tests/bridge/blindxfer_nominal/configs/ast4/sip.conf
M tests/bridge/blindxfer_nominal/test-config.yaml
M tests/bridge/blindxfer_setup/configs/ast1/extensions.conf
M tests/bridge/blindxfer_setup/test-config.yaml
M tests/bridge/blonde_nominal/configs/ast1/extensions.conf
A tests/bridge/blonde_nominal/configs/ast1/pjsip_sip-alice.conf
D tests/bridge/blonde_nominal/configs/ast1/sip-alice.conf
A tests/bridge/blonde_nominal/configs/ast4/pjsip.conf
M tests/bridge/blonde_nominal/test-config.yaml
M tests/bridge/connected_line_update/configs/ast1/extensions.conf
A tests/bridge/connected_line_update/configs/ast1/pjsip_sip-alice.conf
A tests/bridge/connected_line_update/configs/ast1/pjsip_sip-bob.conf
D tests/bridge/connected_line_update/configs/ast1/sip-alice.conf
D tests/bridge/connected_line_update/configs/ast1/sip-bob.conf
A tests/bridge/connected_line_update/configs/ast2/pjsip_sip-uut.conf
D tests/bridge/connected_line_update/configs/ast2/sip-uut.conf
A tests/bridge/connected_line_update/configs/ast3/pjsip_sip-uut.conf
D tests/bridge/connected_line_update/configs/ast3/sip-uut.conf
M tests/bridge/connected_line_update/test-config.yaml
M tests/bridge/dial_LS_options/configs/ast1/extensions.conf
M tests/bridge/dial_LS_options/test-config.yaml
M tests/bridge/disconnect/configs/ast1/extensions.conf
M tests/bridge/disconnect/test-config.yaml
M tests/bridge/parkcall/configs/ast1/extensions.conf
M tests/bridge/parkcall/test-config.yaml
M tests/bridge/parkcall_blindxfer/Hangup.py
M tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf
M tests/bridge/parkcall_blindxfer/test-config.yaml
M tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf
M tests/bridge/parkcall_bridgefeatures/test-config.yaml
M tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py
M tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf
M tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml
M tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py
M tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf
M tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml
M tests/bridge/simple_bridge/configs/ast1/extensions.conf
M tests/bridge/simple_bridge/test-config.yaml
M tests/bridge/transfer_capabilities/configs/ast1/extensions.conf
M tests/bridge/transfer_capabilities/test-config.yaml
M tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf
M tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml
M tests/bridge/transfer_failure/configs/ast1/extensions.conf
M tests/bridge/transfer_failure/test-config.yaml
M tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf
A tests/cdr/app_dial_G_flag/configs/ast1/pjsip.conf
D tests/cdr/app_dial_G_flag/configs/ast1/sip.conf
M tests/cdr/app_dial_G_flag/test-config.yaml
M tests/cdr/app_dial_G_flag/test.lua
M tests/cdr/app_queue/configs/ast1/modules.conf.inc
A tests/cdr/app_queue/configs/ast1/pjsip.conf
M tests/cdr/app_queue/configs/ast1/queues.conf
D tests/cdr/app_queue/configs/ast1/sip.conf
M tests/cdr/app_queue/test-config.yaml
M tests/cdr/app_queue/test.lua
M tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/extensions.conf
A tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/pjsip.conf
D tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/sip.conf
M tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml
A tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/pjsip.conf
D tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/sip.conf
M tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/extensions.conf
A tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/pjsip.conf
D tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/sip.conf
M tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml
A tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/pjsip.conf
D tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/sip.conf
M tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/extensions.conf
A tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/pjsip.conf
D tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/sip.conf
M tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml
M tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/extensions.conf
A tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/pjsip.conf
D tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/sip.conf
M tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml
M tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/extensions.conf
A tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/pjsip.conf
D tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/sip.conf
M tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml
A tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/pjsip.conf
D tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/sip.conf
M tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf
A tests/cdr/console_dial_sip_answer/configs/ast1/pjsip.conf
D tests/cdr/console_dial_sip_answer/configs/ast1/sip.conf
M tests/cdr/console_dial_sip_answer/test-config.yaml
A tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/pjsip.conf
D tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/sip.conf
M tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf
A tests/cdr/console_dial_sip_busy/configs/ast1/pjsip.conf
D tests/cdr/console_dial_sip_busy/configs/ast1/sip.conf
M tests/cdr/console_dial_sip_busy/test-config.yaml
A tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/pjsip.conf
D tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/sip.conf
M tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf
A tests/cdr/console_dial_sip_congestion/configs/ast1/pjsip.conf
D tests/cdr/console_dial_sip_congestion/configs/ast1/sip.conf
M tests/cdr/console_dial_sip_congestion/test-config.yaml
A tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/pjsip.conf
D tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/sip.conf
M tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf
A tests/cdr/console_dial_sip_transfer/configs/ast1/pjsip.conf
D tests/cdr/console_dial_sip_transfer/configs/ast1/sip.conf
M tests/cdr/console_dial_sip_transfer/test-config.yaml
M tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf
A tests/cdr/originate-cdr-disposition/configs/ast1/pjsip.conf
D tests/cdr/originate-cdr-disposition/configs/ast1/sip.conf
M tests/cdr/originate-cdr-disposition/test-config.yaml
M tests/channels/local/local_app/configs/ast1/extensions.conf
A tests/channels/local/local_app/configs/ast1/pjsip.conf
D tests/channels/local/local_app/configs/ast1/sip.conf
M tests/channels/local/local_app/test-config.yaml
M tests/channels/local/local_call/configs/ast1/extensions.conf
A tests/channels/local/local_call/configs/ast1/pjsip.conf
D tests/channels/local/local_call/configs/ast1/sip.conf
M tests/channels/local/local_call/test-config.yaml
M tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf
A tests/channels/local/local_holding_bridge/configs/ast1/pjsip.conf
D tests/channels/local/local_holding_bridge/configs/ast1/sip.conf
M tests/channels/local/local_holding_bridge/test-config.yaml
M tests/channels/local/local_optimize_away/configs/ast1/extensions.conf
A tests/channels/local/local_optimize_away/configs/ast1/pjsip.conf
D tests/channels/local/local_optimize_away/configs/ast1/sip.conf
M tests/channels/local/local_optimize_away/test-config.yaml
M tests/feature_call_pickup/configs/ast1/extensions.conf
A tests/feature_call_pickup/configs/ast1/pjsip.conf
D tests/feature_call_pickup/configs/ast1/sip.conf
M tests/feature_call_pickup/configs/ast2/extensions.conf
A tests/feature_call_pickup/configs/ast2/pjsip.conf
D tests/feature_call_pickup/configs/ast2/sip.conf
M tests/feature_call_pickup/run-test
M tests/feature_call_pickup/test-config.yaml
M tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf
A tests/funcs/func_jitterbuffer/configs/ast1/pjsip.conf
D tests/funcs/func_jitterbuffer/configs/ast1/sip.conf
M tests/funcs/func_jitterbuffer/test-config.yaml
M tests/manager/bridge_actions/configs/ast1/extensions.conf
M tests/manager/bridge_actions/test-config.yaml
M tests/masquerade/configs/ast1/extensions.conf
A tests/masquerade/configs/ast1/pjsip.conf
D tests/masquerade/configs/ast1/sip.conf
A tests/masquerade/configs/ast2/pjsip.conf
D tests/masquerade/configs/ast2/sip.conf
M tests/masquerade/run-test
M tests/masquerade/test-config.yaml
A tests/pbx/merge_contexts/configs/ast1/pjsip.conf
D tests/pbx/merge_contexts/configs/ast1/sip.conf
A tests/pbx/merge_contexts/configs/ast2/pjsip.conf
D tests/pbx/merge_contexts/configs/ast2/sip.conf
M tests/pbx/merge_contexts/run-test
M tests/pbx/merge_contexts/test-config.yaml
A tests/pbx/pbx_lua_background/configs/ast1/pjsip.conf
D tests/pbx/pbx_lua_background/configs/ast1/sip.conf
A tests/pbx/pbx_lua_background/configs/ast2/pjsip.conf
D tests/pbx/pbx_lua_background/configs/ast2/sip.conf
M tests/pbx/pbx_lua_background/run-test
M tests/pbx/pbx_lua_background/test-config.yaml
A tests/pbx/pbx_lua_goto/configs/ast1/pjsip.conf
D tests/pbx/pbx_lua_goto/configs/ast1/sip.conf
A tests/pbx/pbx_lua_goto/configs/ast2/pjsip.conf
D tests/pbx/pbx_lua_goto/configs/ast2/sip.conf
M tests/pbx/pbx_lua_goto/run-test
M tests/pbx/pbx_lua_goto/test-config.yaml
D tests/phoneprov/res_phoneprov/cfgbase.txt
D tests/phoneprov/res_phoneprov/cfgex.txt
D tests/phoneprov/res_phoneprov/configs/ast1/phoneprov.conf
D tests/phoneprov/res_phoneprov/configs/ast1/users.conf
D tests/phoneprov/res_phoneprov/run-test
D tests/phoneprov/res_phoneprov/test-config.yaml
M tests/phoneprov/tests.yaml
M tests/redirecting/forwardername/configs/ast1/extensions.conf
A tests/redirecting/forwardername/configs/ast1/pjsip.conf
M tests/redirecting/forwardername/configs/ast1/queues.conf
D tests/redirecting/forwardername/configs/ast1/sip.conf
M tests/redirecting/forwardername/test-config.yaml
A tests/regressions/M18882/configs/ast1/pjsip.conf
D tests/regressions/M18882/configs/ast1/sip.conf
M tests/regressions/M18882/run-test
M tests/regressions/M18882/test-config.yaml
A tests/udptl/configs/ast1/pjsip.conf
D tests/udptl/configs/ast1/sip.conf
A tests/udptl/configs/ast2/pjsip.conf
D tests/udptl/configs/ast2/sip.conf
M tests/udptl/run-test
M tests/udptl/test-config.yaml
A tests/udptl_v6/configs/ast1/pjsip.conf
A tests/udptl_v6/configs/ast2/pjsip.conf
M tests/udptl_v6/run-test
M tests/udptl_v6/test-config.yaml
277 files changed, 1,880 insertions(+), 1,581 deletions(-)
Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
N A: Looks good to me, but someone else must approve
Friendly Automation: Approved for Submit
diff --git a/configs/bridge/ast1/pjsip.conf b/configs/bridge/ast1/pjsip.conf
new file mode 100644
index 0000000..6319bc4
--- /dev/null
+++ b/configs/bridge/ast1/pjsip.conf
@@ -0,0 +1,40 @@
+#include "pjsip_sip-alice.conf"
+#include "pjsip_sip-bob.conf"
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5060
+
+[alice]
+type = aor
+contact = sip:127.0.0.1:5061
+
+[alice]
+type = identify
+endpoint = alice
+match = 127.0.0.1:5061
+
+[alice]
+type = endpoint
+callerid = Alice <1234>
+send_pai = yes
+allow = !all,ulaw,alaw,gsm
+aors = alice
+
+[bob]
+type = aor
+contact = sip:127.0.0.1:5062
+
+[bob]
+type = identify
+endpoint = bob
+match = 127.0.0.1:5062
+
+[bob]
+type = endpoint
+callerid = Bob <4321>
+send_pai = yes
+allow = !all,ulaw,alaw,gsm
+aors = bob
+
diff --git a/configs/bridge/ast1/sip-alice.conf b/configs/bridge/ast1/pjsip_sip-alice.conf
similarity index 100%
rename from configs/bridge/ast1/sip-alice.conf
rename to configs/bridge/ast1/pjsip_sip-alice.conf
diff --git a/configs/bridge/ast1/sip-bob.conf b/configs/bridge/ast1/pjsip_sip-bob.conf
similarity index 100%
rename from configs/bridge/ast1/sip-bob.conf
rename to configs/bridge/ast1/pjsip_sip-bob.conf
diff --git a/configs/bridge/ast1/sip.conf b/configs/bridge/ast1/sip.conf
deleted file mode 100644
index db81976..0000000
--- a/configs/bridge/ast1/sip.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1:5060
-
-#include sip-alice.conf
-#include sip-bob.conf
-
-[alice](alice-extra)
-sendrpid=pai
-callerid=Alice <1234>
-type = peer
-host = 127.0.0.1
-port = 5061
-
-[bob](bob-extra)
-sendrpid=pai
-callerid=Bob <4321>
-type = peer
-host = 127.0.0.1
-port = 5062
diff --git a/configs/bridge/ast2/pjsip.conf b/configs/bridge/ast2/pjsip.conf
new file mode 100644
index 0000000..d0a6e54
--- /dev/null
+++ b/configs/bridge/ast2/pjsip.conf
@@ -0,0 +1,21 @@
+#include "pjsip_sip-uut.conf"
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5061
+
+[uut]
+type = aor
+contact = sip:127.0.0.1:5060
+
+[uut]
+type = endpoint
+allow = !all,ulaw,alaw,gsm
+aors = uut
+
+[uut]
+type = identify
+endpoint = uut
+match = 127.0.0.1:5060
+
diff --git a/configs/bridge/ast2/sip-uut.conf b/configs/bridge/ast2/pjsip_sip-uut.conf
similarity index 100%
rename from configs/bridge/ast2/sip-uut.conf
rename to configs/bridge/ast2/pjsip_sip-uut.conf
diff --git a/configs/bridge/ast2/sip.conf b/configs/bridge/ast2/sip.conf
deleted file mode 100644
index 01b44de..0000000
--- a/configs/bridge/ast2/sip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[general]
-udpbindaddr=127.0.0.1:5061
-
-#include sip-uut.conf
-
-[uut](uut-extra)
-type=peer
-host=127.0.0.1
-port=5060
diff --git a/configs/bridge/ast3/pjsip.conf b/configs/bridge/ast3/pjsip.conf
new file mode 100644
index 0000000..1276385
--- /dev/null
+++ b/configs/bridge/ast3/pjsip.conf
@@ -0,0 +1,21 @@
+#include "pjsip_sip-uut.conf"
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5062
+
+[uut]
+type = aor
+contact = sip:127.0.0.1:5060
+
+[uut]
+type = endpoint
+allow = !all,ulaw,alaw,gsm
+aors = uut
+
+[uut]
+type = identify
+endpoint = uut
+match = 127.0.0.1:5060
+
diff --git a/configs/bridge/ast3/sip-uut.conf b/configs/bridge/ast3/pjsip_sip-uut.conf
similarity index 100%
rename from configs/bridge/ast3/sip-uut.conf
rename to configs/bridge/ast3/pjsip_sip-uut.conf
diff --git a/configs/bridge/ast3/sip.conf b/configs/bridge/ast3/sip.conf
deleted file mode 100644
index 8d2c480..0000000
--- a/configs/bridge/ast3/sip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[general]
-udpbindaddr=127.0.0.1:5062
-
-#include sip-uut.conf
-
-[uut](uut-extra)
-type=peer
-host=127.0.0.1
-port=5060
diff --git a/lib/python/asterisk/asterisk.py b/lib/python/asterisk/asterisk.py
index b32e760..5a74990 100644
--- a/lib/python/asterisk/asterisk.py
+++ b/lib/python/asterisk/asterisk.py
@@ -743,15 +743,15 @@
instance, install_config() will use the sub-directories version in place
of the top-level version.
- For example, testsuite is running a test against 1.4 (branch-1.4):
+ For example, testsuite is running a test against 18.9 (branch-18.9):
configs/manager.conf
- configs/sip.conf
- configs/branch-1.4/sip.conf
+ configs/pjsip.conf
+ configs/branch-18.9/pjsip.conf
- Because the sip.conf file exists in the branch-1.4 directory, it will
- be used in place of the top-level sip.conf. As for the manager.conf
- file, because it does not exists in the branch-1.4 direcory, the
+ Because the pjsip.conf file exists in the branch-18.9 directory, it will
+ be used in place of the top-level pjsip.conf. As for the manager.conf
+ file, because it does not exists in the branch-18.9 direcory, the
top-level manager.conf will be used.
Keyword Arguments:
diff --git a/lib/python/asterisk/bridge_test_case.py b/lib/python/asterisk/bridge_test_case.py
index 155b3a1..d88d286 100644
--- a/lib/python/asterisk/bridge_test_case.py
+++ b/lib/python/asterisk/bridge_test_case.py
@@ -126,7 +126,7 @@
"""AMI connect handler"""
self.connections += 1
- self.ast[ami.id].cli_exec("sip set debug on")
+ self.ast[ami.id].cli_exec("pjsip set debug on")
self.ast[ami.id].cli_exec("iax2 set debug on")
self.ast[ami.id].cli_exec("xmpp set debug on")
if (ami.id == 0):
diff --git a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf
index 3e5b8ec..ed25366 100644
--- a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf
+++ b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/extensions.conf
@@ -15,7 +15,7 @@
exten => generate,n,Echo()
exten => chanspytest,1,MixMonitor(${TESTAUDIO1}.gsm)
-exten => chanspytest,n,ChanSpy(SIP,q)
+exten => chanspytest,n,ChanSpy(PJSIP,q)
exten => chanspytest,n,StopMixMonitor()
exten => detect_audio,1,Answer()
diff --git a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/pjsip.conf b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..dc0a784
--- /dev/null
+++ b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/pjsip.conf
@@ -0,0 +1,56 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 0.0.0.0
+
+[end_a]
+type = aor
+contact = sip:127.0.0.1:5065
+
+[end_a]
+type = identify
+endpoint = end_a
+match = 127.0.0.1
+
+[end_a]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+direct_media = no
+aors = end_a
+
+[end_b]
+type = aor
+contact = sip:127.0.0.1:5066
+
+[end_b]
+type = identify
+endpoint = end_b
+match = 127.0.0.1
+
+[end_b]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+direct_media = no
+aors = end_b
+
+[end_c]
+type = aor
+contact = sip:127.0.0.1:5067
+
+[end_c]
+type = identify
+endpoint = end_c
+match = 127.0.0.1
+
+[end_c]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+direct_media = no
+aors = end_c
+
diff --git a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/sip.conf b/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/sip.conf
deleted file mode 100644
index c9bcb00..0000000
--- a/tests/apps/chanspy/chanspy_w_mixmonitor/configs/ast1/sip.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-[general]
-directmedia=no
-
-[end_a]
-context=test
-type=friend
-host=127.0.0.1
-port=5065
-insecure=invite
-disallow=all
-allow=ulaw
-
-[end_b]
-context=test
-type=friend
-host=127.0.0.1
-port=5066
-insecure=invite
-disallow=all
-allow=ulaw
-
-[end_c]
-context=test
-type=friend
-host=127.0.0.1
-port=5067
-insecure=invite
-disallow=all
-allow=ulaw
diff --git a/tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml b/tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml
index 91a8b88..5c250cc 100644
--- a/tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml
+++ b/tests/apps/chanspy/chanspy_w_mixmonitor/test-config.yaml
@@ -1,4 +1,5 @@
testinfo:
+ skip: 'pjsua requirement, see ASTERISK-30292'
summary: 'Test Chanspy with MixMonitor'
description: |
'This test verifies basic functionality of using both ChanSpy
@@ -19,7 +20,7 @@
- asterisk : 'app_mixmonitor'
- asterisk : 'app_playback'
- asterisk : 'app_talkdetect'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
- asterisk : 'pbx_config'
- asterisk : 'res_agi'
- asterisk : 'res_musiconhold'
diff --git a/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/pjsip.conf b/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..c21b728
--- /dev/null
+++ b/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2_g722]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2_g722]
+type = identify
+endpoint = ast2_g722
+match = 127.0.0.2
+
+[ast2_g722]
+type = endpoint
+context = confbridge
+disallow = all
+allow = g722
+from_user = ast2_g722
+aors = ast2_g722
+
diff --git a/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/sip.conf b/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/sip.conf
deleted file mode 100644
index a3c3b3a..0000000
--- a/tests/apps/confbridge/confbridge_dynamic_menus/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2_g722]
-type = friend
-context = confbridge
-fromuser = ast2_g722
-host = 127.0.0.2
-disallow = all
-allow = g722
-qualify = no
-insecure = invite
diff --git a/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml b/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml
index 6e99a38..296e685 100644
--- a/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml
@@ -379,6 +379,6 @@
- asterisk : 'app_confbridge'
- asterisk : 'app_senddtmf'
- asterisk : 'app_playback'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
diff --git a/tests/apps/confbridge/confbridge_nominal/configs/ast1/pjsip.conf b/tests/apps/confbridge/confbridge_nominal/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..c21b728
--- /dev/null
+++ b/tests/apps/confbridge/confbridge_nominal/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2_g722]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2_g722]
+type = identify
+endpoint = ast2_g722
+match = 127.0.0.2
+
+[ast2_g722]
+type = endpoint
+context = confbridge
+disallow = all
+allow = g722
+from_user = ast2_g722
+aors = ast2_g722
+
diff --git a/tests/apps/confbridge/confbridge_nominal/configs/ast1/sip.conf b/tests/apps/confbridge/confbridge_nominal/configs/ast1/sip.conf
deleted file mode 100644
index a3c3b3a..0000000
--- a/tests/apps/confbridge/confbridge_nominal/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2_g722]
-type = friend
-context = confbridge
-fromuser = ast2_g722
-host = 127.0.0.2
-disallow = all
-allow = g722
-qualify = no
-insecure = invite
diff --git a/tests/apps/confbridge/confbridge_nominal/configs/ast2/pjsip.conf b/tests/apps/confbridge/confbridge_nominal/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..ff58d25
--- /dev/null
+++ b/tests/apps/confbridge/confbridge_nominal/configs/ast2/pjsip.conf
@@ -0,0 +1,23 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = caller
+disallow = all
+allow = ulaw
+allow = g722
+from_user = ast1
+aors = ast1
+
diff --git a/tests/apps/confbridge/confbridge_nominal/configs/ast2/sip.conf b/tests/apps/confbridge/confbridge_nominal/configs/ast2/sip.conf
deleted file mode 100644
index 956dc04..0000000
--- a/tests/apps/confbridge/confbridge_nominal/configs/ast2/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = caller
-fromuser = ast1
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-allow = g722
-qualify = no
-insecure = invite
diff --git a/tests/apps/confbridge/confbridge_nominal/run-test b/tests/apps/confbridge/confbridge_nominal/run-test
index 33decae..a789447 100755
--- a/tests/apps/confbridge/confbridge_nominal/run-test
+++ b/tests/apps/confbridge/confbridge_nominal/run-test
@@ -187,7 +187,8 @@
self.reactor_timeout = 30
self.create_asterisk(ConfBridgeNominal.asterisk_instances)
- self.ami_1_originates = ["sip/ast1/parameterless", "sip/ast1/user_profile", "sip/ast1/admin_profile"]
+ #self.ami_1_originates = ["pjsip/ast1/parameterless", "pjsip/ast1/user_profile", "pjsip/ast1/admin_profile"]
+ self.ami_1_originates = ["pjsip/parameterless at ast1", "pjsip/user_profile at ast1", "pjsip/admin_profile at ast1"]
self.__amis_connected = 0
self.__user_events_confbridge = 0
self.__user_events_hangup = 0
diff --git a/tests/apps/confbridge/confbridge_nominal/test-config.yaml b/tests/apps/confbridge/confbridge_nominal/test-config.yaml
index dd51564..3759ad3 100644
--- a/tests/apps/confbridge/confbridge_nominal/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_nominal/test-config.yaml
@@ -18,5 +18,5 @@
- asterisk : 'app_playback'
- asterisk : 'app_senddtmf'
- asterisk : 'app_userevent'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
- asterisk : 'pbx_config'
diff --git a/tests/apps/confbridge/confbridge_start_muted/configs/ast1/pjsip.conf b/tests/apps/confbridge/confbridge_start_muted/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..c21b728
--- /dev/null
+++ b/tests/apps/confbridge/confbridge_start_muted/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2_g722]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2_g722]
+type = identify
+endpoint = ast2_g722
+match = 127.0.0.2
+
+[ast2_g722]
+type = endpoint
+context = confbridge
+disallow = all
+allow = g722
+from_user = ast2_g722
+aors = ast2_g722
+
diff --git a/tests/apps/confbridge/confbridge_start_muted/configs/ast1/sip.conf b/tests/apps/confbridge/confbridge_start_muted/configs/ast1/sip.conf
deleted file mode 100644
index a3c3b3a..0000000
--- a/tests/apps/confbridge/confbridge_start_muted/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2_g722]
-type = friend
-context = confbridge
-fromuser = ast2_g722
-host = 127.0.0.2
-disallow = all
-allow = g722
-qualify = no
-insecure = invite
diff --git a/tests/apps/confbridge/confbridge_start_muted/test-config.yaml b/tests/apps/confbridge/confbridge_start_muted/test-config.yaml
index 1995dc7..28f41ad 100644
--- a/tests/apps/confbridge/confbridge_start_muted/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_start_muted/test-config.yaml
@@ -183,5 +183,5 @@
- asterisk: 'app_playback'
- asterisk: 'app_senddtmf'
- asterisk: 'app_verbose'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
- asterisk: 'pbx_config'
diff --git a/tests/apps/directory/directory_attendant_exit/configs/ast1/pjsip.conf b/tests/apps/directory/directory_attendant_exit/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..a91ca93
--- /dev/null
+++ b/tests/apps/directory/directory_attendant_exit/configs/ast1/pjsip.conf
@@ -0,0 +1,21 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2]
+type = identify
+endpoint = ast2
+match = 127.0.0.2
+
+[ast2]
+type = endpoint
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/directory/directory_attendant_exit/configs/ast1/sip.conf b/tests/apps/directory/directory_attendant_exit/configs/ast1/sip.conf
deleted file mode 100644
index e41bb65..0000000
--- a/tests/apps/directory/directory_attendant_exit/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/directory/directory_attendant_exit/configs/ast2/pjsip.conf b/tests/apps/directory/directory_attendant_exit/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..5e3c8c8
--- /dev/null
+++ b/tests/apps/directory/directory_attendant_exit/configs/ast2/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = directory
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/directory/directory_attendant_exit/configs/ast2/sip.conf b/tests/apps/directory/directory_attendant_exit/configs/ast2/sip.conf
deleted file mode 100644
index b7a283d..0000000
--- a/tests/apps/directory/directory_attendant_exit/configs/ast2/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-context = directory
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/directory/directory_attendant_exit/run-test b/tests/apps/directory/directory_attendant_exit/run-test
index 91eebcc..c0a13f9 100755
--- a/tests/apps/directory/directory_attendant_exit/run-test
+++ b/tests/apps/directory/directory_attendant_exit/run-test
@@ -28,7 +28,7 @@
if ami.id == 0:
print("sending a call from ast1 to ast2")
- df = ami.originate("sip/ast2/1234", "senddtmf", "1234", 1)
+ df = ami.originate("PJSIP/1234 at ast2", "senddtmf", "1234", 1)
def handle_failure(reason):
print("error sending originate:")
diff --git a/tests/apps/directory/directory_attendant_exit/test-config.yaml b/tests/apps/directory/directory_attendant_exit/test-config.yaml
index e115ed8..3910e0b 100644
--- a/tests/apps/directory/directory_attendant_exit/test-config.yaml
+++ b/tests/apps/directory/directory_attendant_exit/test-config.yaml
@@ -11,7 +11,7 @@
- asterisk : 'app_directory'
- asterisk : 'app_senddtmf'
- asterisk : 'app_userevent'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
- asterisk : 'pbx_config'
tags:
- directory
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
new file mode 100644
index 0000000..a91ca93
--- /dev/null
+++ b/tests/apps/directory/directory_context_operator_exit/configs/ast1/pjsip.conf
@@ -0,0 +1,21 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2]
+type = identify
+endpoint = ast2
+match = 127.0.0.2
+
+[ast2]
+type = endpoint
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
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
deleted file mode 100644
index e41bb65..0000000
--- a/tests/apps/directory/directory_context_operator_exit/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
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
new file mode 100644
index 0000000..5e3c8c8
--- /dev/null
+++ b/tests/apps/directory/directory_context_operator_exit/configs/ast2/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = directory
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
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
deleted file mode 100644
index b7a283d..0000000
--- a/tests/apps/directory/directory_context_operator_exit/configs/ast2/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-context = directory
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/directory/directory_context_operator_exit/run-test b/tests/apps/directory/directory_context_operator_exit/run-test
index 91eebcc..c0a13f9 100755
--- a/tests/apps/directory/directory_context_operator_exit/run-test
+++ b/tests/apps/directory/directory_context_operator_exit/run-test
@@ -28,7 +28,7 @@
if ami.id == 0:
print("sending a call from ast1 to ast2")
- df = ami.originate("sip/ast2/1234", "senddtmf", "1234", 1)
+ df = ami.originate("PJSIP/1234 at ast2", "senddtmf", "1234", 1)
def handle_failure(reason):
print("error sending originate:")
diff --git a/tests/apps/directory/directory_context_operator_exit/test-config.yaml b/tests/apps/directory/directory_context_operator_exit/test-config.yaml
index 3b10986..3843ebf 100644
--- a/tests/apps/directory/directory_context_operator_exit/test-config.yaml
+++ b/tests/apps/directory/directory_context_operator_exit/test-config.yaml
@@ -11,7 +11,7 @@
- asterisk : 'app_directory'
- asterisk : 'app_senddtmf'
- asterisk : 'app_userevent'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
- asterisk : 'pbx_config'
tags:
- directory
diff --git a/tests/apps/directory/directory_operator_exit/configs/ast1/pjsip.conf b/tests/apps/directory/directory_operator_exit/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..a91ca93
--- /dev/null
+++ b/tests/apps/directory/directory_operator_exit/configs/ast1/pjsip.conf
@@ -0,0 +1,21 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2]
+type = identify
+endpoint = ast2
+match = 127.0.0.2
+
+[ast2]
+type = endpoint
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/directory/directory_operator_exit/configs/ast1/sip.conf b/tests/apps/directory/directory_operator_exit/configs/ast1/sip.conf
deleted file mode 100644
index e41bb65..0000000
--- a/tests/apps/directory/directory_operator_exit/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/directory/directory_operator_exit/configs/ast2/pjsip.conf b/tests/apps/directory/directory_operator_exit/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..5e3c8c8
--- /dev/null
+++ b/tests/apps/directory/directory_operator_exit/configs/ast2/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = directory
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/directory/directory_operator_exit/configs/ast2/sip.conf b/tests/apps/directory/directory_operator_exit/configs/ast2/sip.conf
deleted file mode 100644
index b7a283d..0000000
--- a/tests/apps/directory/directory_operator_exit/configs/ast2/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-context = directory
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/directory/directory_operator_exit/run-test b/tests/apps/directory/directory_operator_exit/run-test
index 91eebcc..642b0ea 100755
--- a/tests/apps/directory/directory_operator_exit/run-test
+++ b/tests/apps/directory/directory_operator_exit/run-test
@@ -28,7 +28,7 @@
if ami.id == 0:
print("sending a call from ast1 to ast2")
- df = ami.originate("sip/ast2/1234", "senddtmf", "1234", 1)
+ df = ami.originate("pjsip/1234 at ast2", "senddtmf", "1234", 1)
def handle_failure(reason):
print("error sending originate:")
diff --git a/tests/apps/directory/directory_operator_exit/test-config.yaml b/tests/apps/directory/directory_operator_exit/test-config.yaml
index 90bd85c..52a894f 100644
--- a/tests/apps/directory/directory_operator_exit/test-config.yaml
+++ b/tests/apps/directory/directory_operator_exit/test-config.yaml
@@ -11,7 +11,7 @@
- asterisk : 'app_directory'
- asterisk : 'app_senddtmf'
- asterisk : 'app_userevent'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
- asterisk : 'pbx_config'
tags:
- directory
diff --git a/tests/apps/incomplete/sip_incomplete/configs/ast1/extensions.conf b/tests/apps/incomplete/sip_incomplete/configs/ast1/extensions.conf
deleted file mode 100644
index 5a73c42..0000000
--- a/tests/apps/incomplete/sip_incomplete/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-
-[default]
-
-; Note that in this case, the Incomplete application should just be a pass through
-; for the SIP channel. It should ignore it and immediately forward the 484 response
-; back to the device. The Incomplete application should return to the dialplan without
-; hanging up on the caller.
-
-exten => 1234,1,NoOp()
- same => n,Dial(SIP/external,300)
- same => n,Verbose(1, DIALSTATUS=${DIALSTATUS}, HANGUPCAUSE=${HANGUPCAUSE})
- same => n,GotoIf($[${HANGUPCAUSE} = 28]?pass:fail)
- same => n(fail),UserEvent(TestResult,result: fail, status: HANGUPCAUSE had invalid value ${HANGUPCAUSE})
- same => n,Wait(2)
- same => n,Hangup()
- same => n(pass),Incomplete(n)
- same => n,Verbose(1, No other option dialed and extension allowed to pass Incomplete; failing)
- same => n,UserEvent(TestResult,result: fail, status: Failed to transition to extension 12345)
- same => n,Wait(2)
- same => n,Hangup()
-
-exten => 12345,1,NoOp()
- same => n,UserEvent(TestResult,result: pass, status: entered into alternate extension 12345)
- same => n,Wait(2)
- same => n,Hangup()
-
-exten => t,1,NoOp()
- same => n,Verbose(1, Entered into timeout)
- same => n,UserEvent(TestResult,result: fail, status: timedout from Incomplete application)
- same => n,Wait(2)
- same => n,Hangup()
-
-exten => i,1,NoOp()
- same => n,Verbose(1, Entered into invalid)
- same => n(fail),UserEvent(TestResult,result: fail, status: entered invalid extension when alternate extension 12345 existed in dialplan)
- same => n,Wait(2)
- same => n,Hangup()
-
-exten => e,1,NoOp()
- same => n,Verbose(1, Entered into exception)
- same => n(fail),UserEvent(TestResult,result: fail, status: entered exception extension when alternate extension 12345 existed in dialplan)
- same => n,Wait(2)
- same => n,Hangup()
diff --git a/tests/apps/incomplete/sip_incomplete/configs/ast1/sip.conf b/tests/apps/incomplete/sip_incomplete/configs/ast1/sip.conf
deleted file mode 100644
index 24fad9c..0000000
--- a/tests/apps/incomplete/sip_incomplete/configs/ast1/sip.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[general]
-directmedia=no
-
-;This is the inbound peer that
-;will attempt to call the external
-;peer
-[inbound]
-type=friend
-host=127.0.0.1
-port=5061
-
-;This is the peer dialed for
-;all outbound calls
-[external]
-type=friend
-host=127.0.0.1
-port=5062
diff --git a/tests/apps/incomplete/sip_incomplete/run-test b/tests/apps/incomplete/sip_incomplete/run-test
deleted file mode 100755
index 8bef418..0000000
--- a/tests/apps/incomplete/sip_incomplete/run-test
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python
-'''
-Copyright (C) 2011, Digium, Inc.
-Matt Jordan <mjordan at digium.com>
-
-This program is free software, distributed under the terms of
-the GNU General Public License Version 2.
-'''
-
-import sys
-import os
-import logging
-
-sys.path.append("lib/python")
-
-from asterisk.test_case import TestCase
-from asterisk.sipp import SIPpScenario
-from twisted.internet import reactor
-
-logger = logging.getLogger(__name__)
-TEST_DIR = os.path.dirname(os.path.realpath(__file__))
-
-Sender_Scenario = {
- 'scenario' : 'sender1.xml',
- '-p' : '5061'
-}
-Receiver_Scenario = {
- 'scenario' : 'receiver1.xml',
- '-p' : '5062'
- }
-
-class SipIncompleteTest(TestCase):
- def __init__(self):
- TestCase.__init__(self)
- self.create_asterisk()
- self.receiverTest = SIPpScenario(TEST_DIR, Receiver_Scenario)
- self.senderTest = SIPpScenario(TEST_DIR, Sender_Scenario)
-
- def ami_connect(self, ami):
- TestCase.ami_connect(self, ami)
-
- self.ast[ami.id].cli_exec("sip set debug on")
- ami.registerEvent('UserEvent', self.user_event)
-
- logger.debug("Starting SIP scenarios")
- self.receiverTest.run(self)
- self.senderTest.run(self)
-
- def user_event(self, ami, event):
- if event['userevent'] != 'TestResult':
- return
-
- if event['result'] == "pass":
- self.passed = True
- logger.info("Test successfully exited")
- else:
- logger.warn("Test did not successfully exit:")
- logger.warn("result: %s" % (event['result'],))
- logger.warn("status: %s" % (event['status'],))
- self.passed = False
-
- self.stop_reactor()
-
- def run(self):
- TestCase.run(self)
- self.create_ami_factory()
-
-
-def main():
- test = SipIncompleteTest()
-
- test.start_asterisk()
-
- reactor.run()
-
- test.stop_asterisk()
-
- if test.passed:
- return 0
- else:
- return 1
-
-
-if __name__ == "__main__":
- sys.exit(main())
-
-
-# vim:sw=4:ts=4:expandtab:textwidth=79
diff --git a/tests/apps/incomplete/sip_incomplete/sipp/receiver1.xml b/tests/apps/incomplete/sip_incomplete/sipp/receiver1.xml
deleted file mode 100644
index 65e514a..0000000
--- a/tests/apps/incomplete/sip_incomplete/sipp/receiver1.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Incomplete Address Responder">
-
- <recv request="INVITE" crlf="true" />
-
- <!-- Simulate an attempt to reach the extension that was dialed in -->
- <!-- The INVITE. After 500 ms, send back a 484 Number incomplete -->
-
- <send>
- <![CDATA[
-
- SIP/2.0 100 Trying
- [last_Via:]
- [last_From:]
- [last_To:];tag=[pid]SIPpTag01[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <pause milliseconds="500" />
-
- <send>
- <![CDATA[
-
- SIP/2.0 484 Number incomplete
- [last_Via:]
- [last_From:]
- [last_To:];tag=[pid]SIPpTag01[call_number]
- [last_Call-ID:]
- [last_CSeq:]
- Contact: <sip:[local_ip]:[local_port];transport=[transport]>
- Content-Length: 0
-
- ]]>
- </send>
-
- <recv request="ACK"
- rtd="true"
- crlf="true">
- </recv>
-
-</scenario>
diff --git a/tests/apps/incomplete/sip_incomplete/sipp/sender1.xml b/tests/apps/incomplete/sip_incomplete/sipp/sender1.xml
deleted file mode 100644
index 9702111..0000000
--- a/tests/apps/incomplete/sip_incomplete/sipp/sender1.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Incomplete Address Sender">
-
- <!-- The initial call attempts to dial extension 1234. This -->
- <!-- will communicate with the receiver1 SIPp scenario, which -->
- <!-- will return 484 Address Incomplete. The sender will then -->
- <!-- attempt again with 12345, which should cause the test to -->
- <!-- complete successfully -->
-
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:1234@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: inbound <sip:wienerschnitzel@[local_ip]:[local_port]>;tag=[call_number]
- To: 1234 <1234@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:kartoffelsalat@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- User-Agent: Channel Param Test
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio 6000 RTP/AVP 0 101
- a=rtpmap:0 PCMU/8000
- a=rtpmap:101 telephone-event/8000
- m=video 6002 RTP/AVP 34
- a=rtpmap:34 H263/90000
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="484" rtd="true">
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:1234@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: inbound <sip:wienerschnitzel@[local_ip]:[local_port]>;tag=[call_number]
- To: 1234 <sip:1234@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:kartoffelsalat@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <!-- Pause to simulate the caller figuring out the next digit to dial -->
- <pause milliseconds="750" />
-
- <send retrans="500">
- <![CDATA[
-
- INVITE sip:12345@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: inbound <sip:wienerschnitzel@[local_ip]:[local_port]>;tag=[call_number]
- To: 12345 <12345@[remote_ip]:[remote_port]>
- Call-ID: [call_id]
- CSeq: 1 INVITE
- Contact: sip:kartoffelsalat@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- User-Agent: Channel Param Test
- Content-Type: application/sdp
- Content-Length: [len]
-
- v=0
- o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
- s=-
- c=IN IP[media_ip_type] [media_ip]
- t=0 0
- m=audio 6000 RTP/AVP 0 101
- a=rtpmap:0 PCMU/8000
- a=rtpmap:101 telephone-event/8000
- m=video 6002 RTP/AVP 34
- a=rtpmap:34 H263/90000
-
- ]]>
- </send>
-
- <recv response="100" optional="true">
- </recv>
-
- <recv response="180" optional="true">
- </recv>
-
- <recv response="183" optional="true">
- </recv>
-
- <recv response="603" rtd="true">
- </recv>
-
- <send>
- <![CDATA[
-
- ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
- Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
- From: test1 <sip:wienerschnitzel@[local_ip]:[local_port]>;tag=[call_number]
- To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
- Call-ID: [call_id]
- CSeq: 1 ACK
- Contact: sip:kartoffelsalat@[local_ip]:[local_port]
- Max-Forwards: 70
- Subject: Performance Test
- Content-Length: 0
-
- ]]>
- </send>
-
- <!-- definition of the response time repartition table (unit is ms) -->
- <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
- <!-- definition of the call length repartition table (unit is ms) -->
- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
\ No newline at end of file
diff --git a/tests/apps/incomplete/sip_incomplete/test-config.yaml b/tests/apps/incomplete/sip_incomplete/test-config.yaml
deleted file mode 100644
index 94757b3..0000000
--- a/tests/apps/incomplete/sip_incomplete/test-config.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-testinfo:
- summary: 'Test for SIP channel handling the Incomplete application notifications'
- description: |
- The test exercises SIP handling of the 484 Address Incomplete response in the presence
- of the Incomplete application. The Incomplete application will queue up a control frame
- that notifies the SIP channel driver that it is waiting for more digits. The SIP channel
- driver will interpret that to mean that it should inform the dialing device that the address
- was incomplete, at which point it will attempt to dial a new extension. The test succeeds
- if the new extension is dialed; it fails if any other extension is reached or if the new
- extension is not dialed.
-
-properties:
- dependencies:
- - sipp :
- version : 'v3.0'
- - asterisk : 'app_dial'
- - asterisk : 'app_userevent'
- - asterisk : 'app_verbose'
- - asterisk : 'chan_sip'
- - asterisk : 'pbx_config'
- tags:
- - SIP
- - apps
- - incomplete
diff --git a/tests/apps/incomplete/tests.yaml b/tests/apps/incomplete/tests.yaml
deleted file mode 100644
index 66f2428..0000000
--- a/tests/apps/incomplete/tests.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enter tests here in the order they should be considered for execution:
-tests:
- - test: 'sip_incomplete'
-
diff --git a/tests/apps/queues/ringinuse_and_pause/configs/ast1/pjsip.conf b/tests/apps/queues/ringinuse_and_pause/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d2bcd3
--- /dev/null
+++ b/tests/apps/queues/ringinuse_and_pause/configs/ast1/pjsip.conf
@@ -0,0 +1,24 @@
+[global]
+type = global
+debug = yes
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5060
+
+[member]
+type = aor
+contact = sip:127.0.0.1:5061
+
+[member]
+type = identify
+endpoint = member
+match = 127.0.0.1
+
+[member]
+type = endpoint
+context = test_context
+direct_media = no
+aors = member
+
diff --git a/tests/apps/queues/ringinuse_and_pause/configs/ast1/sip.conf b/tests/apps/queues/ringinuse_and_pause/configs/ast1/sip.conf
deleted file mode 100644
index 59c3a25..0000000
--- a/tests/apps/queues/ringinuse_and_pause/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-sipdebug=yes
-udpbindaddr=127.0.0.1:5060
-canreinvite=no
-videosupport=yes
-
-[member]
-type = friend
-host = 127.0.0.1
-port = 5061
-context = test_context
-call-limit=3
diff --git a/tests/apps/queues/ringinuse_and_pause/test-config.yaml b/tests/apps/queues/ringinuse_and_pause/test-config.yaml
index f8d9d71..4263140 100644
--- a/tests/apps/queues/ringinuse_and_pause/test-config.yaml
+++ b/tests/apps/queues/ringinuse_and_pause/test-config.yaml
@@ -19,6 +19,6 @@
- app : 'asttest'
- sipp :
version : 'v3.0'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- queues
diff --git a/tests/apps/queues/ringinuse_and_pause/test.lua b/tests/apps/queues/ringinuse_and_pause/test.lua
index 60d93a9..dbc3193 100644
--- a/tests/apps/queues/ringinuse_and_pause/test.lua
+++ b/tests/apps/queues/ringinuse_and_pause/test.lua
@@ -52,7 +52,7 @@
local instance = ast.new()
instance:load_config("configs/ast1/extensions.conf")
instance:load_config("configs/ast1/queues.conf")
- instance:load_config("configs/ast1/sip.conf")
+ instance:load_config("configs/ast1/pjsip.conf")
instance:generate_manager_conf()
instance:spawn()
return instance
diff --git a/tests/apps/queues/set_penalty/configs/ast1/pjsip.conf b/tests/apps/queues/set_penalty/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..37500bd
--- /dev/null
+++ b/tests/apps/queues/set_penalty/configs/ast1/pjsip.conf
@@ -0,0 +1,32 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[mem1]
+type = aor
+max_contacts = 1
+
+[mem1]
+type = endpoint
+context = default
+aors = mem1
+
+[mem2]
+type = aor
+max_contacts = 1
+
+[mem2]
+type = endpoint
+context = default
+aors = mem2
+
+[mem3]
+type = aor
+max_contacts = 1
+
+[mem3]
+type = endpoint
+context = default
+aors = mem3
+
diff --git a/tests/apps/queues/set_penalty/configs/ast1/queues.conf b/tests/apps/queues/set_penalty/configs/ast1/queues.conf
index f3f9bee..7917d03 100644
--- a/tests/apps/queues/set_penalty/configs/ast1/queues.conf
+++ b/tests/apps/queues/set_penalty/configs/ast1/queues.conf
@@ -1,14 +1,14 @@
[general]
[queue1]
-member => sip/mem1
-member => sip/mem2
-member => sip/mem3
+member => pjsip/mem1
+member => pjsip/mem2
+member => pjsip/mem3
[queue2]
-member => sip/mem2
-member => sip/mem3
+member => pjsip/mem2
+member => pjsip/mem3
[queue3]
-member => sip/mem3
-member => sip/mem1
+member => pjsip/mem3
+member => pjsip/mem1
diff --git a/tests/apps/queues/set_penalty/configs/ast1/sip.conf b/tests/apps/queues/set_penalty/configs/ast1/sip.conf
deleted file mode 100644
index 4152a95..0000000
--- a/tests/apps/queues/set_penalty/configs/ast1/sip.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[general]
-bindaddr=127.0.0.1
-context=default
-
-[mem1]
-type=friend
-host=dynamic
-
-[mem2]
-type=friend
-host=dynamic
-
-[mem3]
-type=friend
-host=dynamic
diff --git a/tests/apps/queues/set_penalty/run-test b/tests/apps/queues/set_penalty/run-test
index f05773a..7382167 100755
--- a/tests/apps/queues/set_penalty/run-test
+++ b/tests/apps/queues/set_penalty/run-test
@@ -16,7 +16,7 @@
logger = logging.getLogger(__name__)
"""
-Creates an Asterisk instance with some premade queues containing some premade sip peers as members
+Creates an Asterisk instance with some premade queues containing some premade pjsip peers as members
and changes penalties by using CLI commands and manager actions.
Tests against regression such as the one discussed in https://reviewboard.asterisk.org/r/1609/
@@ -43,7 +43,7 @@
#Evaluates events according to the expectations of a given state and advances the state when finished.
def state_receive(self, event, ami):
if (self.state == 1):
- if (event['queue'] == "queue1" and event['interface'] == "sip/mem1" and event['penalty'] == "1"):
+ if (event['queue'] == "queue1" and event['interface'] == "pjsip/mem1" and event['penalty'] == "1"):
logger.info("state 1: Successfully Completed")
self.state_advance(ami)
@@ -52,11 +52,11 @@
self.stop_reactor()
elif (self.state == 2):
- if (event['queue'] == "queue1" and event['interface'] == "sip/mem2" and event['penalty'] == "2"):
+ if (event['queue'] == "queue1" and event['interface'] == "pjsip/mem2" and event['penalty'] == "2"):
logger.info("state 2: verified condition 1")
self.state_passed_flags = self.state_passed_flags | 1
- elif (event['queue'] == "queue2" and event['interface'] == "sip/mem2" and event['penalty'] == '2'):
+ elif (event['queue'] == "queue2" and event['interface'] == "pjsip/mem2" and event['penalty'] == '2'):
logger.info("state 2: verified condition 2")
self.state_passed_flags = self.state_passed_flags | 2
@@ -69,15 +69,15 @@
self.state_advance(ami)
elif (self.state == 3):
- if (event['queue'] == "queue1" and event['interface'] == "sip/mem3" and event['penalty'] == '3'):
+ if (event['queue'] == "queue1" and event['interface'] == "pjsip/mem3" and event['penalty'] == '3'):
logger.info("state 3: verified condition 1")
self.state_passed_flags = self.state_passed_flags | 1
- elif (event['queue'] == "queue2" and event['interface'] == "sip/mem3" and event['penalty'] == '3'):
+ elif (event['queue'] == "queue2" and event['interface'] == "pjsip/mem3" and event['penalty'] == '3'):
logger.info("state 3: verified condition 2")
self.state_passed_flags = self.state_passed_flags | 2
- elif (event['queue'] == "queue3" and event['interface'] == "sip/mem3" and event['penalty'] == '3'):
+ elif (event['queue'] == "queue3" and event['interface'] == "pjsip/mem3" and event['penalty'] == '3'):
logger.info("state 3: verified condition 3")
self.state_passed_flags = self.state_passed_flags | 4
@@ -90,7 +90,7 @@
self.state_advance(ami)
elif (self.state == 4):
- if (event['queue'] == "queue3" and event['interface'] == "sip/mem1" and event['penalty'] == '4'):
+ if (event['queue'] == "queue3" and event['interface'] == "pjsip/mem1" and event['penalty'] == '4'):
logger.info("state 4: Successfully Completed")
self.state_advance(ami)
@@ -106,17 +106,17 @@
#state specific:
if (self.state == 1): #state 1 - cli command with specific queue on mem1
- ami.command('queue set penalty 1 on sip/mem1 in queue1')
+ ami.command('queue set penalty 1 on pjsip/mem1 in queue1')
elif (self.state == 2): #state 2 - cli command with unspecified queue on mem2
- ami.command('queue set penalty 2 on sip/mem2')
+ ami.command('queue set penalty 2 on pjsip/mem2')
elif (self.state == 3): #state 3 - manager action queuePenalty with unspecified queue on mem3
- message = {'action': 'queuepenalty', 'penalty': '3', 'interface': 'sip/mem3'}
+ message = {'action': 'queuepenalty', 'penalty': '3', 'interface': 'pjsip/mem3'}
ami.sendMessage(message)
elif (self.state == 4): #state 4 - mamager action queuePenalty with specific queue on mem1
- message = {'action': 'queuepenalty', 'penalty': '4', 'interface': 'sip/mem1', 'queue': 'queue3'}
+ message = {'action': 'queuepenalty', 'penalty': '4', 'interface': 'pjsip/mem1', 'queue': 'queue3'}
ami.sendMessage(message)
#states exhausted:
diff --git a/tests/apps/queues/set_penalty/test-config.yaml b/tests/apps/queues/set_penalty/test-config.yaml
index 5640e9d..1df5a1f 100644
--- a/tests/apps/queues/set_penalty/test-config.yaml
+++ b/tests/apps/queues/set_penalty/test-config.yaml
@@ -10,6 +10,6 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'app_queue'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- queues
diff --git a/tests/apps/sendtext/basic/configs/ast1/pjsip.conf b/tests/apps/sendtext/basic/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1dd41c6
--- /dev/null
+++ b/tests/apps/sendtext/basic/configs/ast1/pjsip.conf
@@ -0,0 +1,28 @@
+[global]
+type = global
+debug = yes
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[alice]
+type = aor
+contact = sip:127.0.0.1:5061
+
+[alice]
+type = identify
+endpoint = alice
+match = 127.0.0.1
+
+[alice]
+type = endpoint
+context = default
+disallow = all
+allow = ulaw
+force_rport = yes
+rewrite_contact = yes
+direct_media = no
+aors = alice
+
diff --git a/tests/apps/sendtext/basic/configs/ast1/sip.conf b/tests/apps/sendtext/basic/configs/ast1/sip.conf
deleted file mode 100644
index 1d3f646..0000000
--- a/tests/apps/sendtext/basic/configs/ast1/sip.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[general]
-allowguest=no
-bindaddr=127.0.0.1
-sipdebug=yes
-directmedia=no
-
-[alice]
-type=peer
-context=default
-disallow=all
-allow=ulaw
-qualify=no
-insecure=port,invite
-nat=force_rport
-host=127.0.0.1
-port=5061
-
diff --git a/tests/apps/sendtext/basic/test-config.yaml b/tests/apps/sendtext/basic/test-config.yaml
index aa903a9..64e663b 100644
--- a/tests/apps/sendtext/basic/test-config.yaml
+++ b/tests/apps/sendtext/basic/test-config.yaml
@@ -8,7 +8,7 @@
dependencies:
- app : 'sipp'
- asterisk : 'app_sendtext'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- sip
diff --git a/tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf b/tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf
index 28b9198..25b5b92 100644
--- a/tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf
+++ b/tests/bridge/atxfer_fail_blonde/configs/ast1/extensions.conf
@@ -1,9 +1,9 @@
[default]
-exten => alice_atxfer,1,Dial(SIP/test_call at bob,,T)
+exten => alice_atxfer,1,Dial(PJSIP/test_call at bob,,T)
same => n,Hangup()
-exten => bob_atxfer,1,Dial(SIP/test_call at bob,,t)
+exten => bob_atxfer,1,Dial(PJSIP/test_call at bob,,t)
same => n,Hangup()
exten => 123,1,NoOp(This is the transfer target aka Charlie)
diff --git a/tests/bridge/atxfer_fail_blonde/test-config.yaml b/tests/bridge/atxfer_fail_blonde/test-config.yaml
index c9b2f87..d78cb2d 100644
--- a/tests/bridge/atxfer_fail_blonde/test-config.yaml
+++ b/tests/bridge/atxfer_fail_blonde/test-config.yaml
@@ -24,7 +24,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_atxfer at uut'
+ originate_channel: 'PJSIP/alice_atxfer at uut'
hangup: 'alice'
features:
-
@@ -41,7 +41,7 @@
match:
Event: CEL
EventName: ATTENDEDTRANSFER
- Channel: 'SIP/alice-00000000'
+ Channel: 'PJSIP/alice-00000000'
# hangup the transfer destination
ami-actions:
-
@@ -58,7 +58,7 @@
- python : 'starpy'
- asterisk: 'app_dial'
- asterisk: 'app_echo'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
testconditions:
diff --git a/tests/bridge/atxfer_nominal/configs/ast1/extensions.conf b/tests/bridge/atxfer_nominal/configs/ast1/extensions.conf
index 77d554d..9b324dc 100644
--- a/tests/bridge/atxfer_nominal/configs/ast1/extensions.conf
+++ b/tests/bridge/atxfer_nominal/configs/ast1/extensions.conf
@@ -1,11 +1,11 @@
[default]
-exten => alice_atxfer,1,Dial(SIP/test_call at bob,,T)
+exten => alice_atxfer,1,Dial(PJSIP/test_call at bob,,T)
same => n,Hangup()
-exten => bob_atxfer,1,Dial(SIP/test_call at bob,,t)
+exten => bob_atxfer,1,Dial(PJSIP/test_call at bob,,t)
same => n,Hangup()
exten => 123,1,NoOp(This is our transfer target)
- same => n,Dial(SIP/transfer at charlie,,Tt)
+ same => n,Dial(PJSIP/transfer at charlie,,Tt)
same => n,Hangup()
diff --git a/tests/bridge/atxfer_nominal/configs/ast1/pjsip_sip-alice.conf b/tests/bridge/atxfer_nominal/configs/ast1/pjsip_sip-alice.conf
new file mode 100644
index 0000000..3b312cc
--- /dev/null
+++ b/tests/bridge/atxfer_nominal/configs/ast1/pjsip_sip-alice.conf
@@ -0,0 +1,18 @@
+[alice-extra](!)
+
+[charlie]
+type = aor
+contact = sip:127.0.0.1:5063
+
+[charlie]
+type = identify
+endpoint = charlie
+match = 127.0.0.1:5063
+
+[charlie]
+type = endpoint
+callerid = Charlie <5678>
+send_pai = yes
+allow = !all,ulaw,alaw,gsm
+aors = charlie
+
diff --git a/tests/bridge/atxfer_nominal/configs/ast1/sip-alice.conf b/tests/bridge/atxfer_nominal/configs/ast1/sip-alice.conf
deleted file mode 100644
index 559e86e..0000000
--- a/tests/bridge/atxfer_nominal/configs/ast1/sip-alice.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[alice-extra](!)
-
-[charlie]
-sendrpid=pai
-callerid=Charlie <5678>
-type = peer
-host = 127.0.0.1
-port = 5063
\ No newline at end of file
diff --git a/tests/bridge/atxfer_nominal/configs/ast4/pjsip.conf b/tests/bridge/atxfer_nominal/configs/ast4/pjsip.conf
new file mode 100644
index 0000000..914ebe9
--- /dev/null
+++ b/tests/bridge/atxfer_nominal/configs/ast4/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5063
+
+[uut]
+type = aor
+contact = sip:127.0.0.1:5060
+
+[uut]
+type = endpoint
+allow = !all,ulaw,alaw,gsm
+aors = uut
+
+[uut]
+type = identify
+endpoint = uut
+match = 127.0.0.1
+
diff --git a/tests/bridge/atxfer_nominal/configs/ast4/sip.conf b/tests/bridge/atxfer_nominal/configs/ast4/sip.conf
deleted file mode 100644
index 9a3df35..0000000
--- a/tests/bridge/atxfer_nominal/configs/ast4/sip.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[general]
-udpbindaddr=127.0.0.1:5063
-
-[uut]
-type=peer
-host=127.0.0.1
-port=5060
diff --git a/tests/bridge/atxfer_nominal/test-config.yaml b/tests/bridge/atxfer_nominal/test-config.yaml
index 4ea65e5..79513e8 100644
--- a/tests/bridge/atxfer_nominal/test-config.yaml
+++ b/tests/bridge/atxfer_nominal/test-config.yaml
@@ -42,7 +42,7 @@
asterisk-instances: 4
test-runs:
-
- originate_channel: 'SIP/alice_atxfer at uut'
+ originate_channel: 'PJSIP/alice_atxfer at uut'
features:
-
who: 'alice'
@@ -50,7 +50,7 @@
success: 'true'
exten: '123'
-
- originate_channel: 'SIP/bob_atxfer at uut'
+ originate_channel: 'PJSIP/bob_atxfer at uut'
features:
-
who: 'bob'
@@ -66,6 +66,6 @@
- asterisk: 'app_dial'
- asterisk: 'app_echo'
- asterisk: 'app_userevent'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/atxfer_setup/configs/ast1/extensions.conf b/tests/bridge/atxfer_setup/configs/ast1/extensions.conf
index bf110ad..931a397 100644
--- a/tests/bridge/atxfer_setup/configs/ast1/extensions.conf
+++ b/tests/bridge/atxfer_setup/configs/ast1/extensions.conf
@@ -1,11 +1,11 @@
[default]
-exten => alice_atxfer,1,Dial(SIP/test_call at bob,,Th)
+exten => alice_atxfer,1,Dial(PJSIP/test_call at bob,,Th)
same => n,Hangup()
exten => alice_atxfer2,1,Set(BRIDGE_FEATURES=T)
-same => n,Dial(SIP/test_call at bob,,h)
+same => n,Dial(PJSIP/test_call at bob,,h)
same => n,Hangup()
-exten => bob_atxfer,1,Dial(SIP/test_call at bob,,tH)
+exten => bob_atxfer,1,Dial(PJSIP/test_call at bob,,tH)
same => n,Hangup()
diff --git a/tests/bridge/atxfer_setup/test-config.yaml b/tests/bridge/atxfer_setup/test-config.yaml
index 6867d8f..f27400e 100644
--- a/tests/bridge/atxfer_setup/test-config.yaml
+++ b/tests/bridge/atxfer_setup/test-config.yaml
@@ -20,7 +20,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_atxfer at uut'
+ originate_channel: 'PJSIP/alice_atxfer at uut'
hangup: 'alice'
features:
-
@@ -32,7 +32,7 @@
what: 'atxfer'
success: 'true'
-
- originate_channel: 'SIP/alice_atxfer2 at uut'
+ originate_channel: 'PJSIP/alice_atxfer2 at uut'
hangup: 'alice'
features:
-
@@ -44,7 +44,7 @@
what: 'atxfer'
success: 'true'
-
- originate_channel: 'SIP/bob_atxfer at uut'
+ originate_channel: 'PJSIP/bob_atxfer at uut'
hangup: 'alice'
features:
-
@@ -304,6 +304,6 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf
index f221bc4..55bce92 100644
--- a/tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf
+++ b/tests/bridge/atxfer_threeway_nominal/configs/ast1/extensions.conf
@@ -1,11 +1,11 @@
[default]
-exten => alice_atxfer,1,Dial(SIP/test_call at bob,,T)
+exten => alice_atxfer,1,Dial(PJSIP/test_call at bob,,T)
same => n,Hangup()
-exten => bob_atxfer,1,Dial(SIP/test_call at bob,,t)
+exten => bob_atxfer,1,Dial(PJSIP/test_call at bob,,t)
same => n,Hangup()
exten => 123,1,NoOp(This is our transfer target)
- same => n,Dial(SIP/transfer at charlie,,Tt)
+ same => n,Dial(PJSIP/transfer at charlie,,Tt)
same => n,Hangup()
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
new file mode 100644
index 0000000..189d7b3
--- /dev/null
+++ b/tests/bridge/atxfer_threeway_nominal/configs/ast1/pjsip_sip-alice.conf
@@ -0,0 +1,17 @@
+[alice-extra](!)
+
+[charlie]
+type = aor
+contact = sip:127.0.0.1:5063
+
+[charlie]
+type = identify
+endpoint = charlie
+match = 127.0.0.1:5063
+
+[charlie]
+type = endpoint
+callerid = Charlie <5678>
+send_pai = yes
+allow = !all,ulaw,alaw,gsm
+aors = charlie
diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast1/sip-alice.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast1/sip-alice.conf
deleted file mode 100644
index 589c988..0000000
--- a/tests/bridge/atxfer_threeway_nominal/configs/ast1/sip-alice.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[alice-extra](!)
-
-[charlie]
-sendrpid=pai
-callerid=Charlie <5678>
-type = peer
-host = 127.0.0.1
-port = 5063
-
diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast4/pjsip.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast4/pjsip.conf
new file mode 100644
index 0000000..b453c61
--- /dev/null
+++ b/tests/bridge/atxfer_threeway_nominal/configs/ast4/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5063
+
+[uut]
+type = aor
+contact = sip:127.0.0.1:5060
+
+[uut]
+type = endpoint
+allow = !all,ulaw,alaw,gsm
+aors = uut
+
+[uut]
+type = identify
+endpoint = uut
+match = 127.0.0.1:5060
+
diff --git a/tests/bridge/atxfer_threeway_nominal/configs/ast4/sip.conf b/tests/bridge/atxfer_threeway_nominal/configs/ast4/sip.conf
deleted file mode 100644
index 9a3df35..0000000
--- a/tests/bridge/atxfer_threeway_nominal/configs/ast4/sip.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[general]
-udpbindaddr=127.0.0.1:5063
-
-[uut]
-type=peer
-host=127.0.0.1
-port=5060
diff --git a/tests/bridge/atxfer_threeway_nominal/test-config.yaml b/tests/bridge/atxfer_threeway_nominal/test-config.yaml
index 9f737cf..c5656c3 100644
--- a/tests/bridge/atxfer_threeway_nominal/test-config.yaml
+++ b/tests/bridge/atxfer_threeway_nominal/test-config.yaml
@@ -23,7 +23,7 @@
asterisk-instances: 4
test-runs:
-
- originate_channel: 'SIP/alice_atxfer at uut'
+ originate_channel: 'PJSIP/alice_atxfer at uut'
features:
-
who: 'alice'
@@ -35,7 +35,7 @@
what: 'atxferthreeway'
success: 'true'
-
- originate_channel: 'SIP/bob_atxfer at uut'
+ originate_channel: 'PJSIP/bob_atxfer at uut'
features:
-
who: 'bob'
@@ -65,10 +65,10 @@
conditions:
match:
Event: 'AttendedTransfer'
- OrigTransfererChannel: 'SIP/alice-*'
+ OrigTransfererChannel: 'PJSIP/alice-*'
OrigTransfererConnectedLineNum: '5678'
OrigTransfererConnectedLineName: 'Charlie'
- SecondTransfererChannel: 'SIP/alice-*'
+ SecondTransfererChannel: 'PJSIP/alice-*'
SecondTransfererConnectedLineNum: '5678'
SecondTransfererConnectedLineName: 'Charlie'
DestType: 'Threeway'
@@ -82,10 +82,10 @@
conditions:
match:
Event: 'AttendedTransfer'
- OrigTransfererChannel: 'SIP/bob-*'
+ OrigTransfererChannel: 'PJSIP/bob-*'
OrigTransfererConnectedLineNum: '5678'
OrigTransfererConnectedLineName: 'Charlie'
- SecondTransfererChannel: 'SIP/bob-*'
+ SecondTransfererChannel: 'PJSIP/bob-*'
SecondTransfererConnectedLineNum: '5678'
SecondTransfererConnectedLineName: 'Charlie'
DestType: 'Threeway'
@@ -100,10 +100,10 @@
conditions:
match:
Event: 'VarSet'
- Channel: 'SIP/charlie-*'
+ Channel: 'PJSIP/charlie-*'
ChannelState: '6'
Variable: 'BRIDGEPEER'
- Value: '(SIP/bob-.{8},SIP/alice-.{8}|SIP/alice-.{8},SIP/bob-.{8})'
+ Value: '(PJSIP/bob-.{8},PJSIP/alice-.{8}|PJSIP/alice-.{8},PJSIP/bob-.{8})'
properties:
dependencies:
@@ -112,6 +112,6 @@
- python : 'starpy'
- asterisk: 'app_dial'
- asterisk: 'app_echo'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/automixmon/configs/ast1/extensions.conf b/tests/bridge/automixmon/configs/ast1/extensions.conf
index afe6a6f..a08320a 100644
--- a/tests/bridge/automixmon/configs/ast1/extensions.conf
+++ b/tests/bridge/automixmon/configs/ast1/extensions.conf
@@ -1,7 +1,7 @@
[default]
-exten => alice_automixmon,1,Dial(SIP/test_call at bob,,Xh)
+exten => alice_automixmon,1,Dial(PJSIP/test_call at bob,,Xh)
same => n,Hangup()
-exten => bob_automixmon,1,Dial(SIP/test_call at bob,,xH)
+exten => bob_automixmon,1,Dial(PJSIP/test_call at bob,,xH)
same => n,Hangup()
diff --git a/tests/bridge/automixmon/test-config.yaml b/tests/bridge/automixmon/test-config.yaml
index d4b0840..195d51e 100644
--- a/tests/bridge/automixmon/test-config.yaml
+++ b/tests/bridge/automixmon/test-config.yaml
@@ -20,7 +20,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_automixmon at uut'
+ originate_channel: 'PJSIP/alice_automixmon at uut'
hangup: 'alice'
features:
- # mixmonitor start
@@ -41,7 +41,7 @@
what: 'automixmon'
success: 'true'
-
- originate_channel: 'SIP/bob_automixmon at uut'
+ originate_channel: 'PJSIP/bob_automixmon at uut'
hangup: 'alice'
features:
- # mixmonitor start
@@ -237,6 +237,6 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf b/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf
index 47cba43..de07658 100644
--- a/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf
+++ b/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf
@@ -1,9 +1,9 @@
[default]
exten => alice_automixmon,1,Set(BRIDGE_FEATURES=X)
-same => n,Dial(SIP/test_call at bob,,h)
+same => n,Dial(PJSIP/test_call at bob,,h)
same => n,Hangup()
exten => bob_automixmon,1,Set(BRIDGE_FEATURES=x)
-same => n,Dial(SIP/test_call at bob,,H)
+same => n,Dial(PJSIP/test_call at bob,,H)
same => n,Hangup()
diff --git a/tests/bridge/automixmon_bridgefeatures/test-config.yaml b/tests/bridge/automixmon_bridgefeatures/test-config.yaml
index aa9d175..7b93d52 100644
--- a/tests/bridge/automixmon_bridgefeatures/test-config.yaml
+++ b/tests/bridge/automixmon_bridgefeatures/test-config.yaml
@@ -19,7 +19,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_automixmon at uut'
+ originate_channel: 'PJSIP/alice_automixmon at uut'
hangup: 'alice'
features:
- # mixmonitor start
@@ -40,7 +40,7 @@
what: 'automixmon'
success: 'true'
-
- originate_channel: 'SIP/bob_automixmon at uut'
+ originate_channel: 'PJSIP/bob_automixmon at uut'
hangup: 'alice'
features:
- # mixmonitor start
@@ -235,6 +235,6 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf b/tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf
index 041f0de..2758da8 100644
--- a/tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf
+++ b/tests/bridge/blindxfer_nominal/configs/ast1/extensions.conf
@@ -1,11 +1,11 @@
[default]
-exten => alice_blindxfer,1,Dial(SIP/test_call at bob,,T)
+exten => alice_blindxfer,1,Dial(PJSIP/test_call at bob,,T)
same => n,Hangup()
-exten => bob_blindxfer,1,Dial(SIP/test_call at bob,,t)
+exten => bob_blindxfer,1,Dial(PJSIP/test_call at bob,,t)
same => n,Hangup()
exten => 123,1,NoOp(This is our transfer target)
- same => n,Dial(SIP/transfer at charlie,,Tt)
+ same => n,Dial(PJSIP/transfer at charlie,,Tt)
same => n,Hangup()
diff --git a/tests/bridge/blindxfer_nominal/configs/ast1/pjsip_sip-alice.conf b/tests/bridge/blindxfer_nominal/configs/ast1/pjsip_sip-alice.conf
new file mode 100644
index 0000000..3b312cc
--- /dev/null
+++ b/tests/bridge/blindxfer_nominal/configs/ast1/pjsip_sip-alice.conf
@@ -0,0 +1,18 @@
+[alice-extra](!)
+
+[charlie]
+type = aor
+contact = sip:127.0.0.1:5063
+
+[charlie]
+type = identify
+endpoint = charlie
+match = 127.0.0.1:5063
+
+[charlie]
+type = endpoint
+callerid = Charlie <5678>
+send_pai = yes
+allow = !all,ulaw,alaw,gsm
+aors = charlie
+
diff --git a/tests/bridge/blindxfer_nominal/configs/ast1/sip-alice.conf b/tests/bridge/blindxfer_nominal/configs/ast1/sip-alice.conf
deleted file mode 100644
index 559e86e..0000000
--- a/tests/bridge/blindxfer_nominal/configs/ast1/sip-alice.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[alice-extra](!)
-
-[charlie]
-sendrpid=pai
-callerid=Charlie <5678>
-type = peer
-host = 127.0.0.1
-port = 5063
\ No newline at end of file
diff --git a/tests/bridge/blindxfer_nominal/configs/ast4/pjsip.conf b/tests/bridge/blindxfer_nominal/configs/ast4/pjsip.conf
new file mode 100644
index 0000000..b453c61
--- /dev/null
+++ b/tests/bridge/blindxfer_nominal/configs/ast4/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5063
+
+[uut]
+type = aor
+contact = sip:127.0.0.1:5060
+
+[uut]
+type = endpoint
+allow = !all,ulaw,alaw,gsm
+aors = uut
+
+[uut]
+type = identify
+endpoint = uut
+match = 127.0.0.1:5060
+
diff --git a/tests/bridge/blindxfer_nominal/configs/ast4/sip.conf b/tests/bridge/blindxfer_nominal/configs/ast4/sip.conf
deleted file mode 100644
index 9a3df35..0000000
--- a/tests/bridge/blindxfer_nominal/configs/ast4/sip.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[general]
-udpbindaddr=127.0.0.1:5063
-
-[uut]
-type=peer
-host=127.0.0.1
-port=5060
diff --git a/tests/bridge/blindxfer_nominal/test-config.yaml b/tests/bridge/blindxfer_nominal/test-config.yaml
index 50e555e..5bfe337 100644
--- a/tests/bridge/blindxfer_nominal/test-config.yaml
+++ b/tests/bridge/blindxfer_nominal/test-config.yaml
@@ -42,7 +42,7 @@
asterisk-instances: 4
test-runs:
-
- originate_channel: 'SIP/alice_blindxfer at uut'
+ originate_channel: 'PJSIP/alice_blindxfer at uut'
features:
-
who: 'alice'
@@ -50,7 +50,7 @@
success: 'true'
exten: '123'
-
- originate_channel: 'SIP/bob_blindxfer at uut'
+ originate_channel: 'PJSIP/bob_blindxfer at uut'
features:
-
who: 'bob'
@@ -66,6 +66,6 @@
- asterisk: 'app_dial'
- asterisk: 'app_echo'
- asterisk: 'app_userevent'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/blindxfer_setup/configs/ast1/extensions.conf b/tests/bridge/blindxfer_setup/configs/ast1/extensions.conf
index c0b4c65..5cd71d9 100644
--- a/tests/bridge/blindxfer_setup/configs/ast1/extensions.conf
+++ b/tests/bridge/blindxfer_setup/configs/ast1/extensions.conf
@@ -1,11 +1,11 @@
[default]
-exten => alice_blindxfer,1,Dial(SIP/test_call at bob,,Th)
+exten => alice_blindxfer,1,Dial(PJSIP/test_call at bob,,Th)
same => n,Hangup()
exten => alice_blindxfer2,1,Set(BRIDGE_FEATURES=T)
-same => n,Dial(SIP/test_call at bob,,h)
+same => n,Dial(PJSIP/test_call at bob,,h)
same => n,Hangup()
-exten => bob_blindxfer,1,Dial(SIP/test_call at bob,,tH)
+exten => bob_blindxfer,1,Dial(PJSIP/test_call at bob,,tH)
same => n,Hangup()
diff --git a/tests/bridge/blindxfer_setup/test-config.yaml b/tests/bridge/blindxfer_setup/test-config.yaml
index 735da9f..e2e1fa3 100644
--- a/tests/bridge/blindxfer_setup/test-config.yaml
+++ b/tests/bridge/blindxfer_setup/test-config.yaml
@@ -20,7 +20,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_blindxfer at uut'
+ originate_channel: 'PJSIP/alice_blindxfer at uut'
hangup: 'alice'
features:
-
@@ -32,7 +32,7 @@
what: 'blindxfer'
success: 'true'
-
- originate_channel: 'SIP/alice_blindxfer2 at uut'
+ originate_channel: 'PJSIP/alice_blindxfer2 at uut'
hangup: 'alice'
features:
-
@@ -44,7 +44,7 @@
what: 'blindxfer'
success: 'true'
-
- originate_channel: 'SIP/bob_blindxfer at uut'
+ originate_channel: 'PJSIP/bob_blindxfer at uut'
hangup: 'alice'
features:
-
@@ -304,6 +304,6 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/blonde_nominal/configs/ast1/extensions.conf b/tests/bridge/blonde_nominal/configs/ast1/extensions.conf
index 77d554d..9b324dc 100644
--- a/tests/bridge/blonde_nominal/configs/ast1/extensions.conf
+++ b/tests/bridge/blonde_nominal/configs/ast1/extensions.conf
@@ -1,11 +1,11 @@
[default]
-exten => alice_atxfer,1,Dial(SIP/test_call at bob,,T)
+exten => alice_atxfer,1,Dial(PJSIP/test_call at bob,,T)
same => n,Hangup()
-exten => bob_atxfer,1,Dial(SIP/test_call at bob,,t)
+exten => bob_atxfer,1,Dial(PJSIP/test_call at bob,,t)
same => n,Hangup()
exten => 123,1,NoOp(This is our transfer target)
- same => n,Dial(SIP/transfer at charlie,,Tt)
+ same => n,Dial(PJSIP/transfer at charlie,,Tt)
same => n,Hangup()
diff --git a/tests/bridge/blonde_nominal/configs/ast1/pjsip_sip-alice.conf b/tests/bridge/blonde_nominal/configs/ast1/pjsip_sip-alice.conf
new file mode 100644
index 0000000..3b312cc
--- /dev/null
+++ b/tests/bridge/blonde_nominal/configs/ast1/pjsip_sip-alice.conf
@@ -0,0 +1,18 @@
+[alice-extra](!)
+
+[charlie]
+type = aor
+contact = sip:127.0.0.1:5063
+
+[charlie]
+type = identify
+endpoint = charlie
+match = 127.0.0.1:5063
+
+[charlie]
+type = endpoint
+callerid = Charlie <5678>
+send_pai = yes
+allow = !all,ulaw,alaw,gsm
+aors = charlie
+
diff --git a/tests/bridge/blonde_nominal/configs/ast1/sip-alice.conf b/tests/bridge/blonde_nominal/configs/ast1/sip-alice.conf
deleted file mode 100644
index 559e86e..0000000
--- a/tests/bridge/blonde_nominal/configs/ast1/sip-alice.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[alice-extra](!)
-
-[charlie]
-sendrpid=pai
-callerid=Charlie <5678>
-type = peer
-host = 127.0.0.1
-port = 5063
\ No newline at end of file
diff --git a/tests/bridge/blonde_nominal/configs/ast4/pjsip.conf b/tests/bridge/blonde_nominal/configs/ast4/pjsip.conf
new file mode 100644
index 0000000..b453c61
--- /dev/null
+++ b/tests/bridge/blonde_nominal/configs/ast4/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5063
+
+[uut]
+type = aor
+contact = sip:127.0.0.1:5060
+
+[uut]
+type = endpoint
+allow = !all,ulaw,alaw,gsm
+aors = uut
+
+[uut]
+type = identify
+endpoint = uut
+match = 127.0.0.1:5060
+
diff --git a/tests/bridge/blonde_nominal/test-config.yaml b/tests/bridge/blonde_nominal/test-config.yaml
index 9d28396..812e250 100644
--- a/tests/bridge/blonde_nominal/test-config.yaml
+++ b/tests/bridge/blonde_nominal/test-config.yaml
@@ -29,7 +29,7 @@
asterisk-instances: 4
test-runs:
-
- originate_channel: 'SIP/alice_atxfer at uut'
+ originate_channel: 'PJSIP/alice_atxfer at uut'
features:
-
who: 'alice'
@@ -37,7 +37,7 @@
success: 'true'
exten: '123'
-
- originate_channel: 'SIP/bob_atxfer at uut'
+ originate_channel: 'PJSIP/bob_atxfer at uut'
features:
-
who: 'bob'
@@ -52,6 +52,6 @@
- python : 'starpy'
- asterisk: 'app_dial'
- asterisk: 'app_echo'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/connected_line_update/configs/ast1/extensions.conf b/tests/bridge/connected_line_update/configs/ast1/extensions.conf
index d54a1c0..129f832 100644
--- a/tests/bridge/connected_line_update/configs/ast1/extensions.conf
+++ b/tests/bridge/connected_line_update/configs/ast1/extensions.conf
@@ -10,6 +10,6 @@
[default]
exten => simple_bridge,1,NoOp()
-same => n,Dial(SIP/test_call at bob)
+same => n,Dial(PJSIP/test_call at bob)
same => n,Hangup()
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
new file mode 100644
index 0000000..97841ed
--- /dev/null
+++ b/tests/bridge/connected_line_update/configs/ast1/pjsip_sip-alice.conf
@@ -0,0 +1,6 @@
+[alice-extra](!)
+send_pai=true
+trust_connected_line=true
+send_connected_line=true
+trust_id_inbound=true
+trust_id_outbound=true
\ No newline at end of file
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
new file mode 100644
index 0000000..0f6f6d1
--- /dev/null
+++ b/tests/bridge/connected_line_update/configs/ast1/pjsip_sip-bob.conf
@@ -0,0 +1,6 @@
+[bob-extra](!)
+send_pai=true
+trust_connected_line=true
+send_connected_line=true
+trust_id_inbound=true
+trust_id_outbound=true
\ No newline at end of file
diff --git a/tests/bridge/connected_line_update/configs/ast1/sip-alice.conf b/tests/bridge/connected_line_update/configs/ast1/sip-alice.conf
deleted file mode 100644
index f876215..0000000
--- a/tests/bridge/connected_line_update/configs/ast1/sip-alice.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[alice-extra](!)
-trustrpid=yes
diff --git a/tests/bridge/connected_line_update/configs/ast1/sip-bob.conf b/tests/bridge/connected_line_update/configs/ast1/sip-bob.conf
deleted file mode 100644
index e098b3a..0000000
--- a/tests/bridge/connected_line_update/configs/ast1/sip-bob.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[bob-extra](!)
-trustrpid=yes
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
new file mode 100644
index 0000000..22c658b
--- /dev/null
+++ b/tests/bridge/connected_line_update/configs/ast2/pjsip_sip-uut.conf
@@ -0,0 +1,6 @@
+[uut-extra](!)
+send_pai=true
+trust_connected_line=true
+send_connected_line=true
+trust_id_inbound=true
+trust_id_outbound=true
\ No newline at end of file
diff --git a/tests/bridge/connected_line_update/configs/ast2/sip-uut.conf b/tests/bridge/connected_line_update/configs/ast2/sip-uut.conf
deleted file mode 100644
index 9978755..0000000
--- a/tests/bridge/connected_line_update/configs/ast2/sip-uut.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[uut-extra](!)
-sendrpid=pai
-trustrpid=yes
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
new file mode 100644
index 0000000..22c658b
--- /dev/null
+++ b/tests/bridge/connected_line_update/configs/ast3/pjsip_sip-uut.conf
@@ -0,0 +1,6 @@
+[uut-extra](!)
+send_pai=true
+trust_connected_line=true
+send_connected_line=true
+trust_id_inbound=true
+trust_id_outbound=true
\ No newline at end of file
diff --git a/tests/bridge/connected_line_update/configs/ast3/sip-uut.conf b/tests/bridge/connected_line_update/configs/ast3/sip-uut.conf
deleted file mode 100644
index 9978755..0000000
--- a/tests/bridge/connected_line_update/configs/ast3/sip-uut.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[uut-extra](!)
-sendrpid=pai
-trustrpid=yes
diff --git a/tests/bridge/connected_line_update/test-config.yaml b/tests/bridge/connected_line_update/test-config.yaml
index 22e7830..e95b1ad 100644
--- a/tests/bridge/connected_line_update/test-config.yaml
+++ b/tests/bridge/connected_line_update/test-config.yaml
@@ -1,4 +1,5 @@
testinfo:
+ skip: 'requires further rework for pjsip, see ASTERISK-30292'
summary: 'Connected line update propagation across a bridge'
description: |
'Set up a bridge between two endpoints and ensure that the initial connected line update moves across the bridge as well as subsequent updates.'
@@ -20,7 +21,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/uut/simple_bridge'
+ originate_channel: 'PJSIP/simple_bridge at uut'
ami-uut:
-
@@ -86,7 +87,7 @@
- asterisk: 'app_dial'
- asterisk: 'app_stack'
- asterisk: 'app_userevent'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
- asterisk: 'func_callerid'
tags:
- bridge
diff --git a/tests/bridge/dial_LS_options/configs/ast1/extensions.conf b/tests/bridge/dial_LS_options/configs/ast1/extensions.conf
index 9ddfb9b..189d765 100644
--- a/tests/bridge/dial_LS_options/configs/ast1/extensions.conf
+++ b/tests/bridge/dial_LS_options/configs/ast1/extensions.conf
@@ -1,25 +1,25 @@
[default]
exten => no_warning,1,NoOp()
-same => n,Dial(SIP/test_call at bob,,L(10000))
+same => n,Dial(PJSIP/test_call at bob,,L(10000))
same => n,Hangup()
exten => caller_warning,1,NoOp()
same => n,Set(LIMIT_WARNING_FILE=beep)
-same => n,Dial(SIP/test_call at bob,,L(10000:5000))
+same => n,Dial(PJSIP/test_call at bob,,L(10000:5000))
same => n,Hangup()
exten => callee_warning,1,NoOp()
same => n,Set(LIMIT_WARNING_FILE=beep)
same => n,Set(LIMIT_PLAYAUDIO_CALLER=no)
same => n,Set(LIMIT_PLAYAUDIO_CALLEE=yes)
-same => n,Dial(SIP/test_call at bob,,L(10000:5000))
+same => n,Dial(PJSIP/test_call at bob,,L(10000:5000))
exten => both_warning,1,NoOp()
same => n,Set(LIMIT_WARNING_FILE=beep)
same => n,Set(LIMIT_PLAYAUDIO_CALLEE=yes)
-same => n,Dial(SIP/test_call at bob,,L(10000:5000))
+same => n,Dial(PJSIP/test_call at bob,,L(10000:5000))
exten => no_warning_s,1,NoOp()
-same => n,Dial(SIP/test_call at bob,,S(10))
+same => n,Dial(PJSIP/test_call at bob,,S(10))
same => n,Hangup()
diff --git a/tests/bridge/dial_LS_options/test-config.yaml b/tests/bridge/dial_LS_options/test-config.yaml
index 5d3c3be..2bcb14a 100644
--- a/tests/bridge/dial_LS_options/test-config.yaml
+++ b/tests/bridge/dial_LS_options/test-config.yaml
@@ -17,21 +17,21 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/uut/no_warning'
+ originate_channel: 'PJSIP/no_warning at uut'
-
- originate_channel: 'SIP/uut/caller_warning'
+ originate_channel: 'PJSIP/caller_warning at uut'
-
- originate_channel: 'SIP/uut/callee_warning'
+ originate_channel: 'PJSIP/callee_warning at uut'
-
- originate_channel: 'SIP/uut/both_warning'
+ originate_channel: 'PJSIP/both_warning at uut'
-
- originate_channel: 'SIP/uut/no_warning_s'
+ originate_channel: 'PJSIP/no_warning_s at uut'
properties:
dependencies:
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/disconnect/configs/ast1/extensions.conf b/tests/bridge/disconnect/configs/ast1/extensions.conf
index ebe1c20..a33f119 100644
--- a/tests/bridge/disconnect/configs/ast1/extensions.conf
+++ b/tests/bridge/disconnect/configs/ast1/extensions.conf
@@ -1,11 +1,11 @@
[default]
-exten => alice_disconnect,1,Dial(SIP/test_call at bob,,Ht)
+exten => alice_disconnect,1,Dial(PJSIP/test_call at bob,,Ht)
same => n,Hangup()
exten => alice_disconnect2,1,Set(BRIDGE_FEATURES=H)
-same => n,Dial(SIP/test_call at bob,,t)
+same => n,Dial(PJSIP/test_call at bob,,t)
same => n,Hangup()
-exten => bob_disconnect,1,Dial(SIP/test_call at bob,,hT)
+exten => bob_disconnect,1,Dial(PJSIP/test_call at bob,,hT)
same => n,Hangup()
diff --git a/tests/bridge/disconnect/test-config.yaml b/tests/bridge/disconnect/test-config.yaml
index d238512..853877f 100644
--- a/tests/bridge/disconnect/test-config.yaml
+++ b/tests/bridge/disconnect/test-config.yaml
@@ -19,7 +19,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_disconnect at uut'
+ originate_channel: 'PJSIP/alice_disconnect at uut'
features:
-
who: 'bob'
@@ -30,7 +30,7 @@
what: 'disconnect'
success: 'true'
-
- originate_channel: 'SIP/alice_disconnect2 at uut'
+ originate_channel: 'PJSIP/alice_disconnect2 at uut'
features:
-
who: 'bob'
@@ -41,7 +41,7 @@
what: 'disconnect'
success: 'true'
-
- originate_channel: 'SIP/bob_disconnect at uut'
+ originate_channel: 'PJSIP/bob_disconnect at uut'
features:
-
who: 'alice'
@@ -299,6 +299,6 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/parkcall/configs/ast1/extensions.conf b/tests/bridge/parkcall/configs/ast1/extensions.conf
index 45763dc..0de9739 100644
--- a/tests/bridge/parkcall/configs/ast1/extensions.conf
+++ b/tests/bridge/parkcall/configs/ast1/extensions.conf
@@ -1,7 +1,7 @@
[default]
-exten => alice_parkcall,1,Dial(SIP/test_call at bob,,Kh)
+exten => alice_parkcall,1,Dial(PJSIP/test_call at bob,,Kh)
same => n,Hangup
-exten => bob_parkcall,1,Dial(SIP/test_call at bob,,kH)
+exten => bob_parkcall,1,Dial(PJSIP/test_call at bob,,kH)
same => n,Hangup
diff --git a/tests/bridge/parkcall/test-config.yaml b/tests/bridge/parkcall/test-config.yaml
index 10f4928..ef385e2 100644
--- a/tests/bridge/parkcall/test-config.yaml
+++ b/tests/bridge/parkcall/test-config.yaml
@@ -26,7 +26,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_parkcall at uut'
+ originate_channel: 'PJSIP/alice_parkcall at uut'
features:
-
who: 'bob'
@@ -38,7 +38,7 @@
success: 'true'
-
- originate_channel: 'SIP/bob_parkcall at uut'
+ originate_channel: 'PJSIP/bob_parkcall at uut'
features:
-
who: 'alice'
@@ -101,7 +101,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
- parking
diff --git a/tests/bridge/parkcall_blindxfer/Hangup.py b/tests/bridge/parkcall_blindxfer/Hangup.py
index 84edebb..b062803 100755
--- a/tests/bridge/parkcall_blindxfer/Hangup.py
+++ b/tests/bridge/parkcall_blindxfer/Hangup.py
@@ -34,17 +34,17 @@
if parkee is None:
LOGGER.error("Received TestEvent without a channel.\n")
- if parkee == 'SIP/alice-00000004':
+ if parkee == 'PJSIP/alice-00000004':
# channel which parking failed for
- LOGGER.info("Hanging up channel: SIP/bob-00000005")
- ami.hangup('SIP/bob-00000005')
+ LOGGER.info("Hanging up channel: PJSIP/bob-00000005")
+ ami.hangup('PJSIP/bob-00000005')
# the call that was parked
LOGGER.info("Hanging up channel: Local/fill-park at default-00000000;2")
ami.hangup('Local/fill-park at default-00000000;2')
- elif parkee == 'SIP/alice-00000008':
+ elif parkee == 'PJSIP/alice-00000008':
# channel which parking failed for
- LOGGER.info("Hanging up channel: SIP/bob-00000009")
- ami.hangup('SIP/bob-00000009')
+ LOGGER.info("Hanging up channel: PJSIP/bob-00000009")
+ ami.hangup('PJSIP/bob-00000009')
# the call that was parked
LOGGER.info("Hanging up channel: Local/fill-park at default-00000001;2")
ami.hangup('Local/fill-park at default-00000001;2')
diff --git a/tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf b/tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf
index 1136d75..d4aabce 100644
--- a/tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf
+++ b/tests/bridge/parkcall_blindxfer/configs/ast1/extensions.conf
@@ -4,13 +4,13 @@
; Dial bob
exten => bob,1,NoOp()
- same => n,Dial(SIP/test_call at bob,,T)
+ same => n,Dial(PJSIP/test_call at bob,,T)
same => n,Hangup()
exten => bob-static,1,NoOp()
same => n,Set(PARKINGLOT=parkinglot_static)
same => n,NoOp(CHANNEL TYPE: ${CHANNEL(channeltype)})
- same => n,ExecIf($["${CHANNEL(channeltype)}" = "SIP"]?Goto(bob,1):Goto(echo,1))
+ same => n,ExecIf($["${CHANNEL(channeltype)}" = "PJSIP"]?Goto(bob,1):Goto(echo,1))
; Create a Local channel and park it to fill up the parking slot
; for the static lot before calling Bob.
@@ -22,7 +22,7 @@
exten => bob-dynamic,1,NoOp()
same => n,Gosub(dynparkvars,1)
same => n,NoOp(CHANNEL TYPE: ${CHANNEL(channeltype)})
- same => n,ExecIf($["${CHANNEL(channeltype)}" = "SIP"]?Goto(bob,1):Goto(echo,1))
+ same => n,ExecIf($["${CHANNEL(channeltype)}" = "PJSIP"]?Goto(bob,1):Goto(echo,1))
; Create a Local channel and park it to fill up the parking slot
; for the dynamically created lot before calling Bob.
diff --git a/tests/bridge/parkcall_blindxfer/test-config.yaml b/tests/bridge/parkcall_blindxfer/test-config.yaml
index b5d5bcf..58e1592 100644
--- a/tests/bridge/parkcall_blindxfer/test-config.yaml
+++ b/tests/bridge/parkcall_blindxfer/test-config.yaml
@@ -23,7 +23,7 @@
test-runs:
# Alice blind xfers Bob to the empty default lot.
-
- originate_channel: 'SIP/bob at uut'
+ originate_channel: 'PJSIP/bob at uut'
features:
-
who: 'alice'
@@ -33,7 +33,7 @@
# Alice blind xfers Bob to an empty static custom lot.
-
- originate_channel: 'SIP/bob-static at uut'
+ originate_channel: 'PJSIP/bob-static at uut'
features:
-
who: 'alice'
@@ -45,7 +45,7 @@
# create a local channel and park it to prevent bob's channel from being
# parked.
-
- originate_channel: 'SIP/bob-static-full at uut'
+ originate_channel: 'PJSIP/bob-static-full at uut'
features:
-
who: 'alice'
@@ -55,7 +55,7 @@
# Alice blind xfers Bob to an empty dynamically created lot.
-
- originate_channel: 'SIP/bob-dynamic at uut'
+ originate_channel: 'PJSIP/bob-dynamic at uut'
features:
-
who: 'alice'
@@ -67,7 +67,7 @@
# will create a local channel and park it to prevent bob's channel from
# being parked.
-
- originate_channel: 'SIP/bob-dynamic-full at uut'
+ originate_channel: 'PJSIP/bob-dynamic-full at uut'
features:
-
who: 'alice'
@@ -83,7 +83,7 @@
conditions:
match:
Event: 'Hangup'
- Channel: 'SIP/alice-0000000(0|2|4|6|8)'
+ Channel: 'PJSIP/alice-0000000(0|2|4|6|8)'
requirements:
match:
Cause: '16'
@@ -98,10 +98,10 @@
conditions:
match:
Event: 'ParkedCall'
- ParkeeChannel: 'SIP/bob-00000001'
+ ParkeeChannel: 'PJSIP/bob-00000001'
ParkingSpace: '701'
Parkinglot: 'default'
- ParkerDialString: 'SIP/alice'
+ ParkerDialString: 'PJSIP/alice'
callbackModule: 'Hangup'
callbackMethod: 'handle_parkedcall'
count: '1'
@@ -115,10 +115,10 @@
conditions:
match:
Event: 'ParkedCall'
- ParkeeChannel: 'SIP/bob-00000003'
+ ParkeeChannel: 'PJSIP/bob-00000003'
ParkingSpace: '801'
Parkinglot: 'parkinglot_static'
- ParkerDialString: 'SIP/alice'
+ ParkerDialString: 'PJSIP/alice'
callbackModule: 'Hangup'
callbackMethod: 'handle_parkedcall'
count: '1'
@@ -151,7 +151,7 @@
Type: 'StateChange'
State: 'PLAYBACK'
Message: 'pbx-parkingfailed'
- Channel: 'SIP/alice-0000000(4|8)'
+ Channel: 'PJSIP/alice-0000000(4|8)'
callbackModule: 'Hangup'
callbackMethod: 'handle_testevent'
count: '2'
@@ -165,10 +165,10 @@
conditions:
match:
Event: 'ParkedCall'
- ParkeeChannel: 'SIP/bob-00000007'
+ ParkeeChannel: 'PJSIP/bob-00000007'
ParkingSpace: '901'
Parkinglot: 'parkinglot_dynamic'
- ParkerDialString: 'SIP/alice'
+ ParkerDialString: 'PJSIP/alice'
callbackModule: 'Hangup'
callbackMethod: 'handle_parkedcall'
count: '1'
@@ -197,7 +197,7 @@
- asterisk: 'app_dial'
- asterisk: 'app_echo'
- asterisk: 'app_stack'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
- asterisk: 'func_channel'
tags:
- bridge
diff --git a/tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf b/tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf
index d068a67..d9005a8 100644
--- a/tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf
+++ b/tests/bridge/parkcall_bridgefeatures/configs/ast1/extensions.conf
@@ -1,9 +1,9 @@
[default]
exten => alice_parkcall,1,Set(BRIDGE_FEATURES=K)
-same => n,Dial(SIP/test_call at bob,,h)
+same => n,Dial(PJSIP/test_call at bob,,h)
same => n,Hangup
exten => bob_parkcall,1,Set(BRIDGE_FEATURES=k)
-same => n,Dial(SIP/test_call at bob,,H)
+same => n,Dial(PJSIP/test_call at bob,,H)
same => n,Hangup
diff --git a/tests/bridge/parkcall_bridgefeatures/test-config.yaml b/tests/bridge/parkcall_bridgefeatures/test-config.yaml
index 1c0870d..e1bc48f 100644
--- a/tests/bridge/parkcall_bridgefeatures/test-config.yaml
+++ b/tests/bridge/parkcall_bridgefeatures/test-config.yaml
@@ -21,7 +21,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_parkcall at uut'
+ originate_channel: 'PJSIP/alice_parkcall at uut'
features:
-
who: 'bob'
@@ -33,7 +33,7 @@
success: 'true'
-
- originate_channel: 'SIP/bob_parkcall at uut'
+ originate_channel: 'PJSIP/bob_parkcall at uut'
features:
-
who: 'alice'
@@ -96,7 +96,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
- asterisk: 'res_parking'
tags:
- bridge
diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py b/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py
index c08628e..6d988bc 100755
--- a/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py
+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py
@@ -23,11 +23,11 @@
self.test_object = test_object
self.calls = []
- self.calls.append({'test': '1', 'parker': 'SIP/alice',
+ self.calls.append({'test': '1', 'parker': 'PJSIP/alice',
'lot': 'parkinglot_test1', 'slot': '401'})
- self.calls.append({'test': '2', 'parker': 'SIP/alice',
+ self.calls.append({'test': '2', 'parker': 'PJSIP/alice',
'lot': 'parkinglot_test2', 'slot': '501'})
- self.calls.append({'test': '3', 'parker': 'SIP/alice',
+ self.calls.append({'test': '3', 'parker': 'PJSIP/alice',
'lot': 'parkinglot_test3', 'slot': '601'})
self.userevents_received = 0
self.passed_dialplan = 0
@@ -56,7 +56,7 @@
appdata = event.get('appdata')
registrar = event.get('registrar')
- if appdata != 'SIP/alice,3':
+ if appdata != 'PJSIP/alice,3':
not_right = True
if registrar != 'res_parking':
not_right = True
diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf b/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf
index dd857da..27ce450 100644
--- a/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf
+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/extensions.conf
@@ -1,22 +1,22 @@
[default]
exten => uncaller,1,NoOp()
-same => n,Dial(SIP/test_call at alice,,Kh)
+same => n,Dial(PJSIP/test_call at alice,,Kh)
same => n, Hangup
exten => test1,1,NoOp(BAAA)
same => n,Set(CHANNEL(parkinglot)=parkinglot_test1)
-same => n,Dial(SIP/test_call at bob,,Kh)
+same => n,Dial(PJSIP/test_call at bob,,Kh)
same => n,Hangup
exten => test2,1,NoOp(BAAB)
same => n,Set(CHANNEL(parkinglot)=parkinglot_test2)
-same => n,Dial(SIP/test_call at bob,,Kh)
+same => n,Dial(PJSIP/test_call at bob,,Kh)
same => n,Hangup
exten => test3,1,NoOp(BAAC)
same => n,Set(CHANNEL(parkinglot)=parkinglot_test3)
-same => n,Dial(SIP/test_call at bob,,Kh)
+same => n,Dial(PJSIP/test_call at bob,,Kh)
same => n,Hangup
exten => s,1,NoOp(AAAAC)
diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml b/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml
index 3f2afcf..8f1403d 100644
--- a/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml
+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml
@@ -1,4 +1,5 @@
testinfo:
+ skip: 'requires further rework for pjsip, see ASTERISK-30292'
summary: 'Test call parking timeouts for comebacktoorigin off'
description: |
'This test builds on the more generic parkcall test. With comebacktoorigin disabled,
@@ -22,21 +23,21 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/test1 at uut'
+ originate_channel: 'PJSIP/test1 at uut'
features:
-
who: 'alice'
what: 'parkcall'
success: 'true'
-
- originate_channel: 'SIP/test2 at uut'
+ originate_channel: 'PJSIP/test2 at uut'
features:
-
who: 'alice'
what: 'parkcall'
success: 'true'
-
- originate_channel: 'SIP/test3 at uut'
+ originate_channel: 'PJSIP/test3 at uut'
features:
-
who: 'alice'
@@ -145,7 +146,7 @@
- python : 'starpy'
- asterisk: 'app_dial'
- asterisk: 'app_userevent'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
- asterisk: 'func_channel'
tags:
- bridge
diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py
index 26c62d8..e867745 100755
--- a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py
+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py
@@ -24,11 +24,11 @@
self.test_object = test_object
self.calls = []
- self.calls.append({'parker': 'SIP/alice', 'lot': 'parkinglot_test1',
+ self.calls.append({'parker': 'PJSIP/alice', 'lot': 'parkinglot_test1',
'slot': '401', 'status': 'ANSWER', 'post': False})
- self.calls.append({'parker': 'SIP/alice', 'lot': 'parkinglot_test1',
+ self.calls.append({'parker': 'PJSIP/alice', 'lot': 'parkinglot_test1',
'slot': '402', 'status': 'NOANSWER', 'post': True})
- self.calls.append({'parker': 'SIP/alice', 'lot': 'parkinglot_test1',
+ self.calls.append({'parker': 'PJSIP/alice', 'lot': 'parkinglot_test1',
'slot': '403', 'status': 'BUSY', 'post': True})
self.current_call = None
self.current_call_post = False
diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf
index d3a8fe2..56a5ac1 100644
--- a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf
+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/extensions.conf
@@ -1,7 +1,7 @@
[default]
exten => test,1,NoOp(BAAA)
same => n,Set(CHANNEL(parkinglot)=parkinglot_test1)
-same => n,Dial(SIP/test_call at bob,,Kh)
+same => n,Dial(PJSIP/test_call at bob,,Kh)
same => n,Hangup
[park-dial]
diff --git a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml
index 8615c8c..144c8d0 100644
--- a/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml
+++ b/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml
@@ -1,4 +1,5 @@
testinfo:
+ skip: 'requires further rework for pjsip, see ASTERISK-30292'
summary: 'Test call parking timeouts for comebacktoorigin off'
description: |
'This test builds on the more generic parkcall test. With comebacktoorigin enabled,
@@ -21,21 +22,21 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/test at uut'
+ originate_channel: 'PJSIP/test at uut'
features:
-
who: 'alice'
what: 'parkcall'
success: 'true'
-
- originate_channel: 'SIP/test at uut'
+ originate_channel: 'PJSIP/test at uut'
features:
-
who: 'alice'
what: 'parkcall'
success: 'true'
-
- originate_channel: 'SIP/test at uut'
+ originate_channel: 'PJSIP/test at uut'
features:
-
who: 'alice'
@@ -172,7 +173,7 @@
- asterisk: 'app_senddtmf'
- asterisk: 'app_talkdetect'
- asterisk: 'app_userevent'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
- asterisk: 'func_channel'
tags:
- bridge
diff --git a/tests/bridge/simple_bridge/configs/ast1/extensions.conf b/tests/bridge/simple_bridge/configs/ast1/extensions.conf
index eca1a10..029bdb5 100644
--- a/tests/bridge/simple_bridge/configs/ast1/extensions.conf
+++ b/tests/bridge/simple_bridge/configs/ast1/extensions.conf
@@ -1,4 +1,4 @@
[default]
-exten => test_call,1,Dial(SIP/test_call at bob,,wW)
+exten => test_call,1,Dial(PJSIP/test_call at bob,,wW)
same => n,Hangup()
diff --git a/tests/bridge/simple_bridge/test-config.yaml b/tests/bridge/simple_bridge/test-config.yaml
index 49da8ed..b2acc88 100644
--- a/tests/bridge/simple_bridge/test-config.yaml
+++ b/tests/bridge/simple_bridge/test-config.yaml
@@ -25,10 +25,10 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/test_call at uut'
+ originate_channel: 'PJSIP/test_call at uut'
hangup: 'alice'
-
- originate_channel: 'SIP/test_call at uut'
+ originate_channel: 'PJSIP/test_call at uut'
hangup: 'bob'
ami-uut-v12:
@@ -49,7 +49,7 @@
conditions:
match:
Event: 'BridgeEnter'
- Channel: 'SIP/alice-.*'
+ Channel: 'PJSIP/alice-.*'
requirements:
match:
BridgeUniqueid: '.*-.*-.*'
@@ -72,7 +72,7 @@
conditions:
match:
Event: 'BridgeEnter'
- Channel: 'SIP/bob-.*'
+ Channel: 'PJSIP/bob-.*'
requirements:
match:
BridgeUniqueid: '.*-.*-.*'
@@ -94,7 +94,7 @@
conditions:
match:
Event: 'BridgeLeave'
- Channel: 'SIP/alice-.*'
+ Channel: 'PJSIP/alice-.*'
requirements:
match:
BridgeUniqueid: '.*-.*-.*'
@@ -117,7 +117,7 @@
conditions:
match:
Event: 'BridgeLeave'
- Channel: 'SIP/bob-.*'
+ Channel: 'PJSIP/bob-.*'
requirements:
match:
BridgeUniqueid: '.*-.*-.*'
@@ -362,6 +362,6 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf b/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf
index 300a5ab..d817852 100644
--- a/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf
+++ b/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf
@@ -1,7 +1,7 @@
[default]
-exten => alice_opt,1,Dial(SIP/test_call at bob,,Th)
+exten => alice_opt,1,Dial(PJSIP/test_call at bob,,Th)
same => n,Hangup()
-exten => bob_opt,1,Dial(SIP/test_call at bob,,tH)
+exten => bob_opt,1,Dial(PJSIP/test_call at bob,,tH)
same => n,Hangup()
diff --git a/tests/bridge/transfer_capabilities/test-config.yaml b/tests/bridge/transfer_capabilities/test-config.yaml
index 19b451c..ebb5a32 100644
--- a/tests/bridge/transfer_capabilities/test-config.yaml
+++ b/tests/bridge/transfer_capabilities/test-config.yaml
@@ -11,7 +11,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
@@ -33,7 +33,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_opt at uut'
+ originate_channel: 'PJSIP/alice_opt at uut'
hangup: 'alice'
features:
-
@@ -53,7 +53,7 @@
what: 'atxfer'
success: 'true'
-
- originate_channel: 'SIP/bob_opt at uut'
+ originate_channel: 'PJSIP/bob_opt at uut'
hangup: 'alice'
features:
-
diff --git a/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf b/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf
index 9afe0f9..0d6ae12 100644
--- a/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf
+++ b/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf
@@ -1,10 +1,10 @@
[default]
exten => alice_bridge_features,1,Set(BRIDGE_FEATURES=T)
-same => n,Dial(SIP/test_call at bob,,h)
+same => n,Dial(PJSIP/test_call at bob,,h)
same => n,Hangup()
exten => bob_bridge_features,1,Set(BRIDGE_FEATURES=t)
-same => n,Dial(SIP/test_call at bob,,H)
+same => n,Dial(PJSIP/test_call at bob,,H)
same => n,Hangup()
diff --git a/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml b/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml
index 0edf62f..cdfc79b 100644
--- a/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml
+++ b/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml
@@ -11,7 +11,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
@@ -33,7 +33,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_bridge_features at uut'
+ originate_channel: 'PJSIP/alice_bridge_features at uut'
hangup: 'alice'
features:
-
@@ -53,7 +53,7 @@
what: 'atxfer'
success: 'true'
-
- originate_channel: 'SIP/bob_bridge_features at uut'
+ originate_channel: 'PJSIP/bob_bridge_features at uut'
hangup: 'alice'
features:
-
diff --git a/tests/bridge/transfer_failure/configs/ast1/extensions.conf b/tests/bridge/transfer_failure/configs/ast1/extensions.conf
index cec6e34..f70688d 100644
--- a/tests/bridge/transfer_failure/configs/ast1/extensions.conf
+++ b/tests/bridge/transfer_failure/configs/ast1/extensions.conf
@@ -1,14 +1,14 @@
[default]
-exten => alice_blind,1,Dial(SIP/test_call at bob,,T)
+exten => alice_blind,1,Dial(PJSIP/test_call at bob,,T)
same => n,Hangup()
-exten => alice_attended,1,Dial(SIP/test_call at bob,,T)
+exten => alice_attended,1,Dial(PJSIP/test_call at bob,,T)
same => n,Hangup()
-exten => bob_blind,1,Dial(SIP/test_call at bob,,t)
+exten => bob_blind,1,Dial(PJSIP/test_call at bob,,t)
same => n,Hangup()
-exten => bob_attended,1,Dial(SIP/test_call at bob,,t)
+exten => bob_attended,1,Dial(PJSIP/test_call at bob,,t)
same => n,Hangup()
diff --git a/tests/bridge/transfer_failure/test-config.yaml b/tests/bridge/transfer_failure/test-config.yaml
index 05e338d..01518b4 100644
--- a/tests/bridge/transfer_failure/test-config.yaml
+++ b/tests/bridge/transfer_failure/test-config.yaml
@@ -10,7 +10,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
@@ -32,7 +32,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/alice_blind at uut'
+ originate_channel: 'PJSIP/alice_blind at uut'
hangup: 'alice'
features:
-
@@ -41,7 +41,7 @@
success: 'true'
exten: '77'
-
- originate_channel: 'SIP/alice_attended at uut'
+ originate_channel: 'PJSIP/alice_attended at uut'
hangup: 'alice'
features:
-
@@ -50,7 +50,7 @@
success: 'true'
exten: '77'
-
- originate_channel: 'SIP/bob_blind at uut'
+ originate_channel: 'PJSIP/bob_blind at uut'
hangup: 'bob'
features:
-
@@ -59,7 +59,7 @@
success: 'true'
exten: '77'
-
- originate_channel: 'SIP/bob_attended at uut'
+ originate_channel: 'PJSIP/bob_attended at uut'
hangup: 'bob'
features:
-
@@ -90,7 +90,7 @@
type: 'cel'
conditions:
match:
- Channel: 'SIP/alice-.*'
+ Channel: 'PJSIP/alice-.*'
requirements:
-
match:
diff --git a/tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf b/tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf
index 4512766..97bb0d7 100644
--- a/tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf
+++ b/tests/cdr/app_dial_G_flag/configs/ast1/extensions.conf
@@ -1,7 +1,7 @@
[default]
exten => s,1,Noop
-exten => s,n,Dial(sip/127.0.0.2,,G(hangup^1))
+exten => s,n,Dial(pjsip/127.0.0.2,,G(hangup^1))
exten => hangup,1,Noop
exten => hangup,n,Answer
diff --git a/tests/cdr/app_dial_G_flag/configs/ast1/pjsip.conf b/tests/cdr/app_dial_G_flag/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..01209a1
--- /dev/null
+++ b/tests/cdr/app_dial_G_flag/configs/ast1/pjsip.conf
@@ -0,0 +1,5 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5060
+
diff --git a/tests/cdr/app_dial_G_flag/configs/ast1/sip.conf b/tests/cdr/app_dial_G_flag/configs/ast1/sip.conf
deleted file mode 100644
index d719906..0000000
--- a/tests/cdr/app_dial_G_flag/configs/ast1/sip.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1:5060
-bindaddr = 127.0.0.1
-
diff --git a/tests/cdr/app_dial_G_flag/test-config.yaml b/tests/cdr/app_dial_G_flag/test-config.yaml
index 562c294..0195241 100644
--- a/tests/cdr/app_dial_G_flag/test-config.yaml
+++ b/tests/cdr/app_dial_G_flag/test-config.yaml
@@ -13,7 +13,7 @@
- app : 'asttest'
- sipp :
version : 'v3.0'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- SIP
- CDR
diff --git a/tests/cdr/app_dial_G_flag/test.lua b/tests/cdr/app_dial_G_flag/test.lua
index 9526b79..5183910 100644
--- a/tests/cdr/app_dial_G_flag/test.lua
+++ b/tests/cdr/app_dial_G_flag/test.lua
@@ -37,7 +37,7 @@
print("starting asterisk")
a = ast.new()
a:load_config("configs/ast1/extensions.conf")
-a:load_config("configs/ast1/sip.conf")
+a:load_config("configs/ast1/pjsip.conf")
a:generate_manager_conf()
a:spawn()
diff --git a/tests/cdr/app_queue/configs/ast1/modules.conf.inc b/tests/cdr/app_queue/configs/ast1/modules.conf.inc
index 8e029d2..4acbb6c 100644
--- a/tests/cdr/app_queue/configs/ast1/modules.conf.inc
+++ b/tests/cdr/app_queue/configs/ast1/modules.conf.inc
@@ -1,3 +1,3 @@
load => res_musiconhold.so
-load => chan_sip.so
+load => chan_pjsip.so
load => app_queue.so
diff --git a/tests/cdr/app_queue/configs/ast1/pjsip.conf b/tests/cdr/app_queue/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..01209a1
--- /dev/null
+++ b/tests/cdr/app_queue/configs/ast1/pjsip.conf
@@ -0,0 +1,5 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5060
+
diff --git a/tests/cdr/app_queue/configs/ast1/queues.conf b/tests/cdr/app_queue/configs/ast1/queues.conf
index 2a719be..daf66c8 100644
--- a/tests/cdr/app_queue/configs/ast1/queues.conf
+++ b/tests/cdr/app_queue/configs/ast1/queues.conf
@@ -4,7 +4,7 @@
joinempty = yes
[one-member]
-member = SIP/answered at 127.0.0.2
+member = PJSIP/answered at 127.0.0.2
[zero-members-exit-empty]
joinempty = no
diff --git a/tests/cdr/app_queue/configs/ast1/sip.conf b/tests/cdr/app_queue/configs/ast1/sip.conf
deleted file mode 100644
index 160d1e2..0000000
--- a/tests/cdr/app_queue/configs/ast1/sip.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1:5060
-bindaddr = 127.0.0.1
-canreinvite = no
-pedantic = no
-
diff --git a/tests/cdr/app_queue/test-config.yaml b/tests/cdr/app_queue/test-config.yaml
index 6a23c76..56519b8 100644
--- a/tests/cdr/app_queue/test-config.yaml
+++ b/tests/cdr/app_queue/test-config.yaml
@@ -13,8 +13,8 @@
- app : 'asttest'
- sipp :
version : 'v3.0'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- - SIP
+ - PJSIP
- queue
- CDR
diff --git a/tests/cdr/app_queue/test.lua b/tests/cdr/app_queue/test.lua
index 175b61b..9019708 100644
--- a/tests/cdr/app_queue/test.lua
+++ b/tests/cdr/app_queue/test.lua
@@ -92,7 +92,7 @@
-- start asterisk
print("starting asterisk")
a = ast.new()
-a:load_config("configs/ast1/sip.conf")
+a:load_config("configs/ast1/pjsip.conf")
a:load_config("configs/ast1/extensions.conf")
a:load_config("configs/ast1/cdr.conf")
a:load_config("configs/ast1/queues.conf")
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
index 989340f..e94d973 100644
--- 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
@@ -7,7 +7,7 @@
[default]
exten => 1,1,NoOp(Dial something that should fail)
exten => 1,n,Set(CDR(accountcode)=cdrtest_local)
-exten => 1,n,Dial(SIP/test/2)
+exten => 1,n,Dial(PJSIP/2 at test)
exten => 1,n,Playback(silence/3)
exten => 1,n,ForkCDR(e)
exten => 1,n,Playback(silence/4)
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
new file mode 100644
index 0000000..072bdb2
--- /dev/null
+++ b/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = test_context
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
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
deleted file mode 100644
index 52cda20..0000000
--- a/tests/cdr/cdr_manipulation/cdr_fork_end_time/configs/ast1/sip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[general]
-context=default
-udpbindaddr=127.0.0.1
-directmedia=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
-context=test_context
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
index 9198a01..f2329c1 100644
--- a/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml
+++ b/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml
@@ -43,7 +43,7 @@
destination: '1'
dcontext: 'default'
channel: 'Local/1 at default-.*'
- dchannel: 'SIP/test-.*'
+ dchannel: 'PJSIP/test-.*'
disposition: 'NO ANSWER'
-
accountcode: 'cdrtest_local'
@@ -68,7 +68,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- CDR
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
new file mode 100644
index 0000000..2aa548c
--- /dev/null
+++ b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1:5070
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+disallow = all
+allow = ulaw
+direct_media = no
+aors = test
+
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
deleted file mode 100644
index db3fa67..0000000
--- a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/branch-1.4/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-context=default
-bindaddr=127.0.0.1
-canreinvite=no
-disallow=all
-allow=ulaw
-
-[test]
-type=peer
-host=127.0.0.1
-port=5070
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
index 7964365..6d72f8b 100644
--- 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
@@ -7,12 +7,12 @@
[default]
exten => 1,1,NoOp(Dial something that should fail)
exten => 1,n,Set(CDR(accountcode)=cdrtest_local)
-exten => 1,n,Dial(SIP/test/2)
+exten => 1,n,Dial(PJSIP/2 at test)
exten => 1,n,Goto(${DIALSTATUS})
exten => 1,n,Hangup
exten => 1,n(BUSY),NoOp()
exten => 1,n,ForkCDR
-exten => 1,n,Dial(SIP/test/3)
+exten => 1,n,Dial(PJSIP/3 at test)
exten => 1,n,Hangup
exten => 2,1,NoOp()
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
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
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
deleted file mode 100644
index abffb74..0000000
--- a/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/configs/ast1/sip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[general]
-context=default
-udpbindaddr=127.0.0.1
-directmedia=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
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
index 08b3adf..95724bc 100644
--- 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
@@ -38,29 +38,29 @@
accountcode: 'cdrtest_local'
destination: '1'
lastapp: 'Dial'
- lastarg: 'SIP/test/2'
+ lastarg: 'PJSIP/2 at test'
dcontext: 'default'
channel: 'Local/1 at default-.*'
- dchannel: 'SIP/test-.*'
+ dchannel: 'PJSIP/test-.*'
disposition: 'BUSY'
amaflags: 'DOCUMENTATION'
-
accountcode: 'cdrtest_local'
destination: '1'
lastapp: 'Dial'
- lastarg: 'SIP/test/3'
+ lastarg: 'PJSIP/3 at test'
dcontext: 'default'
channel: 'Local/1 at default-.*'
- dchannel: 'SIP/test-.*'
+ dchannel: 'PJSIP/test-.*'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
-
accountcode: 'cdrtest_local'
destination: '1'
lastapp: 'Dial'
- lastarg: 'SIP/test/3'
+ lastarg: 'PJSIP/3 at test'
dcontext: 'default'
- dchannel: 'SIP/test-.*'
+ dchannel: 'PJSIP/test-.*'
channel: 'Local/1 at default-.*'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
@@ -70,7 +70,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- CDR
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
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
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
deleted file mode 100644
index 56ca78f..0000000
--- a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/branch-1.4/sip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[general]
-context=default
-bindaddr=127.0.0.1
-canreinvite=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
-
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
index f0454b9..4da3d5c 100644
--- 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
@@ -9,7 +9,7 @@
exten => 1,n,Set(CDR(accountcode)=cdrtest_local)
exten => 1,n,Playback(silence/3)
exten => 1,n,ForkCDR
-exten => 1,n,Dial(SIP/test/2)
+exten => 1,n,Dial(PJSIP/2 at test)
exten => 2,1,NoOp()
exten => 2,n,Answer()
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
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
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
deleted file mode 100644
index c0ba7d0..0000000
--- a/tests/cdr/cdr_manipulation/console_fork_before_dial/configs/ast1/sip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[general]
-context=default
-udpbindaddr=127.0.0.1
-directmedia=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
-
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
index e1adfb2..2f31c5c 100644
--- a/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml
+++ b/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml
@@ -1,8 +1,8 @@
testinfo:
- summary: CLI exec console dial which calls ForkCDR before dialing via SIP which answers
+ summary: CLI exec console dial which calls ForkCDR before dialing via PJSIP which answers
description: |
'An Asterisk instance originates a Local channel which will play silence for about
- 3 seconds before using ForkCDR and then dial itself via SIP. The receiving channel
+ 3 seconds before using ForkCDR and then dial itself via PJSIP. The receiving channel
answers and then immediately hangs up. CDRs are tested for expected behavior.'
test-modules:
@@ -52,7 +52,7 @@
accountcode: 'cdrtest_sip'
destination: '2'
dcontext: 'default'
- channel: 'SIP/test-.*'
+ channel: 'PJSIP/test-.*'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
@@ -61,7 +61,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- dial
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
index 9b7c502..09f7d2d 100644
--- a/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/extensions.conf
+++ b/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/extensions.conf
@@ -7,7 +7,7 @@
[default]
exten => 1,1,NoOp()
same => n,Set(CDR(accountcode)=cdrtest_local)
- same => n,Dial(SIP/test/2)
+ same => n,Dial(PJSIP/2 at test)
exten => 2,1,NoOp()
same => n,Congestion()
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
new file mode 100644
index 0000000..5e94092
--- /dev/null
+++ b/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/pjsip.conf
@@ -0,0 +1,21 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
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
deleted file mode 100644
index e9cea12..0000000
--- a/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/sip.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[general]
-context=default
-udpbindaddr=127.0.0.1
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
diff --git a/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml b/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml
index c3ae774..6b830a6 100644
--- a/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml
+++ b/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml
@@ -1,7 +1,7 @@
testinfo:
- summary: CLI exec console dial which dials via SIP which returns congestion
+ summary: CLI exec console dial which dials via PJSIP which returns congestion
description: |
- 'Asterisk dials an extension locally which dials with SIP
+ 'Asterisk dials an extension locally which dials with PJSIP
to another extension which does not pick up and sends congestion.'
test-modules:
@@ -33,7 +33,7 @@
destination: '2'
dcontext: 'default'
callerid: '"Anonymous" <Anonymous>'
- channel: 'SIP/test-00000001'
+ channel: 'PJSIP/test-00000001'
disposition: 'CONGESTION'
amaflags: 'DOCUMENTATION'
-
@@ -49,8 +49,8 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- - SIP
+ - PJSIP
- CDR
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
index 52a7903..28efb53 100644
--- a/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/extensions.conf
+++ b/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/extensions.conf
@@ -2,11 +2,11 @@
[default]
exten = test1,1,Noop
-exten = test1,n,Dial(SIP/test1)
+exten = test1,n,Dial(PJSIP/test1)
exten = test2,1,Noop
-exten = test2,n,Dial(SIP/test2)
+exten = test2,n,Dial(PJSIP/test2)
exten = test3,1,Noop
-exten = test3,n,Dial(SIP/test3)
+exten = test3,n,Dial(PJSIP/test3)
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
new file mode 100644
index 0000000..a535630
--- /dev/null
+++ b/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5060
+
+[test1]
+type = aor
+max_contacts = 1
+remove_existing = true
+
+[test1]
+type = endpoint
+direct_media = no
+accountcode = account1
+allow = !all,ulaw,alaw,gsm
+aors = test1
+
+[test2]
+type = aor
+max_contacts = 1
+remove_existing = true
+
+[test2]
+type = endpoint
+direct_media = no
+allow = !all,ulaw,alaw,gsm
+aors = test2
+
+[test3]
+type = aor
+max_contacts = 1
+remove_existing = true
+
+[test3]
+type = endpoint
+direct_media = no
+accountcode = account3
+allow = !all,ulaw,alaw,gsm
+aors = test3
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
deleted file mode 100644
index 27ec165..0000000
--- a/tests/cdr/cdr_properties/blind-transfer-accountcode/configs/ast1/sip.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1
-bindaddr = 127.0.0.1
-canreinvite = no
-pedantic = no
-
-[test1]
-type = friend
-host = dynamic
-accountcode = account1
-
-[test2]
-type = friend
-host = dynamic
-;accountcode = account2
-
-[test3]
-type = friend
-host = dynamic
-accountcode = account3
-
diff --git a/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml b/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml
index 66e13bb..491b143 100644
--- a/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml
+++ b/tests/cdr/cdr_properties/blind-transfer-accountcode/test-config.yaml
@@ -1,5 +1,6 @@
testinfo:
- summary: 'Test account code propagation for SIP blind transfers.'
+ skip: 'requires further rework for pjsip, see ASTERISK-30292'
+ summary: 'Test account code propagation for PJSIP blind transfers.'
description: |
"This test ensures that when a channel with an account code, dials a
channel without an account code, then transfers the dialed channel to
@@ -15,11 +16,11 @@
version : 'v3.0'
feature : 'TLS'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- CDR
- - SIP
+ - PJSIP
- transfer
test-modules:
@@ -124,15 +125,15 @@
destination: 'test3'
accountcode: 'account1'
disposition: 'ANSWERED'
- channel: 'SIP/test1-.*'
- dchannel: 'SIP/test3-.*'
+ channel: 'PJSIP/test1-.*'
+ dchannel: 'PJSIP/test3-.*'
-
source: 'test3'
destination: 'test2'
accountcode: 'account1'
disposition: 'ANSWERED'
- channel: 'SIP/test3-.*'
- dchannel: 'SIP/test2-.*'
+ channel: 'PJSIP/test3-.*'
+ dchannel: 'PJSIP/test2-.*'
-
file: 'account1'
lines:
@@ -141,14 +142,14 @@
destination: 'test3'
accountcode: 'account1'
disposition: 'ANSWERED'
- channel: 'SIP/test1-.*'
- dchannel: 'SIP/test3-.*'
+ channel: 'PJSIP/test1-.*'
+ dchannel: 'PJSIP/test3-.*'
-
source: 'test3'
destination: 'test2'
accountcode: 'account1'
disposition: 'ANSWERED'
- channel: 'SIP/test3-.*'
- dchannel: 'SIP/test2-.*'
+ channel: 'PJSIP/test3-.*'
+ dchannel: 'PJSIP/test2-.*'
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
new file mode 100644
index 0000000..3c79e34
--- /dev/null
+++ b/tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/pjsip.conf
@@ -0,0 +1,21 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = test
+direct_media = no
+accountcode = cdrtest_sip
+aors = test
+
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
deleted file mode 100644
index 718b218..0000000
--- a/tests/cdr/console_dial_sip_answer/configs/ast1/branch-1.4/sip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[general]
-context=default
-bindaddr=127.0.0.1
-canreinvite=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
-context=test
diff --git a/tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf b/tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf
index 7ee0e54..fbee9ac 100644
--- a/tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf
+++ b/tests/cdr/console_dial_sip_answer/configs/ast1/extensions.conf
@@ -7,7 +7,7 @@
[default]
exten => 1,1,NoOp()
exten => 1,n,Set(CDR(accountcode)=cdrtest_local)
-exten => 1,n,Dial(SIP/test/2)
+exten => 1,n,Dial(PJSIP/2 at test)
[test]
exten => 2,1,NoOp()
diff --git a/tests/cdr/console_dial_sip_answer/configs/ast1/pjsip.conf b/tests/cdr/console_dial_sip_answer/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..d7146a0
--- /dev/null
+++ b/tests/cdr/console_dial_sip_answer/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = test
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
diff --git a/tests/cdr/console_dial_sip_answer/configs/ast1/sip.conf b/tests/cdr/console_dial_sip_answer/configs/ast1/sip.conf
deleted file mode 100644
index 04ab7d8..0000000
--- a/tests/cdr/console_dial_sip_answer/configs/ast1/sip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[general]
-context=default
-udpbindaddr=127.0.0.1
-directmedia=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
-context=test
diff --git a/tests/cdr/console_dial_sip_answer/test-config.yaml b/tests/cdr/console_dial_sip_answer/test-config.yaml
index 12ade6c..57425b1 100644
--- a/tests/cdr/console_dial_sip_answer/test-config.yaml
+++ b/tests/cdr/console_dial_sip_answer/test-config.yaml
@@ -42,7 +42,7 @@
accountcode: 'cdrtest_sip'
destination: '2'
dcontext: 'test'
- channel: 'SIP/test-.*'
+ channel: 'PJSIP/test-.*'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
@@ -52,7 +52,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- CDR
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
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
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
deleted file mode 100644
index 0e20399..0000000
--- a/tests/cdr/console_dial_sip_busy/configs/ast1/branch-1.4/sip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[general]
-context=default
-bindaddr=127.0.0.1
-canreinvite=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
diff --git a/tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf b/tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf
index f3adbc0..ee4e201 100644
--- a/tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf
+++ b/tests/cdr/console_dial_sip_busy/configs/ast1/extensions.conf
@@ -7,7 +7,7 @@
[default]
exten => 1,1,NoOp()
exten => 1,n,Set(CDR(accountcode)=cdrtest_local)
-exten => 1,n,Dial(SIP/2 at test)
+exten => 1,n,Dial(PJSIP/2 at test)
exten => 2,1,Busy()
exten => 2,n,Hangup()
diff --git a/tests/cdr/console_dial_sip_busy/configs/ast1/pjsip.conf b/tests/cdr/console_dial_sip_busy/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/console_dial_sip_busy/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
diff --git a/tests/cdr/console_dial_sip_busy/configs/ast1/sip.conf b/tests/cdr/console_dial_sip_busy/configs/ast1/sip.conf
deleted file mode 100644
index abffb74..0000000
--- a/tests/cdr/console_dial_sip_busy/configs/ast1/sip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[general]
-context=default
-udpbindaddr=127.0.0.1
-directmedia=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
diff --git a/tests/cdr/console_dial_sip_busy/test-config.yaml b/tests/cdr/console_dial_sip_busy/test-config.yaml
index 5015805..79bee03 100644
--- a/tests/cdr/console_dial_sip_busy/test-config.yaml
+++ b/tests/cdr/console_dial_sip_busy/test-config.yaml
@@ -1,7 +1,7 @@
testinfo:
- summary: CLI exec console dial which dials via SIP which returns busy
+ summary: CLI exec console dial which dials via PJSIP which returns busy
description: |
- 'An Asterisk instance dials itself from a local channel via SIP.
+ 'An Asterisk instance dials itself from a local channel via PJSIP.
The extension sends a busy indication.'
test-modules:
@@ -33,7 +33,7 @@
destination: '1'
dcontext: 'default'
channel: 'Local/1 at default-.*'
- dchannel: 'SIP/test-.*'
+ dchannel: 'PJSIP/test-.*'
disposition: 'BUSY'
amaflags: 'DOCUMENTATION'
@@ -42,10 +42,10 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- dial
- CDR
- - SIP
+ - PJSIP
- chan_local
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
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
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
deleted file mode 100644
index 56ca78f..0000000
--- a/tests/cdr/console_dial_sip_congestion/configs/ast1/branch-1.4/sip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[general]
-context=default
-bindaddr=127.0.0.1
-canreinvite=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
-
diff --git a/tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf b/tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf
index 23f8469..088ea40 100644
--- a/tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf
+++ b/tests/cdr/console_dial_sip_congestion/configs/ast1/extensions.conf
@@ -7,7 +7,7 @@
[default]
exten => 1,1,NoOp()
exten => 1,n,Set(CDR(accountcode)=cdrtest_local)
-exten => 1,n,Dial(SIP/test/2)
+exten => 1,n,Dial(PJSIP/2 at test)
exten => 2,1,NoOp()
exten => 2,n,Congestion()
diff --git a/tests/cdr/console_dial_sip_congestion/configs/ast1/pjsip.conf b/tests/cdr/console_dial_sip_congestion/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/console_dial_sip_congestion/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
diff --git a/tests/cdr/console_dial_sip_congestion/configs/ast1/sip.conf b/tests/cdr/console_dial_sip_congestion/configs/ast1/sip.conf
deleted file mode 100644
index c0ba7d0..0000000
--- a/tests/cdr/console_dial_sip_congestion/configs/ast1/sip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[general]
-context=default
-udpbindaddr=127.0.0.1
-directmedia=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
-
diff --git a/tests/cdr/console_dial_sip_congestion/test-config.yaml b/tests/cdr/console_dial_sip_congestion/test-config.yaml
index cc2e750..4c64b78 100644
--- a/tests/cdr/console_dial_sip_congestion/test-config.yaml
+++ b/tests/cdr/console_dial_sip_congestion/test-config.yaml
@@ -1,8 +1,8 @@
testinfo:
- summary: CLI exec console dial which dials via SIP which returns congestion
+ summary: CLI exec console dial which dials via PJSIP which returns congestion
description: |
- 'An Asterisk instance originates a local channel to dial itself via SIP.
- Upon reaching the extension the SIP channel dials, Asterisk will return congestion.'
+ 'An Asterisk instance originates a local channel to dial itself via PJSIP.
+ Upon reaching the extension the PJSIP channel dials, Asterisk will return congestion.'
test-modules:
test-object:
@@ -33,7 +33,7 @@
destination: '1'
dcontext: 'default'
channel: 'Local/1 at default-.*'
- dchannel: 'SIP/test-.*'
+ dchannel: 'PJSIP/test-.*'
disposition: 'FAILED'
amaflags: 'DOCUMENTATION'
@@ -42,10 +42,10 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- dial
- - SIP
+ - PJSIP
- CDR
- chan_local
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
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
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
deleted file mode 100644
index 56ca78f..0000000
--- a/tests/cdr/console_dial_sip_transfer/configs/ast1/branch-1.4/sip.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[general]
-context=default
-bindaddr=127.0.0.1
-canreinvite=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
-
diff --git a/tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf b/tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf
index 18b294e..14905ca 100644
--- a/tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf
+++ b/tests/cdr/console_dial_sip_transfer/configs/ast1/extensions.conf
@@ -7,7 +7,7 @@
[default]
exten => 1,1,NoOp()
exten => 1,n,Set(CDR(accountcode)=cdrtest_local)
-exten => 1,n,Dial(SIP/2 at test)
+exten => 1,n,Dial(PJSIP/2 at test)
exten => 2,1,NoOp()
exten => 2,n,Set(CDR(accountcode)=cdrtest_local2)
diff --git a/tests/cdr/console_dial_sip_transfer/configs/ast1/pjsip.conf b/tests/cdr/console_dial_sip_transfer/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..d21a880
--- /dev/null
+++ b/tests/cdr/console_dial_sip_transfer/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[test]
+type = aor
+contact = sip:127.0.0.1
+
+[test]
+type = identify
+endpoint = test
+match = 127.0.0.1
+
+[test]
+type = endpoint
+context = default
+direct_media = no
+accountcode = cdrtest_sip
+allow = ulaw
+aors = test
+
diff --git a/tests/cdr/console_dial_sip_transfer/configs/ast1/sip.conf b/tests/cdr/console_dial_sip_transfer/configs/ast1/sip.conf
deleted file mode 100644
index abffb74..0000000
--- a/tests/cdr/console_dial_sip_transfer/configs/ast1/sip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[general]
-context=default
-udpbindaddr=127.0.0.1
-directmedia=no
-
-[test]
-type=peer
-host=127.0.0.1
-accountcode=cdrtest_sip
diff --git a/tests/cdr/console_dial_sip_transfer/test-config.yaml b/tests/cdr/console_dial_sip_transfer/test-config.yaml
index f14464d..7ebe7a2 100644
--- a/tests/cdr/console_dial_sip_transfer/test-config.yaml
+++ b/tests/cdr/console_dial_sip_transfer/test-config.yaml
@@ -1,7 +1,7 @@
testinfo:
- summary: CLI exec console dial which dials via SIP which transfers the call
+ summary: CLI exec console dial which dials via PJSIP which transfers the call
description: |
- 'One Asterisk instance with console dial calls another instance via SIP.
+ 'One Asterisk instance with console dial calls another instance via PJSIP.
the other instance transfers to another extension and the CDRs are
tested for expected behavior.'
@@ -34,7 +34,7 @@
destination: '1'
dcontext: 'default'
channel: 'Local/1 at default-.*'
- dchannel: 'SIP/test-.*'
+ dchannel: 'PJSIP/test-.*'
disposition: 'NO ANSWER'
amaflags: 'DOCUMENTATION'
-
@@ -61,11 +61,11 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- accountcode
- dial
- - SIP
+ - PJSIP
- CDR
- chan_local
- transfer
diff --git a/tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf b/tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf
index a3da4fe..ac8f705 100644
--- a/tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf
+++ b/tests/cdr/originate-cdr-disposition/configs/ast1/extensions.conf
@@ -7,5 +7,5 @@
exten => wait,n,Hangup
exten => dial,1,Noop
-exten => dial,n,Dial(sip/test2,1)
+exten => dial,n,Dial(pjsip/1 at test2)
diff --git a/tests/cdr/originate-cdr-disposition/configs/ast1/pjsip.conf b/tests/cdr/originate-cdr-disposition/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..a00ee1e
--- /dev/null
+++ b/tests/cdr/originate-cdr-disposition/configs/ast1/pjsip.conf
@@ -0,0 +1,37 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5060
+
+[test1]
+type = aor
+contact = sip:127.0.0.2
+
+[test1]
+type = identify
+endpoint = test1
+match = 127.0.0.2
+
+[test1]
+type = endpoint
+direct_media = no
+accountcode = account1
+allow = !all,ulaw,alaw,gsm
+aors = test1
+
+[test2]
+type = aor
+contact = sip:127.0.0.3
+
+[test2]
+type = identify
+endpoint = test2
+match = 127.0.0.3
+
+[test2]
+type = endpoint
+direct_media = no
+accountcode = account2
+allow = !all,ulaw,alaw,gsm
+aors = test2
+
diff --git a/tests/cdr/originate-cdr-disposition/configs/ast1/sip.conf b/tests/cdr/originate-cdr-disposition/configs/ast1/sip.conf
deleted file mode 100644
index a04b870..0000000
--- a/tests/cdr/originate-cdr-disposition/configs/ast1/sip.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1:5060
-bindaddr = 127.0.0.1
-canreinvite = no
-
-[test1]
-type = friend
-host = 127.0.0.2
-accountcode = account1
-
-[test2]
-type = friend
-host = 127.0.0.3
-accountcode = account2
-
diff --git a/tests/cdr/originate-cdr-disposition/test-config.yaml b/tests/cdr/originate-cdr-disposition/test-config.yaml
index 847adbd..3eaa840 100644
--- a/tests/cdr/originate-cdr-disposition/test-config.yaml
+++ b/tests/cdr/originate-cdr-disposition/test-config.yaml
@@ -1,4 +1,5 @@
testinfo:
+ skip: 'requires further rework for pjsip, see ASTERISK-30292'
summary: 'Test for proper CDR dispositions when originating calls.'
description: |
"This test verifies that the CDRs generated during originates have the
@@ -14,9 +15,9 @@
- sipp :
version : 'v3.0'
- asterisk : 'cdr_csv'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- - SIP
+ - PJSIP
- CDR
test-modules:
@@ -40,40 +41,40 @@
lines:
-
disposition: 'ANSWERED'
- channel: 'SIP/test1-.*'
+ channel: 'PJSIP/test1-.*'
dchannel: ''
-
disposition: 'BUSY'
- channel: 'SIP/test1-.*'
+ channel: 'PJSIP/test1-.*'
dchannel: ''
-
disposition: 'FAILED'
- channel: 'SIP/test1-.*'
+ channel: 'PJSIP/test1-.*'
dchannel: ''
-
disposition: 'NO ANSWER'
- channel: 'SIP/test1-.*'
+ channel: 'PJSIP/test1-.*'
dchannel: ''
-
disposition: 'NO ANSWER'
- channel: 'SIP/test1-.*'
- dchannel: 'SIP/test2-.*'
+ channel: 'PJSIP/test1-.*'
+ dchannel: 'PJSIP/test2-.*'
sequence-originator:
-
- parameters: { channel: 'sip/test1', context: 'default', exten: 'wait', priority: '1' }
+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'wait', priority: '1' }
ignore-originate-failure: False
-
- parameters: { channel: 'sip/test1', context: 'default', exten: 'wait', priority: '1' }
+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'wait', priority: '1' }
ignore-originate-failure: True
-
- parameters: { channel: 'sip/test1', context: 'default', exten: 'wait', priority: '1' }
+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'wait', priority: '1' }
ignore-originate-failure: True
-
- parameters: { channel: 'sip/test1', context: 'default', exten: 'wait', priority: '1', timeout: 1 }
+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'wait', priority: '1', timeout: 1 }
ignore-originate-failure: True
-
- parameters: { channel: 'sip/test1', context: 'default', exten: 'dial', priority: '1' }
+ parameters: { channel: 'pjsip/test1', context: 'default', exten: 'dial', priority: '1' }
ignore-originate-failure: True
diff --git a/tests/channels/local/local_app/configs/ast1/extensions.conf b/tests/channels/local/local_app/configs/ast1/extensions.conf
index 3692c25..c826e27 100644
--- a/tests/channels/local/local_app/configs/ast1/extensions.conf
+++ b/tests/channels/local/local_app/configs/ast1/extensions.conf
@@ -7,7 +7,7 @@
same => n,Hangup()
exten => dial_foo,1,NoOp()
- same => n,Dial(SIP/foo at asterisk)
+ same => n,Dial(PJSIP/foo at asterisk)
same => n,Hangup()
exten => foo,1,NoOp()
diff --git a/tests/channels/local/local_app/configs/ast1/pjsip.conf b/tests/channels/local/local_app/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..5496e8a
--- /dev/null
+++ b/tests/channels/local/local_app/configs/ast1/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[asterisk]
+type = aor
+contact = sip:127.0.0.1
+
+[asterisk]
+type = endpoint
+allow = ulaw
+aors = asterisk
+
+[asterisk]
+type = identify
+endpoint = asterisk
+match = 127.0.0.1
+
diff --git a/tests/channels/local/local_app/configs/ast1/sip.conf b/tests/channels/local/local_app/configs/ast1/sip.conf
deleted file mode 100644
index 710eb26..0000000
--- a/tests/channels/local/local_app/configs/ast1/sip.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1
-
-[asterisk]
-type = friend
-host = 127.0.0.1
-
diff --git a/tests/channels/local/local_app/test-config.yaml b/tests/channels/local/local_app/test-config.yaml
index d9ff9a7..b582206 100644
--- a/tests/channels/local/local_app/test-config.yaml
+++ b/tests/channels/local/local_app/test-config.yaml
@@ -19,7 +19,7 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- chan_local
diff --git a/tests/channels/local/local_call/configs/ast1/extensions.conf b/tests/channels/local/local_call/configs/ast1/extensions.conf
index 9dd72f4..38f3c1d 100644
--- a/tests/channels/local/local_call/configs/ast1/extensions.conf
+++ b/tests/channels/local/local_call/configs/ast1/extensions.conf
@@ -8,11 +8,11 @@
same => n,Hangup()
exten => dial_bar,1,NoOp()
- same => n,Dial(SIP/bar at asterisk)
+ same => n,Dial(PJSIP/bar at asterisk)
same => n,Hangup()
exten => dial_foo,1,NoOp()
- same => n,Dial(SIP/foo at asterisk)
+ same => n,Dial(PJSIP/foo at asterisk)
same => n,Hangup()
exten => foo,1,NoOp()
diff --git a/tests/channels/local/local_call/configs/ast1/pjsip.conf b/tests/channels/local/local_call/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..5496e8a
--- /dev/null
+++ b/tests/channels/local/local_call/configs/ast1/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[asterisk]
+type = aor
+contact = sip:127.0.0.1
+
+[asterisk]
+type = endpoint
+allow = ulaw
+aors = asterisk
+
+[asterisk]
+type = identify
+endpoint = asterisk
+match = 127.0.0.1
+
diff --git a/tests/channels/local/local_call/configs/ast1/sip.conf b/tests/channels/local/local_call/configs/ast1/sip.conf
deleted file mode 100644
index 710eb26..0000000
--- a/tests/channels/local/local_call/configs/ast1/sip.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1
-
-[asterisk]
-type = friend
-host = 127.0.0.1
-
diff --git a/tests/channels/local/local_call/test-config.yaml b/tests/channels/local/local_call/test-config.yaml
index 62e4230..b8f839e 100644
--- a/tests/channels/local/local_call/test-config.yaml
+++ b/tests/channels/local/local_call/test-config.yaml
@@ -13,7 +13,7 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- chan_local
diff --git a/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf b/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf
index 816a8aa..8853363 100644
--- a/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf
+++ b/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf
@@ -7,7 +7,7 @@
same => n,Hangup()
exten => dial_foo,1,NoOp()
- same => n,Dial(SIP/foo at asterisk)
+ same => n,Dial(PJSIP/foo at asterisk)
same => n,Hangup()
exten => foo,1,NoOp()
diff --git a/tests/channels/local/local_holding_bridge/configs/ast1/pjsip.conf b/tests/channels/local/local_holding_bridge/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..5496e8a
--- /dev/null
+++ b/tests/channels/local/local_holding_bridge/configs/ast1/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[asterisk]
+type = aor
+contact = sip:127.0.0.1
+
+[asterisk]
+type = endpoint
+allow = ulaw
+aors = asterisk
+
+[asterisk]
+type = identify
+endpoint = asterisk
+match = 127.0.0.1
+
diff --git a/tests/channels/local/local_holding_bridge/configs/ast1/sip.conf b/tests/channels/local/local_holding_bridge/configs/ast1/sip.conf
deleted file mode 100644
index 710eb26..0000000
--- a/tests/channels/local/local_holding_bridge/configs/ast1/sip.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1
-
-[asterisk]
-type = friend
-host = 127.0.0.1
-
diff --git a/tests/channels/local/local_holding_bridge/test-config.yaml b/tests/channels/local/local_holding_bridge/test-config.yaml
index 37207aa..a385caa 100644
--- a/tests/channels/local/local_holding_bridge/test-config.yaml
+++ b/tests/channels/local/local_holding_bridge/test-config.yaml
@@ -14,7 +14,7 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- chan_local
diff --git a/tests/channels/local/local_optimize_away/configs/ast1/extensions.conf b/tests/channels/local/local_optimize_away/configs/ast1/extensions.conf
index d1c153e..27bff2f 100644
--- a/tests/channels/local/local_optimize_away/configs/ast1/extensions.conf
+++ b/tests/channels/local/local_optimize_away/configs/ast1/extensions.conf
@@ -8,11 +8,11 @@
same => n,Hangup()
exten => dial_bar,1,NoOp()
- same => n,Dial(SIP/bar at asterisk)
+ same => n,Dial(PJSIP/bar at asterisk)
same => n,Hangup()
exten => dial_foo,1,NoOp()
- same => n,Dial(SIP/foo at asterisk)
+ same => n,Dial(PJSIP/foo at asterisk)
same => n,Hangup()
exten => foo,1,NoOp()
diff --git a/tests/channels/local/local_optimize_away/configs/ast1/pjsip.conf b/tests/channels/local/local_optimize_away/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..17dee85
--- /dev/null
+++ b/tests/channels/local/local_optimize_away/configs/ast1/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 0.0.0.0
+
+[asterisk]
+type = aor
+contact = sip:127.0.0.1
+
+[asterisk]
+type = endpoint
+allow = ulaw
+aors = asterisk
+
+[asterisk]
+type = identify
+endpoint = asterisk
+match = 127.0.0.1
+
diff --git a/tests/channels/local/local_optimize_away/configs/ast1/sip.conf b/tests/channels/local/local_optimize_away/configs/ast1/sip.conf
deleted file mode 100644
index 710eb26..0000000
--- a/tests/channels/local/local_optimize_away/configs/ast1/sip.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[general]
-udpbindaddr = 127.0.0.1
-
-[asterisk]
-type = friend
-host = 127.0.0.1
-
diff --git a/tests/channels/local/local_optimize_away/test-config.yaml b/tests/channels/local/local_optimize_away/test-config.yaml
index 83f4f86..afc5a56 100644
--- a/tests/channels/local/local_optimize_away/test-config.yaml
+++ b/tests/channels/local/local_optimize_away/test-config.yaml
@@ -11,7 +11,7 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- chan_local
diff --git a/tests/feature_call_pickup/configs/ast1/extensions.conf b/tests/feature_call_pickup/configs/ast1/extensions.conf
index bbc2912..25f367b 100644
--- a/tests/feature_call_pickup/configs/ast1/extensions.conf
+++ b/tests/feature_call_pickup/configs/ast1/extensions.conf
@@ -5,7 +5,7 @@
[pickuptest]
exten => dial_faker,1,NoOp()
same => n,Answer()
- same => n,Dial(SIP/faker)
+ same => n,Dial(PJSIP/faker)
exten => test_fuzz,1,NoOp
same => n,Answer()
diff --git a/tests/feature_call_pickup/configs/ast1/pjsip.conf b/tests/feature_call_pickup/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..8fd656e
--- /dev/null
+++ b/tests/feature_call_pickup/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[sip_receive]
+type = aor
+contact = sip:127.0.0.2
+
+[sip_receive]
+type = identify
+endpoint = sip_receive
+match = 127.0.0.2
+
+[sip_receive]
+type = endpoint
+context = default
+disallow = all
+allow = ulaw
+pickup_group = 5
+aors = sip_receive
+
+[faker]
+type = aor
+contact = sip:127.0.0.3
+
+[faker]
+type = identify
+endpoint = faker
+match = 127.0.0.3
+
+[faker]
+type = endpoint
+context = default
+disallow = all
+allow = ulaw
+call_group = 5
+aors = faker
+
diff --git a/tests/feature_call_pickup/configs/ast1/sip.conf b/tests/feature_call_pickup/configs/ast1/sip.conf
deleted file mode 100644
index 2989833..0000000
--- a/tests/feature_call_pickup/configs/ast1/sip.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-disallow = all
-allow = ulaw
-
-[sip_receive]
-type = friend
-host = 127.0.0.2
-context = default
-pickupgroup = 5
-
-[faker]
-type=friend
-host = 127.0.0.3
-context = default
-callgroup = 5
diff --git a/tests/feature_call_pickup/configs/ast2/extensions.conf b/tests/feature_call_pickup/configs/ast2/extensions.conf
index 688b753..76ea907 100644
--- a/tests/feature_call_pickup/configs/ast2/extensions.conf
+++ b/tests/feature_call_pickup/configs/ast2/extensions.conf
@@ -1,6 +1,6 @@
[pickuptest]
exten => test_out,1,NoOp
- same => n, Dial(SIP/sip_send/*8)
+ same => n, Dial(PJSIP/*8 at sip_send)
exten => pickup_exten,1,NoOp
same => n, Answer()
diff --git a/tests/feature_call_pickup/configs/ast2/pjsip.conf b/tests/feature_call_pickup/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..c1009ae
--- /dev/null
+++ b/tests/feature_call_pickup/configs/ast2/pjsip.conf
@@ -0,0 +1,21 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[sip_send]
+type = aor
+contact = sip:127.0.0.1
+
+[sip_send]
+type = identify
+endpoint = sip_send
+match = 127.0.0.1
+
+[sip_send]
+type = endpoint
+context = default
+disallow = all
+allow = ulaw
+aors = sip_send
+
diff --git a/tests/feature_call_pickup/configs/ast2/sip.conf b/tests/feature_call_pickup/configs/ast2/sip.conf
deleted file mode 100644
index 1736af6..0000000
--- a/tests/feature_call_pickup/configs/ast2/sip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-disallow = all
-allow = ulaw
-
-[sip_send]
-type = friend
-host = 127.0.0.1
-context = default
diff --git a/tests/feature_call_pickup/run-test b/tests/feature_call_pickup/run-test
index db2d976..0b7ea39 100755
--- a/tests/feature_call_pickup/run-test
+++ b/tests/feature_call_pickup/run-test
@@ -23,9 +23,9 @@
def __init__(self):
TestCase.__init__(self)
- self.pickeeChannel = "Local/dial_faker at pickuptest-"
- self.pickerChannel = "SIP/sip_receive-"
- self.targetChannel = "SIP/faker-"
+ self.pickeeChannel = "Local/dial_faker at pickuptest"
+ self.pickerChannel = "PJSIP/sip_receive"
+ self.targetChannel = "PJSIP/faker"
self.bridge = None
diff --git a/tests/feature_call_pickup/test-config.yaml b/tests/feature_call_pickup/test-config.yaml
index c649dfc..9790867 100644
--- a/tests/feature_call_pickup/test-config.yaml
+++ b/tests/feature_call_pickup/test-config.yaml
@@ -8,7 +8,7 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- pickup
- features
diff --git a/tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf b/tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf
index a637fe1..987282a 100644
--- a/tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf
+++ b/tests/funcs/func_jitterbuffer/configs/ast1/extensions.conf
@@ -16,7 +16,7 @@
same => n,Verbose(1, ${RECORDED_FILE})
same => n,Hangup()
-; Subroutines used to set the Jitter Buffer on the outbound SIP channel
+; Subroutines used to set the Jitter Buffer on the outbound PJSIP channel
same => n(default_jb),NoOp()
same => n,Set(JITTERBUFFER(${CURRENT_JB_TYPE})=default))
same => n,Return()
@@ -38,11 +38,11 @@
same => n,Wait(2)
same => n,Hangup()
-; Extensions that set up the jitter buffers and dial the SIP channel
+; Extensions that set up the jitter buffers and dial the PJSIP channel
exten => default,1,NoOp()
same => n,Set(GLOBAL(CURRENT_TEST_TYPE)=default_jb)
same => n,Set(GLOBAL(CURRENT_JB_TYPE)=${JB_TYPE})
- same => n,Dial(SIP/ast1)
+ same => n,Dial(PJSIP/ast1)
same => n,Hangup()
exten => all_param,1,NoOp()
@@ -51,7 +51,7 @@
same => n,Set(GLOBAL(CURRENT_RESYNC_THRESHOLD)=${RESYNC_THRESHOLD})
same => n,Set(GLOBAL(CURRENT_TARGET_EXTRA)=${TARGET_EXTRA})
same => n,Set(GLOBAL(CURRENT_JB_TYPE)=${JB_TYPE})
- same => n,Dial(SIP/ast1)
+ same => n,Dial(PJSIP/ast1)
same => n,Hangup()
; Talk detect verification for the recorded file
diff --git a/tests/funcs/func_jitterbuffer/configs/ast1/pjsip.conf b/tests/funcs/func_jitterbuffer/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..58f195d
--- /dev/null
+++ b/tests/funcs/func_jitterbuffer/configs/ast1/pjsip.conf
@@ -0,0 +1,19 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 0.0.0.0
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1:5060
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = sippeer
+aors = ast1
+
diff --git a/tests/funcs/func_jitterbuffer/configs/ast1/sip.conf b/tests/funcs/func_jitterbuffer/configs/ast1/sip.conf
deleted file mode 100644
index 67492c6..0000000
--- a/tests/funcs/func_jitterbuffer/configs/ast1/sip.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[general]
-
-[ast1]
-context=sippeer
-type=peer
-host=127.0.0.1
-port=5060
diff --git a/tests/funcs/func_jitterbuffer/test-config.yaml b/tests/funcs/func_jitterbuffer/test-config.yaml
index e313d8f..85a7b75 100644
--- a/tests/funcs/func_jitterbuffer/test-config.yaml
+++ b/tests/funcs/func_jitterbuffer/test-config.yaml
@@ -17,4 +17,4 @@
- python : 'starpy'
- asterisk: 'app_talkdetect'
- asterisk: 'func_jitterbuffer'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
diff --git a/tests/manager/bridge_actions/configs/ast1/extensions.conf b/tests/manager/bridge_actions/configs/ast1/extensions.conf
index eca1a10..029bdb5 100644
--- a/tests/manager/bridge_actions/configs/ast1/extensions.conf
+++ b/tests/manager/bridge_actions/configs/ast1/extensions.conf
@@ -1,4 +1,4 @@
[default]
-exten => test_call,1,Dial(SIP/test_call at bob,,wW)
+exten => test_call,1,Dial(PJSIP/test_call at bob,,wW)
same => n,Hangup()
diff --git a/tests/manager/bridge_actions/test-config.yaml b/tests/manager/bridge_actions/test-config.yaml
index cada2ba..af1e99d 100644
--- a/tests/manager/bridge_actions/test-config.yaml
+++ b/tests/manager/bridge_actions/test-config.yaml
@@ -18,7 +18,7 @@
bridge-config:
test-runs:
-
- originate_channel: 'SIP/test_call at uut'
+ originate_channel: 'PJSIP/test_call at uut'
hangup: 'alice'
ami-uut:
@@ -28,7 +28,7 @@
conditions:
match:
Event: 'BridgeEnter'
- Channel: 'SIP/bob-.*'
+ Channel: 'PJSIP/bob-.*'
BridgeType: 'basic'
BridgeTechnology: 'simple_bridge'
callbackModule: 'check_bridge'
@@ -72,6 +72,6 @@
- python : 'twisted'
- python : 'starpy'
- asterisk: 'app_dial'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/masquerade/configs/ast1/extensions.conf b/tests/masquerade/configs/ast1/extensions.conf
index 7c32259..68ea5a2 100644
--- a/tests/masquerade/configs/ast1/extensions.conf
+++ b/tests/masquerade/configs/ast1/extensions.conf
@@ -27,7 +27,7 @@
[last_call]
exten => 8000,1,NoOp(Last call in chain)
exten => 8000,n,UserEvent(last_call,status: EXECUTING ${CHANNEL(name)})
-exten => 8000,n,Dial(SIP/ast2/last_in_chain,30)
+exten => 8000,n,Dial(PJSIP/last_in_chain at ast2,30)
exten => 8000,n,UserEvent(ast1,status: FAILURE Last call continued in dialplan DIALSTATUS=${DIALSTATUS})
exten => 8000,n,Hangup()
diff --git a/tests/masquerade/configs/ast1/pjsip.conf b/tests/masquerade/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..194f6f3
--- /dev/null
+++ b/tests/masquerade/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast1]
+type = aor
+contact = sip:127.0.0.2
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.2
+
+[ast1]
+type = endpoint
+context = parkedcalls
+disallow = all
+allow = gsm
+from_user = ast1
+aors = ast1
+
+[ast2]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2]
+type = identify
+endpoint = ast2
+match = 127.0.0.2
+
+[ast2]
+type = endpoint
+context = parkedcalls
+disallow = all
+allow = gsm
+from_user = ast2
+aors = ast2
+
diff --git a/tests/masquerade/configs/ast1/sip.conf b/tests/masquerade/configs/ast1/sip.conf
deleted file mode 100644
index 21d35c8..0000000
--- a/tests/masquerade/configs/ast1/sip.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[general]
-udpbindaddr=127.0.0.1
-
-[ast1]
-type=friend
-fromuser=ast1
-host=127.0.0.2
-context=parkedcalls
-disallow=all
-allow=gsm
-qualify=no
-insecure=invite
-
-[ast2]
-type=friend
-fromuser=ast2
-host=127.0.0.2
-context=parkedcalls
-disallow=all
-allow=gsm
-qualify=no
-insecure=invite
diff --git a/tests/masquerade/configs/ast2/pjsip.conf b/tests/masquerade/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..f29b893
--- /dev/null
+++ b/tests/masquerade/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = incoming
+disallow = all
+allow = gsm
+from_user = ast1
+aors = ast1
+
+[ast2]
+type = aor
+contact = sip:127.0.0.1
+
+[ast2]
+type = identify
+endpoint = ast2
+match = 127.0.0.1
+
+[ast2]
+type = endpoint
+context = incoming
+disallow = all
+allow = gsm
+from_user = ast2
+aors = ast2
+
diff --git a/tests/masquerade/configs/ast2/sip.conf b/tests/masquerade/configs/ast2/sip.conf
deleted file mode 100644
index c57444c..0000000
--- a/tests/masquerade/configs/ast2/sip.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[general]
-udpbindaddr=127.0.0.2
-
-[ast1]
-type=friend
-fromuser=ast1
-host=127.0.0.1
-context=incoming
-disallow=all
-allow=gsm
-qualify=no
-insecure=invite
-
-[ast2]
-type=friend
-fromuser=ast2
-host=127.0.0.1
-context=incoming
-disallow=all
-allow=gsm
-qualify=no
-insecure=invite
diff --git a/tests/masquerade/run-test b/tests/masquerade/run-test
index 9d83aff..b686b96 100755
--- a/tests/masquerade/run-test
+++ b/tests/masquerade/run-test
@@ -37,7 +37,7 @@
self.expected_space = 701
# Use IAX calls
# self.use_sip_calls = False
- # Use SIP calls
+ # Use PJSIP calls
self.use_sip_calls = True
if self.use_sip_calls:
@@ -98,7 +98,7 @@
LOGGER.info("Fetching parked call at " + str(self.expected_space))
tech_prefix = "IAX2/ast1/"
if self.use_sip_calls:
- tech_prefix = "SIP/ast1/"
+ tech_prefix = "PJSIP/ast1/"
self.ami[1].originate(
channel=tech_prefix + str(self.expected_space),
context="getit", exten="retrieve", priority=1,
diff --git a/tests/masquerade/test-config.yaml b/tests/masquerade/test-config.yaml
index 0428e68..0fea360 100644
--- a/tests/masquerade/test-config.yaml
+++ b/tests/masquerade/test-config.yaml
@@ -7,8 +7,8 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- parking
# - iax2
- - SIP
+ - PJSIP
diff --git a/tests/pbx/merge_contexts/configs/ast1/pjsip.conf b/tests/pbx/merge_contexts/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..08cfce6
--- /dev/null
+++ b/tests/pbx/merge_contexts/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2]
+type = identify
+endpoint = ast2
+match = 127.0.0.2
+
+[ast2]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/pbx/merge_contexts/configs/ast1/sip.conf b/tests/pbx/merge_contexts/configs/ast1/sip.conf
deleted file mode 100644
index 0cac93c..0000000
--- a/tests/pbx/merge_contexts/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-fromuser = ast1
-context = test
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/pbx/merge_contexts/configs/ast2/pjsip.conf b/tests/pbx/merge_contexts/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..bccb641
--- /dev/null
+++ b/tests/pbx/merge_contexts/configs/ast2/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/pbx/merge_contexts/configs/ast2/sip.conf b/tests/pbx/merge_contexts/configs/ast2/sip.conf
deleted file mode 100644
index fbe5906..0000000
--- a/tests/pbx/merge_contexts/configs/ast2/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-context = test
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/pbx/merge_contexts/run-test b/tests/pbx/merge_contexts/run-test
index 7592073..d87473c 100755
--- a/tests/pbx/merge_contexts/run-test
+++ b/tests/pbx/merge_contexts/run-test
@@ -36,15 +36,15 @@
return reason
# pbx_ael
- df = ami.originate("sip/ast2/12", "test", "1234", 1)
+ df = ami.originate("PJSIP/12 at ast2", "test", "1234", 1)
df.addErrback(handle_failure)
# pbx_config
- df = ami.originate("sip/ast2/123", "test", "1234", 1)
+ df = ami.originate("PJSIP/123 at ast2", "test", "1234", 1)
df.addErrback(handle_failure)
# pbx_lua
- df = ami.originate("sip/ast2/1234", "test", "1234", 1)
+ df = ami.originate("PJSIP/1234 at ast2", "test", "1234", 1)
df.addErrback(handle_failure)
else:
ami.registerEvent('UserEvent', self.test_result)
diff --git a/tests/pbx/merge_contexts/test-config.yaml b/tests/pbx/merge_contexts/test-config.yaml
index 30a5f7e..67324ec 100644
--- a/tests/pbx/merge_contexts/test-config.yaml
+++ b/tests/pbx/merge_contexts/test-config.yaml
@@ -10,6 +10,6 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- dialplan
diff --git a/tests/pbx/pbx_lua_background/configs/ast1/pjsip.conf b/tests/pbx/pbx_lua_background/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..08cfce6
--- /dev/null
+++ b/tests/pbx/pbx_lua_background/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2]
+type = identify
+endpoint = ast2
+match = 127.0.0.2
+
+[ast2]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/pbx/pbx_lua_background/configs/ast1/sip.conf b/tests/pbx/pbx_lua_background/configs/ast1/sip.conf
deleted file mode 100644
index 0cac93c..0000000
--- a/tests/pbx/pbx_lua_background/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-fromuser = ast1
-context = test
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/pbx/pbx_lua_background/configs/ast2/pjsip.conf b/tests/pbx/pbx_lua_background/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..bccb641
--- /dev/null
+++ b/tests/pbx/pbx_lua_background/configs/ast2/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/pbx/pbx_lua_background/configs/ast2/sip.conf b/tests/pbx/pbx_lua_background/configs/ast2/sip.conf
deleted file mode 100644
index fbe5906..0000000
--- a/tests/pbx/pbx_lua_background/configs/ast2/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-context = test
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/pbx/pbx_lua_background/run-test b/tests/pbx/pbx_lua_background/run-test
index 9680e04..b93d056 100755
--- a/tests/pbx/pbx_lua_background/run-test
+++ b/tests/pbx/pbx_lua_background/run-test
@@ -26,7 +26,7 @@
print("sending a call from ast1 to ast2")
- df = ami.originate("sip/ast2/1234", "test", "1234", 1)
+ df = ami.originate("PJSIP/1234 at ast2", "test", "1234", 1)
def handle_failure(reason):
print("error sending originate:")
diff --git a/tests/pbx/pbx_lua_background/test-config.yaml b/tests/pbx/pbx_lua_background/test-config.yaml
index 52a2677..2026637 100644
--- a/tests/pbx/pbx_lua_background/test-config.yaml
+++ b/tests/pbx/pbx_lua_background/test-config.yaml
@@ -8,7 +8,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'pbx_lua'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- dialplan
- dialplan_lua
diff --git a/tests/pbx/pbx_lua_goto/configs/ast1/pjsip.conf b/tests/pbx/pbx_lua_goto/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..08cfce6
--- /dev/null
+++ b/tests/pbx/pbx_lua_goto/configs/ast1/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[ast2]
+type = aor
+contact = sip:127.0.0.2
+
+[ast2]
+type = identify
+endpoint = ast2
+match = 127.0.0.2
+
+[ast2]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/pbx/pbx_lua_goto/configs/ast1/sip.conf b/tests/pbx/pbx_lua_goto/configs/ast1/sip.conf
deleted file mode 100644
index 0cac93c..0000000
--- a/tests/pbx/pbx_lua_goto/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-fromuser = ast1
-context = test
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/pbx/pbx_lua_goto/configs/ast2/pjsip.conf b/tests/pbx/pbx_lua_goto/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..bccb641
--- /dev/null
+++ b/tests/pbx/pbx_lua_goto/configs/ast2/pjsip.conf
@@ -0,0 +1,22 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.2
+
+[ast1]
+type = aor
+contact = sip:127.0.0.1
+
+[ast1]
+type = identify
+endpoint = ast1
+match = 127.0.0.1
+
+[ast1]
+type = endpoint
+context = test
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/pbx/pbx_lua_goto/configs/ast2/sip.conf b/tests/pbx/pbx_lua_goto/configs/ast2/sip.conf
deleted file mode 100644
index fbe5906..0000000
--- a/tests/pbx/pbx_lua_goto/configs/ast2/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-context = test
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/pbx/pbx_lua_goto/run-test b/tests/pbx/pbx_lua_goto/run-test
index 9680e04..b93d056 100755
--- a/tests/pbx/pbx_lua_goto/run-test
+++ b/tests/pbx/pbx_lua_goto/run-test
@@ -26,7 +26,7 @@
print("sending a call from ast1 to ast2")
- df = ami.originate("sip/ast2/1234", "test", "1234", 1)
+ df = ami.originate("PJSIP/1234 at ast2", "test", "1234", 1)
def handle_failure(reason):
print("error sending originate:")
diff --git a/tests/pbx/pbx_lua_goto/test-config.yaml b/tests/pbx/pbx_lua_goto/test-config.yaml
index 6fc1dc3..ac13b98 100644
--- a/tests/pbx/pbx_lua_goto/test-config.yaml
+++ b/tests/pbx/pbx_lua_goto/test-config.yaml
@@ -9,7 +9,7 @@
- python : 'twisted'
- python : 'starpy'
- asterisk : 'pbx_lua'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- dialplan
- dialplan_lua
diff --git a/tests/phoneprov/res_phoneprov/cfgbase.txt b/tests/phoneprov/res_phoneprov/cfgbase.txt
deleted file mode 100644
index 82371d5..0000000
--- a/tests/phoneprov/res_phoneprov/cfgbase.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-profile_variable: ${PROFILE_VARIABLE}
-context: ${SIPPEER(${CALLERID},context)}
-mac: ${MAC}
-profile: ${PROFILE}
-username: ${USERNAME}
-display_name: ${DISPLAY_NAME}
-secret: ${SECRET}
-server: ${SERVER}
-server_port: ${SERVER_PORT}
-line: ${LINE}
-linekeys: ${LINEKEYS}
-timezone: ${TIMEZONE}
-tzoffset: ${TZOFFSET}
-extension_length: ${EXTENSION_LENGTH}
-${PP_EACH_EXTENSION(${MAC},cfgex.txt)}
diff --git a/tests/phoneprov/res_phoneprov/cfgex.txt b/tests/phoneprov/res_phoneprov/cfgex.txt
deleted file mode 100644
index ac64859..0000000
--- a/tests/phoneprov/res_phoneprov/cfgex.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-username_${LINE}: ${USERNAME}
-display_name_${LINE}: ${DISPLAY_NAME}
-context_${LINE}: ${SIPPEER(${CALLERID},context)}
diff --git a/tests/phoneprov/res_phoneprov/configs/ast1/phoneprov.conf b/tests/phoneprov/res_phoneprov/configs/ast1/phoneprov.conf
deleted file mode 100644
index 6f79980..0000000
--- a/tests/phoneprov/res_phoneprov/configs/ast1/phoneprov.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[general]
-serverport=41060
-default_profile=profile1
-
-[profile1]
-setvar = PROFILE_VARIABLE = this is a test
-setvar = TIMEZONE = America/Denver
-cfgbase${MAC}.txt => cfgbase.txt,text/plain
diff --git a/tests/phoneprov/res_phoneprov/configs/ast1/users.conf b/tests/phoneprov/res_phoneprov/configs/ast1/users.conf
deleted file mode 100644
index 8fc6679..0000000
--- a/tests/phoneprov/res_phoneprov/configs/ast1/users.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-[general]
-localextenlength = 3
-
-[6000]
-fullname = Joe User 6000
-username = 6000
-email = joe at foo.bar
-secret = 1234
-hasvoicemail = no
-vmsecret = 1234
-hassip = yes
-hasiax = no
-hash323 = no
-hasmanager = no
-callwaiting = no
-context = defctx1
-macaddress = 112233445566
-profile = profile1
-autoprov = yes
-LINEKEYS = 2
-linenumber = 1
-cid_number = 6000
-
-[6001]
-fullname = Joe User 6001
-username = 6001
-email = joe at foo.bar
-secret = 1234
-hasvoicemail = no
-vmsecret = 1234
-hassip = yes
-hasiax = no
-hash323 = no
-hasmanager = no
-callwaiting = no
-context = defctx2
-macaddress = 112233445566
-profile = profile1
-autoprov = yes
-LINEKEYS = 2
-linenumber = 2
-cid_number = 6001
diff --git a/tests/phoneprov/res_phoneprov/run-test b/tests/phoneprov/res_phoneprov/run-test
deleted file mode 100755
index 0fe5844..0000000
--- a/tests/phoneprov/res_phoneprov/run-test
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-"""Test res_phoneprov basic ops
-
-Copyright (C) 2014, Fairview 5 Engineering, LLC
-George Joseph <george.joseph at fairview5.com>
-
-This program is free software, distributed under the terms of
-the GNU General Public License Version 2.
-"""
-
-import os
-import sys
-import logging
-
-from twisted.internet import reactor
-from email.parser import HeaderParser
-from shutil import copy
-from httplib import *
-sys.path.append("lib/python")
-from asterisk.test_case import TestCase
-
-LOGGER = logging.getLogger(__name__)
-PATH = os.path.dirname(os.path.realpath(__file__))
-
-class ResPhoneprovTest(TestCase):
- def __init__(self):
- super(ResPhoneprovTest, self).__init__()
- self.reactor_timeout = 15
- self.create_asterisk()
-
- def stop_reactor(self):
- self.con.close()
- super(ResPhoneprovTest, self).stop_reactor()
-
- def run(self):
- super(ResPhoneprovTest, self).run()
- self.passed = True
-
- try:
- copy("%s/cfgbase.txt" % PATH,
- "%s/var/lib/asterisk/phoneprov/cfgbase.txt" % self.ast[0].base)
- copy("%s/cfgex.txt" % PATH,
- "%s/var/lib/asterisk/phoneprov/cfgex.txt" % self.ast[0].base)
- self.con = HTTPConnection("127.0.0.1:8088")
- self.con.request("GET", "/phoneprov/cfgbase112233445566.txt")
- self.res = self.con.getresponse()
- self.data = self.res.read()
- except:
- self.stop_reactor()
- self.passed = False
- raise
-
- if self.res.status != 200:
- LOGGER.error("Status code was %d\n%s." % (self.res.status, self.data))
- self.passed = False
- self.stop_reactor()
- return
-
- response = HeaderParser().parsestr(self.data)
-
- for name, value in self.test_config.config['substitutions'].items():
- if response.get(name) != value:
- LOGGER.error("'%s' was '%s' instead of '%s'" % (name, response.get(name), value))
- self.passed = False
- break
-
- if not self.passed:
- LOGGER.error(response)
-
- self.stop_reactor()
-
-def main():
- test = ResPhoneprovTest()
- reactor.run()
-
- if not test.passed:
- return 1
-
- return 0
-
-if __name__ == "__main__":
- sys.exit(main() or 0)
diff --git a/tests/phoneprov/res_phoneprov/test-config.yaml b/tests/phoneprov/res_phoneprov/test-config.yaml
deleted file mode 100644
index 1c99dc1..0000000
--- a/tests/phoneprov/res_phoneprov/test-config.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-testinfo:
- summary: 'Test res_phoneprov basic ops'
- description: |
- 'Test res_phoneprov basic ops by setting up a user in users.conf and insuring
- that proper template substitution is done.
-
-properties:
- dependencies:
- - python : 'twisted'
- - python : 'starpy'
- - python : 'httplib'
- - python : 'email'
- - asterisk : 'chan_sip'
- - asterisk : 'res_phoneprov'
-
-substitutions:
- profile_variable: "this is a test"
- context: "defctx1"
- username: "6000"
- server: "127.0.0.1"
- server_port: "41060"
- extension_length: "3"
- timezone: "America/Denver"
- context_1: "defctx1"
- context_2: "defctx2"
diff --git a/tests/phoneprov/tests.yaml b/tests/phoneprov/tests.yaml
index e9e983a..0c883de 100644
--- a/tests/phoneprov/tests.yaml
+++ b/tests/phoneprov/tests.yaml
@@ -1,4 +1,3 @@
# Enter tests here in the order they should be considered for execution:
tests:
- - test: 'res_phoneprov'
- test: 'res_phoneprov_pjsip'
diff --git a/tests/redirecting/forwardername/configs/ast1/extensions.conf b/tests/redirecting/forwardername/configs/ast1/extensions.conf
index 2d7607e..592ea11 100644
--- a/tests/redirecting/forwardername/configs/ast1/extensions.conf
+++ b/tests/redirecting/forwardername/configs/ast1/extensions.conf
@@ -1,19 +1,19 @@
[default]
-exten => forwarder,1,NoOp(Dial SIP/forwarder)
-same => n,Dial(SIP/forwarder)
+exten => forwarder,1,NoOp(Dial PJSIP/forwarder)
+same => n,Dial(PJSIP/forwarder)
same => n,Hangup
-exten => queue,1,NoOp(Queue SIP/forwarder)
+exten => queue,1,NoOp(Queue PJSIP/forwarder)
same => n,Queue(queue,Rtc)
same => n,Hangup
-exten => originate,1,NoOp(Originate SIP/forwarder)
+exten => originate,1,NoOp(Originate PJSIP/forwarder)
same => n,Answer
-same => n,Originate(SIP/forwarder,app,Playback,hello-world)
+same => n,Originate(PJSIP/forwarder,app,Playback,hello-world)
same => n,Hangup
exten => test_forwardername,1,Answer
same => n,NoOp(FORWARDERNAME is '${FORWARDERNAME}')
-same => n,UserEvent(ForwarderName, Result: ${IF($["${CUT(FORWARDERNAME,-,1-$[${FIELDQTY(FORWARDERNAME,-)} - 1])}" = "SIP/forwarder"]?Success:Failure)})
+same => n,UserEvent(ForwarderName, Result: ${IF($["${CUT(FORWARDERNAME,-,1-$[${FIELDQTY(FORWARDERNAME,-)} - 1])}" = "PJSIP/forwarder"]?Success:Failure)})
same => n,Hangup()
diff --git a/tests/redirecting/forwardername/configs/ast1/pjsip.conf b/tests/redirecting/forwardername/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..05f1f0c
--- /dev/null
+++ b/tests/redirecting/forwardername/configs/ast1/pjsip.conf
@@ -0,0 +1,33 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5060
+
+[caller]
+type = aor
+contact = sip:127.0.0.1:5061
+
+[caller]
+type = endpoint
+allow = ulaw
+aors = caller
+
+[caller]
+type = identify
+endpoint = caller
+match = 127.0.0.1
+
+[forwarder]
+type = aor
+contact = sip:127.0.0.1:5062
+
+[forwarder]
+type = endpoint
+allow = ulaw
+aors = forwarder
+
+[forwarder]
+type = identify
+endpoint = forwarder
+match = 127.0.0.1
+
diff --git a/tests/redirecting/forwardername/configs/ast1/queues.conf b/tests/redirecting/forwardername/configs/ast1/queues.conf
index 0890117..6ffe4ae 100644
--- a/tests/redirecting/forwardername/configs/ast1/queues.conf
+++ b/tests/redirecting/forwardername/configs/ast1/queues.conf
@@ -1,4 +1,4 @@
[general]
[queue]
-member => SIP/forwarder
+member => PJSIP/forwarder
diff --git a/tests/redirecting/forwardername/configs/ast1/sip.conf b/tests/redirecting/forwardername/configs/ast1/sip.conf
deleted file mode 100644
index 528824f..0000000
--- a/tests/redirecting/forwardername/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-
-udpbindaddr = 127.0.0.1:5060
-
-[caller]
-type=peer
-host=127.0.0.1
-port=5061
-
-[forwarder]
-type=peer
-host=127.0.0.1
-port=5062
diff --git a/tests/redirecting/forwardername/test-config.yaml b/tests/redirecting/forwardername/test-config.yaml
index a8149fe..a79ad7f 100644
--- a/tests/redirecting/forwardername/test-config.yaml
+++ b/tests/redirecting/forwardername/test-config.yaml
@@ -55,6 +55,6 @@
- asterisk: 'app_queue'
- asterisk: 'app_originate'
- asterisk: 'app_userevent'
- - asterisk: 'chan_sip'
+ - asterisk: 'chan_pjsip'
tags:
- bridge
diff --git a/tests/regressions/M18882/configs/ast1/pjsip.conf b/tests/regressions/M18882/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..cc912a5
--- /dev/null
+++ b/tests/regressions/M18882/configs/ast1/pjsip.conf
@@ -0,0 +1,14 @@
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1
+
+[0004f2040001]
+type = aor
+max_contacts = 1
+
+[0004f2040001]
+type = endpoint
+allow = ulaw
+aors = 0004f2040001
+
diff --git a/tests/regressions/M18882/configs/ast1/sip.conf b/tests/regressions/M18882/configs/ast1/sip.conf
deleted file mode 100644
index 1cc6edc..0000000
--- a/tests/regressions/M18882/configs/ast1/sip.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[general]
-bindaddr=127.0.0.1
-
-[0004f2040001]
-type=friend
-host=dynamic
diff --git a/tests/regressions/M18882/run-test b/tests/regressions/M18882/run-test
index afe1ed5..85058b4 100755
--- a/tests/regressions/M18882/run-test
+++ b/tests/regressions/M18882/run-test
@@ -19,7 +19,7 @@
TestCase.__init__(self)
self.create_asterisk()
self.peer = '0004f2040001'
- self.family = 'SIP'
+ self.family = 'PJSIP'
self.key = 'Registry/0004f2040001'
self.value = '172.16.0.100:5300:360:0004f2040001:sip:0004f2040001 at 172.16.0.100:5300'
self.reload = False
@@ -33,14 +33,11 @@
def ami_dbGet(self, ami):
def onResult(result):
if result != self.value:
- self.ami[0].logoff().addCallbacks(self.ami_logoff)
+ self.ami[0].logoff().addCallbacks(self.ami_logoff)
+
if self.reload == False:
- self.ast[0].cli_exec('module unload chan_sip')
- self.ast[0].cli_exec('module load chan_sip')
self.reload = True
self.ami_dbGet(ami)
- else:
- self.sipShowPeers()
self.ami[0].dbGet(self.family, self.key).addCallbacks(onResult)
diff --git a/tests/regressions/M18882/test-config.yaml b/tests/regressions/M18882/test-config.yaml
index f85e7a8..61fc7f5 100644
--- a/tests/regressions/M18882/test-config.yaml
+++ b/tests/regressions/M18882/test-config.yaml
@@ -1,4 +1,5 @@
testinfo:
+ skip: 'chan_sip dependancy, '
summary: 'Test loggin in to the Asterisk Manager Interface'
description: |
'This test provides a basic AMI sanity check. It will log in,
@@ -8,6 +9,6 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- AMI
diff --git a/tests/udptl/configs/ast1/pjsip.conf b/tests/udptl/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..3e60ad7
--- /dev/null
+++ b/tests/udptl/configs/ast1/pjsip.conf
@@ -0,0 +1,25 @@
+[global]
+type = global
+debug = yes
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5060
+
+[receiver]
+type = aor
+contact = sip:127.0.0.1:5061
+
+[receiver]
+type = identify
+endpoint = receiver
+match = 127.0.0.1
+
+[receiver]
+type = endpoint
+allow=!all,ulaw,alaw
+t38_udptl=yes
+context=facks
+media_address=127.0.0.1
+aors = receiver
diff --git a/tests/udptl/configs/ast1/sip.conf b/tests/udptl/configs/ast1/sip.conf
deleted file mode 100644
index ebde45b..0000000
--- a/tests/udptl/configs/ast1/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.1:5060
-t38pt_udptl = yes
-sipdebug = yes
-
-[receiver]
-type = friend
-host = 127.0.0.1
-port = 5061
-insecure = invite
-context = facks
diff --git a/tests/udptl/configs/ast2/pjsip.conf b/tests/udptl/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..34744c8
--- /dev/null
+++ b/tests/udptl/configs/ast2/pjsip.conf
@@ -0,0 +1,25 @@
+[global]
+type = global
+debug = yes
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = 127.0.0.1:5061
+
+[sender]
+type = aor
+contact = sip:127.0.0.1:5060
+
+[sender]
+type = identify
+endpoint = sender
+match = 127.0.0.1
+
+[sender]
+type = endpoint
+allow=!all,ulaw,alaw
+t38_udptl=yes
+context=facks
+media_address=127.0.0.1
+aors = sender
diff --git a/tests/udptl/configs/ast2/sip.conf b/tests/udptl/configs/ast2/sip.conf
deleted file mode 100644
index 1717186..0000000
--- a/tests/udptl/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1:5061
-t38pt_udptl = yes
-sipdebug = yes
-faxdetect = yes
-
-[sender]
-type = friend
-host = 127.0.0.1
-port = 5060
-insecure = invite
-context = facks
diff --git a/tests/udptl/run-test b/tests/udptl/run-test
index 882cf7d..667be1f 100755
--- a/tests/udptl/run-test
+++ b/tests/udptl/run-test
@@ -24,7 +24,7 @@
def ami_connect(self, ami):
if ami.id == 0:
- self.ami[0].originate(channel = "SIP/666 at receiver",
+ self.ami[0].originate(channel = "PJSIP/666 at receiver",
application = "SendFax",
data = "tests/udptl/1page.tif")
elif ami.id == 1:
diff --git a/tests/udptl/test-config.yaml b/tests/udptl/test-config.yaml
index 21ec844..519ae54 100644
--- a/tests/udptl/test-config.yaml
+++ b/tests/udptl/test-config.yaml
@@ -1,5 +1,5 @@
testinfo:
- summary: 'Test T.38 FAX transmission over SIP'
+ skip: 'requires further rework for pjsip, see ASTERISK-30292'
description: |
'One Asterisk instance sends a FAX to another Asterisk instance'
issues:
@@ -10,7 +10,7 @@
- python : 'twisted'
- python : 'starpy'
- custom : 'fax'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- - SIP
+ - PJSIP
- fax
diff --git a/tests/udptl_v6/configs/ast1/pjsip.conf b/tests/udptl_v6/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..bf06659
--- /dev/null
+++ b/tests/udptl_v6/configs/ast1/pjsip.conf
@@ -0,0 +1,25 @@
+[global]
+type = global
+debug = yes
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = [::1]:5060
+
+[receiver]
+type = aor
+contact = sip:[::1]:5061
+
+[receiver]
+type = identify
+endpoint = receiver
+match = ::1
+
+[receiver]
+type = endpoint
+context = facks
+aors = receiver
+t38_udptl = yes
+t38_udptl_ec = none
+
diff --git a/tests/udptl_v6/configs/ast2/pjsip.conf b/tests/udptl_v6/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..14d92c5
--- /dev/null
+++ b/tests/udptl_v6/configs/ast2/pjsip.conf
@@ -0,0 +1,25 @@
+[global]
+type = global
+debug = yes
+
+[transport-udp]
+type = transport
+protocol = udp
+bind = [::1]:5061
+
+[sender]
+type = aor
+contact = sip:[::1]:5060
+
+[sender]
+type = identify
+endpoint = sender
+match = ::1
+
+[sender]
+type = endpoint
+context = facks
+aors = sender
+t38_udptl = yes
+t38_udptl_ec = none
+
diff --git a/tests/udptl_v6/run-test b/tests/udptl_v6/run-test
index a64086b..6113b51 100755
--- a/tests/udptl_v6/run-test
+++ b/tests/udptl_v6/run-test
@@ -25,7 +25,7 @@
def ami_connect(self, ami):
if ami.id == 0:
- self.ami[0].originate(channel = "SIP/666 at receiver",
+ self.ami[0].originate(channel = "PJSIP/666 at receiver",
application = "SendFax",
data = "tests/udptl_v6/1page.tif")
elif ami.id == 1:
diff --git a/tests/udptl_v6/test-config.yaml b/tests/udptl_v6/test-config.yaml
index bd515bb..0baf573 100644
--- a/tests/udptl_v6/test-config.yaml
+++ b/tests/udptl_v6/test-config.yaml
@@ -1,5 +1,6 @@
testinfo:
- summary: 'Test T.38 FAX transmission over SIP'
+ skip: 'requires further rework for pjsip, see ASTERISK-30292'
+ summary: 'Test T.38 FAX transmission over PJSIP'
description: |
'One Asterisk instance sends a FAX to another Asterisk instance.
This test uses IPv6 addressing.'
@@ -12,7 +13,7 @@
- python : 'starpy'
- custom : 'fax'
- custom : 'ipv6'
- - asterisk : 'chan_sip'
+ - asterisk : 'chan_pjsip'
tags:
- - SIP
+ - PJSIP
- fax
--
To view, visit https://gerrit.asterisk.org/c/testsuite/+/19784
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Change-Id: I75960f1af9d7544c01dd00981626c02869fc1f51
Gerrit-Change-Number: 19784
Gerrit-PatchSet: 6
Gerrit-Owner: Michael Bradeen <mbradeen at sangoma.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: N A <asterisk at phreaknet.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20230130/4b6f1ee0/attachment-0001.html>
More information about the asterisk-code-review
mailing list