TT#2503 update scenarios_lnp WRT new parameter handling

Change-Id: I76a57fdabe1a7f237ae9e4b650cf063a0ff465fd

scenarios_lnp/incoming_peer/0003_test.yml.tt2

@@ -37,13 +37,8 @@ flow:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LNP:
       $avp(callee_cli): ['4311003']
-      $xavp(caller_real_prefs[0]=>lnp_to_rn): None
   - start|ROUTE_LNP_SET_URI:
       $var(lnp_dst): 4318881003
-  - start|ROUTE_LNP_SET_PARAMS:
-      $xavp(caller_real_prefs[0]=>lnp_add_npdi): None
-  - return|ROUTE_LNP_SET_PARAMS:
-      $var(lnp_npdi): 0
   - return|ROUTE_LNP_SET_URI:
   - return|ROUTE_LNP:
   - start|ROUTE_FIND_CALLEE_POST:
@@ -102,6 +97,12 @@ flow:
   - return|ROUTE_PREPARE_CALLER_CLI:
   - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
+  - start|ROUTE_LNP_SET_PARAMS:
+      $xavp(callee_peer_prefs[0]=>lnp_to_rn): None
+      $xavp(callee_peer_prefs[0]=>lnp_add_npdi): None
+  - return|ROUTE_LNP_SET_PARAMS:
+      $var(lnp_npdi): 0
+      $var(lnp_rn): 0
   - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
   - return|ROUTE_ADD_CALLINFO:

scenarios_lnp/invite/0003_test.yml.tt2

@@ -62,13 +62,8 @@ flow:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_LNP:
       $avp(callee_cli): ['4311001']
-      $xavp(caller_real_prefs[0]=>lnp_to_rn): None
   - start|ROUTE_LNP_SET_URI:
       $var(lnp_dst): 4318881001
-  - start|ROUTE_LNP_SET_PARAMS:
-      $xavp(caller_real_prefs[0]=>lnp_add_npdi): None
-  - return|ROUTE_LNP_SET_PARAMS:
-      $var(lnp_npdi): 0
   - return|ROUTE_LNP_SET_URI:
   - return|ROUTE_LNP:
   - start|ROUTE_CHECK_PBX:
@@ -112,6 +107,12 @@ flow:
   - return|ROUTE_PREPARE_CALLER_CLI:
   - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
+  - start|ROUTE_LNP_SET_PARAMS:
+      $xavp(callee_real_prefs[0]=>lnp_add_npdi): None
+      $xavp(callee_real_prefs[0]=>lnp_to_rn): None
+  - return|ROUTE_LNP_SET_PARAMS:
+      $var(lnp_npdi): 0
+      $var(lnp_rn): 0
   - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
   - return|ROUTE_ADD_CALLINFO:

scenarios_lnp/invite_peerout/0003_test.yml.tt2

@@ -51,10 +51,6 @@ flow:
   - return|ROUTE_APPLY_REWRITE_RULE:
   - start|ROUTE_LNP_SET_URI:
       $var(lnp_dst): 0043test28881001
-  - start|ROUTE_LNP_SET_PARAMS:
-      $xavp(caller_real_prefs[0]=>lnp_add_npdi): 1
-  - return|ROUTE_LNP_SET_PARAMS:
-      $var(lnp_npdi): 1
   - return|ROUTE_LNP_SET_URI:
   - return|ROUTE_LNP:
   - start|ROUTE_FIND_CALLEE_POST:
@@ -119,6 +115,10 @@ flow:
   - start|ROUTE_SET_CALLEE:
   - start|ROUTE_APPLY_REWRITE_RULE:
   - return|ROUTE_APPLY_REWRITE_RULE:
+  - start|ROUTE_LNP_SET_PARAMS:
+      $xavp(callee_peer_prefs[0]=>lnp_add_npdi): 1
+  - return|ROUTE_LNP_SET_PARAMS:
+      $var(lnp_npdi): 1
   - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
   - return|ROUTE_ADD_CALLINFO:

scenarios_lnp/invite_peerout/prefs.json

@@ -1,10 +1,10 @@
 {
     "testuser1002@spce.test": {
-        "lnp_add_npdi": true,
         "rewrite_rule_set": "rw_00"
     },
     "peer_00_host0": {
         "concurrent_max": 1,
-        "rewrite_rule_set": "rw_00"
+        "rewrite_rule_set": "rw_00",
+        "lnp_add_npdi": true
     }
 }

scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2

@@ -40,13 +40,8 @@ flow:
       $xavp(callee_real_prefs[0]=>lnp_for_local_sub): None
   - start|ROUTE_LNP:
       $avp(callee_cli): ['004321001']
-      $xavp(caller_real_prefs[0]=>lnp_to_rn): 1
   - start|ROUTE_LNP_SET_URI:
       $var(lnp_dst): 004328881001
-  - start|ROUTE_LNP_SET_PARAMS:
-      $xavp(caller_real_prefs[0]=>lnp_add_npdi): 1
-  - return|ROUTE_LNP_SET_PARAMS:
-      $var(lnp_npdi): 1
   - return|ROUTE_LNP_SET_URI:
   - return|ROUTE_LNP:
   - start|ROUTE_FIND_CALLEE_POST:
@@ -103,6 +98,12 @@ flow:
   - return|ROUTE_PREPARE_CALLER_CLI:
   - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
+  - start|ROUTE_LNP_SET_PARAMS:
+      $xavp(callee_peer_prefs[0]=>lnp_to_rn): 1
+      $xavp(callee_peer_prefs[0]=>lnp_add_npdi): 1
+  - return|ROUTE_LNP_SET_PARAMS:
+      $var(lnp_npdi): 1
+      $var(lnp_rn): 1
   - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
   - return|ROUTE_ADD_CALLINFO:

scenarios_lnp/invite_peerout_rn/prefs.json

@@ -1,9 +1,7 @@
 {
-	"testuser1002@spce.test": {
-		"lnp_to_rn": true,
-		"lnp_add_npdi": true
-	},
     "peer_00_host0": {
+        "lnp_to_rn": true,
+        "lnp_add_npdi": true,
         "concurrent_max": 1
     }
 }