From 3590f7c03aef1573791040bfdd97d350327e8d2f Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Tue, 30 Jul 2013 15:57:25 +0200
Subject: [PATCH] scenarios/invite_blockout_blst: Added scenario.yml and
 cleanup.

---
 scenarios/invite_blockout_blst/scenario.yml   | 15 +++++++++++++
 .../invite_blockout_blst/sipp_scenario00.xml  | 22 +++++++++----------
 2 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 scenarios/invite_blockout_blst/scenario.yml

diff --git a/scenarios/invite_blockout_blst/scenario.yml b/scenarios/invite_blockout_blst/scenario.yml
new file mode 100644
index 00000000..ef678cdb
--- /dev/null
+++ b/scenarios/invite_blockout_blst/scenario.yml
@@ -0,0 +1,15 @@
+scenarios:
+  - ip: 127.126.0.1
+    user: testuser1002
+    domain: spce.test
+    username: testuser1002
+    password: testuser
+    responders:
+      - ip: 127.1.0.1
+        number: 4311003
+        user: testuser1003
+        domain: spce.test
+        register: no
+        username: testuser1003
+        password: testuser
+        active: no
diff --git a/scenarios/invite_blockout_blst/sipp_scenario00.xml b/scenarios/invite_blockout_blst/sipp_scenario00.xml
index 3be1861d..0d5cb8a0 100644
--- a/scenarios/invite_blockout_blst/sipp_scenario00.xml
+++ b/scenarios/invite_blockout_blst/sipp_scenario00.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <scenario name="Sipwise NGCP Benchmark UAC Caller">
-  <send retrans="500" start_rtd="1" start_rtd="2">
+  <send start_rtd="1" start_rtd="2">
     <![CDATA[
 
       INVITE sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -37,29 +37,29 @@
 
       ACK sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
     ]]>
   </send>
 
-  <send retrans="500" start_rtd="3">
+  <send start_rtd="3">
     <![CDATA[
 
       INVITE sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
-      [field1 file="caller.csv"]
+      [field1 file="caller.csv" line=0]
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -86,11 +86,11 @@
 
       ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
-      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0