[asterisk-commits] jrose: testsuite/asterisk/trunk r4170 - in /asterisk/trunk/tests/bridge: ./ a...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Sep 12 13:13:07 CDT 2013
Author: jrose
Date: Thu Sep 12 13:13:04 2013
New Revision: 4170
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4170
Log:
Testsuite: Update bridge/automon and bridge/automixmon tests for Asterisk 12
(issue ASTERISK-22325)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2821/
Added:
asterisk/trunk/tests/bridge/automixmon_bridgefeatures/
asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/
asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/
asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf (with props)
asterisk/trunk/tests/bridge/automixmon_bridgefeatures/test-config.yaml (with props)
asterisk/trunk/tests/bridge/automon_bridgefeatures/
asterisk/trunk/tests/bridge/automon_bridgefeatures/configs/
asterisk/trunk/tests/bridge/automon_bridgefeatures/configs/ast1/
asterisk/trunk/tests/bridge/automon_bridgefeatures/configs/ast1/extensions.conf (with props)
asterisk/trunk/tests/bridge/automon_bridgefeatures/test-config.yaml (with props)
Modified:
asterisk/trunk/tests/bridge/automixmon/configs/ast1/extensions.conf
asterisk/trunk/tests/bridge/automixmon/test-config.yaml
asterisk/trunk/tests/bridge/automon/configs/ast1/extensions.conf
asterisk/trunk/tests/bridge/automon/test-config.yaml
asterisk/trunk/tests/bridge/tests.yaml
Modified: asterisk/trunk/tests/bridge/automixmon/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/automixmon/configs/ast1/extensions.conf?view=diff&rev=4170&r1=4169&r2=4170
==============================================================================
--- asterisk/trunk/tests/bridge/automixmon/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/bridge/automixmon/configs/ast1/extensions.conf Thu Sep 12 13:13:04 2013
@@ -5,11 +5,3 @@
exten => bob_automixmon,1,Dial(SIP/test_call at bob,,xH)
same => n,Hangup()
-
-exten => alice_automixmon2,1,Set(BRIDGE_FEATURES=X)
-same => n,Dial(SIP/test_call at bob,,h)
-same => n,Hangup()
-
-exten => bob_automixmon2,1,Set(BRIDGE_FEATURES=x)
-same => n,Dial(SIP/test_call at bob,,H)
-same => n,Hangup()
Modified: asterisk/trunk/tests/bridge/automixmon/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/automixmon/test-config.yaml?view=diff&rev=4170&r1=4169&r2=4170
==============================================================================
--- asterisk/trunk/tests/bridge/automixmon/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/automixmon/test-config.yaml Thu Sep 12 13:13:04 2013
@@ -14,8 +14,13 @@
config-section: 'cdr-config'
typename: 'cdr.CDRModule'
-
+ maxversion: '12.0.0'
config-section: 'cel-config'
typename: 'cel.CELModule'
+ -
+ minversion: '12.0.0'
+ config-section: 'cel-config-v12'
+ typename: 'ami.AMIEventModule'
bridge-config:
test-runs:
@@ -61,48 +66,7 @@
who: 'bob'
what: 'automixmon'
success: 'true'
- -
- originate_channel: 'SIP/alice_automixmon2 at uut'
- hangup: 'alice'
- features:
- - # mixmonitor start
- who: 'bob'
- what: 'automixmon'
- success: 'false'
- -
- who: 'alice'
- what: 'automixmon'
- success: 'true'
-
- - # mixmonitor stop
- who: 'bob'
- what: 'automixmon'
- success: 'false'
- -
- who: 'alice'
- what: 'automixmon'
- success: 'true'
- -
- originate_channel: 'SIP/bob_automixmon2 at uut'
- hangup: 'alice'
- features:
- - # mixmonitor start
- who: 'alice'
- what: 'automixmon'
- success: 'false'
- -
- who: 'bob'
- what: 'automixmon'
- success: 'true'
-
- - # mixmonitor stop
- who: 'alice'
- what: 'automixmon'
- success: 'false'
- -
- who: 'bob'
- what: 'automixmon'
- success: 'true'
+
cdr-config:
-
file: 'Master'
@@ -127,26 +91,6 @@
lastapp: 'Dial'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
- -
- source: '1234'
- destination: 'alice_automixmon2'
- dcontext: 'default'
- callerid: '"Alice" <1234>'
- channel: '.*/alice-.*'
- dchannel: '.*/bob-.*'
- lastapp: 'Dial'
- disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
- -
- source: '1234'
- destination: 'bob_automixmon2'
- dcontext: 'default'
- callerid: '"Alice" <1234>'
- channel: '.*/alice-.*'
- dchannel: '.*/bob-.*'
- lastapp: 'Dial'
- disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
cel-config:
-
@@ -368,226 +312,152 @@
context: 'default'
channel: '.*/alice-.*'
- # Test 3: alice_automixmon2
- -
- eventtype: 'CHAN_START'
- cidname: 'Alice'
- cidnum: '1234'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'APP_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automixmon2'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'CHAN_START'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- -
- eventtype: 'ANSWER'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'ANSWER'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automixmon2'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'BRIDGE_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automixmon2'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'BRIDGE_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automixmon2'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'HANGUP'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- eventextra: '16,.*/alice-.*'
- -
- eventtype: 'CHAN_END'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'APP_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automixmon2'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'HANGUP'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automixmon2'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- eventextra: '16,.*/alice-.*,ANSWER'
- -
- eventtype: 'CHAN_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automixmon2'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'LINKEDID_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automixmon2'
- exten: 'alice_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
-
- # Test 4: bob_automixmon2
- -
- eventtype: 'CHAN_START'
- cidname: 'Alice'
- cidnum: '1234'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'APP_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automixmon2'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'CHAN_START'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- -
- eventtype: 'ANSWER'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'ANSWER'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automixmon2'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'BRIDGE_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automixmon2'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'BRIDGE_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automixmon2'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'HANGUP'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- eventextra: '16,.*/alice-.*'
- -
- eventtype: 'CHAN_END'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'APP_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automixmon2'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'HANGUP'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automixmon2'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- eventextra: '16,.*/alice-.*,ANSWER'
- -
- eventtype: 'CHAN_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automixmon2'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'LINKEDID_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automixmon2'
- exten: 'bob_automixmon2'
- context: 'default'
- channel: '.*/alice-.*'
-
-
+cel-config-v12:
+ -
+ type: 'cel'
+ conditions:
+ match:
+ Channel: '.*/bob-.*'
+ requirements:
+ # First iteration
+ -
+ id: 'bob-start-one'
+ partialorder:
+ after: 'alice-app-start-one'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'bob-answer-one'
+ partialorder:
+ before: 'alice-answer-one'
+ before: 'alice-bridge-enter-one'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'bob-bridge-enter-one'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ match:
+ EventName: 'CHAN_END'
+ # Second iteration
+ -
+ id: 'bob-start-two'
+ partialorder:
+ after: 'alice-app-start-two'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'bob-answer-two'
+ partialorder:
+ before: 'alice-answer-two'
+ before: 'alice-bridge-enter-two'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'bob-bridge-enter-two'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ match:
+ EventName: 'CHAN_END'
+ -
+ type: 'cel'
+ conditions:
+ match:
+ Channel: '.*/alice-.*'
+ requirements:
+ # First iteration
+ -
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'alice-app-start-one'
+ match:
+ EventName: 'APP_START'
+ -
+ id: 'alice-answer-one'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'alice-bridge-enter-one'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'APP_END'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ id: 'alice-end-one'
+ match:
+ EventName: 'CHAN_END'
+ # Second iteration
+ -
+ id: 'alice-start-two'
+ partialorder:
+ after: 'linkedid-end-one'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'alice-app-start-two'
+ match:
+ EventName: 'APP_START'
+ -
+ id: 'alice-answer-two'
+ partialorder:
+ after: 'bob-answer-two'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'alice-bridge-enter-two'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'APP_END'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ match:
+ EventName: 'CHAN_END'
+ -
+ type: 'cel'
+ conditions:
+ match:
+ EventName: 'LINKEDID_END'
+ requirements:
+ -
+ id: 'linkedid-end-one'
+ match:
+ EventName: 'LINKEDID_END'
+ -
+ id: 'linkedid-end-two'
+ match:
+ EventName: 'LINKEDID_END'
properties:
- minversion: '12.0.0'
+ minversion: '11.0.0'
dependencies:
- buildoption: 'TEST_FRAMEWORK'
- python : 'twisted'
Added: asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf?view=auto&rev=4170
==============================================================================
--- asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf (added)
+++ asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf Thu Sep 12 13:13:04 2013
@@ -1,0 +1,9 @@
+[default]
+
+exten => alice_automixmon,1,Set(BRIDGE_FEATURES=X)
+same => n,Dial(SIP/test_call at bob,,h)
+same => n,Hangup()
+
+exten => bob_automixmon,1,Set(BRIDGE_FEATURES=x)
+same => n,Dial(SIP/test_call at bob,,H)
+same => n,Hangup()
Propchange: asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/trunk/tests/bridge/automixmon_bridgefeatures/configs/ast1/extensions.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/trunk/tests/bridge/automixmon_bridgefeatures/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/automixmon_bridgefeatures/test-config.yaml?view=auto&rev=4170
==============================================================================
--- asterisk/trunk/tests/bridge/automixmon_bridgefeatures/test-config.yaml (added)
+++ asterisk/trunk/tests/bridge/automixmon_bridgefeatures/test-config.yaml Thu Sep 12 13:13:04 2013
@@ -1,0 +1,239 @@
+testinfo:
+ summary: 'Test the auto mixmonitor feature'
+ description: |
+ 'This is the same as the automixmon test, only the'
+ 'feature is applied by the BRIDGE_FEATURES channel variable'
+ 'instead of with application arguments.'
+
+test-modules:
+ test-object:
+ config-section: bridge-config
+ typename: 'BridgeTestCase.BridgeTestCase'
+ modules:
+ -
+ config-section: 'cdr-config'
+ typename: 'cdr.CDRModule'
+ -
+ config-section: 'cel-config'
+ typename: 'ami.AMIEventModule'
+bridge-config:
+ test-runs:
+ -
+ originate_channel: 'SIP/alice_automixmon at uut'
+ hangup: 'alice'
+ features:
+ - # mixmonitor start
+ who: 'bob'
+ what: 'automixmon'
+ success: 'false'
+ -
+ who: 'alice'
+ what: 'automixmon'
+ success: 'true'
+
+ - # mixmonitor stop
+ who: 'bob'
+ what: 'automixmon'
+ success: 'false'
+ -
+ who: 'alice'
+ what: 'automixmon'
+ success: 'true'
+ -
+ originate_channel: 'SIP/bob_automixmon at uut'
+ hangup: 'alice'
+ features:
+ - # mixmonitor start
+ who: 'alice'
+ what: 'automixmon'
+ success: 'false'
+ -
+ who: 'bob'
+ what: 'automixmon'
+ success: 'true'
+
+ - # mixmonitor stop
+ who: 'alice'
+ what: 'automixmon'
+ success: 'false'
+ -
+ who: 'bob'
+ what: 'automixmon'
+ success: 'true'
+cdr-config:
+-
+ file: 'Master'
+ lines:
+ -
+ source: '1234'
+ destination: 'alice_automixmon'
+ dcontext: 'default'
+ callerid: '"Alice" <1234>'
+ channel: '.*/alice-.*'
+ dchannel: '.*/bob-.*'
+ lastapp: 'Dial'
+ disposition: 'ANSWERED'
+ amaflags: 'DOCUMENTATION'
+ -
+ source: '1234'
+ destination: 'bob_automixmon'
+ dcontext: 'default'
+ callerid: '"Alice" <1234>'
+ channel: '.*/alice-.*'
+ dchannel: '.*/bob-.*'
+ lastapp: 'Dial'
+ disposition: 'ANSWERED'
+ amaflags: 'DOCUMENTATION'
+
+cel-config:
+ -
+ type: 'cel'
+ conditions:
+ match:
+ Channel: '.*/bob-.*'
+ requirements:
+ # First iteration
+ -
+ id: 'bob-start-one'
+ partialorder:
+ after: 'alice-app-start-one'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'bob-answer-one'
+ partialorder:
+ before: 'alice-answer-one'
+ before: 'alice-bridge-enter-one'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'bob-bridge-enter-one'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ match:
+ EventName: 'CHAN_END'
+ # Second iteration
+ -
+ id: 'bob-start-two'
+ partialorder:
+ after: 'alice-app-start-two'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'bob-answer-two'
+ partialorder:
+ before: 'alice-answer-two'
+ before: 'alice-bridge-enter-two'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'bob-bridge-enter-two'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ match:
+ EventName: 'CHAN_END'
+ -
+ type: 'cel'
+ conditions:
+ match:
+ Channel: '.*/alice-.*'
+ requirements:
+ # First iteration
+ -
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'alice-app-start-one'
+ match:
+ EventName: 'APP_START'
+ -
+ id: 'alice-answer-one'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'alice-bridge-enter-one'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'APP_END'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ id: 'alice-end-one'
+ match:
+ EventName: 'CHAN_END'
+ # Second iteration
+ -
+ id: 'alice-start-two'
+ partialorder:
+ after: 'linkedid-end-one'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'alice-app-start-two'
+ match:
+ EventName: 'APP_START'
+ -
+ id: 'alice-answer-two'
+ partialorder:
+ after: 'bob-answer-two'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'alice-bridge-enter-two'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'APP_END'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ match:
+ EventName: 'CHAN_END'
+ -
+ type: 'cel'
+ conditions:
+ match:
+ EventName: 'LINKEDID_END'
+ requirements:
+ -
+ id: 'linkedid-end-one'
+ match:
+ EventName: 'LINKEDID_END'
+ -
+ id: 'linkedid-end-two'
+ match:
+ EventName: 'LINKEDID_END'
+
+properties:
+ minversion: '12.0.0'
+ dependencies:
+ - buildoption: 'TEST_FRAMEWORK'
+ - python : 'twisted'
+ - python : 'starpy'
+ tags:
+ - bridge
Propchange: asterisk/trunk/tests/bridge/automixmon_bridgefeatures/test-config.yaml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/trunk/tests/bridge/automixmon_bridgefeatures/test-config.yaml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/trunk/tests/bridge/automixmon_bridgefeatures/test-config.yaml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: asterisk/trunk/tests/bridge/automon/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/automon/configs/ast1/extensions.conf?view=diff&rev=4170&r1=4169&r2=4170
==============================================================================
--- asterisk/trunk/tests/bridge/automon/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/bridge/automon/configs/ast1/extensions.conf Thu Sep 12 13:13:04 2013
@@ -5,11 +5,3 @@
exten => bob_automon,1,Dial(SIP/test_call at bob,,wH)
same => n,Hangup
-
-exten => alice_automon2,1,Set(BRIDGE_FEATURES=W)
-same => n,Dial(SIP/test_call at bob,,h)
-same => n,Hangup
-
-exten => bob_automon2,1,Set(BRIDGE_FEATURES=w)
-same => n,Dial(SIP/test_call at bob,,H)
-same => n,Hangup
Modified: asterisk/trunk/tests/bridge/automon/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/automon/test-config.yaml?view=diff&rev=4170&r1=4169&r2=4170
==============================================================================
--- asterisk/trunk/tests/bridge/automon/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/automon/test-config.yaml Thu Sep 12 13:13:04 2013
@@ -14,8 +14,13 @@
config-section: 'cdr-config'
typename: 'cdr.CDRModule'
-
+ maxversion: '12.0.0'
config-section: 'cel-config'
typename: 'cel.CELModule'
+ -
+ minversion: '12.0.0'
+ config-section: 'cel-config-v12'
+ typename: 'ami.AMIEventModule'
bridge-config:
test-runs:
@@ -63,50 +68,6 @@
what: 'automon'
success: 'true'
- -
- originate_channel: 'SIP/alice_automon2 at uut'
- hangup: 'alice'
- features:
- - #monitor start
- who: 'bob'
- what: 'automon'
- success: 'false'
- -
- who: 'alice'
- what: 'automon'
- success: 'true'
-
- - #monitor stop
- who: 'bob'
- what: 'automon'
- success: 'false'
- -
- who: 'alice'
- what: 'automon'
- success: 'true'
-
- -
- originate_channel: 'SIP/bob_automon2 at uut'
- hangup: 'alice'
- features:
- - #monitor start
- who: 'alice'
- what: 'automon'
- success: 'false'
- -
- who: 'bob'
- what: 'automon'
- success: 'true'
-
- - #monitor stop
- who: 'alice'
- what: 'automon'
- success: 'false'
- -
- who: 'bob'
- what: 'automon'
- success: 'true'
-
cdr-config:
-
file: 'Master'
@@ -123,7 +84,7 @@
amaflags: 'DOCUMENTATION'
-
source: '1234'
- destination: 'alice_automon2'
+ destination: 'bob_automon'
dcontext: 'default'
callerid: '"Alice" <1234>'
channel: '.*/alice-.*'
@@ -131,26 +92,6 @@
lastapp: 'Dial'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
- -
- source: '1234'
- destination: 'bob_automon'
- dcontext: 'default'
- callerid: '"Alice" <1234>'
- channel: '.*/alice-.*'
- dchannel: '.*/bob-.*'
- lastapp: 'Dial'
- disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
- -
- source: '1234'
- destination: 'bob_automon2'
- dcontext: 'default'
- callerid: '"Alice" <1234>'
- channel: '.*/alice-.*'
- dchannel: '.*/bob-.*'
- lastapp: 'Dial'
- disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
cel-config:
-
@@ -372,224 +313,152 @@
context: 'default'
channel: '.*/alice-.*'
- # Test 3: alice_automon2
- -
- eventtype: 'CHAN_START'
- cidname: 'Alice'
- cidnum: '1234'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'APP_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automon2'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'CHAN_START'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- -
- eventtype: 'ANSWER'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'ANSWER'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automon2'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'BRIDGE_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automon2'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'BRIDGE_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automon2'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'HANGUP'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- eventextra: '16,.*/alice-.*'
- -
- eventtype: 'CHAN_END'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'APP_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automon2'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'HANGUP'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automon2'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- eventextra: '16,.*/alice-.*,ANSWER'
- -
- eventtype: 'CHAN_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automon2'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'LINKEDID_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'alice_automon2'
- exten: 'alice_automon2'
- context: 'default'
- channel: '.*/alice-.*'
-
- # Test 4: bob_automon2
- -
- eventtype: 'CHAN_START'
- cidname: 'Alice'
- cidnum: '1234'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'APP_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automon2'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'CHAN_START'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- -
- eventtype: 'ANSWER'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'ANSWER'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automon2'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'BRIDGE_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automon2'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'BRIDGE_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automon2'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'HANGUP'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- eventextra: '16,.*/alice-.*'
- -
- eventtype: 'CHAN_END'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'APP_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automon2'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'HANGUP'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automon2'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- eventextra: '16,.*/alice-.*,ANSWER'
- -
- eventtype: 'CHAN_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automon2'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'LINKEDID_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_automon2'
- exten: 'bob_automon2'
- context: 'default'
- channel: '.*/alice-.*'
+cel-config-v12:
+ -
+ type: 'cel'
+ conditions:
+ match:
+ Channel: '.*/bob-.*'
+ requirements:
+ # First iteration
+ -
+ id: 'bob-start-one'
+ partialorder:
+ after: 'alice-app-start-one'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'bob-answer-one'
+ partialorder:
+ before: 'alice-answer-one'
+ before: 'alice-bridge-enter-one'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'bob-bridge-enter-one'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ match:
+ EventName: 'CHAN_END'
+ # Second iteration
+ -
+ id: 'bob-start-two'
+ partialorder:
+ after: 'alice-app-start-two'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'bob-answer-two'
+ partialorder:
+ before: 'alice-answer-two'
+ before: 'alice-bridge-enter-two'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'bob-bridge-enter-two'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ match:
[... 396 lines stripped ...]
More information about the asterisk-commits
mailing list