diff --git a/bin/check.sh b/bin/check.sh
index 1974e7dd..54abd724 100755
--- a/bin/check.sh
+++ b/bin/check.sh
@@ -154,6 +154,8 @@ function delete_voip
if [ -f "${SCEN_CHECK_DIR}/lnp.yml" ]; then
echo "$(date) - Deleting lnp carrier/number"
"${BIN_DIR}/create_lnp.pl" -delete "${SCEN_CHECK_DIR}/lnp.yml"
+ # REMOVE ME!! fix for REST API
+ ngcp-sercmd proxy lcr.reload
fi
if [ -f "${SCEN_CHECK_DIR}/ncos.yml" ]; then
diff --git a/scenarios/invite_concurrent_max_out/0003_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0003_test.yml.tt2
index c88fccea..deb07853 100644
--- a/scenarios/invite_concurrent_max_out/0003_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0003_test.yml.tt2
@@ -53,10 +53,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2
index 3becfd35..442b0a5d 100644
--- a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2
@@ -53,10 +53,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- start|ROUTE_ACC_FAILURE:
diff --git a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
index c88fccea..deb07853 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
@@ -53,10 +53,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios/invite_concurrent_max_out_per_account/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0014_test.yml.tt2
index 3becfd35..442b0a5d 100644
--- a/scenarios/invite_concurrent_max_out_per_account/0014_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0014_test.yml.tt2
@@ -53,10 +53,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- start|ROUTE_ACC_FAILURE:
diff --git a/scenarios/invite_peerout/0003_test.yml.tt2 b/scenarios/invite_peerout/0003_test.yml.tt2
index c88fccea..deb07853 100644
--- a/scenarios/invite_peerout/0003_test.yml.tt2
+++ b/scenarios/invite_peerout/0003_test.yml.tt2
@@ -53,10 +53,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
index 0938ac3c..7c9bc201 100644
--- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
@@ -59,10 +59,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
index 8885c88a..cfe5c496 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
@@ -61,10 +61,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
index 5dbf3011..f93c4c05 100644
--- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
@@ -63,14 +63,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
- - start|ROUTE_CLEAR_PEER_OUT_PREF:
- - return|ROUTE_CLEAR_PEER_OUT_PREF:
- - start|ROUTE_LOAD_PEER_OUT_PREF:
- - return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios_lnp/incoming_peer/sipp_scenario00.xml b/scenarios_lnp/incoming_peer/sipp_scenario00.xml
index eda64a35..23fa0403 100644
--- a/scenarios_lnp/incoming_peer/sipp_scenario00.xml
+++ b/scenarios_lnp/incoming_peer/sipp_scenario00.xml
@@ -59,7 +59,7 @@
-
+
diff --git a/scenarios_lnp/invite/0003_test.yml.tt2 b/scenarios_lnp/invite/0003_test.yml.tt2
index 760ecfec..2ec36413 100644
--- a/scenarios_lnp/invite/0003_test.yml.tt2
+++ b/scenarios_lnp/invite/0003_test.yml.tt2
@@ -75,10 +75,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios_lnp/invite/sipp_scenario00.xml b/scenarios_lnp/invite/sipp_scenario00.xml
index 33ab4bee..06657486 100644
--- a/scenarios_lnp/invite/sipp_scenario00.xml
+++ b/scenarios_lnp/invite/sipp_scenario00.xml
@@ -109,7 +109,7 @@
-
+
diff --git a/scenarios_lnp/invite_peerout/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
index a9894524..3eef5a17 100644
--- a/scenarios_lnp/invite_peerout/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
@@ -66,10 +66,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios_lnp/invite_peerout/sipp_scenario00.xml b/scenarios_lnp/invite_peerout/sipp_scenario00.xml
index eae4a7e6..7cfebc15 100644
--- a/scenarios_lnp/invite_peerout/sipp_scenario00.xml
+++ b/scenarios_lnp/invite_peerout/sipp_scenario00.xml
@@ -109,7 +109,7 @@
-
+
diff --git a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
index a3cc82db..8556932e 100644
--- a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
@@ -66,10 +66,12 @@ flow:
- return|ROUTE_CHECK_PBX:
- start|ROUTE_INVITE_TO_EXT:
- start|ROUTE_PSTN:
+ - start|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_CLEAR_PEER_OUT_PREF:
- return|ROUTE_CLEAR_PEER_OUT_PREF:
- start|ROUTE_LOAD_PEER_OUT_PREF:
- return|ROUTE_LOAD_PEER_OUT_PREF:
+ - return|ROUTE_PSTN_SELECT_PEER:
- start|ROUTE_OUTBOUND:
- start|ROUTE_SET_CALLER_DIALOG:
- return|ROUTE_SET_CALLER_DIALOG:
diff --git a/scenarios_lnp/invite_peerout_rn/sipp_scenario00.xml b/scenarios_lnp/invite_peerout_rn/sipp_scenario00.xml
index eae4a7e6..7cfebc15 100644
--- a/scenarios_lnp/invite_peerout_rn/sipp_scenario00.xml
+++ b/scenarios_lnp/invite_peerout_rn/sipp_scenario00.xml
@@ -109,7 +109,7 @@
-
+