cleaning the call_and_hangup conf

2 files changed, 49 insertions, 89 deletions

diff --git a/asterisk-load-tests/call_and_hangup/driver/extensions.conf b/asterisk-load-tests/call_and_hangup/driver/extensions.conf
index a0586e4..5ed79ec 100644
--- a/asterisk-load-tests/call_and_hangup/driver/extensions.conf
+++ b/asterisk-load-tests/call_and_hangup/driver/extensions.conf
@@ -1,50 +1,37 @@
 [default]
-;exten => _X.,1,NoOp(### Call from ${CALLERID} to ${EXTEN} ###)
-
-exten => _0.,1,Dial(SIP/${EXTEN:1}@tolapai)
-exten => _1.,1,Dial(DAHDI/g11/${EXTEN:1})
-exten => _2.,1,Dial(DAHDI/g12/${EXTEN:1})
-exten => _3.,1,Dial(DAHDI/g13/${EXTEN:1})
-exten => _4.,1,Dial(DAHDI/g14/${EXTEN:1})
-exten => 5,1,Dial(DAHDI/g5)
-exten => 6,1,Playback(hello-world)
-
-exten => 7,1,Answer
-exten => 7,n,Echo
-
 
 ; appel via le port B410P BRI 1
-exten = 101,1,NoOp()
+exten = 1,1,NoOp()
 same  =	    n,Dial(DAHDI/g11)
 same  =     n,Hangup()
 
 ; appel via le port B410p BRI 2
-exten = 102,1,NoOp()
+exten = 2,1,NoOp()
 same  =	    n,Dial(DAHDI/g12)
 same  =     n,Hangup()
 
 ; appel via le port B410p BRI 3
-exten = 103,1,NoOp()
+exten = 3,1,NoOp()
 same  =	    n,Dial(DAHDI/g13)
 same  =     n,Hangup()
 
 ; appel via le port B410p BRI 4
-exten = 104,1,NoOp()
+exten = 4,1,NoOp()
 same  =	    n,Dial(DAHDI/g14)
 same  =     n,Hangup()
 
 ; appel via le port FXS 1 de la carte TDM400
-exten = 105,1,NoOp()
+exten = 5,1,NoOp()
 same  =	    n,Dial(DAHDI/g4)
 same  =     n,Hangup()
 
 ; appel via le port FXS 2 de la carte TDM400
-exten = 106,1,NoOp()
+exten = 6,1,NoOp()
 same  =	    n,Dial(DAHDI/g5)
 same  =     n,Hangup()
 
 ; appel via le port FXO 1 de la carte TDM400
-exten = 107,1,NoOp()
+exten = 7,1,NoOp()
 same  =	    n,Dial(DAHDI/g6)
 same  =     n,Hangup()
 
diff --git a/asterisk-load-tests/call_and_hangup/tested/extensions.conf b/asterisk-load-tests/call_and_hangup/tested/extensions.conf
index d8ecd17..516d70d 100644
--- a/asterisk-load-tests/call_and_hangup/tested/extensions.conf
+++ b/asterisk-load-tests/call_and_hangup/tested/extensions.conf
@@ -15,113 +15,86 @@ include => default
 [from-pstn]
 
 exten = s,1,Noop(${CALLERID} => ${EXTEN})
-;1 si on appelle un hello-worl, 103 si on appelle le FXS ?
-;exten = s,n,Goto(test,1)
-exten = s,n,Goto(103,1)
-
-exten = test,1,NoOp()
-same  =	     n,Answer()
-same  =	     n,Wait(1)
-same  =	     n,Playback(hello-world)
-same  =	     n,Wait(1)
-same  =      n,Hangup()
+same  =   n,Goto(103,1)
 
 exten = 103,1,NoOp(Dial FXS port - this is intended to be a loop)
-;exten = 103,n,Dial(DAHDI/g11/${EXTEN})
-exten = 103,n,Dial(DAHDI/g11)
+same  =   n,Dial(DAHDI/g11)
 
 include => default
 
-;exten = 2,1,Playback(/root/socialisme)
-
 [default]
 exten = s,1,Noop(${CALLERID} => ${EXTEN})
-exten = s,n,Dial(DAHDI/g21)
-
-
-; FXS Phone
-exten = 1,1,NoOp( Call 1 )
-exten = 1,n,Dial(DAHDI/g11)
-
-; FXO
-exten = 8,1,NoOp( Call 8 )
-exten = 8,n,Dial(DAHDI/g12)
+same  =   n,Dial(DAHDI/g21)
 
 ; ISDN Phone
-exten = 2,1,NoOp( Call 2 )
-exten = 2,n,Dial(DAHDI/g21)
-
-; Aastra IP Phone
-exten = 3,1,NoOp( Call 3 )
-exten = 3, n,Dial(SIP/${EXTEN})
-
-; vers XiVO
-exten = _9X.,1,NoOp()
-exten = _9X.,n,Dial(SIP/test-oh/${EXTEN:1})
+exten = 1,1,NoOp( Call 2 )
+same  =   n,Dial(DAHDI/g21)
 
 ; ISDN
-exten = 4,1,NoOp( Call 4 )
-exten = 4,n,Dial(DAHDI/g22)
+exten = 2,1,NoOp( Call 4 )
+same  =   n,Dial(DAHDI/g22)
 
 ; ISDN
-exten = 5,1,NoOp( Call 5 )
-exten = 5,n,Dial(DAHDI/g23)
-
+exten = 3,1,NoOp( Call 5 )
+same  =   n,Dial(DAHDI/g23)
 
 ; ISDN
-exten = 6,1,NoOp( Call 6 )
-exten = 6,n,Dial(DAHDI/g24)
+exten = 4,1,NoOp( Call 6 )
+same  =   n,Dial(DAHDI/g24)
 
-; Call via ISDN port #2
-exten = _7X.,1,NoOp( Call ${EXTEN:1} via port #2)
-exten = _7X.,n,Dial(DAHDI/g22/${EXTEN:1})
+; FXS Phone
+exten = 5,1,NoOp( Call 1 )
+same  =   n,Dial(DAHDI/g11)
 
+; FXO
+exten = 7,1,NoOp( Call 8 )
+same  =   n,Dial(DAHDI/g12)
 
-; Test sounds
 
+; Test sounds
 exten = 81,1,While(1)
-exten = 81,n,Playback(/root/sounds/socialisme)
-exten = 81,n,Sleep(1)
-exten = 81,n,EndWhile
+same  =    n,Playback(/root/sounds/socialisme)
+same  =    n,Sleep(1)
+same  =    n,EndWhile
 
 exten = 82,1,While(1)
-exten = 82,n,Playback(/root/sounds/ufo)
-exten = 82,n,Sleep(1)
-exten = 82,n,EndWhile
+same  =    n,Playback(/root/sounds/ufo)
+same  =    n,Sleep(1)
+same  =    n,EndWhile
 
 exten = 83,1,While(1)
-exten = 83,n,Playback(/root/sounds/bodenstandig2000_8k)
-exten = 83,n,Sleep(1)
-exten = 83,n,EndWhile
+same  =    n,Playback(/root/sounds/bodenstandig2000_8k)
+same  =    n,Sleep(1)
+same  =    n,EndWhile
 
 exten = 84,1,While(1)
-exten = 84,n,Playback(/root/sounds/Sinatra_8k)
-exten = 84,n,Sleep(1)
-exten = 84,n,EndWhile
+same  =    n,Playback(/root/sounds/Sinatra_8k)
+same  =    n,Sleep(1)
+same  =    n,EndWhile
 
 exten = 85,1,While(1)
-exten = 85,n,Playback(/root/sounds/schnappi_8k)
-exten = 85,n,Sleep(1)
-exten = 85,n,EndWhile
+same  =    n,Playback(/root/sounds/schnappi_8k)
+same  =    n,Sleep(1)
+same  =    n,EndWhile
 
 exten = 86,1,While(1)
 ; exten = 86,n,Set(CHANNEL(language)=fr)
-exten = 86,n,Playback(tt-weasels)
-exten = 86,n,Sleep(1)
-exten = 86,n,EndWhile()
+same  =    n,Playback(tt-weasels)
+same  =    n,Sleep(1)
+same  =    n,EndWhile()
 
 exten = 87,1,While(1)
 ; exten = 87,n,Set(CHANNEL(language)=fr)
-exten = 87,n,Playback(tt-monkeysintro)
-exten = 87,n,Sleep(1)
-exten = 87,n,EndWhile()
+same  =    n,Playback(tt-monkeysintro)
+same  =    n,Sleep(1)
+same  =    n,EndWhile()
 
 
 
 exten = 666,1,While(1)
-exten = 666,n,Playback(/root/sounds/schnappi_satan_8k)
-exten = 666,n,Sleep(1)
-exten = 666,n,EndWhile
+same  =    n,Playback(/root/sounds/schnappi_satan_8k)
+same  =    n,Sleep(1)
+same  =    n,EndWhile
 
 ;exten = _1XX,1,Dial(SIP/test/${EXTEN})