From 3a982cffa20f59ec0cac37f3a4c4279be7d06334 Mon Sep 17 00:00:00 2001
From: Andrew Pogrebennyk <apogrebennyk@sipwise.com>
Date: Wed, 9 Jul 2014 12:59:28 +0200
Subject: [PATCH] MT#7319 fix invite_concurrent_max_out

---
 .../0012_test.yml.tt2                         |  6 ++--
 .../0018_test.yml.tt2                         | 12 +++----
 .../invite_concurrent_max_out/scenario.yml    |  2 +-
 .../sipp_scenario_responder01.xml             | 34 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/scenarios/invite_concurrent_max_out/0012_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0012_test.yml.tt2
index acd03216..2baa7174 100644
--- a/scenarios/invite_concurrent_max_out/0012_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0012_test.yml.tt2
@@ -15,7 +15,7 @@ flow:
 sip_in:
   - '^INVITE'
   - 'Contact: sip:testuser1002@'
-  - 'To: <sip:testuser1002@'
+  - 'To: <sip:testuser1004@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -24,11 +24,11 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1002@'
+      'To: <sip:testuser1004@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1002@'
+      'To: <sip:testuser1004@'
     ]
diff --git a/scenarios/invite_concurrent_max_out/0018_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0018_test.yml.tt2
index 3d436a1a..9b3894c0 100644
--- a/scenarios/invite_concurrent_max_out/0018_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0018_test.yml.tt2
@@ -65,10 +65,10 @@ flow:
   - end|ROUTE_ADD_CALLINFO_REPLY:
   - exit|ROUTE_EARLY_REJECT:
 sip_in:
-  - '^INVITE sip:testuser1002@'
+  - '^INVITE sip:testuser1004@'
   - 'Contact: sip:testuser1002@'
   - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1002@'
+  - 'To: <sip:testuser1004@'
   - 'CSeq:  2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -78,19 +78,19 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq:  2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1002@'
+      'To: <sip:testuser1004@'
     ]
   - [
       '^SIP/2.0 101 Connecting',
-      '<sip:testuser1002@',
-      'To: <sip:testuser1002@',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1004@',
       'CSeq:  2 INVITE',
       'P-NGCP-Authorization: testuser1002@',
     ]
   - [
       '^SIP/2.0 403 Maximum parallel calls exceeded',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1002@',
+      'To: <sip:testuser1004@',
       'CSeq:  2 INVITE',
       'P-NGCP-Authorization: testuser1002@',
       'P-NGCP-Authorized: 1'
diff --git a/scenarios/invite_concurrent_max_out/scenario.yml b/scenarios/invite_concurrent_max_out/scenario.yml
index 1f5e467a..4c6759fc 100644
--- a/scenarios/invite_concurrent_max_out/scenario.yml
+++ b/scenarios/invite_concurrent_max_out/scenario.yml
@@ -30,6 +30,6 @@ scenarios:
         domain: spce.test
         register: yes
       - ip: 127.2.0.1
-        username: testuser1002
+        username: testuser1004
         domain: spce.test
         register: yes
diff --git a/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml b/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml
index 766a7675..36d7a1ec 100644
--- a/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml
+++ b/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml
@@ -7,13 +7,13 @@
   <send start_rtd="1" start_rtd="2">
     <![CDATA[
 
-      INVITE sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
+      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=1]@[field3 file="callee.csv" line=1]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="callee.csv" line=1]@[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]
@@ -38,13 +38,13 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]:[remote_port] SIP/2.0
       [last_Via:]
-      From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>[peer_tag_param]
+      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=1]@[field3 file="callee.csv" line=1]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: [cseq] ACK
-      Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0
 
@@ -56,15 +56,15 @@
   <send>
     <![CDATA[
 
-      INVITE sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
+      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=1]@[field3 file="callee.csv" line=1]>
       Call-ID: [call_id]
       CSeq:  [cseq] INVITE
-      Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
-      [field2 file="callee.csv" line=1]
+      [field1 file="caller.csv" line=0]
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -89,13 +89,13 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]:[remote_port] SIP/2.0
       [last_Via:]
-      From: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>[peer_tag_param]
+      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=1]@[field3 file="callee.csv" line=1]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: [cseq] ACK
-      Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
       Content-Length: 0