<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9137">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
Richard Mudgett: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">apps/dial: Convert to use chan_pjsip<br><br>The sip_to_pjsip script took care of the sip.conf to pjsip.conf<br>conversion but there were other issues.<br><br>The regex in sipp.xml files to capture the to tag was wrong.<br>"s" now gets returned as ConnectedLineNum in many cases.<br>"NO ANSWER" now gets returned as a dial status when the remote<br>end doesn't answer instead of "BUSY"<br><br>This commit is dependent on the mainline asterisk commit...<br>"chan_pjsip: Register for "BEFORE_MEDIA" responses"<br><br>Change-Id: If176aff9ca48a9e7037514c202b83b270eb52537<br>---<br>M tests/apps/dial/dial_answer/sipp/charlie.xml<br>M tests/apps/dial/dial_answer/test-config.yaml<br>M tests/apps/dial/dial_busy/test-config.yaml<br>M tests/apps/dial/dial_congestion/test-config.yaml<br>M tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml<br>M tests/apps/dial/dial_hangup/test-config.yaml<br>M tests/apps/dial/dial_no_answer/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml<br>M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml<br>M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml<br>M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml<br>M tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml<br>M tests/apps/dial/dial_timeout/test-config.yaml<br>M tests/apps/dial/dial_unavail/test-config.yaml<br>27 files changed, 55 insertions(+), 55 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/tests/apps/dial/dial_answer/sipp/charlie.xml b/tests/apps/dial/dial_answer/sipp/charlie.xml<br>index cc2d8aa..5b52c4e 100644<br>--- a/tests/apps/dial/dial_answer/sipp/charlie.xml<br>+++ b/tests/apps/dial/dial_answer/sipp/charlie.xml<br>@@ -24,7 +24,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our BYE --><br> <action><br>- <ereg regexp=".*(;tag=.*)"<br>+ <ereg regexp="(;tag=.*)"<br> header="From:"<br> search_in="hdr"<br> check_it="true"<br>diff --git a/tests/apps/dial/dial_answer/test-config.yaml b/tests/apps/dial/dial_answer/test-config.yaml<br>index 191156d..e2b21ca 100644<br>--- a/tests/apps/dial/dial_answer/test-config.yaml<br>+++ b/tests/apps/dial/dial_answer/test-config.yaml<br>@@ -19,7 +19,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -44,19 +44,19 @@<br> destination: 's'<br> dcontext: 'default'<br> callerid: '"" <>'<br>- channel: 'Local/s@default-.{8};1'<br>- dchannel: ''<br>- lastapp: 'Echo'<br>+ channel: 'Local/s@default-.{8};2'<br>+ dchannel: 'PJSIP/charlie-.{8}'<br>+ lastapp: 'Dial'<br> disposition: 'ANSWERED'<br> amaflags: 'DOCUMENTATION'<br> -<br> accountcode: ''<br> destination: 's'<br> dcontext: 'default'<br>- callerid: '"" <>'<br>- channel: 'Local/s@default-.{8};2'<br>- dchannel: 'PJSIP/charlie-.{8}'<br>- lastapp: 'Dial'<br>+ callerid: '"" <s>'<br>+ channel: 'Local/s@default-.{8};1'<br>+ dchannel: ''<br>+ lastapp: 'Echo'<br> disposition: 'ANSWERED'<br> amaflags: 'DOCUMENTATION'<br> <br>diff --git a/tests/apps/dial/dial_busy/test-config.yaml b/tests/apps/dial/dial_busy/test-config.yaml<br>index ffa7b16..40a1064 100644<br>--- a/tests/apps/dial/dial_busy/test-config.yaml<br>+++ b/tests/apps/dial/dial_busy/test-config.yaml<br>@@ -19,7 +19,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -103,7 +103,7 @@<br> DestLinkedid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'BUSY'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_congestion/test-config.yaml b/tests/apps/dial/dial_congestion/test-config.yaml<br>index c493481..69aab93 100644<br>--- a/tests/apps/dial/dial_congestion/test-config.yaml<br>+++ b/tests/apps/dial/dial_congestion/test-config.yaml<br>@@ -18,7 +18,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -95,7 +95,7 @@<br> DestUniqueid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'CONGESTION'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml b/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml<br>index 43a0ebd..f7398d4 100644<br>--- a/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml<br>+++ b/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml<br>@@ -20,7 +20,7 @@<br> - asterisk : 'func_hangupcause'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -89,7 +89,7 @@<br> DestUniqueid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'CANCEL'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_hangup/test-config.yaml b/tests/apps/dial/dial_hangup/test-config.yaml<br>index f10eb55..8fe20a2 100644<br>--- a/tests/apps/dial/dial_hangup/test-config.yaml<br>+++ b/tests/apps/dial/dial_hangup/test-config.yaml<br>@@ -19,7 +19,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -88,7 +88,7 @@<br> DestUniqueid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'CANCEL'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_no_answer/test-config.yaml b/tests/apps/dial/dial_no_answer/test-config.yaml<br>index 4a8b103..1e31b11 100644<br>--- a/tests/apps/dial/dial_no_answer/test-config.yaml<br>+++ b/tests/apps/dial/dial_no_answer/test-config.yaml<br>@@ -18,7 +18,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -49,7 +49,7 @@<br> channel: 'Local/s@default-.{8};2'<br> dchannel: 'PJSIP/bob-.{8}'<br> lastapp: 'Dial'<br>- disposition: 'BUSY'<br>+ disposition: 'NO ANSWER'<br> amaflags: 'DOCUMENTATION'<br> <br> ami-config-12:<br>@@ -95,9 +95,9 @@<br> DestUniqueid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br>- DialStatus: 'BUSY'<br>+ DialStatus: 'NOANSWER'<br> count: '1'<br> <br> originator-config:<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml<br>index 4877881..2e304c2 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml<br>@@ -18,7 +18,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml<br>index 01b3d6d..645a43a 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml<br>@@ -21,7 +21,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml<br>index 1b3c8a9..f11f3db 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml<br>@@ -18,7 +18,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml<br>index 6e465ac..335adbe 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml<br>@@ -18,7 +18,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -49,7 +49,7 @@<br> channel: 'Local/s@default-.{8};2'<br> dchannel: 'PJSIP/bob-.{8}'<br> lastapp: 'Dial'<br>- disposition: 'BUSY'<br>+ disposition: 'NO ANSWER'<br> amaflags: 'DOCUMENTATION'<br> -<br> accountcode: ''<br>@@ -59,7 +59,7 @@<br> channel: 'Local/s@default-.{8};2'<br> dchannel: 'PJSIP/charlie-.{8}'<br> lastapp: 'Dial'<br>- disposition: 'BUSY'<br>+ disposition: 'NO ANSWER'<br> amaflags: 'DOCUMENTATION'<br> <br> ami-config-12:<br>@@ -130,7 +130,7 @@<br> CallerIDName: '<unknown>'<br> ConnectedLineNum: '<unknown>'<br> ConnectedLineName: '<unknown>'<br>- DialStatus: 'BUSY'<br>+ DialStatus: 'NOANSWER'<br> count: '1'<br> -<br> type: 'headermatch'<br>@@ -145,7 +145,7 @@<br> CallerIDName: '<unknown>'<br> ConnectedLineNum: '<unknown>'<br> ConnectedLineName: '<unknown>'<br>- DialStatus: 'BUSY'<br>+ DialStatus: 'NOANSWER'<br> count: '1'<br> <br> originator-config:<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml<br>index a79b675..4c5d7da 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml<br>@@ -18,7 +18,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml<br>index b10524a..ab5fe6e 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml<br>@@ -5,7 +5,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our response --><br> <action><br>- <ereg regexp=".*(;tag=.*)"<br>+ <ereg regexp="(;tag=.*)"<br> header="From:"<br> search_in="hdr"<br> check_it="true"<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml<br>index cfc4739..39aacda 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml<br>@@ -24,7 +24,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our BYE --><br> <action><br>- <ereg regexp=".*(;tag=.*)"<br>+ <ereg regexp="(;tag=.*)"<br> header="From:"<br> search_in="hdr"<br> check_it="true"<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml<br>index 4752971..1ea7232 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml<br>@@ -21,7 +21,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -146,7 +146,7 @@<br> DestLinkedid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'CANCEL'<br> count: '1'<br>@@ -165,7 +165,7 @@<br> DestLinkedid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'ANSWER'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml<br>index 9874415..81be64e 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml<br>@@ -5,7 +5,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our response --><br> <action><br>- <ereg regexp=".*(;tag=.*)" header="From:" search_in="hdr"<br>+ <ereg regexp="(;tag=.*)" header="From:" search_in="hdr"<br> check_it="true" assign_to="remote_tag" /><br> </action><br> </recv><br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml<br>index a0dedab..aa11595 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml<br>@@ -6,7 +6,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our BYE --><br> <action><br>- <ereg regexp=".*(;tag=.*)" header="From:" search_in="hdr"<br>+ <ereg regexp="(;tag=.*)" header="From:" search_in="hdr"<br> check_it="true" assign_to="dummy,remote_tag" /><br> </action><br> </recv><br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml<br>index cfc4739..39aacda 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml<br>@@ -24,7 +24,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our BYE --><br> <action><br>- <ereg regexp=".*(;tag=.*)"<br>+ <ereg regexp="(;tag=.*)"<br> header="From:"<br> search_in="hdr"<br> check_it="true"<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml<br>index 93e5439..c294a78 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml<br>@@ -19,7 +19,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -144,7 +144,7 @@<br> Channel: 'Local/s@default-.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'ANSWER'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml<br>index cfc4739..39aacda 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml<br>@@ -24,7 +24,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our BYE --><br> <action><br>- <ereg regexp=".*(;tag=.*)"<br>+ <ereg regexp="(;tag=.*)"<br> header="From:"<br> search_in="hdr"<br> check_it="true"<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml<br>index 0c2d5c6..1718d0b 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml<br>@@ -19,7 +19,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -144,7 +144,7 @@<br> Channel: 'Local/s@default-.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'ANSWER'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml<br>index cfc4739..39aacda 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml<br>@@ -24,7 +24,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our BYE --><br> <action><br>- <ereg regexp=".*(;tag=.*)"<br>+ <ereg regexp="(;tag=.*)"<br> header="From:"<br> search_in="hdr"<br> check_it="true"<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml<br>index d7118c5..eda94af 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml<br>@@ -20,7 +20,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -51,7 +51,7 @@<br> channel: 'Local/s@default-.{8};2'<br> dchannel: 'PJSIP/bob-.{8}'<br> lastapp: 'Dial'<br>- disposition: 'BUSY'<br>+ disposition: 'NO ANSWER'<br> amaflags: 'DOCUMENTATION'<br> -<br> accountcode: ''<br>@@ -132,7 +132,7 @@<br> CallerIDName: '<unknown>'<br> ConnectedLineNum: '<unknown>'<br> ConnectedLineName: '<unknown>'<br>- DialStatus: 'BUSY'<br>+ DialStatus: 'NOANSWER'<br> count: '1'<br> -<br> type: 'headermatch'<br>@@ -145,7 +145,7 @@<br> Channel: 'Local/s@default-.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'ANSWER'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml<br>index 7ccface..875dc1a 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml<br>@@ -24,7 +24,7 @@<br> <recv request="INVITE" crlf="true"><br> <!-- Save the from tag. We'll need it when we send our BYE --><br> <action><br>- <ereg regexp=".*(;tag=.*)"<br>+ <ereg regexp="(;tag=.*)"<br> header="From:"<br> search_in="hdr"<br> check_it="true"<br>diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml<br>index deb08f1..00ef2e2 100644<br>--- a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml<br>+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml<br>@@ -19,7 +19,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -144,7 +144,7 @@<br> Channel: 'Local/s@default-.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'ANSWER'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_timeout/test-config.yaml b/tests/apps/dial/dial_timeout/test-config.yaml<br>index d4a3459..512953a 100644<br>--- a/tests/apps/dial/dial_timeout/test-config.yaml<br>+++ b/tests/apps/dial/dial_timeout/test-config.yaml<br>@@ -19,7 +19,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -79,7 +79,7 @@<br> DestUniqueid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'NOANSWER'<br> count: '1'<br>diff --git a/tests/apps/dial/dial_unavail/test-config.yaml b/tests/apps/dial/dial_unavail/test-config.yaml<br>index 1ab86e1..ccbe5ba 100644<br>--- a/tests/apps/dial/dial_unavail/test-config.yaml<br>+++ b/tests/apps/dial/dial_unavail/test-config.yaml<br>@@ -18,7 +18,7 @@<br> - asterisk : 'func_strings'<br> - asterisk : 'pbx_config'<br> tags:<br>- - SIP<br>+ - pjsip<br> - dial<br> - CDR<br> <br>@@ -95,7 +95,7 @@<br> DestUniqueid: '.*'<br> CallerIDNum: '<unknown>'<br> CallerIDName: '<unknown>'<br>- ConnectedLineNum: '<unknown>'<br>+ ConnectedLineNum: 's'<br> ConnectedLineName: '<unknown>'<br> DialStatus: 'CHANUNAVAIL'<br> count: '1'<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9137">change 9137</a>. To unsubscribe, 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/9137"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If176aff9ca48a9e7037514c202b83b270eb52537 </div>
<div style="display:none"> Gerrit-Change-Number: 9137 </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: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>