[asterisk-commits] dlee: branch dlee/ari-tests r3845 - in /asterisk/team/dlee/ari-tests: ./ conf...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Jun 12 13:42:18 CDT 2013


Author: dlee
Date: Wed Jun 12 13:42:16 2013
New Revision: 3845

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3845
Log:
Merged revisions 3831-3839 from http://svn.asterisk.org/svn/testsuite/asterisk/trunk

Added:
    asterisk/team/dlee/ari-tests/configs/cdr.conf
      - copied unchanged from r3839, asterisk/trunk/configs/cdr.conf
    asterisk/team/dlee/ari-tests/sample-yaml/simpletestcase-config.yaml.sample
      - copied unchanged from r3839, asterisk/trunk/sample-yaml/simpletestcase-config.yaml.sample
Modified:
    asterisk/team/dlee/ari-tests/   (props changed)
    asterisk/team/dlee/ari-tests/lib/python/asterisk/TestRunner.py
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_answer/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_busy/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_congestion/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_hangup/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_no_answer/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_timeout/test-config.yaml
    asterisk/team/dlee/ari-tests/tests/apps/dial/dial_unavail/test-config.yaml

Propchange: asterisk/team/dlee/ari-tests/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 12 13:42:16 2013
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-3828
+/asterisk/trunk:1-3844

Modified: asterisk/team/dlee/ari-tests/lib/python/asterisk/TestRunner.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/lib/python/asterisk/TestRunner.py?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/lib/python/asterisk/TestRunner.py (original)
+++ asterisk/team/dlee/ari-tests/lib/python/asterisk/TestRunner.py Wed Jun 12 13:42:16 2013
@@ -23,6 +23,8 @@
 LOGGER = logging.getLogger('TestRunner')
 
 sys.path.append('lib/python')
+
+from version import AsteriskVersion
 
 class TestModuleFinder(object):
     ''' Determines if a module is a test module that can be loaded '''
@@ -133,9 +135,11 @@
 
     modminversion = module_spec.get('minversion')
     modmaxversion = module_spec.get('maxversion')
-    if modminversion is not None and ast_version < modminversion:
+    if modminversion is not None and \
+        AsteriskVersion(ast_version) < AsteriskVersion(modminversion):
         return False
-    if modmaxversion is not None and ast_version > modmaxversion:
+    if modmaxversion is not None and \
+        AsteriskVersion(ast_version) >= AsteriskVersion(modmaxversion):
         return False
 
     return True

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_answer/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_answer/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_answer/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial an endpoint and make sure it Answers'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,45 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: 'cdr-config-11'
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+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-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_busy/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_busy/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_busy/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial an endpoint and get a response code that maps to a Busy status'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,34 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: 'cdr-config-11'
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'BUSY'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_congestion/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_congestion/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_congestion/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial an endpoint and get a response code that maps to a Congestion status'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,34 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -5,7 +5,7 @@
         up the caller. Verify that the dial is cancelled.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -21,13 +21,49 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            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:
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'NO ANSWER'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-11:
+    -
+        type: 'callback'
+        conditions:
+            match:
+                Event: 'Dial'
+                SubEvent: 'Begin'
+        callbackModule: 'send_dtmf'
+        callbackMethod: 'send_dtmf'
+
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_hangup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_hangup/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_hangup/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_hangup/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -5,7 +5,7 @@
         up the caller. Verify that the dial is cancelled.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -21,13 +21,50 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            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:
+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: 'NO ANSWER'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-11:
+    -
+        type: 'callback'
+        conditions:
+            match:
+                Event: 'Dial'
+                SubEvent: 'Begin'
+                Destination: 'SIP/charlie-.*'
+        callbackModule: 'hangup'
+        callbackMethod: 'send_hangup'
+
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_no_answer/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_no_answer/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_no_answer/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial an endpoint and get a response code that maps to a No Answer status'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,34 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial two endpoints. Both reply that they are busy.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -5,7 +5,7 @@
         Verify that all dial operations are cancelled.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -21,13 +21,30 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            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:
+ami-config-11:
+    -
+        type: 'callback'
+        conditions:
+            match:
+                Event: 'Dial'
+                SubEvent: 'Begin'
+                Destination: 'SIP/bob-.*'
+        callbackModule: 'send_dtmf'
+        callbackMethod: 'send_dtmf'
+
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial two endpoints, both of whom happen to be congested.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial two endpoints, both of whom fail to answer.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial two endpoints, both of whom happen to be unavailable.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -5,7 +5,7 @@
         Verify that Asterisk cancels the other Dial request.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -19,13 +19,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial two endpoints. One replies back as Busy, the other Answers.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
+            minversion: '12.0.0'
             config-section: ami-config
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial two endpoints. One replies back as Congested, the other Answers.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial two endpoints. One replies back with a No Answer, the other Answers.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial two endpoints. One replies back as Unavailable, the other Answers.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,14 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_timeout/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_timeout/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_timeout/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_timeout/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -5,7 +5,7 @@
         dial operation'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -20,13 +20,34 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'NO ANSWER'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-12:
     -
         type: 'headermatch'
         conditions:

Modified: asterisk/team/dlee/ari-tests/tests/apps/dial/dial_unavail/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-tests/tests/apps/dial/dial_unavail/test-config.yaml?view=diff&rev=3845&r1=3844&r2=3845
==============================================================================
--- asterisk/team/dlee/ari-tests/tests/apps/dial/dial_unavail/test-config.yaml (original)
+++ asterisk/team/dlee/ari-tests/tests/apps/dial/dial_unavail/test-config.yaml Wed Jun 12 13:42:16 2013
@@ -4,7 +4,7 @@
         'Dial an endpoint and get a response code that maps to an Unavailable status'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
@@ -18,13 +18,34 @@
         typename: 'sipp.SIPpTestCase'
     modules:
         -
-            config-section: ami-config
+            minversion: '11.0.0'
+            maxversion: '12.0.0'
+            config-section: cdr-config-11
+            typename: 'cdr.CDRModule'
+        -
+            minversion: '12.0.0'
+            config-section: ami-config-12
             typename: 'ami.AMIEventModule'
         -
             config-section: originator-config
             typename: 'PluggableModules.Originator'
 
-ami-config:
+cdr-config-11:
+    -
+        file: 'Master'
+        lines:
+            -
+                accountcode: ''
+                destination: 's'
+                dcontext: 'default'
+                callerid: ''
+                channel: 'Local/s at default-.{8};2'
+                dchannel: 'SIP/bob-.{8}'
+                lastapp: 'Hangup'
+                disposition: 'FAILED'
+                amaflags: 'DOCUMENTATION'
+
+ami-config-12:
     -
         type: 'headermatch'
         conditions:




More information about the asterisk-commits mailing list