[asterisk-commits] jrose: testsuite/asterisk/trunk r4174 - in /asterisk/trunk/tests/bridge: ./ a...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Sep 12 13:46:33 CDT 2013
Author: jrose
Date: Thu Sep 12 13:46:29 2013
New Revision: 4174
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4174
Log:
testsuite: Update bridge/transfer_capabilities, and xfer_setup tests for Ast12
(closes issue ASTERISK-22324)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2822/
Added:
asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/
asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/
asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/
asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf (with props)
asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml (with props)
Modified:
asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml
asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml
asterisk/trunk/tests/bridge/tests.yaml
asterisk/trunk/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf
asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml
Modified: asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml?view=diff&rev=4174&r1=4173&r2=4174
==============================================================================
--- asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml Thu Sep 12 13:46:29 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:
@@ -413,6 +418,213 @@
exten: 'bob_atxfer'
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'
+ # Third iteration
+ -
+ id: 'bob-start-three'
+ partialorder:
+ after: 'alice-app-start-three'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'bob-answer-three'
+ partialorder:
+ before: 'alice-answer-three'
+ before: 'alice-bridge-enter-three'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'bob-bridge-enter-three'
+ 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'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'alice-bridge-enter-two'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'APP_END'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ id: 'alice-end-two'
+ match:
+ EventName: 'CHAN_END'
+ # Third iteration
+ -
+ id: 'alice-start-three'
+ partialorder:
+ after: 'linkedid-end-two'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'alice-app-start-three'
+ match:
+ EventName: 'APP_START'
+ -
+ id: 'alice-answer-three'
+ partialorder:
+ after: 'bob-answer-three'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'alice-bridge-enter-three'
+ 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'
+ -
+ id: 'linkedid-end-three'
+ match:
+ EventName: 'LINKEDID_END'
properties:
minversion: '11.0.0'
Modified: asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml?view=diff&rev=4174&r1=4173&r2=4174
==============================================================================
--- asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml Thu Sep 12 13:46:29 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:
@@ -413,6 +418,213 @@
exten: 'bob_blindxfer'
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'
+ # Third iteration
+ -
+ id: 'bob-start-three'
+ partialorder:
+ after: 'alice-app-start-three'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'bob-answer-three'
+ partialorder:
+ before: 'alice-answer-three'
+ before: 'alice-bridge-enter-three'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'bob-bridge-enter-three'
+ 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'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'alice-bridge-enter-two'
+ match:
+ EventName: 'BRIDGE_ENTER'
+ -
+ match:
+ EventName: 'BRIDGE_EXIT'
+ -
+ match:
+ EventName: 'APP_END'
+ -
+ match:
+ EventName: 'HANGUP'
+ -
+ id: 'alice-end-two'
+ match:
+ EventName: 'CHAN_END'
+ # Third iteration
+ -
+ id: 'alice-start-three'
+ partialorder:
+ after: 'linkedid-end-two'
+ match:
+ EventName: 'CHAN_START'
+ -
+ id: 'alice-app-start-three'
+ match:
+ EventName: 'APP_START'
+ -
+ id: 'alice-answer-three'
+ partialorder:
+ after: 'bob-answer-three'
+ match:
+ EventName: 'ANSWER'
+ -
+ id: 'alice-bridge-enter-three'
+ 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'
+ -
+ id: 'linkedid-end-three'
+ match:
+ EventName: 'LINKEDID_END'
properties:
minversion: '11.0.0'
Modified: asterisk/trunk/tests/bridge/tests.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/tests.yaml?view=diff&rev=4174&r1=4173&r2=4174
==============================================================================
--- asterisk/trunk/tests/bridge/tests.yaml (original)
+++ asterisk/trunk/tests/bridge/tests.yaml Thu Sep 12 13:46:29 2013
@@ -17,5 +17,6 @@
- test: 'dial_LS_options'
- test: 'connected_line_update'
- test: 'transfer_capabilities'
+ - test: 'transfer_capabilities_bridgefeatures'
- test: 'transfer_failure'
- test: 'bridge_action'
Modified: asterisk/trunk/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf?view=diff&rev=4174&r1=4173&r2=4174
==============================================================================
--- asterisk/trunk/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/bridge/transfer_capabilities/configs/ast1/extensions.conf Thu Sep 12 13:46:29 2013
@@ -3,14 +3,5 @@
exten => alice_opt,1,Dial(SIP/test_call at bob,,Th)
same => n,Hangup()
-exten => alice_bridge_features,1,Set(BRIDGE_FEATURES=T)
-same => n,Dial(SIP/test_call at bob,,h)
-same => n,Hangup()
-
exten => bob_opt,1,Dial(SIP/test_call at bob,,tH)
same => n,Hangup()
-
-exten => bob_bridge_features,1,Set(BRIDGE_FEATURES=t)
-same => n,Dial(SIP/test_call at bob,,H)
-same => n,Hangup()
-
Modified: asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml?view=diff&rev=4174&r1=4173&r2=4174
==============================================================================
--- asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml Thu Sep 12 13:46:29 2013
@@ -3,10 +3,10 @@
description: |
'Test blind and attended transfers from Alice and Bob to ensure that
the "T" and "t" options allow the correct parties to perform transfers
- when used from the Dial application and from BRIDGE_FEATURES.'
+ when used from the Dial application'
properties:
- minversion: '12.0.0'
+ minversion: '11.0.0'
dependencies:
- buildoption: 'TEST_FRAMEWORK'
- python : 'twisted'
@@ -23,9 +23,14 @@
config-section: 'ami-config'
typename: 'ami.AMIEventModule'
-
+ maxversion: '12.0.0'
config-section: 'cel-config'
typename: 'cel.CELModule'
-
+ minversion: '12.0.0'
+ config-section: 'cel-config-v12'
+ typename: 'ami.AMIEventModule'
+ -
config-section: 'cdr-config'
typename: 'cdr.CDRModule'
@@ -52,47 +57,7 @@
what: 'atxfer'
success: 'true'
-
- originate_channel: 'SIP/alice_bridge_features at uut'
- hangup: 'alice'
- features:
- -
- who: 'bob'
- what: 'blindxfer'
- success: 'false'
- -
- who: 'bob'
- what: 'atxfer'
- success: 'false'
- -
- who: 'alice'
- what: 'blindxfer'
- success: 'true'
- -
- who: 'alice'
- what: 'atxfer'
- success: 'true'
- -
originate_channel: 'SIP/bob_opt at uut'
- hangup: 'alice'
- features:
- -
- who: 'alice'
- what: 'blindxfer'
- success: 'false'
- -
- who: 'alice'
- what: 'atxfer'
- success: 'false'
- -
- who: 'bob'
- what: 'blindxfer'
- success: 'true'
- -
- who: 'bob'
- what: 'atxfer'
- success: 'true'
- -
- originate_channel: 'SIP/bob_bridge_features at uut'
hangup: 'alice'
features:
-
@@ -235,15 +200,15 @@
eventtype: 'CHAN_START'
cidname: 'Alice'
cidnum: '1234'
- exten: 'alice_bridge_features'
+ exten: 'bob_opt'
context: 'default'
channel: '.*/alice-.*'
-
eventtype: 'APP_START'
cidname: 'Alice'
cidnum: '1234'
- dnid: 'alice_bridge_features'
- exten: 'alice_bridge_features'
+ dnid: 'bob_opt'
+ exten: 'bob_opt'
context: 'default'
channel: '.*/alice-.*'
app: 'Dial'
@@ -263,8 +228,8 @@
eventtype: 'ANSWER'
cidname: 'Alice'
cidnum: '1234'
- dnid: 'alice_bridge_features'
- exten: 'alice_bridge_features'
+ dnid: 'bob_opt'
+ exten: 'bob_opt'
context: 'default'
channel: '.*/alice-.*'
app: 'Dial'
@@ -272,8 +237,8 @@
eventtype: 'BRIDGE_START'
cidname: 'Alice'
cidnum: '1234'
- dnid: 'alice_bridge_features'
- exten: 'alice_bridge_features'
+ dnid: 'bob_opt'
+ exten: 'bob_opt'
context: 'default'
channel: '.*/alice-.*'
app: 'Dial'
@@ -282,8 +247,8 @@
eventtype: 'BRIDGE_END'
cidname: 'Alice'
cidnum: '1234'
- dnid: 'alice_bridge_features'
- exten: 'alice_bridge_features'
+ dnid: 'bob_opt'
+ exten: 'bob_opt'
context: 'default'
channel: '.*/alice-.*'
app: 'Dial'
@@ -295,7 +260,7 @@
channel: '.*/bob-.*'
app: 'AppDial'
appdata: '\(Outgoing Line\)'
- eventextra: '16,.*/alice-.*,'
+ eventextra: '16,.*,'
-
eventtype: 'CHAN_END'
cidname: 'Bob'
@@ -307,8 +272,8 @@
eventtype: 'APP_END'
cidname: 'Alice'
cidnum: '1234'
- dnid: 'alice_bridge_features'
- exten: 'alice_bridge_features'
+ dnid: 'bob_opt'
+ exten: 'bob_opt'
context: 'default'
channel: '.*/alice-.*'
app: 'Dial'
@@ -316,239 +281,171 @@
eventtype: 'HANGUP'
cidname: 'Alice'
cidnum: '1234'
- dnid: 'alice_bridge_features'
- exten: 'alice_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- eventextra: '16,.*/alice-.*,ANSWER'
+ dnid: 'bob_opt'
+ exten: 'bob_opt'
+ context: 'default'
+ channel: '.*/alice-.*'
+ eventextra: '16,.*,ANSWER'
-
eventtype: 'CHAN_END'
cidname: 'Alice'
cidnum: '1234'
- dnid: 'alice_bridge_features'
- exten: 'alice_bridge_features'
+ dnid: 'bob_opt'
+ exten: 'bob_opt'
context: 'default'
channel: '.*/alice-.*'
-
eventtype: 'LINKEDID_END'
cidname: 'Alice'
cidnum: '1234'
- dnid: 'alice_bridge_features'
- exten: 'alice_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'CHAN_START'
- cidname: 'Alice'
- cidnum: '1234'
- exten: 'bob_opt'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'APP_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_opt'
- exten: 'bob_opt'
- 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_opt'
- exten: 'bob_opt'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'BRIDGE_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_opt'
- exten: 'bob_opt'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'BRIDGE_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_opt'
- exten: 'bob_opt'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'HANGUP'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- eventextra: '16,.*,'
- -
- eventtype: 'CHAN_END'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'APP_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_opt'
- exten: 'bob_opt'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'HANGUP'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_opt'
- exten: 'bob_opt'
- context: 'default'
- channel: '.*/alice-.*'
- eventextra: '16,.*,ANSWER'
- -
- eventtype: 'CHAN_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_opt'
- exten: 'bob_opt'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'LINKEDID_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_opt'
- exten: 'bob_opt'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'CHAN_START'
- cidname: 'Alice'
- cidnum: '1234'
- exten: 'bob_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'APP_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_bridge_features'
- exten: 'bob_bridge_features'
- 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_bridge_features'
- exten: 'bob_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'BRIDGE_START'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_bridge_features'
- exten: 'bob_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'BRIDGE_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_bridge_features'
- exten: 'bob_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- bridgepeer: '.*/bob-.*'
- -
- eventtype: 'HANGUP'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- eventextra: '16,.*,'
- -
- eventtype: 'CHAN_END'
- cidname: 'Bob'
- cidnum: '4321'
- channel: '.*/bob-.*'
- app: 'AppDial'
- appdata: '\(Outgoing Line\)'
- -
- eventtype: 'APP_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_bridge_features'
- exten: 'bob_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- app: 'Dial'
- -
- eventtype: 'HANGUP'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_bridge_features'
- exten: 'bob_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- eventextra: '16,.*,ANSWER'
- -
- eventtype: 'CHAN_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_bridge_features'
- exten: 'bob_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
- -
- eventtype: 'LINKEDID_END'
- cidname: 'Alice'
- cidnum: '1234'
- dnid: 'bob_bridge_features'
- exten: 'bob_bridge_features'
- context: 'default'
- channel: '.*/alice-.*'
+ dnid: 'bob_opt'
+ exten: 'bob_opt'
+ 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'
cdr-config:
-
@@ -566,29 +463,10 @@
amaflags: 'DOCUMENTATION'
-
source: '1234'
- destination: 'alice_bridge_features'
+ destination: 'bob_opt'
dcontext: 'default'
callerid: '"Alice" <1234>'
channel: '.*/alice-.*'
dchannel: '.*/bob-.*'
lastapp: 'Dial'
disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
- -
- source: '1234'
- destination: 'bob_opt'
- dcontext: 'default'
- callerid: '"Alice" <1234>'
- channel: '.*/alice-.*'
- dchannel: '.*/bob-.*'
- lastapp: 'Dial'
- disposition: 'ANSWERED'
- -
- source: '1234'
- destination: 'bob_bridge_features'
- dcontext: 'default'
- callerid: '"Alice" <1234>'
- channel: '.*/alice-.*'
- dchannel: '.*/bob-.*'
- lastapp: 'Dial'
- disposition: 'ANSWERED'
Added: asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf?view=auto&rev=4174
==============================================================================
--- asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf (added)
+++ asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf Thu Sep 12 13:46:29 2013
@@ -1,0 +1,10 @@
+[default]
+
+exten => alice_bridge_features,1,Set(BRIDGE_FEATURES=T)
+same => n,Dial(SIP/test_call at bob,,h)
+same => n,Hangup()
+
+exten => bob_bridge_features,1,Set(BRIDGE_FEATURES=t)
+same => n,Dial(SIP/test_call at bob,,H)
+same => n,Hangup()
+
Propchange: asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/configs/ast1/extensions.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml?view=auto&rev=4174
==============================================================================
--- asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml (added)
+++ asterisk/trunk/tests/bridge/transfer_capabilities_bridgefeatures/test-config.yaml Thu Sep 12 13:46:29 2013
@@ -1,0 +1,250 @@
+testinfo:
+ summary: 'Test blind and attended transfers via T dial option and BRIDGE_FEATURES'
+ description: |
+ 'This test is the same as the transfer_capabilities test, only the'
+ 'features are applied by the BRIDGE_FEATURES channel variable instead'
+ 'of by using application arguments.'
+
+properties:
+ minversion: '12.0.0'
+ dependencies:
+ - buildoption: 'TEST_FRAMEWORK'
+ - python : 'twisted'
+ - python : 'starpy'
+ tags:
+ - bridge
+
+test-modules:
+ test-object:
+ config-section: bridge-config
+ typename: 'BridgeTestCase.BridgeTestCase'
+ modules:
+ -
+ config-section: 'ami-config'
+ typename: 'ami.AMIEventModule'
+ -
+ config-section: 'cel-config'
+ typename: 'ami.AMIEventModule'
+ -
+ config-section: 'cdr-config'
+ typename: 'cdr.CDRModule'
+
+bridge-config:
+ test-runs:
+ -
+ originate_channel: 'SIP/alice_bridge_features at uut'
+ hangup: 'alice'
+ features:
+ -
+ who: 'bob'
+ what: 'blindxfer'
+ success: 'false'
+ -
+ who: 'bob'
+ what: 'atxfer'
+ success: 'false'
+ -
+ who: 'alice'
+ what: 'blindxfer'
+ success: 'true'
+ -
+ who: 'alice'
+ what: 'atxfer'
+ success: 'true'
+ -
[... 209 lines stripped ...]
More information about the asterisk-commits
mailing list