diff --git a/bin/provide_next_network.pl b/bin/provide_next_network.pl index 2f3e94c6..feda035f 100755 --- a/bin/provide_next_network.pl +++ b/bin/provide_next_network.pl @@ -68,4 +68,4 @@ foreach my $scen (@{$ids->{scenarios}}) } $port = $port +1; $mport = $mport + 2; -print "${port}:${mport}\n"; +print "${port}:${mport}"; diff --git a/bin/provide_next_phone.pl b/bin/provide_next_phone.pl index d54599a1..d9362d93 100755 --- a/bin/provide_next_phone.pl +++ b/bin/provide_next_phone.pl @@ -66,4 +66,5 @@ foreach my $domain (@{$ids->{domains}}) } } } -print "$phone->{cc}:$phone->{ac}:$phone->{sn}\n"; +$phone->{sn}++; +print "$phone->{cc}:$phone->{ac}:$phone->{sn}"; diff --git a/bin/provide_scenario.sh b/bin/provide_scenario.sh index 7f1ecb06..a6160ca2 100755 --- a/bin/provide_scenario.sh +++ b/bin/provide_scenario.sh @@ -213,6 +213,7 @@ scenario_csv() { echo "$(date) - Generating csv/reg.xml files" echo "IP=${IP} PORT=${PORT} MPORT=${MPORT}" echo "PEER_IP=${PEER_IP} PEER_PORT=${PEER_PORT} PEER_MPORT=${PEER_MPORT}" + echo "PHONE:${PHONE}" if ! "${BIN_DIR}/scenario.pl" \ --ip="${IP}" --port="${PORT}" --mport="${MPORT}" --phone="${PHONE}" \ --peer-ip="${PEER_IP}" --peer-port="${PEER_PORT}" --peer-mport="${PEER_MPORT}" \ diff --git a/bin/provide_scenarios.sh b/bin/provide_scenarios.sh index 31a7f4aa..1385d074 100755 --- a/bin/provide_scenarios.sh +++ b/bin/provide_scenarios.sh @@ -98,6 +98,12 @@ get_config() { PHONE_CC=${data[6]} PHONE_AC=${data[7]} PHONE_SN=${data[8]} + if [[ ${ACTION} == "create" ]] ; then + echo "*** configs from ${CONFIG}" + echo -e "\\tIP:${IP} PORT:${PORT} MPORT:${MPORT}" + echo -e "\\tPEER_IP:${PEER_IP} PEER_PORT:${PEER_PORT} MPORT:${PEER_MPORT}" + echo -e "\\tPHONE_CC:${PHONE_CC} PHONE_ACC:${PHONE_AC} PHONE_SN:${PHONE_SN}" + fi } update_network() { @@ -126,13 +132,16 @@ update_network() { create() { local scen=${BASE_DIR}/${GROUP}/$1 - echo "*** Providing:$1 IP:${IP} PORT:${PORT} MPORT:${MPORT} PEER_IP:${PEER_IP} PEER_PORT:${PEER_PORT} MPORT:${PEER_MPORT}***" + echo "*** Providing:$1 ************************************" + echo -e "\\tIP:${IP} PORT:${PORT} MPORT:${MPORT}" + echo -e "\\tPEER_IP:${PEER_IP} PEER_PORT:${PEER_PORT} MPORT:${PEER_MPORT}" + echo -e "\\tPHONE_CC:${PHONE_CC} PHONE_ACC:${PHONE_AC} PHONE_SN:${PHONE_SN}" "${BIN_DIR}/provide_scenario.sh" \ -i "${IP}" -p "${PORT}" -m "${MPORT}" \ -n "${PHONE_CC}:${PHONE_AC}:${PHONE_SN}" \ -I "${PEER_IP}" -P "${PEER_PORT}" -M "${PEER_MPORT}" \ "${scen}" "${ACTION}" - echo "*** done $1 ***" + echo "*** done $1 *****************************************" update_network "${scen}" }