[Asterisk-code-review] rest_api: Remove pjsua from originate to dialplan test. (testsuite[16])

Friendly Automation asteriskteam at digium.com
Thu Mar 24 10:40:54 CDT 2022


Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/testsuite/+/18190 )

Change subject: rest_api: Remove pjsua from originate to dialplan test.
......................................................................

rest_api: Remove pjsua from originate to dialplan test.

The pjsua application is not actually needed for this test
and is experiencing issues in 2.12. As we're trying to move
around from the usage of pjsua this test has now been moved
to calling back into Asterisk instead, removing any need for
pjsua or even SIPp.

ASTERISK-29351

Change-Id: I8a59d66ce1ddc115b3dfa1c9f1507638fd14b461
---
M tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/extensions.conf
M tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/pjsip.conf
M tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/test-config.yaml
3 files changed, 20 insertions(+), 21 deletions(-)

Approvals:
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/extensions.conf b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/extensions.conf
index 16bc15e..ded7d29 100644
--- a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/extensions.conf
+++ b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/extensions.conf
@@ -5,6 +5,7 @@
 same => n,Hangup()
 
 exten => echo,1,Answer()
+same => n,UserEvent(Start)
 same => n,Echo()
 same => n,Hangup()
 
@@ -45,3 +46,7 @@
 exten => h,1,NoOp()
 
 exten => _.,1,UserEvent(Failed)
+
+[alice-inbound]
+exten => alice,1,Answer
+same => n,Wait(360)
diff --git a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/pjsip.conf b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/pjsip.conf
index 1f2bd83..a8a7831 100644
--- a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/pjsip.conf
+++ b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/pjsip.conf
@@ -21,8 +21,20 @@
 media_address=127.0.0.1
 aors=alice
 
+[alice-inbound]
+type=endpoint
+context=alice-inbound
+disallow=all
+allow=ulaw
+direct_media=no
+media_address=127.0.0.1
+
 [alice]
 type=aor
 max_contacts=1
-contact=sip:alice at 127.0.0.1:5061\;transport=udp
+contact=sip:alice at 127.0.0.1:5060\;transport=udp
 
+[alice]
+type=identify
+match=127.0.0.1
+endpoint=alice-inbound
diff --git a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/test-config.yaml b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/test-config.yaml
index 01183b0..44431b5 100644
--- a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/test-config.yaml
+++ b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/test-config.yaml
@@ -26,7 +26,6 @@
         - python: requests
         - python: twisted
         - python: starpy
-        - python: pjsua
         - asterisk: app_echo
         - asterisk: app_userevent
         - asterisk: res_ari_channels
@@ -41,25 +40,9 @@
         typename: ari.AriOriginateTestObject
     modules:
         -
-            config-section: pjsua-config
-            typename: phones.PjsuaPhoneController
-        -
             config-section: pluggable-config
             typename: pluggable_modules.EventActionModule
 
-pjsua-config:
-    transports:
-        -
-            name: 'local-ipv4-1'
-            bind: '127.0.0.1'
-            bindport: '5061'
-    accounts:
-        -
-            name: 'alice'
-            username: 'alice'
-            domain: '127.0.0.1'
-            transport: 'local-ipv4-1'
-
 originate-config:
     memcheck-delay-stop: 7
     apps: testsuite
@@ -72,14 +55,13 @@
             priority: '1'
 
 pluggable-config:
-    # Upon phone being ready, originate the channels.
     -
         ami-events:
             conditions:
                 match:
                     Event: 'UserEvent'
-                    UserEvent: 'PJsuaPhonesReady'
-            count: 1
+                    UserEvent: 'Start'
+            count: '1'
         ari-requests:
             -
                 method: 'post'

-- 
To view, visit https://gerrit.asterisk.org/c/testsuite/+/18190
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: testsuite
Gerrit-Branch: 16
Gerrit-Change-Id: I8a59d66ce1ddc115b3dfa1c9f1507638fd14b461
Gerrit-Change-Number: 18190
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20220324/ebd72755/attachment.html>


More information about the asterisk-code-review mailing list