Moved client-specific scripts to separate folders

Signed-off-by: George Milescu <george.milescu@gmail.com>

diff --git a/ConfigFiles/client_script_mappings b/ConfigFiles/client_script_mappings
index 019a022..678cf86 100644 (file)
--- a/ConfigFiles/client_script_mappings
+++ b/ConfigFiles/client_script_mappings
@@ -17,11 +17,11 @@ start_client()
        DEBUG echo "starting client ..."
        case "${client_type}" in
                "hrktorrent_seeder")
-                       ./start_hrk_seeder.sh &
+                       clients/hrk/start_hrk_seeder.sh &
                        return $!
                        ;;
                "hrktorrent_leecher")
-                       ./start_hrk_leecher.sh &
+                       clients/hrk/start_hrk_leecher.sh &
                        return $!
                        ;;
        esac
@@ -34,10 +34,10 @@ stop_client()
        DEBUG echo "stopping client ..."
        case "${CLIENT_TYPE}" in
                "hrktorrent_seeder")
-                       ./stop_hrk.sh
+                       clients/hrk/stop_hrk.sh
                        ;;
                "hrktorrent_leecher")
-                       ./stop_hrk.sh
+                       clients/hrk/stop_hrk.sh
                        ;;
        esac
 }
@@ -50,10 +50,10 @@ detect_complete_client()
        DEBUG echo "stopping client ..."
        case "${client_type}" in
                "hrktorrent_seeder")
-                       ./detect_complete_hrk.sh ${log_file}
+                       clients/hrk/detect_complete_hrk.sh ${log_file}
                        ;;
                "hrktorrent_leecher")
-                       ./detect_complete_hrk.sh ${log_file}
+                       clients/hrk/detect_complete_hrk.sh ${log_file}
                        ;;
        esac
 }
@@ -68,11 +68,11 @@ parse_client_log()
        case "${client_type}" in
                "hrktorrent_seeder")
                        DEBUG echo "hello hrktorrent_seeder"
-                       ./parse_hrk.sh ${log_folder} ${log_file}
+                       clients/hrk/parse_hrk.sh ${log_folder} ${log_file}
                        ;;
                "hrktorrent_leecher")
                        DEBUG echo "hello hrktorrent_leecher"
-                       ./parse_hrk.sh ${log_folder} ${log_file}
+                       clients/hrk/parse_hrk.sh ${log_folder} ${log_file}
                        ;;
        esac
 }

diff --git a/ConfigFiles/test-scenario-pre-post-nop.cfg b/ConfigFiles/test-scenario-pre-post-nop.cfg
index 609675c..16421c4 100644 (file)
--- a/ConfigFiles/test-scenario-pre-post-nop.cfg
+++ b/ConfigFiles/test-scenario-pre-post-nop.cfg
@@ -5,5 +5,5 @@
 #   * client-wise limitation
 #
 # Hostname                     SSHport         User    RemoteFolder            NetInterface    Download(Mbps)  DownloadBurst(K)        Upload(Mbps)    UploadBurst(K)          PreRunScript            PostRunScript           ClientType              TorrentFile             Periods
-p2p-next-03.grid.pub.ro                10122           p2p     /home/p2p/george        eth0            8               100                     8               100                     pre-run_nop.sh  post-run_nop.sh         hrktorrent_seeder       Data.100M.ct.torrent    (10,60) (60,100) (120,200) (200,230) (250,600)
-p2p-next-03.grid.pub.ro                10222           p2p     /home/p2p/george        eth0            8               100                     8               100                     pre-run_nop.sh  post-run_nop.sh         hrktorrent_leecher      Data.100M.ct.torrent    (10,30) (40,70) (80,110) (130,160) (180,250) (300,600)
+p2p-next-03.grid.pub.ro                10122           p2p     /home/p2p/george        eth0            8               100                     8               100                     pre-run_nop.sh          post-run_nop.sh         hrktorrent_seeder       Data.100M.ct.torrent    (10,60) (60,100) (120,200) (200,230) (250,600)
+p2p-next-03.grid.pub.ro                10222           p2p     /home/p2p/george        eth0            8               100                     8               100                     pre-run_nop.sh          post-run_nop.sh         hrktorrent_leecher      Data.100M.ct.torrent    (10,30) (40,70) (80,110) (130,160) (180,250) (300,600)

diff --git a/ControlScripts/detect_complete_hrk.sh b/ControlScripts/clients/hrk/detect_complete_hrk.sh
similarity index 100%
rename from ControlScripts/detect_complete_hrk.sh
rename to ControlScripts/clients/hrk/detect_complete_hrk.sh

diff --git a/ControlScripts/parse_hrk.sh b/ControlScripts/clients/hrk/parse_hrk.sh
similarity index 100%
rename from ControlScripts/parse_hrk.sh
rename to ControlScripts/clients/hrk/parse_hrk.sh

diff --git a/ControlScripts/start_hrk_leecher.sh b/ControlScripts/clients/hrk/start_hrk_leecher.sh
similarity index 100%
rename from ControlScripts/start_hrk_leecher.sh
rename to ControlScripts/clients/hrk/start_hrk_leecher.sh

diff --git a/ControlScripts/start_hrk_seeder.sh b/ControlScripts/clients/hrk/start_hrk_seeder.sh
similarity index 100%
rename from ControlScripts/start_hrk_seeder.sh
rename to ControlScripts/clients/hrk/start_hrk_seeder.sh

diff --git a/ControlScripts/stop_hrk.sh b/ControlScripts/clients/hrk/stop_hrk.sh
similarity index 100%
rename from ControlScripts/stop_hrk.sh
rename to ControlScripts/clients/hrk/stop_hrk.sh

diff --git a/ControlScripts/detect_complete_tribler_doe.sh b/ControlScripts/clients/tribler/detect_complete_tribler_doe.sh
similarity index 100%
rename from ControlScripts/detect_complete_tribler_doe.sh
rename to ControlScripts/clients/tribler/detect_complete_tribler_doe.sh

diff --git a/ControlScripts/detect_complete_tribler_leecher.sh b/ControlScripts/clients/tribler/detect_complete_tribler_leecher.sh
similarity index 100%
rename from ControlScripts/detect_complete_tribler_leecher.sh
rename to ControlScripts/clients/tribler/detect_complete_tribler_leecher.sh

diff --git a/ControlScripts/detect_complete_tribler_proxy.sh b/ControlScripts/clients/tribler/detect_complete_tribler_proxy.sh
similarity index 100%
rename from ControlScripts/detect_complete_tribler_proxy.sh
rename to ControlScripts/clients/tribler/detect_complete_tribler_proxy.sh

diff --git a/ControlScripts/detect_complete_tribler_seeder.sh b/ControlScripts/clients/tribler/detect_complete_tribler_seeder.sh
similarity index 100%
rename from ControlScripts/detect_complete_tribler_seeder.sh
rename to ControlScripts/clients/tribler/detect_complete_tribler_seeder.sh

diff --git a/ControlScripts/parse_tribler_doe.sh b/ControlScripts/clients/tribler/parse_tribler_doe.sh
similarity index 100%
rename from ControlScripts/parse_tribler_doe.sh
rename to ControlScripts/clients/tribler/parse_tribler_doe.sh

diff --git a/ControlScripts/parse_tribler_leecher.sh b/ControlScripts/clients/tribler/parse_tribler_leecher.sh
similarity index 100%
rename from ControlScripts/parse_tribler_leecher.sh
rename to ControlScripts/clients/tribler/parse_tribler_leecher.sh

diff --git a/ControlScripts/parse_tribler_proxy.sh b/ControlScripts/clients/tribler/parse_tribler_proxy.sh
similarity index 100%
rename from ControlScripts/parse_tribler_proxy.sh
rename to ControlScripts/clients/tribler/parse_tribler_proxy.sh

diff --git a/ControlScripts/parse_tribler_seeder.sh b/ControlScripts/clients/tribler/parse_tribler_seeder.sh
similarity index 100%
rename from ControlScripts/parse_tribler_seeder.sh
rename to ControlScripts/clients/tribler/parse_tribler_seeder.sh

diff --git a/ControlScripts/start_tribler_doe.sh b/ControlScripts/clients/tribler/start_tribler_doe.sh
similarity index 100%
rename from ControlScripts/start_tribler_doe.sh
rename to ControlScripts/clients/tribler/start_tribler_doe.sh

diff --git a/ControlScripts/start_tribler_gui.sh b/ControlScripts/clients/tribler/start_tribler_gui.sh
similarity index 100%
rename from ControlScripts/start_tribler_gui.sh
rename to ControlScripts/clients/tribler/start_tribler_gui.sh

diff --git a/ControlScripts/start_tribler_leecher.sh b/ControlScripts/clients/tribler/start_tribler_leecher.sh
similarity index 100%
rename from ControlScripts/start_tribler_leecher.sh
rename to ControlScripts/clients/tribler/start_tribler_leecher.sh

diff --git a/ControlScripts/start_tribler_proxy.sh b/ControlScripts/clients/tribler/start_tribler_proxy.sh
similarity index 100%
rename from ControlScripts/start_tribler_proxy.sh
rename to ControlScripts/clients/tribler/start_tribler_proxy.sh

diff --git a/ControlScripts/start_tribler_seeder.sh b/ControlScripts/clients/tribler/start_tribler_seeder.sh
similarity index 100%
rename from ControlScripts/start_tribler_seeder.sh
rename to ControlScripts/clients/tribler/start_tribler_seeder.sh

diff --git a/ControlScripts/stop_tribler.sh b/ControlScripts/clients/tribler/stop_tribler.sh
similarity index 100%
rename from ControlScripts/stop_tribler.sh
rename to ControlScripts/clients/tribler/stop_tribler.sh