test: further portings to sr and small extensions

test/unit/16.sh

@@ -31,11 +31,11 @@ fi ;
 CFG=2.cfg
 cp $CFG $CFG.bak
 
-echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
+echo "loadmodule \"../../modules/db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"postgres://openserro:openserro@localhost/openser\")" >> $CFG
 
 # start
-../$BIN -w . -f $CFG > /dev/null
+$BIN -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/17.sh

@@ -30,14 +30,13 @@ CFG=17.cfg
 
 tmp_name=""$RANDOM"_kamailiodb_tmp"
 
-echo "loadmodule \"../modules/db_berkeley/db_berkeley.so\"" >> $CFG
+echo "loadmodule \"../../modules/db_berkeley/db_berkeley.so\"" >> $CFG
 cat 2.cfg >> $CFG
 echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"berkeley://`pwd`/../scripts/$tmp_name\")" >> $CFG
 
-cd ../scripts
-
 # setup config file
 cp $CTLRC $CTLRC.bak
+
 sed -i "s/# DBENGINE=MYSQL/DBENGINE=DB_BERKELEY/g" $CTLRC
 sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC
 sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" $CTLRC
@@ -45,11 +44,11 @@ sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" $CTLRC
 cp $DBCTL $DBCTL.bak
 sed -i "s/TEST=\"false\"/TEST=\"true\"/g" $DBCTL
 
-./$DBCTL create $tmp_name > /dev/null
+$DBCTL create $tmp_name > /dev/null
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then
-	../$BIN -w . -f ../test/$CFG > /dev/null	
+	$BIN -w . -f $CFG > /dev/null
 	ret=$?
 fi ;
 
@@ -57,11 +56,10 @@ sleep 1
 $KILL
 
 # cleanup
-./$DBCTL drop $tmp_name > /dev/null
+$DBCTL drop $tmp_name > /dev/null
 mv $CTLRC.bak $CTLRC
 mv $DBCTL.bak $DBCTL
 
-cd ../test/
 rm $CFG
 
 exit $ret

test/unit/2.cfg

@@ -9,7 +9,7 @@ loadmodule "auth_db"
 loadmodule "avpops"
 loadmodule "benchmark"
 loadmodule "cfgutils"
-###loadmodule "dialog"
+loadmodule "dialog"
 loadmodule "dispatcher"
 loadmodule "diversion"
 loadmodule "domain"
@@ -53,8 +53,8 @@ loadmodule "xlog"
 
 modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 modparam("mi_datagram", "socket_name", "/tmp/kamailio.sock")
-###modparam("dialog", "dlg_flag", 10)
-###modparam("dialog", "db_mode", 2)
+modparam("dialog", "dlg_flag", 10)
+modparam("dialog", "db_mode", 2)
 ##modparam("tm", "fr_inv_timer_avp", "$avp(i:704)")
 modparam("^auth$|lcr", "rpid_avp", "$avp(i:302)")
 modparam("sms", "modems", "Nokia [d=/dev/ttyS1;b=9600;m=new;l=30] ")

test/unit/26.cfg

@@ -1,27 +1,23 @@
-debug=3
-mpath="../modules"
-loadmodule "sl/sl.so"
-loadmodule "tm/tm.so"
-loadmodule "xlog/xlog.so"
-loadmodule "maxfwd/maxfwd.so"
-loadmodule "pv/pv.so"
-loadmodule "carrierroute/carrierroute.so"
-loadmodule "mi_fifo/mi_fifo.so"
+debug=2
+loadpath "../../modules_k"
+loadmodule "sl"
+loadmodule "../../modules/tm/tm.so"
+loadmodule "tmx"
+loadmodule "xlog"
+loadmodule "maxfwd"
+loadmodule "pv"
+loadmodule "../../modules/carrierroute/carrierroute.so"
+loadmodule "mi_fifo"
 
 modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
-avp_aliases="domain=s:10"
-avp_aliases="carrier=s:11"
-avp_aliases="host=s:12"
-avp_aliases="comment=s:13"
-
 route{
 	# initial sanity checks
 	if (!mf_process_maxfwd_header("10")) {
 		sl_send_reply("483","Too Many Hops");
 		return;
 	}
-	if (msg:len >  max_len) {
+	if (msg:len > 4096) {
 		sl_send_reply("513", "Message too big");
 		return;
 	}
@@ -31,15 +27,16 @@ route{
 	setflag(2);
 
 	# user route
-	if(cr_user_carrier("$rU", "$rd", "$avp(carrier)")) {
-		$avp(domain)="domain0";
-		if (!cr_route("$avp(carrier)", "$avp(domain)", "$rU", "$rU", "call_id", "$avp(comment)")) {
+	xlog("user $rU, domain $rd");
+	if(cr_user_carrier("$rU", "$rd", "$avp(s:11)")) {
+		$avp(s:10)="domain0";
+		if (!cr_route("$avp(s:11)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:13)")) {
 			xlog("L_ERR", "cr_route failed\n");
 			exit;
 		}
 		t_on_failure("1");
-		$avp(host) = $rd+":"+$rp;
-		#xlog("host: $avp(host), comment: $avp(comment)");
+		$avp(s:12) = $rd+":"+$rp;
+		#xlog("host: $avp(s:12), comment: $avp(s:13)");
 	} else {
 	# default route
 		if (!cr_route("default", "domain0", "$rU", "$rU", "call_id")) {
@@ -54,15 +51,15 @@ route{
 
 failure_route[1] {
 	revert_uri();
-	if (!cr_next_domain("$avp(carrier)", "$avp(domain)", "$rU", "$avp(host)", "$T_reply_code", "$avp(domain)")) {
+	if (!cr_next_domain("$avp(s:11)", "$avp(s:10)", "$rU", "$avp(s:12)", "$T_reply_code", "$avp(s:10)")) {
 		xlog("L_ERR", "cr_next_domain failed\n");
 		exit;
 	}
-	if (!cr_route("$avp(carrier)", "$avp(domain)", "$rU", "$rU", "call_id")) {
+	if (!cr_route("$avp(s:11)", "$avp(s:10)", "$rU", "$rU", "call_id")) {
 		xlog("L_ERR", "cr_route failed\n");
 		exit;
 	}
-	$avp(host) = $rd+":"+$rp;
+	$avp(s:12) = $rd+":"+$rp;
 	t_on_failure("1");
 	append_branch();
 	if (!t_relay()) {

test/unit/26.sh

@@ -32,7 +32,7 @@ CFG=26.cfg
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
+echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 # setup database
@@ -74,19 +74,20 @@ $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('4972112
 $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('49721123456785', 3);"
 
 
-../$BIN -w . -f $CFG > /dev/null
+$BIN -w . -f $CFG > /dev/null
 
 ret=$?
 
 sleep 1
 
-if [ "$ret" -eq 0 ] ; then
-	sipp -sn uas -bg -i localhost -m 12 -p 7000 &> /dev/null
-	sipp -sn uas -bg -i localhost -m 12 -p 8000 &> /dev/null
-	sipp -sn uac -s 49721123456787 127.0.0.1:5060 -i 127.0.0.1 -m 20 -p 5061 &> /dev/null
-	ret=$?
-	killall sipp &> /dev/null
-fi;
+#if [ "$ret" -eq 0 ] ; then
+#	sipp -sn uas -bg -i localhost -m 12 -p 7000 &> /dev/null
+#	sipp -sn uas -bg -i localhost -m 12 -p 8000 &> /dev/null
+#	sipp -sn uac -s 49721123456787 127.0.0.1:5060 -i 127.0.0.1 -m 20 -p 5061 &> /dev/null
+#	ret=$?
+#	killall sipp &> /dev/null
+#fi;
+#sleep 2
 
 if [ "$ret" -eq 0 ] ; then
 	sipp -sn uas -bg -i localhost -m 10 -p 9000 &> /dev/null
@@ -113,7 +114,7 @@ $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_n
 flags, mask, next_domain) values ('5', '3', '1', '49', '127.0.0.1:10000', '486', '0', '0', '2');"
 
 if [ ! "$ret" -eq 0 ] ; then
-	../scripts/$CTL fifo cr_reload_routes
+	$CTL fifo cr_reload_routes
 	killall sipp &> /dev/null
 	sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null
 	sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null
@@ -142,8 +143,6 @@ $MYSQL "delete from subscriber where username='49721123456786';"
 $MYSQL "delete from subscriber where username='49721123456785';"
 $MYSQL "alter table subscriber drop cr_preferred_carrier;"
 
-cd ../test
-
 mv $CFG.bak $CFG
 
 exit $ret

test/unit/30.cfg

@@ -1,11 +1,11 @@
-debug=3
-mpath="../modules"
-loadmodule "sl/sl.so"
-loadmodule "tm/tm.so"
-loadmodule "xlog/xlog.so"
-loadmodule "maxfwd/maxfwd.so"
-loadmodule "pv/pv.so"
-loadmodule "carrierroute/carrierroute.so"
+debug=2
+loadpath "../../modules_k"
+loadmodule "sl"
+loadmodule "../../modules/tm/tm.so"
+loadmodule "xlog"
+loadmodule "maxfwd"
+loadmodule "pv"
+loadmodule "../../modules/carrierroute/carrierroute.so"
 
 route{
 	# initial sanity checks
@@ -13,7 +13,8 @@ route{
 		sl_send_reply("483","Too Many Hops");
 		return;
 	}
-	if (msg:len >  max_len) {
+
+	if (msg:len > 4096) {
 		sl_send_reply("513", "Message too big");
 		return;
 	}

test/unit/30.sh

@@ -32,10 +32,10 @@ CFG=30.cfg
 cp $CFG $CFG.bak
 
 # setup config
-echo "modparam(\"carrierroute\", \"config_file\", \"`pwd`/../test/carrierroute-2.cfg\")" >> $CFG
+echo "modparam(\"carrierroute\", \"config_file\", \"carrierroute-2.cfg\")" >> $CFG
 
 
-../$BIN -w . -f $CFG > /dev/null
+$BIN -w . -f $CFG > /dev/null
 
 ret=$?
 
@@ -65,8 +65,6 @@ fi;
 $KILL
 killall -9 sipp
 
-cd ../test
-
 mv $CFG.bak $CFG
 
 exit $ret

test/unit/37.sh

@@ -36,7 +36,7 @@ fi ;
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
+echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 # setup database
@@ -62,16 +62,14 @@ while [  $COUNTER -lt $NR ]; do
 
 done
 
-../$BIN -m 128 -w . -f $CFG > /dev/null
+$BIN -m 128 -w . -f $CFG > /dev/null
 ret=$?
 
 # adjust if you have bigger rule sets
 sleep 20
 
-cd ../scripts
-
 if [ $ret -eq 0 ] ; then
-	tmp=`./$CTL fifo cr_dump_routes | grep "host-" | wc -l`
+	tmp=`$CTL fifo cr_dump_routes | grep "host-" | wc -l`
 	let "TMPNR = $NR * 10"
 	if ! [ $tmp -eq $TMPNR ]; then
 		ret=1
@@ -111,8 +109,6 @@ $MYSQL "delete from carrierroute where carrier=9;"
 $MYSQL "delete from carrierroute where carrier=10;"
 $MYSQL "delete from carrierroute where carrier=11;"
 
-cd ../test
-
 mv $CFG.bak $CFG
 
 exit $ret

test/unit/42.sh

@@ -32,7 +32,7 @@ CFG=26.cfg
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
+echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"match_mode\", 128)" >> $CFG
 
@@ -75,7 +75,7 @@ $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('ab4-123
 $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('ab4-123456785', 3);"
 
 
-../$BIN -w . -f $CFG > /dev/null
+$BIN -w . -f $CFG > /dev/null
 
 ret=$?
 
@@ -114,7 +114,7 @@ $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_n
 flags, mask, next_domain) values ('5', '3', '1', 'ab4-', '127.0.0.1:10000', '486', '0', '0', '2');"
 
 if [ ! "$ret" -eq 0 ] ; then
-	../scripts/$CTL fifo cr_reload_routes
+	$CTL fifo cr_reload_routes
 	killall sipp &> /dev/null
 	sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null
 	sipp -sn uac -s ab4-123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null
@@ -143,8 +143,6 @@ $MYSQL "delete from subscriber where username='ab4-123456786';"
 $MYSQL "delete from subscriber where username='ab4-123456785';"
 $MYSQL "alter table subscriber drop cr_preferred_carrier;"
 
-cd ../test
-
 mv $CFG.bak $CFG
 
 exit $ret

test/unit/include/common

@@ -2,9 +2,10 @@
 DB_ALL_MOD="acc|alias_db|auth_db|avpops|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt|userblacklist"
 # root directory relative to tests
 SR_DIR="../.."
-CTLRC="$SR_DIR/scripts/kamctlrc"
-CTL="$SR_DIR/scripts/kamctl"
-DBCTL="$SR_DIR/scripts/kamdbctl"
+CTL_DIR="$SR_DIR/scripts"
+CTLRC="$CTL_DIR/kamctlrc"
+CTL="$CTL_DIR/kamctl"
+DBCTL="$CTL_DIR/kamdbctl"
 BIN="$SR_DIR/ser"
 KILL="killall -15 $BIN"
 # test directory relative to root