From ceffaeb938be16847550d6a5699c8e660eeed55e Mon Sep 17 00:00:00 2001
From: Andrew Pogrebennyk <apogrebennyk@sipwise.com>
Date: Fri, 5 Jul 2013 14:44:52 +0200
Subject: [PATCH] Fix xavp checks in the registration tests.

---
 scenarios/register_allowip/0002_test.yml      |  5 ++--
 .../register_ignore_allowip/0002_test.yml     | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/scenarios/register_allowip/0002_test.yml b/scenarios/register_allowip/0002_test.yml
index 14a1a471..5145e69a 100644
--- a/scenarios/register_allowip/0002_test.yml
+++ b/scenarios/register_allowip/0002_test.yml
@@ -29,7 +29,7 @@ flow:
         - caller
       $xavp(caller_real_prefs[0]=>ac): 1
       $xavp(caller_real_prefs[0]=>account_id): '\d+'
-      $xavp(caller_real_prefs[0]=>allowed_ips_grp): 1
+      $xavp(caller_real_prefs[0]=>allowed_ips_grp): '\d+' 
       $xavp(caller_real_prefs[0]=>cc): 43
       $xavp(caller_real_prefs[0]=>cli): 4311003
       $xavp(caller_real_prefs[0]=>dummy[*]):
@@ -37,12 +37,11 @@ flow:
       $xavp(caller_real_prefs[0]=>man_allowed_ips_grp): 0
       $xavp(caller_usr_prefs[0]=>ac): 1
       $xavp(caller_usr_prefs[0]=>account_id): '\d+'
-      $xavp(caller_usr_prefs[0]=>allowed_ips_grp): 1
+      $xavp(caller_usr_prefs[0]=>allowed_ips_grp): '\d+'
       $xavp(caller_usr_prefs[0]=>cc): 43
       $xavp(caller_usr_prefs[0]=>cli): 4311003
       $xavp(caller_usr_prefs[0]=>dummy[*]):
         - caller
-      $xavp(caller_usr_prefs[0]=>allowed_ips_grp): 1
 sip_in:
   - '^REGISTER'
   - 'Contact: sip:testuser1003@'
diff --git a/scenarios/register_ignore_allowip/0002_test.yml b/scenarios/register_ignore_allowip/0002_test.yml
index b73d4c6f..8196b3bc 100644
--- a/scenarios/register_ignore_allowip/0002_test.yml
+++ b/scenarios/register_ignore_allowip/0002_test.yml
@@ -15,6 +15,34 @@ flow:
   - end|ROUTE_AUTH:
   - start|ROUTE_PREFERENCES:
   - end|ROUTE_PREFERENCES:
+      $xavp(callee_dom_prefs[0]=>dummy[*]):
+        - callee
+      $xavp(callee_peer_prefs[0]=>dummy[*]):
+        - callee
+      $xavp(callee_real_prefs[0]=>dummy[*]):
+        - callee
+      $xavp(callee_usr_prefs[0]=>dummy[*]):
+        - callee
+      $xavp(caller_dom_prefs[0]=>dummy[*]):
+        - caller
+      $xavp(caller_peer_prefs[0]=>dummy[*]):
+        - caller
+      $xavp(caller_real_prefs[0]=>ac): 1
+      $xavp(caller_real_prefs[0]=>account_id): '\d+'
+      $xavp(caller_real_prefs[0]=>allowed_ips_grp): '\d+' 
+      $xavp(caller_real_prefs[0]=>ignore_allowed_ips): 1
+      $xavp(caller_real_prefs[0]=>cc): 43
+      $xavp(caller_real_prefs[0]=>cli): 4311003
+      $xavp(caller_real_prefs[0]=>dummy[*]):
+        - caller
+      $xavp(caller_usr_prefs[0]=>ac): 1
+      $xavp(caller_usr_prefs[0]=>account_id): '\d+'
+      $xavp(caller_usr_prefs[0]=>allowed_ips_grp): '\d+'
+      $xavp(caller_usr_prefs[0]=>ignore_allowed_ips): 1
+      $xavp(caller_usr_prefs[0]=>cc): 43
+      $xavp(caller_usr_prefs[0]=>cli): 4311003
+      $xavp(caller_usr_prefs[0]=>dummy[*]):
+        - caller
   - exit|ROUTE_REG_HANDLE:
 sip_in:
   - '^REGISTER'