From 3ed5d82776ed8b7508f5da004b0ea56403711049 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Wed, 9 Nov 2016 15:31:00 +0100
Subject: [PATCH] TT#4856 scenarios_pbx: add counters info

* update flow with ROUTE_SCA_UPDATE
* sems-pbx CSeq is random, use regex

Change-Id: I384852f18991380e78012a2f2a9f97920ebb6825
---
 scenarios_pbx/invite/0005_test.yml.tt2 | 32 ++++++++++++++++++++++----
 scenarios_pbx/invite/0006_test.yml.tt2 |  9 ++++++++
 scenarios_pbx/invite/0007_test.yml.tt2 | 25 ++++++++++++++------
 scenarios_pbx/invite/0009_test.yml.tt2 |  8 +++++--
 scenarios_pbx/invite/0010_test.yml.tt2 |  9 ++++++++
 scenarios_pbx/invite/0011_test.yml.tt2 |  9 +++++---
 scenarios_pbx/invite/0012_test.yml.tt2 | 10 +++++++-
 scenarios_pbx/invite/0014_test.yml.tt2 |  4 ++--
 scenarios_pbx/invite/0015_test.yml.tt2 |  3 +++
 scenarios_pbx/invite/0016_test.yml.tt2 |  7 +++---
 scenarios_pbx/invite/0017_test.yml.tt2 |  4 ++--
 11 files changed, 96 insertions(+), 24 deletions(-)

diff --git a/scenarios_pbx/invite/0005_test.yml.tt2 b/scenarios_pbx/invite/0005_test.yml.tt2
index 90547ca6..cea9870a 100644
--- a/scenarios_pbx/invite/0005_test.yml.tt2
+++ b/scenarios_pbx/invite/0005_test.yml.tt2
@@ -47,6 +47,11 @@ flow:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - start|ROUTE_SET_CALLEE_DIALOG:
   - return|ROUTE_SET_CALLEE_DIALOG:
+      $avp(lua_dlg_profile): [
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "total"
+      ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
   - start|ROUTE_ORDER_CF_MAP_ID:
@@ -68,10 +73,21 @@ flow:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
+      $avp(lua_dlg_profile): [
+        "totalaccountout:[% customerpbx_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "total"
+      ]
   - start|ROUTE_ACC_CALLER:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
   - return|ROUTE_ACC_CALLEE:
+  - start|ROUTE_SCA_UPDATE:
+  - return|ROUTE_SCA_UPDATE:
   - start|BRANCH_ROUTE_NO_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - return|ROUTE_BRANCH_ACC_RTP:
@@ -88,7 +104,15 @@ flow:
   - return|BRANCH_ROUTE_NO_SBC:
   - return|BRANCH_ROUTE_NO_SBC:
   - exit|ROUTE_OUTBOUND:
-
+      $avp(lua_dlg_profile): [
+        "totalaccountout:[% customerpbx_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "total"
+      ]
 sip_in:
   - '^INVITE sip:1003'
   - 'Contact: sip:testuser1002@'
@@ -108,7 +132,7 @@ sip_out:
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:1003@',
-      'P-Caller-UUID: \w+',
+      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:testuser1002@'
     ]
   - [
@@ -117,8 +141,8 @@ sip_out:
       'From: <sip:testuser1002@',
       'To: <sip:testuser1003@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
+      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
       'P-NGCP-Lookup-Ext: 1003',
       'P-NGCP-Orig-User: 43110021003',
       'P-NGCP-Orig-Dialed: 1003',
diff --git a/scenarios_pbx/invite/0006_test.yml.tt2 b/scenarios_pbx/invite/0006_test.yml.tt2
index 7915c06f..c1a1b0ad 100644
--- a/scenarios_pbx/invite/0006_test.yml.tt2
+++ b/scenarios_pbx/invite/0006_test.yml.tt2
@@ -1,5 +1,14 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "totalaccountout:[% customerpbx_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "total"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - 'SIP/2.0 100 Trying'
diff --git a/scenarios_pbx/invite/0007_test.yml.tt2 b/scenarios_pbx/invite/0007_test.yml.tt2
index b42e782b..526095a6 100644
--- a/scenarios_pbx/invite/0007_test.yml.tt2
+++ b/scenarios_pbx/invite/0007_test.yml.tt2
@@ -36,6 +36,9 @@ flow:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - start|ROUTE_SET_CALLEE_DIALOG:
   - return|ROUTE_SET_CALLEE_DIALOG:
+      $avp(lua_dlg_profile): [
+        "total"
+      ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
   - start|ROUTE_ORDER_CF_MAP_ID:
@@ -45,6 +48,10 @@ flow:
   - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "local",
+        "total"
+      ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
   - start|BRANCH_ROUTE_SBC:
@@ -81,11 +88,15 @@ flow:
   - return|BRANCH_ROUTE_SBC:
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "local",
+        "total"
+      ]
 sip_in:
   - 'INVITE sip:testuser1003@'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Max-Forwards: 70'
   - 'P-NGCP-Lookup-Ext: 1003'
   - 'P-NGCP-Orig-User: 43110021003'
@@ -96,8 +107,8 @@ sip_in:
   - 'P-NGCP-ContBlockOut-Override: 0'
   - 'P-NGCP-ContAdmBlockOut-Override: 0'
   - 'P-Caller-CLIR: 0'
-  - 'P-Caller-UUID: \w+'
-  - 'P-Callee-UUID: \w+'
+  - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]'
+  - 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:testuser1002@'
   - 'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=5085;'
   - 'P-To-Device: 1'
@@ -109,21 +120,21 @@ sip_out:
       'Via: SIP/2.0/UDP 127.0.0.1:5085;branch=',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1003@',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'Content-Length: 0'
    ]
   - [
        'INVITE sip:testuser1003@',
        'From: <sip:4311002@',
        'To: <sip:testuser1003@',
-       'CSeq: 10 INVITE',
+       'CSeq: \d+ INVITE',
        'Max-Forwards: 69',
        'P-NGCP-Lookup-Ext: 1003',
        'Content-Type: application/sdp',
        'Contact: <sip:127.0.0.1:5085;transport=udp>',
        'Call-Info: <sip:spce.test>;appearance-index=1',
-       'P-Caller-UUID: \w+',
-       'P-Callee-UUID: \w+',
+       'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+       'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
        'P-Asserted-Identity: <sip:4311002@',
        'P-Called-Party-ID: <sip:testuser1003@',
        'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
diff --git a/scenarios_pbx/invite/0009_test.yml.tt2 b/scenarios_pbx/invite/0009_test.yml.tt2
index eed8f56a..ffd4c54f 100644
--- a/scenarios_pbx/invite/0009_test.yml.tt2
+++ b/scenarios_pbx/invite/0009_test.yml.tt2
@@ -1,11 +1,15 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "local",
+        "total"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
 sip_out:
   - [
       '^SIP/2.0 180 Ringing',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
     ]
diff --git a/scenarios_pbx/invite/0010_test.yml.tt2 b/scenarios_pbx/invite/0010_test.yml.tt2
index 1c18ea97..83c75162 100644
--- a/scenarios_pbx/invite/0010_test.yml.tt2
+++ b/scenarios_pbx/invite/0010_test.yml.tt2
@@ -1,5 +1,14 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "totalaccountout:[% customerpbx_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "total"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
diff --git a/scenarios_pbx/invite/0011_test.yml.tt2 b/scenarios_pbx/invite/0011_test.yml.tt2
index ba41b7ac..fa6abfda 100644
--- a/scenarios_pbx/invite/0011_test.yml.tt2
+++ b/scenarios_pbx/invite/0011_test.yml.tt2
@@ -2,15 +2,18 @@ flow:
   - start|REPLY_ROUTE_NAT:
   - 'start|dialog:start':
   - 'return|dialog:start':
-  # branch ??
+      $avp(lua_dlg_profile): [
+        "local",
+        "total"
+      ]
   - 'return|dialog:start':
 sip_in:
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
diff --git a/scenarios_pbx/invite/0012_test.yml.tt2 b/scenarios_pbx/invite/0012_test.yml.tt2
index 4afff712..b7c34377 100644
--- a/scenarios_pbx/invite/0012_test.yml.tt2
+++ b/scenarios_pbx/invite/0012_test.yml.tt2
@@ -2,7 +2,15 @@ flow:
   - start|REPLY_ROUTE_NAT:
   - 'start|dialog:start':
   - 'return|dialog:start':
-  # branch ??
+      $avp(lua_dlg_profile): [
+        "totalaccountout:[% customerpbx_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customerpbx_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "total"
+      ]
   - 'return|dialog:start':
 sip_in:
   - '^SIP/2.0 200 OK'
diff --git a/scenarios_pbx/invite/0014_test.yml.tt2 b/scenarios_pbx/invite/0014_test.yml.tt2
index e050dfef..0c7bd6c5 100644
--- a/scenarios_pbx/invite/0014_test.yml.tt2
+++ b/scenarios_pbx/invite/0014_test.yml.tt2
@@ -9,13 +9,13 @@ flow:
   - return|ROUTE_OUTBOUND:
 sip_in:
   - '^ACK sip:testuser1003@127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'CSeq: 10 ACK'
+  - 'CSeq: \d+ ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
       '^ACK sip:testuser1003@127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'CSeq: 10 ACK',
+      'CSeq: \d+ ACK',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
     ]
diff --git a/scenarios_pbx/invite/0015_test.yml.tt2 b/scenarios_pbx/invite/0015_test.yml.tt2
index 2fbb81cd..81910f7d 100644
--- a/scenarios_pbx/invite/0015_test.yml.tt2
+++ b/scenarios_pbx/invite/0015_test.yml.tt2
@@ -7,11 +7,14 @@ flow:
   - return|ROUTE_INITVARS:
   - 'start|dialog:end':
   - 'return|dialog:end':
+       $avp(lua_dlg_profile): None
   - 'return|dialog:end':
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_SCA_UPDATE:
+  - return|ROUTE_SCA_UPDATE:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
 sip_in:
diff --git a/scenarios_pbx/invite/0016_test.yml.tt2 b/scenarios_pbx/invite/0016_test.yml.tt2
index 5f708a07..7c69f830 100644
--- a/scenarios_pbx/invite/0016_test.yml.tt2
+++ b/scenarios_pbx/invite/0016_test.yml.tt2
@@ -7,6 +7,7 @@ flow:
   - return|ROUTE_INITVARS:
   - 'start|dialog:end':
   - 'return|dialog:end':
+      $avp(lua_dlg_profile): None
   - 'return|dialog:end':
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
@@ -16,7 +17,7 @@ flow:
   - exit|ROUTE_OUTBOUND:
 sip_in:
   - '^BYE sip:testuser1003@127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Max-Forwards: 70'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
@@ -26,14 +27,14 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
   - [
       '^BYE sip:testuser1003@127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
       'From: <sip:4311002@',
diff --git a/scenarios_pbx/invite/0017_test.yml.tt2 b/scenarios_pbx/invite/0017_test.yml.tt2
index 094eb844..4c7247cf 100644
--- a/scenarios_pbx/invite/0017_test.yml.tt2
+++ b/scenarios_pbx/invite/0017_test.yml.tt2
@@ -3,14 +3,14 @@ flow:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:4311002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1003@'