From ba040fcc357121affcf33e7e15d84b04b80205a3 Mon Sep 17 00:00:00 2001
From: Andrew Pogrebennyk <apogrebennyk@sipwise.com>
Date: Mon, 27 Jul 2015 10:10:39 +0200
Subject: [PATCH] MT#14153 fix kamailio-config-test invite_voicebox

Change-Id: I765b48c6f512690981e709f6c78806f9e67c36d8
---
 scenarios/invite_voicebox/0003_test.yml.tt2   |  7 ++++
 scenarios/invite_voicebox/0013_test.yml.tt2   | 34 +++++++++----------
 .../{0012_test.yml.tt2 => 0014_test.yml.tt2}  | 34 +++++++++----------
 scenarios/invite_voicebox/sipp_scenario00.xml |  3 ++
 4 files changed, 44 insertions(+), 34 deletions(-)
 rename scenarios/invite_voicebox/{0012_test.yml.tt2 => 0014_test.yml.tt2} (91%)

diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2
index fdc4e631..15a57c79 100644
--- a/scenarios/invite_voicebox/0003_test.yml.tt2
+++ b/scenarios/invite_voicebox/0003_test.yml.tt2
@@ -91,6 +91,13 @@ sip_out:
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
+  - [
+      '^SIP/2.0 102 Connecting',
+      'CSeq: 2 INVITE',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1001@',
+      'P-NGCP-Callee-Info: <sip:testuser1001@spce.test>;ip=voicebox.local;port=5060'
+    ]
   - [
       '^INVITE sip:vmu4311001@voicebox.local SIP/2.0',
       'CSeq: 2 INVITE',
diff --git a/scenarios/invite_voicebox/0013_test.yml.tt2 b/scenarios/invite_voicebox/0013_test.yml.tt2
index 3ac69cf3..f5aae9b3 100644
--- a/scenarios/invite_voicebox/0013_test.yml.tt2
+++ b/scenarios/invite_voicebox/0013_test.yml.tt2
@@ -1,5 +1,8 @@
 flow:
 [% IF PRO %]
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -12,47 +15,44 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-[% ELSE %]
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 [% END %]
 sip_in:
 [% IF PRO %]
-  - '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0'
-  - 'CSeq: 11 BYE'
-  - 'Content-Length: 0'
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
   - 'From: <sip:testuser1002@'
+  - 'Content-Length: 0'
   - 'To: <sip:testuser1001@'
 [% ELSE %]
-  - '^SIP/2.0 200 OK'
+  - '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0'
   - 'CSeq: 11 BYE'
-  - 'From: <sip:4311002@'
   - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
 [% END %]
 sip_out:
 [% IF PRO %]
   - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
+[% ELSE %]
   - [
-      '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0',
+      '^SIP/2.0 100 Trying',
       'CSeq: 11 BYE',
-      'Max-Forwards: 70',
       'Content-Length: 0',
-      'From: <sip:4311002@',
+      'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
-[% ELSE %]
   - [
-      '^SIP/2.0 200 OK',
+      '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0',
       'CSeq: 11 BYE',
+      'Max-Forwards: 69',
       'Content-Length: 0',
-      'From: <sip:testuser1002@',
+      'From: <sip:4311002@',
       'To: <sip:testuser1001@'
     ]
-[% END %]
\ No newline at end of file
+[% END %]
diff --git a/scenarios/invite_voicebox/0012_test.yml.tt2 b/scenarios/invite_voicebox/0014_test.yml.tt2
similarity index 91%
rename from scenarios/invite_voicebox/0012_test.yml.tt2
rename to scenarios/invite_voicebox/0014_test.yml.tt2
index f5aae9b3..3ac69cf3 100644
--- a/scenarios/invite_voicebox/0012_test.yml.tt2
+++ b/scenarios/invite_voicebox/0014_test.yml.tt2
@@ -1,8 +1,5 @@
 flow:
 [% IF PRO %]
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -15,44 +12,47 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
+[% ELSE %]
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
 [% END %]
 sip_in:
 [% IF PRO %]
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 3 BYE'
-  - 'From: <sip:testuser1002@'
+  - '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0'
+  - 'CSeq: 11 BYE'
   - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
 [% ELSE %]
-  - '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0'
+  - '^SIP/2.0 200 OK'
   - 'CSeq: 11 BYE'
+  - 'From: <sip:4311002@'
   - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
 [% END %]
 sip_out:
 [% IF PRO %]
   - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
+      '^SIP/2.0 100 Trying',
+      'CSeq: 11 BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
-[% ELSE %]
   - [
-      '^SIP/2.0 100 Trying',
+      '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0',
       'CSeq: 11 BYE',
+      'Max-Forwards: 70',
       'Content-Length: 0',
-      'From: <sip:testuser1002@',
+      'From: <sip:4311002@',
       'To: <sip:testuser1001@'
     ]
+[% ELSE %]
   - [
-      '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0',
+      '^SIP/2.0 200 OK',
       'CSeq: 11 BYE',
-      'Max-Forwards: 69',
       'Content-Length: 0',
-      'From: <sip:4311002@',
+      'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
-[% END %]
+[% END %]
\ No newline at end of file
diff --git a/scenarios/invite_voicebox/sipp_scenario00.xml b/scenarios/invite_voicebox/sipp_scenario00.xml
index 71e73045..f9702501 100644
--- a/scenarios/invite_voicebox/sipp_scenario00.xml
+++ b/scenarios/invite_voicebox/sipp_scenario00.xml
@@ -80,6 +80,9 @@
   <recv response="100" optional="true">
   </recv>
 
+  <recv response="102" optional="true">
+  </recv>
+
   <recv response="180" optional="true">
   </recv>