Advertisement
Guest User

Untitled

a guest
Sep 5th, 2013
21
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 14.43 KB | None | 0 0
  1. Index: tests/bridge/simple_bridge/test-config.yaml
  2. ===================================================================
  3. --- tests/bridge/simple_bridge/test-config.yaml (revision 4120)
  4. +++ tests/bridge/simple_bridge/test-config.yaml (working copy)
  5. @@ -13,16 +13,17 @@
  6. config-section: 'cdr-config'
  7. typename: 'cdr.CDRModule'
  8. -
  9. - config-section: 'cel-config'
  10. - typename: 'cel.CELModule'
  11. - -
  12. + maxversion: '12.0.0'
  13. + config-section: 'ami-uut-v11'
  14. typename: 'ami.AMIEventModule'
  15. - config-section: 'ami-uut-v12'
  16. + -
  17. minversion: '12.0.0'
  18. + config-section: 'cel-config'
  19. + typename: 'ami.AMIEventModule'
  20. -
  21. + minversion: '12.0.0'
  22. + config-section: 'ami-uut-v12'
  23. typename: 'ami.AMIEventModule'
  24. - config-section: 'ami-uut-v11'
  25. - maxversion: '12.0.0'
  26.  
  27. bridge-config:
  28. test-runs:
  29. @@ -42,7 +43,8 @@
  30. Event: 'BridgeCreate'
  31. requirements:
  32. match:
  33. - BridgeType: 'simple_bridge'
  34. + BridgeType: 'basic'
  35. + BridgeTechnology: 'simple_bridge'
  36. count: '2'
  37. -
  38. type: 'headermatch'
  39. @@ -54,7 +56,8 @@
  40. requirements:
  41. match:
  42. BridgeUniqueid: '.*-.*-.*'
  43. - BridgeType: 'simple_bridge'
  44. + BridgeType: 'basic'
  45. + BridgeTechnology: 'simple_bridge'
  46. ChannelState: '6'
  47. ChannelStateDesc: 'Up'
  48. CallerIDNum: '1234'
  49. @@ -76,7 +79,8 @@
  50. requirements:
  51. match:
  52. BridgeUniqueid: '.*-.*-.*'
  53. - BridgeType: 'simple_bridge'
  54. + BridgeType: 'basic'
  55. + BridgeTechnology: 'simple_bridge'
  56. ChannelState: '6'
  57. ChannelStateDesc: 'Up'
  58. ConnectedLineNum: '1234'
  59. @@ -97,7 +101,8 @@
  60. requirements:
  61. match:
  62. BridgeUniqueid: '.*-.*-.*'
  63. - BridgeType: 'simple_bridge'
  64. + BridgeType: 'basic'
  65. + BridgeTechnology: 'simple_bridge'
  66. ChannelState: '6'
  67. ChannelStateDesc: 'Up'
  68. CallerIDNum: '1234'
  69. @@ -119,7 +124,8 @@
  70. requirements:
  71. match:
  72. BridgeUniqueid: '.*-.*-.*'
  73. - BridgeType: 'simple_bridge'
  74. + BridgeType: 'basic'
  75. + BridgeTechnology: 'simple_bridge'
  76. ChannelState: '6'
  77. ChannelStateDesc: 'Up'
  78. ConnectedLineNum: '1234'
  79. @@ -139,7 +145,8 @@
  80. requirements:
  81. match:
  82. BridgeUniqueid: '.*-.*-.*'
  83. - BridgeType: 'simple_bridge'
  84. + BridgeType: 'basic'
  85. + BridgeTechnology: 'simple_bridge'
  86. count: '2'
  87.  
  88. ami-uut-v11:
  89. @@ -229,221 +236,156 @@
  90.  
  91. cel-config:
  92. -
  93. - file: 'Master'
  94. - lines:
  95. + type: 'cel'
  96. + conditions:
  97. + match:
  98. + Channel: '.*/bob-.*'
  99. + requirements:
  100. + # First iteration
  101. -
  102. - eventtype: 'CHAN_START'
  103. - cidname: 'Alice'
  104. - cidnum: '1234'
  105. - exten: 'test_call'
  106. - context: 'default'
  107. - channel: '.*/alice-.*'
  108. + id: 'bob-start-one'
  109. + partialorder:
  110. + after: 'alice-app-start-one'
  111. + match:
  112. + EventName: 'CHAN_START'
  113. -
  114. - eventtype: 'APP_START'
  115. - cidname: 'Alice'
  116. - cidnum: '1234'
  117. - dnid: 'test_call'
  118. - exten: 'test_call'
  119. - context: 'default'
  120. - channel: '.*/alice-.*'
  121. - app: 'Dial'
  122. + id: 'bob-answer-one'
  123. + partialorder:
  124. + before: 'alice-answer-one'
  125. + before: 'alice-enter-bridge-one'
  126. + match:
  127. + EventName: 'ANSWER'
  128. -
  129. - eventtype: 'CHAN_START'
  130. - cidname: 'Bob'
  131. - cidnum: '4321'
  132. - channel: '.*/bob-.*'
  133. + id: 'bob-enter-bridge-one'
  134. + match:
  135. + EventName: 'BRIDGE_ENTER'
  136. -
  137. - eventtype: 'ANSWER'
  138. - cidname: 'Bob'
  139. - cidnum: '4321'
  140. - channel: '.*/bob-.*'
  141. - app: 'AppDial'
  142. - appdata: '\(Outgoing Line\)'
  143. + match:
  144. + EventName: 'BRIDGE_EXIT'
  145. -
  146. - eventtype: 'ANSWER'
  147. - cidname: 'Alice'
  148. - cidnum: '1234'
  149. - dnid: 'test_call'
  150. - exten: 'test_call'
  151. - context: 'default'
  152. - channel: '.*/alice-.*'
  153. - app: 'Dial'
  154. + match:
  155. + EventName: 'HANGUP'
  156. -
  157. - eventtype: 'BRIDGE_START'
  158. - cidname: 'Alice'
  159. - cidnum: '1234'
  160. - dnid: 'test_call'
  161. - exten: 'test_call'
  162. - context: 'default'
  163. - channel: '.*/alice-.*'
  164. - app: 'Dial'
  165. - bridgepeer: '.*/bob-.*'
  166. + match:
  167. + EventName: 'CHAN_END'
  168. + # Second iteration
  169. -
  170. - eventtype: 'BRIDGE_END'
  171. - cidname: 'Alice'
  172. - cidnum: '1234'
  173. - dnid: 'test_call'
  174. - exten: 'test_call'
  175. - context: 'default'
  176. - channel: '.*/alice-.*'
  177. - app: 'Dial'
  178. - bridgepeer: '.*/bob-.*'
  179. + id: 'bob-start-two'
  180. + partialorder:
  181. + after: 'alice-app-start-two'
  182. + match:
  183. + EventName: 'CHAN_START'
  184. -
  185. - eventtype: 'HANGUP'
  186. - cidname: 'Bob'
  187. - cidnum: '4321'
  188. - channel: '.*/bob-.*'
  189. - app: 'AppDial'
  190. - appdata: '\(Outgoing Line\)'
  191. - eventextra: '16,.*/alice-.*'
  192. + id: 'bob-answer-two'
  193. + partialorder:
  194. + before: 'alice-answer-two'
  195. + before: 'alice-bridge-enter-two'
  196. + match:
  197. + EventName: 'ANSWER'
  198. -
  199. - eventtype: 'CHAN_END'
  200. - cidname: 'Bob'
  201. - cidnum: '4321'
  202. - channel: '.*/bob-.*'
  203. - app: 'AppDial'
  204. - appdata: '\(Outgoing Line\)'
  205. + match:
  206. + EventName: 'BRIDGE_ENTER'
  207. -
  208. - eventtype: 'APP_END'
  209. - cidname: 'Alice'
  210. - cidnum: '1234'
  211. - dnid: 'test_call'
  212. - exten: 'test_call'
  213. - context: 'default'
  214. - channel: '.*/alice-.*'
  215. - app: 'Dial'
  216. + match:
  217. + EventName: 'BRIDGE_EXIT'
  218. -
  219. - eventtype: 'HANGUP'
  220. - cidname: 'Alice'
  221. - cidnum: '1234'
  222. - dnid: 'test_call'
  223. - exten: 'test_call'
  224. - context: 'default'
  225. - channel: '.*/alice-.*'
  226. - eventextra: '16,.*/alice-.*,ANSWER'
  227. + match:
  228. + EventName: 'HANGUP'
  229. -
  230. - eventtype: 'CHAN_END'
  231. - cidname: 'Alice'
  232. - cidnum: '1234'
  233. - dnid: 'test_call'
  234. - exten: 'test_call'
  235. - context: 'default'
  236. - channel: '.*/alice-.*'
  237. + id: 'bob-end-two'
  238. + match:
  239. + EventName: 'CHAN_END'
  240. + -
  241. + type: 'cel'
  242. + conditions:
  243. + match:
  244. + Channel: '.*/alice-.*'
  245. + requirements:
  246. + # First iteration
  247. -
  248. - eventtype: 'LINKEDID_END'
  249. - cidname: 'Alice'
  250. - cidnum: '1234'
  251. - dnid: 'test_call'
  252. - exten: 'test_call'
  253. - context: 'default'
  254. - channel: '.*/alice-.*'
  255. + match:
  256. + EventName: 'CHAN_START'
  257. -
  258. - eventtype: 'CHAN_START'
  259. - cidname: 'Alice'
  260. - cidnum: '1234'
  261. - exten: 'test_call'
  262. - context: 'default'
  263. - channel: '.*/alice-.*'
  264. + id: 'alice-app-start-one'
  265. + match:
  266. + EventName: 'APP_START'
  267. -
  268. - eventtype: 'APP_START'
  269. - cidname: 'Alice'
  270. - cidnum: '1234'
  271. - dnid: 'test_call'
  272. - exten: 'test_call'
  273. - context: 'default'
  274. - channel: '.*/alice-.*'
  275. - app: 'Dial'
  276. + id: 'alice-answer-one'
  277. + partialorder:
  278. + after: 'bob-answer-one'
  279. + before: 'bob-enter-bridge-one'
  280. + match:
  281. + EventName: 'ANSWER'
  282. -
  283. - eventtype: 'CHAN_START'
  284. - cidname: 'Bob'
  285. - cidnum: '4321'
  286. - channel: '.*/bob-.*'
  287. + id: 'alice-enter-bridge-one'
  288. + match:
  289. + EventName: 'BRIDGE_ENTER'
  290. -
  291. - eventtype: 'ANSWER'
  292. - cidname: 'Bob'
  293. - cidnum: '4321'
  294. - channel: '.*/bob-.*'
  295. - app: 'AppDial'
  296. - appdata: '\(Outgoing Line\)'
  297. + match:
  298. + EventName: 'BRIDGE_EXIT'
  299. -
  300. - eventtype: 'ANSWER'
  301. - cidname: 'Alice'
  302. - cidnum: '1234'
  303. - dnid: 'test_call'
  304. - exten: 'test_call'
  305. - context: 'default'
  306. - channel: '.*/alice-.*'
  307. - app: 'Dial'
  308. + match:
  309. + EventName: 'APP_END'
  310. -
  311. - eventtype: 'BRIDGE_START'
  312. - cidname: 'Alice'
  313. - cidnum: '1234'
  314. - dnid: 'test_call'
  315. - exten: 'test_call'
  316. - context: 'default'
  317. - channel: '.*/alice-.*'
  318. - app: 'Dial'
  319. - bridgepeer: '.*/bob-.*'
  320. + match:
  321. + EventName: 'HANGUP'
  322. -
  323. - eventtype: 'BRIDGE_END'
  324. - cidname: 'Alice'
  325. - cidnum: '1234'
  326. - dnid: 'test_call'
  327. - exten: 'test_call'
  328. - context: 'default'
  329. - channel: '.*/alice-.*'
  330. - app: 'Dial'
  331. - bridgepeer: '.*/bob-.*'
  332. + id: 'alice-end-one'
  333. + match:
  334. + EventName: 'CHAN_END'
  335. + # Second iteration
  336. -
  337. - eventtype: 'HANGUP'
  338. - cidname: 'Bob'
  339. - cidnum: '4321'
  340. - channel: '.*/bob-.*'
  341. - app: 'AppDial'
  342. - appdata: '\(Outgoing Line\)'
  343. - eventextra: '16,.*/bob-.*'
  344. + id: 'alice-start-two'
  345. + partialorder:
  346. + after: 'linkedid-end-one'
  347. + match:
  348. + EventName: 'CHAN_START'
  349. -
  350. - eventtype: 'CHAN_END'
  351. - cidname: 'Bob'
  352. - cidnum: '4321'
  353. - channel: '.*/bob-.*'
  354. - app: 'AppDial'
  355. - appdata: '\(Outgoing Line\)'
  356. + id: 'alice-app-start-two'
  357. + match:
  358. + EventName: 'APP_START'
  359. -
  360. - eventtype: 'APP_END'
  361. - cidname: 'Alice'
  362. - cidnum: '1234'
  363. - dnid: 'test_call'
  364. - exten: 'test_call'
  365. - context: 'default'
  366. - channel: '.*/alice-.*'
  367. - app: 'Dial'
  368. + id: 'alice-answer-two'
  369. + partialorder:
  370. + after: 'bob-answer-two'
  371. + match:
  372. + EventName: 'ANSWER'
  373. -
  374. - eventtype: 'HANGUP'
  375. - cidname: 'Alice'
  376. - cidnum: '1234'
  377. - dnid: 'test_call'
  378. - exten: 'test_call'
  379. - context: 'default'
  380. - channel: '.*/alice-.*'
  381. - eventextra: '16,.*/bob-.*,ANSWER'
  382. + id: 'alice-bridge-enter-two'
  383. + match:
  384. + EventName: 'BRIDGE_ENTER'
  385. -
  386. - eventtype: 'CHAN_END'
  387. - cidname: 'Alice'
  388. - cidnum: '1234'
  389. - dnid: 'test_call'
  390. - exten: 'test_call'
  391. - context: 'default'
  392. - channel: '.*/alice-.*'
  393. + match:
  394. + EventName: 'BRIDGE_EXIT'
  395. -
  396. - eventtype: 'LINKEDID_END'
  397. - cidname: 'Alice'
  398. - cidnum: '1234'
  399. - dnid: 'test_call'
  400. - exten: 'test_call'
  401. - context: 'default'
  402. - channel: '.*/alice-.*'
  403. + match:
  404. + EventName: 'APP_END'
  405. + -
  406. + match:
  407. + EventName: 'HANGUP'
  408. + -
  409. + match:
  410. + EventName: 'CHAN_END'
  411. + -
  412. + type: 'cel'
  413. + conditions:
  414. + match:
  415. + EventName: 'LINKEDID_END'
  416. + requirements:
  417. + -
  418. + id: 'linkedid-end-one'
  419. + partialorder:
  420. + after: 'alice-end-one'
  421. + match:
  422. + EventName: 'LINKEDID_END'
  423. + -
  424. + id: 'linkedid-end-two'
  425. + partialorder:
  426. + after: 'bob-end-two'
  427. + match:
  428. + EventName: 'LINKEDID_END'
  429.  
  430. +
  431. properties:
  432. minversion: '11.0.0'
  433. dependencies:
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement