From: Razvan Deaconescu <razvan.deaconescu@cs.pub.ro>
Date: Wed, 18 Aug 2010 12:53:33 +0000 (+0300)
Subject: TestSpecs/gen: update generation scripts to take into account "number of connections... 
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=954ef34051adc40dc5c9a9d310ca5762c2630f45;p=p2p-testing-infrastructure.git

TestSpecs/gen: update generation scripts to take into account "number of connections" variable
---

diff --git a/TestSpecs/gen/rgen b/TestSpecs/gen/rgen
index f553700..56c5501 100755
--- a/TestSpecs/gen/rgen
+++ b/TestSpecs/gen/rgen
@@ -56,7 +56,7 @@ rm(args)
 END
 
 index=1
-while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst pre_run_script post_run_script client_type torrent_file periods; do
+while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst num_conn pre_run_script post_run_script client_type torrent_file periods; do
 	new_port=${port%22}
 	if test -z "${new_port}"; then
 		base_log_name=${server%%.*}
@@ -80,7 +80,7 @@ cat <<END
 END
 
 index=1
-while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst pre_run_script post_run_script client_type torrent_file periods; do
+while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst num_conn pre_run_script post_run_script client_type torrent_file periods; do
 	if ! test_is_leecher ${client_type}; then
 		((index++))
 		continue
@@ -98,7 +98,7 @@ p <- ggplot() +
 END
 
 index=1
-while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst pre_run_script post_run_script client_type torrent_file periods; do
+while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst num_conn pre_run_script post_run_script client_type torrent_file periods; do
 	if ! test_is_leecher ${client_type}; then
 		((index++))
 		continue
@@ -133,7 +133,7 @@ p <- ggplot() +
 END
 
 index=1
-while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst pre_run_script post_run_script client_type torrent_file periods; do
+while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst num_conn pre_run_script post_run_script client_type torrent_file periods; do
 	if ! test_is_leecher ${client_type}; then
 		((index++))
 		continue
diff --git a/TestSpecs/gen/tgen b/TestSpecs/gen/tgen
index d2264b7..049e78a 100755
--- a/TestSpecs/gen/tgen
+++ b/TestSpecs/gen/tgen
@@ -57,7 +57,7 @@ generate_scenario()
 	echo "### END SCENARIO INFO"
 	echo ""
 
-	echo -e "# Hostname\t\t\tSSHport\t\tUser\t\tRemoteFolder\t\tNetInterface\t\tDownload(Mbps)\tDownloadBurst(K)\tUpload(Mbps)\tUploadBurst(K)\t\tPreRunScript\t\tPostRunScript\t\tClientType\t\t\tTorrentFile\t\tPeriods"
+	echo -e "# Hostname\t\t\tSSHport\t\tUser\t\tRemoteFolder\t\tNetInterface\t\tDownload(Mbps)\tDownloadBurst(K)\tUpload(Mbps)\tUploadBurst(K)\tOverallNoOfConnections\tPreRunScript\t\tPostRunScript\t\tClientType\t\t\tTorrentFile\t\tPeriods"
 	index=0
 	for sys_index in 01 03 04 05 06 07 08 09 10; do
 		for ce_index in 1 2 3 4 5 6 7 8 9 10; do
@@ -69,7 +69,8 @@ generate_scenario()
 			echo -en "$down_bw\t\t"
 			echo -en "100\t\t\t"
 			echo -en "$up_bw\t\t"
-			echo -en "100\t\t\t"
+			echo -en "100\t\t"
+			echo -en "$num_conn\t\t\t"
 			echo -en "pre-run_nop.sh\t\t"
 			echo -en "post-run_nop.sh\t\t"