[Asterisk-code-review] Update app/voicemail tests to use chan pjsip instead of chan... (testsuite[master])

Wed May 23 13:19:35 CDT 2018

George Joseph has uploaded this change for review. ( https://gerrit.asterisk.org/9046


Change subject: Update app/voicemail tests to use chan_pjsip instead of chan_sip
......................................................................

Update app/voicemail tests to use chan_pjsip instead of chan_sip

This required a small change to the voicemail.py library but otherwise
sip_to_pjsip.py took care of converting all of the sip.conf files.
Then it was just a matter of adjusting the dial strings in the run-test
files.

Change-Id: I2722aa6b670e500063a497371f7a7749d59e13e5
---
M lib/python/asterisk/voicemail.py
A tests/apps/voicemail/authenticate_extensions/configs/ast1/pjsip.conf
D tests/apps/voicemail/authenticate_extensions/configs/ast1/sip.conf
A tests/apps/voicemail/authenticate_extensions/configs/ast2/pjsip.conf
D tests/apps/voicemail/authenticate_extensions/configs/ast2/sip.conf
M tests/apps/voicemail/authenticate_extensions/run-test
M tests/apps/voicemail/authenticate_extensions/test-config.yaml
A tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/pjsip.conf
D tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/sip.conf
A tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/pjsip.conf
D tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/sip.conf
M tests/apps/voicemail/authenticate_invalid_mailbox/run-test
M tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml
A tests/apps/voicemail/authenticate_invalid_password/configs/ast1/pjsip.conf
D tests/apps/voicemail/authenticate_invalid_password/configs/ast1/sip.conf
A tests/apps/voicemail/authenticate_invalid_password/configs/ast2/pjsip.conf
D tests/apps/voicemail/authenticate_invalid_password/configs/ast2/sip.conf
M tests/apps/voicemail/authenticate_invalid_password/run-test
M tests/apps/voicemail/authenticate_invalid_password/test-config.yaml
A tests/apps/voicemail/authenticate_nominal/configs/ast1/pjsip.conf
D tests/apps/voicemail/authenticate_nominal/configs/ast1/sip.conf
A tests/apps/voicemail/authenticate_nominal/configs/ast2/pjsip.conf
D tests/apps/voicemail/authenticate_nominal/configs/ast2/sip.conf
M tests/apps/voicemail/authenticate_nominal/run-test
M tests/apps/voicemail/authenticate_nominal/test-config.yaml
A tests/apps/voicemail/check_voicemail_callback/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_callback/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_callback/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_callback/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_callback/run-test
M tests/apps/voicemail/check_voicemail_callback/test-config.yaml
A tests/apps/voicemail/check_voicemail_delete/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_delete/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_delete/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_delete/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_delete/run-test
M tests/apps/voicemail/check_voicemail_delete/test-config.yaml
A tests/apps/voicemail/check_voicemail_dialout/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_dialout/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_dialout/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_dialout/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_dialout/run-test
M tests/apps/voicemail/check_voicemail_dialout/test-config.yaml
A tests/apps/voicemail/check_voicemail_envelope/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_envelope/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_envelope/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_envelope/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_envelope/run-test
M tests/apps/voicemail/check_voicemail_envelope/test-config.yaml
A tests/apps/voicemail/check_voicemail_forward/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_forward/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_forward/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_forward/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_forward/run-test
M tests/apps/voicemail/check_voicemail_forward/test-config.yaml
A tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_forward_hangup/run-test
M tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml
A tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test
M tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml
A tests/apps/voicemail/check_voicemail_new_user/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_new_user/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_new_user/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_new_user/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_new_user/run-test
M tests/apps/voicemail/check_voicemail_new_user/test-config.yaml
A tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_new_user_hangup/run-test
M tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml
A tests/apps/voicemail/check_voicemail_nominal/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_nominal/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_nominal/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_nominal/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_nominal/run-test
M tests/apps/voicemail/check_voicemail_nominal/test-config.yaml
A tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_options_change_password/run-test
M tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml
A tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test
M tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml
A tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_options_record_busy/run-test
M tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml
A tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_options_record_name/run-test
M tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml
A tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_options_record_temp/run-test
M tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml
A tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_options_record_unavail/run-test
M tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml
A tests/apps/voicemail/check_voicemail_reply/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_reply/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_reply/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_reply/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_reply/run-test
M tests/apps/voicemail/check_voicemail_reply/test-config.yaml
A tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/pjsip.conf
D tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/sip.conf
A tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/pjsip.conf
D tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/sip.conf
M tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test
M tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml
A tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/pjsip.conf
D tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/sip.conf
A tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/pjsip.conf
D tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/sip.conf
M tests/apps/voicemail/leave_voicemail_contexts/run-test
M tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml
A tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/pjsip.conf
D tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/sip.conf
A tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/pjsip.conf
D tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/sip.conf
M tests/apps/voicemail/leave_voicemail_external_notification/run-test
M tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml
A tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/pjsip.conf
D tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/sip.conf
A tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/pjsip.conf
D tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/sip.conf
M tests/apps/voicemail/leave_voicemail_forwarding/run-test
M tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml
A tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/pjsip.conf
D tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/sip.conf
A tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/pjsip.conf
D tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/sip.conf
M tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test
M tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml
A tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/pjsip.conf
D tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf
A tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/pjsip.conf
D tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf
M tests/apps/voicemail/leave_voicemail_nominal/run-test
A tests/apps/voicemail/leave_voicemail_priority/configs/ast1/pjsip.conf
D tests/apps/voicemail/leave_voicemail_priority/configs/ast1/sip.conf
A tests/apps/voicemail/leave_voicemail_priority/configs/ast2/pjsip.conf
D tests/apps/voicemail/leave_voicemail_priority/configs/ast2/sip.conf
M tests/apps/voicemail/leave_voicemail_priority/run-test
M tests/apps/voicemail/leave_voicemail_priority/test-config.yaml
168 files changed, 2,335 insertions(+), 810 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/46/9046/1

diff --git a/lib/python/asterisk/voicemail.py b/lib/python/asterisk/voicemail.py
index 22ae949..283650b 100644
--- a/lib/python/asterisk/voicemail.py
+++ b/lib/python/asterisk/voicemail.py
@@ -86,7 +86,7 @@
 
     # The default expected channel to be used to send info to the voicemail
     # server
-    default_sender_channel = "SIP/ast1-00000000"
+    default_sender_channel = "PJSIP/ast1-00000000"
 
     def __init__(self):
         """Constructor"""
diff --git a/tests/apps/voicemail/authenticate_extensions/configs/ast1/pjsip.conf b/tests/apps/voicemail/authenticate_extensions/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/authenticate_extensions/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/authenticate_extensions/configs/ast1/sip.conf b/tests/apps/voicemail/authenticate_extensions/configs/ast1/sip.conf
deleted file mode 100644
index 16b8af0..0000000
--- a/tests/apps/voicemail/authenticate_extensions/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/authenticate_extensions/configs/ast2/pjsip.conf b/tests/apps/voicemail/authenticate_extensions/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/authenticate_extensions/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/authenticate_extensions/configs/ast2/sip.conf b/tests/apps/voicemail/authenticate_extensions/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/authenticate_extensions/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/authenticate_extensions/run-test b/tests/apps/voicemail/authenticate_extensions/run-test
index 602da32..8f19b43 100755
--- a/tests/apps/voicemail/authenticate_extensions/run-test
+++ b/tests/apps/voicemail/authenticate_extensions/run-test
@@ -136,15 +136,15 @@
 
     def executeTest(self, ami):
         if self.test_counter == 0:
-            logger.debug("Originating call to sip/ast/9000")
-            df = ami.originate("sip/ast1/9000", "voicemailCaller", "wait", 1)
+            logger.debug("Originating call to PJSIP/9000 at ast1")
+            df = ami.originate("PJSIP/9000 at ast1", "voicemailCaller", "wait", 1)
             df.addErrback(self.handle_originate_failure)
         else:
-            self.sender_channel = "SIP/ast1-00000001"
+            self.sender_channel = "PJSIP/ast1-00000001"
             startObject = LoginWithoutMailbox(self.test_state_controller, self)
             self.test_state_controller.change_state(startObject)
-            logger.debug("Originating call to sip/ast/9000")
-            df = ami.originate("sip/ast1/9000", "voicemailCaller", "wait", 1)
+            logger.debug("Originating call to PJSIP/9000 at ast1")
+            df = ami.originate("PJSIP/9000 at ast1", "voicemailCaller", "wait", 1)
             df.addErrback(self.handle_originate_failure)
 
     def user_event(self, ami, event):
diff --git a/tests/apps/voicemail/authenticate_extensions/test-config.yaml b/tests/apps/voicemail/authenticate_extensions/test-config.yaml
index 859004e..466669a 100644
--- a/tests/apps/voicemail/authenticate_extensions/test-config.yaml
+++ b/tests/apps/voicemail/authenticate_extensions/test-config.yaml
@@ -11,7 +11,7 @@
         - python : 'starpy'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_voicemail'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/pjsip.conf b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/sip.conf b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/sip.conf
deleted file mode 100644
index 16b8af0..0000000
--- a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/pjsip.conf b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/sip.conf b/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/authenticate_invalid_mailbox/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/run-test b/tests/apps/voicemail/authenticate_invalid_mailbox/run-test
index 17095be..7997005 100755
--- a/tests/apps/voicemail/authenticate_invalid_mailbox/run-test
+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/run-test
@@ -65,7 +65,7 @@
     def __init__(self):
         super(AuthenticateInvalidMailbox, self).__init__()
         self.create_asterisk(2)
-        self.channel = "sip/ast1/9000"
+        self.channel = "PJSIP/9000 at ast1"
 
     def ami_connect(self, ami):
         super(AuthenticateInvalidMailbox, self).ami_connect(ami)
diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml b/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml
index ceaf166..13bf03f 100644
--- a/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml
+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml
@@ -11,7 +11,7 @@
         - python : 'starpy'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_voicemail'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/pjsip.conf b/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/sip.conf b/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/sip.conf
deleted file mode 100644
index 16b8af0..0000000
--- a/tests/apps/voicemail/authenticate_invalid_password/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/pjsip.conf b/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/sip.conf b/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/authenticate_invalid_password/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/authenticate_invalid_password/run-test b/tests/apps/voicemail/authenticate_invalid_password/run-test
index ec389b9..38cf026 100755
--- a/tests/apps/voicemail/authenticate_invalid_password/run-test
+++ b/tests/apps/voicemail/authenticate_invalid_password/run-test
@@ -135,15 +135,15 @@
 
     def executeTest(self, ami):
         if self.test_counter == 0:
-            logger.debug("Originating call to sip/ast/9000")
-            df = ami.originate("sip/ast1/9000", "voicemailCaller", "wait", 1)
+            logger.debug("Originating call to PJSIP/ast/9000")
+            df = ami.originate("PJSIP/9000 at ast1", "voicemailCaller", "wait", 1)
             df.addErrback(self.handle_originate_failure)
         else:
-            self.sender_channel = "SIP/ast1-00000001"
+            self.sender_channel = "PJSIP/ast1-00000001"
             startObject = LoginWithoutMailbox(self.test_state_controller, self)
             self.test_state_controller.change_state(startObject)
-            logger.debug("Originating call to sip/ast/9001")
-            df = ami.originate("sip/ast1/9001", "voicemailCaller", "wait", 1)
+            logger.debug("Originating call to PJSIP/9001 at ast1")
+            df = ami.originate("PJSIP/9001 at ast1", "voicemailCaller", "wait", 1)
             df.addErrback(self.handle_originate_failure)
 
     def user_event(self, ami, event):
diff --git a/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml b/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml
index 73deb42..0834058 100644
--- a/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml
+++ b/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml
@@ -11,7 +11,7 @@
         - python : 'starpy'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_voicemail'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/authenticate_nominal/configs/ast1/pjsip.conf b/tests/apps/voicemail/authenticate_nominal/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/authenticate_nominal/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/authenticate_nominal/configs/ast1/sip.conf b/tests/apps/voicemail/authenticate_nominal/configs/ast1/sip.conf
deleted file mode 100644
index 16b8af0..0000000
--- a/tests/apps/voicemail/authenticate_nominal/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/authenticate_nominal/configs/ast2/pjsip.conf b/tests/apps/voicemail/authenticate_nominal/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/authenticate_nominal/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/authenticate_nominal/configs/ast2/sip.conf b/tests/apps/voicemail/authenticate_nominal/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/authenticate_nominal/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/authenticate_nominal/run-test b/tests/apps/voicemail/authenticate_nominal/run-test
index 49b182f..36c633b 100755
--- a/tests/apps/voicemail/authenticate_nominal/run-test
+++ b/tests/apps/voicemail/authenticate_nominal/run-test
@@ -106,9 +106,9 @@
         and test controller object type
         """
         self.credentials = [
-            ("9000", "1234", "SIP/ast1-00000000", LoginWithMailbox),
-            ("9001", "0", "SIP/ast1-00000001", LoginWithoutMailbox),
-            ("9002", "1234567890", "SIP/ast1-00000002", LoginWithoutMailbox)]
+            ("9000", "1234", "PJSIP/ast1-00000000", LoginWithMailbox),
+            ("9001", "0", "PJSIP/ast1-00000001", LoginWithoutMailbox),
+            ("9002", "1234567890", "PJSIP/ast1-00000002", LoginWithoutMailbox)]
         self.create_asterisk(2)
         self.test_counter = 0
 
@@ -139,8 +139,8 @@
         self.test_state_controller.change_state(startObject)
         self.sender_channel = tuple[2]
 
-        logger.debug("Originating call to sip/ast1/" + tuple[0])
-        df = self.ami_sender.originate("sip/ast1/" + tuple[0], "voicemailCaller", "wait", 1)
+        logger.debug("Originating call to PJSIP/" + tuple[0] + "@ast1")
+        df = self.ami_sender.originate("PJSIP/" + tuple[0] + "@ast1", "voicemailCaller", "wait", 1)
         df.addErrback(self.handle_originate_failure)
         self.test_counter += 1
 
diff --git a/tests/apps/voicemail/authenticate_nominal/test-config.yaml b/tests/apps/voicemail/authenticate_nominal/test-config.yaml
index 213496d..f0f6521 100644
--- a/tests/apps/voicemail/authenticate_nominal/test-config.yaml
+++ b/tests/apps/voicemail/authenticate_nominal/test-config.yaml
@@ -12,7 +12,7 @@
         - python : 'starpy'
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_callback/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_callback/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_callback/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_callback/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_callback/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_callback/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_callback/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_callback/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_callback/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_callback/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_callback/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_callback/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_callback/run-test b/tests/apps/voicemail/check_voicemail_callback/run-test
index 62f8e0e..8bc7dc4 100755
--- a/tests/apps/voicemail/check_voicemail_callback/run-test
+++ b/tests/apps/voicemail/check_voicemail_callback/run-test
@@ -203,7 +203,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_callback/test-config.yaml b/tests/apps/voicemail/check_voicemail_callback/test-config.yaml
index f62ea87..7c7e112 100644
--- a/tests/apps/voicemail/check_voicemail_callback/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_callback/test-config.yaml
@@ -12,7 +12,7 @@
         - python : 'starpy'
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_delete/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_delete/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_delete/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_delete/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_delete/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_delete/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_delete/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_delete/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_delete/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_delete/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_delete/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_delete/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_delete/run-test b/tests/apps/voicemail/check_voicemail_delete/run-test
index 1c20a1e..4a9d525 100755
--- a/tests/apps/voicemail/check_voicemail_delete/run-test
+++ b/tests/apps/voicemail/check_voicemail_delete/run-test
@@ -185,7 +185,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_delete/test-config.yaml b/tests/apps/voicemail/check_voicemail_delete/test-config.yaml
index 2defc46..29e02e9 100644
--- a/tests/apps/voicemail/check_voicemail_delete/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_delete/test-config.yaml
@@ -12,7 +12,7 @@
         - python : 'starpy'
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_dialout/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_dialout/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_dialout/run-test b/tests/apps/voicemail/check_voicemail_dialout/run-test
index a36821c..fac4222 100755
--- a/tests/apps/voicemail/check_voicemail_dialout/run-test
+++ b/tests/apps/voicemail/check_voicemail_dialout/run-test
@@ -195,7 +195,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml b/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml
index b462b81..9d682f9 100644
--- a/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml
@@ -11,7 +11,7 @@
         - python : 'starpy'
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_envelope/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_envelope/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_envelope/run-test b/tests/apps/voicemail/check_voicemail_envelope/run-test
index 62123cf..bc6e0d5 100755
--- a/tests/apps/voicemail/check_voicemail_envelope/run-test
+++ b/tests/apps/voicemail/check_voicemail_envelope/run-test
@@ -238,7 +238,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml b/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml
index 4ec2025..939ab88 100644
--- a/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml
@@ -13,7 +13,7 @@
         - python : 'starpy'
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_forward/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_forward/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_forward/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_forward/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_forward/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_forward/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_forward/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_forward/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_forward/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_forward/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_forward/run-test b/tests/apps/voicemail/check_voicemail_forward/run-test
index 3c572dd..3dd2aec 100755
--- a/tests/apps/voicemail/check_voicemail_forward/run-test
+++ b/tests/apps/voicemail/check_voicemail_forward/run-test
@@ -218,7 +218,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_forward/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward/test-config.yaml
index 1d8cadc..acd7785 100644
--- a/tests/apps/voicemail/check_voicemail_forward/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_forward/test-config.yaml
@@ -12,7 +12,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_forward_hangup/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/run-test b/tests/apps/voicemail/check_voicemail_forward_hangup/run-test
index 855886f..2836fb1 100755
--- a/tests/apps/voicemail/check_voicemail_forward_hangup/run-test
+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/run-test
@@ -225,7 +225,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml
index 10cca13..f0971ff 100644
--- a/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml
@@ -13,7 +13,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test b/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test
index 61e5131..2dbc408 100755
--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test
+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test
@@ -234,7 +234,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml
index 6069fb0..ab48613 100644
--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml
@@ -12,7 +12,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_new_user/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_new_user/run-test b/tests/apps/voicemail/check_voicemail_new_user/run-test
index 1124fb1..e3c3bad 100755
--- a/tests/apps/voicemail/check_voicemail_new_user/run-test
+++ b/tests/apps/voicemail/check_voicemail_new_user/run-test
@@ -202,7 +202,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml b/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml
index 0565758..1c4d32d 100644
--- a/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml
@@ -14,7 +14,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/run-test b/tests/apps/voicemail/check_voicemail_new_user_hangup/run-test
index 7616a56..03e6136 100755
--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/run-test
+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/run-test
@@ -198,7 +198,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml b/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml
index b705781..2c2ed55 100644
--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml
@@ -13,7 +13,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_nominal/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_nominal/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_nominal/run-test b/tests/apps/voicemail/check_voicemail_nominal/run-test
index 728d8aa..0066f03 100755
--- a/tests/apps/voicemail/check_voicemail_nominal/run-test
+++ b/tests/apps/voicemail/check_voicemail_nominal/run-test
@@ -265,7 +265,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml b/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml
index 28be740..6089973 100644
--- a/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml
@@ -12,7 +12,7 @@
         - python : 'starpy'
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_options_change_password/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/run-test b/tests/apps/voicemail/check_voicemail_options_change_password/run-test
index 1cf5d82..37f91d0 100755
--- a/tests/apps/voicemail/check_voicemail_options_change_password/run-test
+++ b/tests/apps/voicemail/check_voicemail_options_change_password/run-test
@@ -185,7 +185,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml
index c4c532f..b157464 100644
--- a/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml
@@ -14,7 +14,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test
index a691945..5c6b8d9 100755
--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test
+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/run-test
@@ -182,7 +182,7 @@
     """
 
     testParentDir = "tests/apps/voicemail"  # parent directory the test is in
-    channel = "sip/ast1/8052"  # channel to connect to that acts as vm server
+    channel = "PJSIP/8052 at ast1"  # channel to connect to that acts as vm server
 
     def __init__(self):
         super(CheckVoicemailChangePassword, self).__init__()
diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml
index 22e0aa9..bfd8156 100644
--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml
@@ -15,7 +15,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_options_record_busy/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/run-test b/tests/apps/voicemail/check_voicemail_options_record_busy/run-test
index 5731b91..3d96c09 100755
--- a/tests/apps/voicemail/check_voicemail_options_record_busy/run-test
+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/run-test
@@ -174,7 +174,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml
index 496bca0..de47837 100644
--- a/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml
@@ -11,7 +11,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_options_record_name/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/run-test b/tests/apps/voicemail/check_voicemail_options_record_name/run-test
index de527a6..8749c8e 100755
--- a/tests/apps/voicemail/check_voicemail_options_record_name/run-test
+++ b/tests/apps/voicemail/check_voicemail_options_record_name/run-test
@@ -174,7 +174,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml
index 6fb31b8..1b5dcac 100644
--- a/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml
@@ -11,7 +11,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_options_record_temp/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/run-test b/tests/apps/voicemail/check_voicemail_options_record_temp/run-test
index 74224bb..846e4a6 100755
--- a/tests/apps/voicemail/check_voicemail_options_record_temp/run-test
+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/run-test
@@ -239,7 +239,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml
index 6fb31b8..1b5dcac 100644
--- a/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml
@@ -11,7 +11,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/run-test b/tests/apps/voicemail/check_voicemail_options_record_unavail/run-test
index a998130..10f71d4 100755
--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/run-test
+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/run-test
@@ -174,7 +174,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml
index d5cdc37..b852f21 100644
--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml
@@ -11,7 +11,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_reply/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_reply/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_reply/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_reply/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_reply/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_reply/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_reply/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_reply/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_reply/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_reply/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_reply/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_reply/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_reply/run-test b/tests/apps/voicemail/check_voicemail_reply/run-test
index 6835138..c918826 100755
--- a/tests/apps/voicemail/check_voicemail_reply/run-test
+++ b/tests/apps/voicemail/check_voicemail_reply/run-test
@@ -218,7 +218,7 @@
     """
     The channel to connect to that acts as the voicemail server
     """
-    channel = "sip/ast1/8052"
+    channel = "PJSIP/8052 at ast1"
 
     """
     The voicemail manager object
diff --git a/tests/apps/voicemail/check_voicemail_reply/test-config.yaml b/tests/apps/voicemail/check_voicemail_reply/test-config.yaml
index b3f6809..9979e6c 100644
--- a/tests/apps/voicemail/check_voicemail_reply/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_reply/test-config.yaml
@@ -13,7 +13,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/pjsip.conf b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..4d1eac8
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast1
+aors = ast2
+
diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/sip.conf b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/sip.conf
deleted file mode 100644
index 1d6df41..0000000
--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast1/sip.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast1
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/pjsip.conf b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..66698dd
--- /dev/null
+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemailCaller
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/sip.conf b/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/sip.conf
deleted file mode 100644
index b0d2cd0..0000000
--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/configs/ast2/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-context = voicemailCaller
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test b/tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test
index 7027bf8..4be96de 100755
--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test
+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/run-test
@@ -213,11 +213,6 @@
     testParentDir = "tests/apps/voicemail"
 
     """
-    The channel to connect to that acts as the voicemail server
-    """
-    channel = "sip/ast1/"
-
-    """
     The voicemail manager object
     """
     voicemailManager = None
@@ -284,8 +279,8 @@
                     self.stop_reactor()
 
         else:
-            logger.debug("Originating call to " + self.channel)
-            df = ami.originate(self.channel + "8052", "voicemailCaller", "wait", 1)
+            logger.debug("Originating call to PJSIP/8052 at ast1")
+            df = ami.originate("PJSIP/8052 at ast1", "voicemailCaller", "wait", 1)
             df.addErrback(self.handle_originate_failure)
             self.leaveVoicemail()
 
@@ -299,9 +294,9 @@
         self.stop_reactor()
 
     def leaveVoicemail(self):
-        logger.debug("Originating call to " + self.channel + "1234")
+        logger.debug("Originating call to PJSIP/1234 at ast1")
         self.ast[self.ami_sender.id].cli_exec("dialplan set global TALK_AUDIO " + self.audioFile)
-        df = self.ami_sender.originate(self.channel + "1234", "voicemailCaller", "leaveVoicemail", 1)
+        df = self.ami_sender.originate("PJSIP/1234 at ast1", "voicemailCaller", "leaveVoicemail", 1)
         df.addErrback(self.handle_originate_failure)
 
     def user_event(self, ami, event):
diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml b/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml
index c1e3d91..1f86f3f 100644
--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml
+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml
@@ -17,7 +17,7 @@
         - asterisk : 'app_voicemail'
         - asterisk : 'app_senddtmf'
         - asterisk : 'app_playback'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/sip.conf
deleted file mode 100644
index 0d703fb..0000000
--- a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_contexts/run-test b/tests/apps/voicemail/leave_voicemail_contexts/run-test
index 169512e..4897686 100755
--- a/tests/apps/voicemail/leave_voicemail_contexts/run-test
+++ b/tests/apps/voicemail/leave_voicemail_contexts/run-test
@@ -132,12 +132,12 @@
         self.reset_timeout()
         if self.testCounter < 5:
             # The first 5 tests start out in extension 9000
-            self.ami_sender.originate(channel = "sip/ast1/9000",
+            self.ami_sender.originate(channel = "PJSIP/9000 at ast1",
                 context = "voicemailCaller",
                 exten = "wait",
                 priority= 1).addErrback(self.handle_originate_failure)
         elif self.testCounter < len(self.expectedValues):
-            self.ami_sender.originate(channel = "sip/ast1/1234",
+            self.ami_sender.originate(channel = "PJSIP/1234 at ast1",
                 context = "voicemailCaller",
                 exten = "wait",
                 priority = 1).addErrback(self.handle_originate_failure)
diff --git a/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml b/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml
index 95bc2a3..63fe6d8 100644
--- a/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml
+++ b/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml
@@ -10,7 +10,7 @@
         - python : 'starpy'
         - asterisk: 'app_voicemail'
         - asterisk: 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/sip.conf
deleted file mode 100644
index 0d703fb..0000000
--- a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/leave_voicemail_external_notification/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/run-test b/tests/apps/voicemail/leave_voicemail_external_notification/run-test
index 0ab2710..4497be6 100755
--- a/tests/apps/voicemail/leave_voicemail_external_notification/run-test
+++ b/tests/apps/voicemail/leave_voicemail_external_notification/run-test
@@ -144,23 +144,23 @@
     def executeTest(self):
         if self.testCounter == 0:
             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 1234")
-            df = self.senderAmi.originate("sip/ast1/1234", "sendvoicemail", "1234", 1)
+            df = self.senderAmi.originate("PJSIP/1234 at ast1", "sendvoicemail", "1234", 1)
             df.addErrback(self.handle_originate_failure)
         elif self.testCounter == 1:
             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 9000")
-            df = self.senderAmi.originate("sip/ast1/9000", "sendvoicemail", "1234", 1)
+            df = self.senderAmi.originate("PJSIP/9000 at ast1", "sendvoicemail", "1234", 1)
             df.addErrback(self.handle_originate_failure)
         elif self.testCounter == 2:
             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 9001")
-            df = self.senderAmi.originate("sip/ast1/9001", "sendvoicemail", "1234", 1)
+            df = self.senderAmi.originate("PJSIP/9001 at ast1", "sendvoicemail", "1234", 1)
             df.addErrback(self.handle_originate_failure)
         elif self.testCounter == 3:
             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 9002")
-            df = self.senderAmi.originate("sip/ast1/9002", "sendvoicemail", "1234", 1)
+            df = self.senderAmi.originate("PJSIP/9002 at ast1", "sendvoicemail", "1234", 1)
             df.addErrback(self.handle_originate_failure)
         elif self.testCounter == 4:
             logger.debug("Executing test [" + str(self.testCounter) + "] - send to 9003")
-            df = self.senderAmi.originate("sip/ast1/9003", "sendvoicemail", "1234", 1)
+            df = self.senderAmi.originate("PJSIP/9003 at ast1", "sendvoicemail", "1234", 1)
             df.addErrback(self.handle_originate_failure)
 
         self.testCounter += 1
diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml b/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml
index b6bfe25..4f15d61 100644
--- a/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml
+++ b/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml
@@ -13,7 +13,7 @@
         - python : 'starpy'
         - asterisk: 'app_voicemail'
         - asterisk: 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/sip.conf
deleted file mode 100644
index 0d703fb..0000000
--- a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/leave_voicemail_forwarding/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/run-test b/tests/apps/voicemail/leave_voicemail_forwarding/run-test
index a88164e..d604fe2 100755
--- a/tests/apps/voicemail/leave_voicemail_forwarding/run-test
+++ b/tests/apps/voicemail/leave_voicemail_forwarding/run-test
@@ -129,8 +129,8 @@
 
     def originate_call(self):
         extension = self.extensions[self.test_counter]
-        logger.info("Originating call to sip/ast1/" + str(extension))
-        df = self.ami_sender.originate("sip/ast1/" + str(extension), "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )
+        logger.info("Originating call to PJSIP/" + str(extension)) + "@ast1"
+        df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )
         df.addErrback(self.handle_originate_failure)
 
     def user_event(self, ami, event):
@@ -152,7 +152,7 @@
         else:
             """ Originate the next call and reset the state machine """
             self.test_counter += 1
-            self.sender_channel = "SIP/ast1-0000000" + str(self.test_counter)
+            self.sender_channel = "PJSIP/ast1-0000000" + str(self.test_counter)
             self.test_state_controller.change_state(StartVoiceMailState(self.test_state_controller, self))
             self.originate_call()
 
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml b/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml
index ad9ada2..0afafa7 100644
--- a/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml
+++ b/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml
@@ -12,7 +12,7 @@
         - python : 'starpy'
         - asterisk: 'app_voicemail'
         - asterisk: 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/sip.conf
deleted file mode 100644
index 0d703fb..0000000
--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test
index 55eb3f0..2263f80 100755
--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test
+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/run-test
@@ -129,8 +129,8 @@
 
     def originate_call(self):
         extension = self.extensions[self.test_counter]
-        logger.info("Originating call to sip/ast1/" + str(extension))
-        df = self.ami_sender.originate("sip/ast1/" + str(extension), "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )
+        logger.info("Originating call to PJSIP/" + str(extension) + "@ast1")
+        df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )
         df.addErrback(self.handle_originate_failure)
 
     def user_event(self, ami, event):
diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml
index b720063..41f0078 100644
--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml
+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml
@@ -12,7 +12,7 @@
         - python : 'starpy'
         - asterisk: 'app_voicemail'
         - asterisk: 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps
diff --git a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..ed09b27
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/pjsip.conf
@@ -0,0 +1,119 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+[ast3]
+qualify = no
+
+[ast4]
+qualify = no
+
+[ast5]
+qualify = no
+
+[ast6]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
+[ast3]
+type = aor
+contact = sip:127.0.0.3
+
+[ast3]
+type = identify
+endpoint = ast3
+match = 127.0.0.3
+
+[ast3]
+type = endpoint
+context = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast3
+
+[ast4]
+type = aor
+contact = sip:127.0.0.4
+
+[ast4]
+type = identify
+endpoint = ast4
+match = 127.0.0.4
+
+[ast4]
+type = endpoint
+context = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast4
+
+[ast5]
+type = aor
+contact = sip:127.0.0.5
+
+[ast5]
+type = identify
+endpoint = ast5
+match = 127.0.0.5
+
+[ast5]
+type = endpoint
+context = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast5
+
+[ast6]
+type = aor
+contact = sip:127.0.0.6
+
+[ast6]
+type = identify
+endpoint = ast6
+match = 127.0.0.6
+
+[ast6]
+type = endpoint
+context = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast6
+
diff --git a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf
deleted file mode 100644
index 99fe322..0000000
--- a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
-[ast3]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.3
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
-[ast4]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.4
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
-[ast5]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.5
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
-
-[ast6]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.6
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_nominal/run-test b/tests/apps/voicemail/leave_voicemail_nominal/run-test
index 840f686..651c9d2 100755
--- a/tests/apps/voicemail/leave_voicemail_nominal/run-test
+++ b/tests/apps/voicemail/leave_voicemail_nominal/run-test
@@ -127,8 +127,8 @@
 
     def originate_call(self):
         extension = self.extensions[self.test_counter]
-        logger.info("Originating call to sip/ast1/" + str(extension))
-        df = self.ami_sender.originate("sip/ast1/" + str(extension), "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )
+        logger.info("Originating call to PJSIP/" + str(extension) + "@ast1")
+        df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )
         df.addErrback(self.handle_originate_failure)
 
     def user_event(self, ami, event):
diff --git a/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/pjsip.conf b/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/pjsip.conf
new file mode 100644
index 0000000..1aee750
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/pjsip.conf
@@ -0,0 +1,39 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.1
+
+[ast2]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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 = voicemail
+disallow = all
+allow = ulaw
+from_user = ast_server
+aors = ast2
+
diff --git a/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/sip.conf b/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/sip.conf
deleted file mode 100644
index 0d703fb..0000000
--- a/tests/apps/voicemail/leave_voicemail_priority/configs/ast1/sip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[general]
-bindaddr = 127.0.0.1
-
-[ast2]
-type = friend
-context = voicemail
-fromuser = ast_server
-host = 127.0.0.2
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/pjsip.conf b/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/pjsip.conf
new file mode 100644
index 0000000..28f0820
--- /dev/null
+++ b/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/pjsip.conf
@@ -0,0 +1,38 @@
+;--
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements start
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+[general]
+bindaddr = 127.0.0.2
+
+[ast1]
+qualify = no
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Non mapped elements end
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+--;
+
+
+[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
+disallow = all
+allow = ulaw
+from_user = ast2
+aors = ast1
+
diff --git a/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/sip.conf b/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/sip.conf
deleted file mode 100644
index 1303790..0000000
--- a/tests/apps/voicemail/leave_voicemail_priority/configs/ast2/sip.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[general]
-bindaddr = 127.0.0.2
-
-[ast1]
-type = friend
-fromuser = ast2
-host = 127.0.0.1
-disallow = all
-allow = ulaw
-qualify = no
-insecure = invite
diff --git a/tests/apps/voicemail/leave_voicemail_priority/run-test b/tests/apps/voicemail/leave_voicemail_priority/run-test
index eee02ff..17451e7 100755
--- a/tests/apps/voicemail/leave_voicemail_priority/run-test
+++ b/tests/apps/voicemail/leave_voicemail_priority/run-test
@@ -123,8 +123,8 @@
 
     def originate_call(self):
         extension = self.extensions[self.test_counter]
-        logger.info("Originating call to sip/ast1/" + str(extension))
-        df = self.ami_sender.originate("sip/ast1/" + str(extension), "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )
+        logger.info("Originating call to PJSIP/" + str(extension) + "@ast1")
+        df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )
         df.addErrback(self.handle_originate_failure)
 
     def user_event(self, ami, event):
diff --git a/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml b/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml
index 8cb33b7..c89d2a1 100644
--- a/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml
+++ b/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml
@@ -11,7 +11,7 @@
         - python : 'starpy'
         - asterisk: 'app_voicemail'
         - asterisk: 'app_senddtmf'
-        - asterisk : 'chan_sip'
+        - asterisk : 'chan_pjsip'
     tags:
         - voicemail
         - apps

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

Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2722aa6b670e500063a497371f7a7749d59e13e5
Gerrit-Change-Number: 9046
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180523/b8c5bc7b/attachment-0001.html>
