<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/testsuite/+/18820">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rest_api: Remove pjsua from originate to dialplan test.<br><br>The pjsua application is not actually needed for this test<br>and is experiencing issues in 2.12. As we're trying to move<br>around from the usage of pjsua this test has now been moved<br>to calling back into Asterisk instead, removing any need for<br>pjsua or even SIPp.<br><br>ASTERISK-29351<br><br>Change-Id: I8a59d66ce1ddc115b3dfa1c9f1507638fd14b461<br>---<br>M tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/extensions.conf<br>M tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/pjsip.conf<br>M tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/test-config.yaml<br>3 files changed, 20 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>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</span><br><span>index 16bc15e..ded7d29 100644</span><br><span>--- a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/extensions.conf</span><br><span>+++ b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/extensions.conf</span><br><span>@@ -5,6 +5,7 @@</span><br><span> same => n,Hangup()</span><br><span> </span><br><span> exten => echo,1,Answer()</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,UserEvent(Start)</span><br><span> same => n,Echo()</span><br><span> same => n,Hangup()</span><br><span> </span><br><span>@@ -45,3 +46,7 @@</span><br><span> exten => h,1,NoOp()</span><br><span> </span><br><span> exten => _.,1,UserEvent(Failed)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[alice-inbound]</span><br><span style="color: hsl(120, 100%, 40%);">+exten => alice,1,Answer</span><br><span style="color: hsl(120, 100%, 40%);">+same => n,Wait(360)</span><br><span>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</span><br><span>index 1f2bd83..a8a7831 100644</span><br><span>--- a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/pjsip.conf</span><br><span>+++ b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/configs/ast1/pjsip.conf</span><br><span>@@ -21,8 +21,20 @@</span><br><span> media_address=127.0.0.1</span><br><span> aors=alice</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+[alice-inbound]</span><br><span style="color: hsl(120, 100%, 40%);">+type=endpoint</span><br><span style="color: hsl(120, 100%, 40%);">+context=alice-inbound</span><br><span style="color: hsl(120, 100%, 40%);">+disallow=all</span><br><span style="color: hsl(120, 100%, 40%);">+allow=ulaw</span><br><span style="color: hsl(120, 100%, 40%);">+direct_media=no</span><br><span style="color: hsl(120, 100%, 40%);">+media_address=127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> [alice]</span><br><span> type=aor</span><br><span> max_contacts=1</span><br><span style="color: hsl(0, 100%, 40%);">-contact=sip:alice@127.0.0.1:5061\;transport=udp</span><br><span style="color: hsl(120, 100%, 40%);">+contact=sip:alice@127.0.0.1:5060\;transport=udp</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+[alice]</span><br><span style="color: hsl(120, 100%, 40%);">+type=identify</span><br><span style="color: hsl(120, 100%, 40%);">+match=127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+endpoint=alice-inbound</span><br><span>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</span><br><span>index 01183b0..44431b5 100644</span><br><span>--- a/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/test-config.yaml</span><br><span>+++ b/tests/rest_api/applications/channel-subscriptions/originate_to_dialplan/non_local_channels/test-config.yaml</span><br><span>@@ -26,7 +26,6 @@</span><br><span> - python: requests</span><br><span> - python: twisted</span><br><span> - python: starpy</span><br><span style="color: hsl(0, 100%, 40%);">- - python: pjsua</span><br><span> - asterisk: app_echo</span><br><span> - asterisk: app_userevent</span><br><span> - asterisk: res_ari_channels</span><br><span>@@ -41,25 +40,9 @@</span><br><span> typename: ari.AriOriginateTestObject</span><br><span> modules:</span><br><span> -</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: pjsua-config</span><br><span style="color: hsl(0, 100%, 40%);">- typename: phones.PjsuaPhoneController</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span> config-section: pluggable-config</span><br><span> typename: pluggable_modules.EventActionModule</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-pjsua-config:</span><br><span style="color: hsl(0, 100%, 40%);">- transports:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- name: 'local-ipv4-1'</span><br><span style="color: hsl(0, 100%, 40%);">- bind: '127.0.0.1'</span><br><span style="color: hsl(0, 100%, 40%);">- bindport: '5061'</span><br><span style="color: hsl(0, 100%, 40%);">- accounts:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- name: 'alice'</span><br><span style="color: hsl(0, 100%, 40%);">- username: 'alice'</span><br><span style="color: hsl(0, 100%, 40%);">- domain: '127.0.0.1'</span><br><span style="color: hsl(0, 100%, 40%);">- transport: 'local-ipv4-1'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> originate-config:</span><br><span> memcheck-delay-stop: 7</span><br><span> apps: testsuite</span><br><span>@@ -72,14 +55,13 @@</span><br><span> priority: '1'</span><br><span> </span><br><span> pluggable-config:</span><br><span style="color: hsl(0, 100%, 40%);">- # Upon phone being ready, originate the channels.</span><br><span> -</span><br><span> ami-events:</span><br><span> conditions:</span><br><span> match:</span><br><span> Event: 'UserEvent'</span><br><span style="color: hsl(0, 100%, 40%);">- UserEvent: 'PJsuaPhonesReady'</span><br><span style="color: hsl(0, 100%, 40%);">- count: 1</span><br><span style="color: hsl(120, 100%, 40%);">+ UserEvent: 'Start'</span><br><span style="color: hsl(120, 100%, 40%);">+ count: '1'</span><br><span> ari-requests:</span><br><span> -</span><br><span> method: 'post'</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/testsuite/+/18820">change 18820</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/testsuite/+/18820"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: certified/18.9 </div>
<div style="display:none"> Gerrit-Change-Id: I8a59d66ce1ddc115b3dfa1c9f1507638fd14b461 </div>
<div style="display:none"> Gerrit-Change-Number: 18820 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-CC: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>