[asterisk-commits] mjordan: testsuite/asterisk/trunk r3857 - in /asterisk/trunk: lib/python/aste...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sun Jun 16 21:31:22 CDT 2013


Author: mjordan
Date: Sun Jun 16 21:31:19 2013
New Revision: 3857

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3857
Log:
Update a large number of tests for Asterisk 12 CDR changes

This patch does the following:
* Updates the rest of the Dial tests to handle CDR changes.
* Restructures the CDR tests to better accomodate new tests that will
  (eventually) be coming. Tests that check CDR properties are now in the
  cdr_properties sub directory; tests that manipulate CDRs (NoCDR, ForkCDR,
  ResetCDR) are now in cdr_manipulation.
* A few other small tweaks to properly check/handle messages from Stasis-Core


Added:
    asterisk/trunk/tests/apps/page/configs/ast1/amd.conf   (with props)
    asterisk/trunk/tests/cdr/cdr-tests.py   (with props)
    asterisk/trunk/tests/cdr/cdr_manipulation/
    asterisk/trunk/tests/cdr/cdr_manipulation/tests.yaml   (with props)
    asterisk/trunk/tests/cdr/cdr_properties/
    asterisk/trunk/tests/cdr/cdr_properties/tests.yaml   (with props)
    asterisk/trunk/tests/cdr/configs/
    asterisk/trunk/tests/cdr/configs/basic/
    asterisk/trunk/tests/cdr/configs/basic/ast1/
    asterisk/trunk/tests/cdr/configs/basic/ast1/cdr.conf   (with props)
    asterisk/trunk/tests/cdr/configs/unanswered/
    asterisk/trunk/tests/cdr/configs/unanswered/ast1/
    asterisk/trunk/tests/cdr/configs/unanswered/ast1/cdr.conf   (with props)
Removed:
    asterisk/trunk/tests/cdr/ForkCdrModule.py
    asterisk/trunk/tests/cdr/blind-transfer-accountcode/
    asterisk/trunk/tests/cdr/cdr_accountcode/
    asterisk/trunk/tests/cdr/cdr_fork_end_time/
    asterisk/trunk/tests/cdr/cdr_userfield/
    asterisk/trunk/tests/cdr/console_fork_after_busy_forward/
    asterisk/trunk/tests/cdr/console_fork_before_dial/
    asterisk/trunk/tests/cdr/nocdr/
Modified:
    asterisk/trunk/lib/python/asterisk/PluggableModules.py
    asterisk/trunk/lib/python/asterisk/version.py
    asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/send_dtmf.py
    asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml
    asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
    asterisk/trunk/tests/apps/mixmonitor/testaudio2.raw
    asterisk/trunk/tests/apps/mixmonitor/testaudio3.raw
    asterisk/trunk/tests/apps/queues/queue_all_paused_no_answer/test-config.yaml
    asterisk/trunk/tests/apps/queues/queue_no_answer/test-config.yaml
    asterisk/trunk/tests/apps/queues/queue_one_paused_no_answer/test-config.yaml
    asterisk/trunk/tests/cdr/batch_cdrs/configs/ast1/cdr.conf
    asterisk/trunk/tests/cdr/cdr_originate_sip_congestion_log/configs/ast1/cdr.conf
    asterisk/trunk/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml
    asterisk/trunk/tests/cdr/cdr_unanswered_yes/test-config.yaml
    asterisk/trunk/tests/cdr/console_dial_sip_answer/test-config.yaml
    asterisk/trunk/tests/cdr/console_dial_sip_busy/test-config.yaml
    asterisk/trunk/tests/cdr/console_dial_sip_congestion/test-config.yaml
    asterisk/trunk/tests/cdr/console_dial_sip_transfer/test-config.yaml
    asterisk/trunk/tests/cdr/tests.yaml

Modified: asterisk/trunk/lib/python/asterisk/PluggableModules.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/PluggableModules.py?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/lib/python/asterisk/PluggableModules.py (original)
+++ asterisk/trunk/lib/python/asterisk/PluggableModules.py Sun Jun 16 21:31:19 2013
@@ -33,6 +33,7 @@
             'ignore-originate-failure': 'no',
             'trigger': 'scenario_start',
             'id': '0',
+            'async': 'False',
             'event': None
         }
 
@@ -85,11 +86,16 @@
         LOGGER.info("Originating call")
 
         if len(self.config['context']) > 0:
-            self.ami.originate(channel = self.config['channel'], context = self.config['context'],
-                exten = self.config['exten'], priority = self.config['priority']).addErrback(self.failure)
+            self.ami.originate(channel=self.config['channel'],
+                               context=self.config['context'],
+                               exten=self.config['exten'],
+                               priority=self.config['priority'],
+                               async=self.config['async']).addErrback(self.failure)
         else:
-            self.ami.originate(channel = self.config['channel'], application = self.config['application'],
-                data = self.config['data']).addErrback(self.failure)
+            self.ami.originate(channel=self.config['channel'],
+                               application=self.config['application'],
+                               data=self.config['data'],
+                               async=self.config['async']).addErrback(self.failure)
 
     def scenario_started(self, result):
         '''Handle origination on scenario start if configured to do so.'''

Modified: asterisk/trunk/lib/python/asterisk/version.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/version.py?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/lib/python/asterisk/version.py (original)
+++ asterisk/trunk/lib/python/asterisk/version.py Sun Jun 16 21:31:19 2013
@@ -209,7 +209,7 @@
         return 100
 
     def has_feature(self, feature):
-        if (self.name or self.major == 11):
+        if (self.name or self.major >= 11):
             # Assume that 11 or trunk has all the features
             return True
         if feature == self.feature:
@@ -523,17 +523,17 @@
         v2 = AsteriskVersion("1.8.12.0")
         self.assertTrue(v1 < v2)
 
-    def test_cmp26(self):
+    def test_cmp27(self):
         v1 = AsteriskVersion("SVN-branch-1.8.11-r363674")
         v2 = AsteriskVersion("SVN-branch-1.8.15-r363674")
         self.assertTrue(v1 < v2)
 
-    def test_cmp27(self):
+    def test_cmp28(self):
         v1 = AsteriskVersion("SVN-branch-1.8.11-r363674")
         v2 = AsteriskVersion("SVN-branch-1.8-r369138M")
         self.assertTrue(v1 < v2)
 
-    def test_cmp28(self):
+    def test_cmp29(self):
         v1 = AsteriskVersion("1.8.11-cert1")
         v2 = AsteriskVersion("Asterisk SVN-branch-1.8.11-cert-r368608")
         self.assertTrue(v1 < v2)

Modified: asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/send_dtmf.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/send_dtmf.py?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/send_dtmf.py (original)
+++ asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/send_dtmf.py Sun Jun 16 21:31:19 2013
@@ -13,7 +13,8 @@
 def send_dtmf(ami, event):
     ''' Callback called when we detect dial has started.
     '''
-
+    if 'channel' not in event:
+        return True
     channel = event['channel'][:len(event['channel']) - 2]
     channel += ';1'
     LOGGER.info('Sending DTMF to hangup channel %s' % channel)

Modified: asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -75,7 +75,7 @@
                 accountcode: ''
                 destination: 's'
                 dcontext: 'default'
-                callerid: ''
+                callerid: '"" <>'
                 channel: 'Local/s at default-.{8};2'
                 dchannel: 'SIP/bob-.{8}'
                 lastapp: 'Dial'
@@ -100,6 +100,7 @@
         conditions:
             match:
                 Event: 'DialBegin'
+                DestChannel: 'SIP/bob-.*'
         callbackModule: 'send_dtmf'
         callbackMethod: 'send_dtmf'
     -

Modified: asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -61,7 +61,7 @@
                 channel: 'Local/s at default-.{8};2'
                 dchannel: 'SIP/bob-.{8}'
                 lastapp: 'Dial'
-                disposition: 'NO ANSWER'
+                disposition: 'BUSY'
                 amaflags: 'DOCUMENTATION'
 
 ami-config-12:
@@ -109,7 +109,7 @@
                 CallerIDName: '<unknown>'
                 ConnectedLineNum: '<unknown>'
                 ConnectedLineName: '<unknown>'
-                DialStatus: 'NOANSWER'
+                DialStatus: 'BUSY'
         count: '1'
 
 originator-config:

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -18,12 +18,92 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: ami-config-11
+            typename: 'ami.AMIEventModule'
+        -
             minversion: '12.0.0'
             config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
+
+ami-config-11:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/bob-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 486 Busy Here'
+                AsteriskCause: 'User busy'
+        count: '1'
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/charlie-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 486 Busy Here'
+                AsteriskCause: 'User busy'
+        count: '1'
+
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'BUSY'
+                amaflags: 'DOCUMENTATION'
+
+cdr-config-12:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Dial'
+                disposition: 'BUSY'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'BUSY'
+                amaflags: 'DOCUMENTATION'
 
 ami-config-12:
     -

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -23,6 +23,15 @@
         -
             minversion: '11.0.0'
             maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
             config-section: ami-config-11
             typename: 'ami.AMIEventModule'
         -
@@ -33,7 +42,59 @@
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'NO ANSWER'
+                amaflags: 'DOCUMENTATION'
+
+cdr-config-12:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Dial'
+                disposition: 'NO ANSWER'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'NO ANSWER'
+                amaflags: 'DOCUMENTATION'
+
 ami-config-11:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/bob-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 180 Ringing'
+                AsteriskCause: 'Normal Clearing'
+        count: '1'
     -
         type: 'callback'
         conditions:

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -18,12 +18,92 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: ami-config-11
+            typename: 'ami.AMIEventModule'
+        -
             minversion: '12.0.0'
             config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
+
+ami-config-11:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/bob-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 503 Service Unavailable'
+                AsteriskCause: 'Circuit/channel congestion'
+        count: '1'
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/charlie-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 503 Service Unavailable'
+                AsteriskCause: 'Circuit/channel congestion'
+        count: '1'
+
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+
+cdr-config-12:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Dial'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
 
 ami-config-12:
     -

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -18,6 +18,20 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: ami-config-11
+            typename: 'ami.AMIEventModule'
+        -
             minversion: '12.0.0'
             config-section: ami-config-12
             typename: 'ami.AMIEventModule'
@@ -25,6 +39,72 @@
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+
+cdr-config-12:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Dial'
+                disposition: 'BUSY'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'BUSY'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-11:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/bob-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 480 Temporarily Unavailable'
+                AsteriskCause: 'User alerting'
+        count: '1'
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/charlie-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 480 Temporarily Unavailable'
+                AsteriskCause: 'User alerting'
+        count: '1'
+
 ami-config-12:
     -
         type: 'headermatch'
@@ -93,7 +173,7 @@
                 CallerIDName: '<unknown>'
                 ConnectedLineNum: '<unknown>'
                 ConnectedLineName: '<unknown>'
-                DialStatus: 'NOANSWER'
+                DialStatus: 'BUSY'
         count: '1'
     -
         type: 'headermatch'
@@ -108,7 +188,7 @@
                 CallerIDName: '<unknown>'
                 ConnectedLineNum: '<unknown>'
                 ConnectedLineName: '<unknown>'
-                DialStatus: 'NOANSWER'
+                DialStatus: 'BUSY'
         count: '1'
 
 originator-config:

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -18,12 +18,92 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: ami-config-11
+            typename: 'ami.AMIEventModule'
+        -
             minversion: '12.0.0'
             config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
+
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+
+cdr-config-12:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Dial'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-11:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/bob-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 420 Bad Extension'
+                AsteriskCause: 'No route to destination'
+        count: '1'
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/charlie-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 420 Bad Extension'
+                AsteriskCause: 'No route to destination'
+        count: '1'
 
 ami-config-12:
     -

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -19,12 +19,112 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: ami-config-11
+            typename: 'ami.AMIEventModule'
+        -
             minversion: '12.0.0'
             config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
+
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};1'
+                dchannel: ''
+                lastapp: 'Echo'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+
+cdr-config-12:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};1'
+                dchannel: ''
+                lastapp: 'Echo'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Dial'
+                disposition: 'NO ANSWER'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-11:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/bob-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 180 Ringing'
+                AsteriskCause: 'Normal Clearing'
+        count: '1'
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/charlie-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 200 OK'
+                AsteriskCause: 'Normal Clearing'
+        count: '1'
 
 ami-config-12:
     -

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -18,12 +18,112 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
             minversion: '12.0.0'
-            config-section: ami-config
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: ami-config-11
+            typename: 'ami.AMIEventModule'
+        -
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
+
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};1'
+                dchannel: ''
+                lastapp: 'Echo'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+
+cdr-config-12:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};1'
+                dchannel: ''
+                lastapp: 'Echo'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Dial'
+                disposition: 'BUSY'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-11:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/bob-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 486 Busy Here'
+                AsteriskCause: 'User busy'
+        count: '1'
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/charlie-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 200 OK'
+                AsteriskCause: 'Normal Clearing'
+        count: '1'
 
 ami-config-12:
     -

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -18,12 +18,112 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: ami-config-11
+            typename: 'ami.AMIEventModule'
+        -
             minversion: '12.0.0'
             config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
+
+cdr-config-12:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};1'
+                dchannel: ''
+                lastapp: 'Echo'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Dial'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/charlie-.{8}'
+                lastapp: 'Dial'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};1'
+                dchannel: ''
+                lastapp: 'Echo'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-11:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/bob-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 503 Service Unavailable'
+                AsteriskCause: 'Circuit/channel congestion'
+        count: '1'
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'HangupCause'
+                HangupChannel: 'SIP/charlie-.*'
+        requirements:
+            match:
+                TechCause: 'SIP 200 OK'
+                AsteriskCause: 'Normal Clearing'
+        count: '1'
 
 ami-config-12:
     -

Modified: asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml?view=diff&rev=3857&r1=3856&r2=3857
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml Sun Jun 16 21:31:19 2013
@@ -19,13 +19,87 @@
     modules:
         -
             minversion: '12.0.0'
+            config-section: cdr-config-12
+            typename: 'cdr.CDRModule'
+        -

[... 923 lines stripped ...]



More information about the asterisk-commits mailing list