Moved client_script_mappings and globalconfig from TestSpecs to ControlScripts

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

diff --git a/TestSpecs/client_script_mappings b/ControlScripts/client_script_mappings
similarity index 100%
rename from TestSpecs/client_script_mappings
rename to ControlScripts/client_script_mappings

diff --git a/ControlScripts/clients/hrk/start_hrk_leecher.sh b/ControlScripts/clients/hrk/start_hrk_leecher.sh
index ece73077b590ab6afb5785173e88d26211a97bc2..818062e37e282f4c6ddf7e427a6e32f904eea01a 100755 (executable)
--- a/ControlScripts/clients/hrk/start_hrk_leecher.sh
+++ b/ControlScripts/clients/hrk/start_hrk_leecher.sh
@@ -14,10 +14,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/clients/hrk/start_hrk_seeder.sh b/ControlScripts/clients/hrk/start_hrk_seeder.sh
index 0418677d560ec6633940ef50f326e820ad7a06e2..2bf9ee86057aa18b4911408604ca86d968172fa2 100755 (executable)
--- a/ControlScripts/clients/hrk/start_hrk_seeder.sh
+++ b/ControlScripts/clients/hrk/start_hrk_seeder.sh
@@ -14,10 +14,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/clients/tribler/start_tribler_doe.sh b/ControlScripts/clients/tribler/start_tribler_doe.sh
index bf28ed3aeda096859bed844eb8bdacefea5b843b..9a280b87c428041689681def48209d1290f45a57 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_doe.sh
+++ b/ControlScripts/clients/tribler/start_tribler_doe.sh
@@ -13,10 +13,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/clients/tribler/start_tribler_leecher.sh b/ControlScripts/clients/tribler/start_tribler_leecher.sh
index 9f9c37eb3479e99d43910dc0646798b98855c43f..7353376d2bc77473b7172370593e6fa8c011c19e 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_leecher.sh
+++ b/ControlScripts/clients/tribler/start_tribler_leecher.sh
@@ -13,11 +13,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-echo "pwd=$(pwd)"
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/clients/tribler/start_tribler_proxy.sh b/ControlScripts/clients/tribler/start_tribler_proxy.sh
index 55c372515e7172d1de66759eafc07075f31e0c18..ada6fde00b6d14e1d7c342fc73086a8576f2ae22 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_proxy.sh
+++ b/ControlScripts/clients/tribler/start_tribler_proxy.sh
@@ -21,10 +21,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration file

diff --git a/ControlScripts/clients/tribler/start_tribler_seeder.sh b/ControlScripts/clients/tribler/start_tribler_seeder.sh
index 1cbb18c985eb281c3ad6a4ea5d978ce4b40ccd24..023d4e9f0240bd170ff7f48898803b3ba53b63e1 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_seeder.sh
+++ b/ControlScripts/clients/tribler/start_tribler_seeder.sh
@@ -12,11 +12,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-echo "pwd=$(pwd)"
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration file (TORRENT_FILE)

diff --git a/ControlScripts/detect_complete_client.sh b/ControlScripts/detect_complete_client.sh
index 12a6f059cc5af70f15d619790884fdf731fd91e9..9a711b84f638a7c31c971fc648aa566de32bbfcb 100755 (executable)
--- a/ControlScripts/detect_complete_client.sh
+++ b/ControlScripts/detect_complete_client.sh
@@ -18,10 +18,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration file (CLIENT_TYPE)
@@ -34,10 +34,10 @@ fi
 
 # Read client mappings configuration file
 # Check if the client mappings configuration file exists
-if [ ! -e ../TestSpecs/client_script_mappings ]; then
-       echo "Warning: The client mappings config file ../TestSpecs/client_script_mappings does not exist."
+if [ ! -e client_script_mappings ]; then
+       echo "Warning: The client mappings config file client_script_mappings does not exist."
 else
-       source ../TestSpecs/client_script_mappings
+       source client_script_mappings
 fi
 
 log_file=$1

diff --git a/TestSpecs/globalconfig b/ControlScripts/globalconfig
similarity index 100%
rename from TestSpecs/globalconfig
rename to ControlScripts/globalconfig

diff --git a/ControlScripts/parse_client_log.sh b/ControlScripts/parse_client_log.sh
index 4989a6f6e0b908ecf60c6ca2da93d4de5b84620f..4ca5df6f3137c5c35439f1ee1c3269cc02f22bc7 100755 (executable)
--- a/ControlScripts/parse_client_log.sh
+++ b/ControlScripts/parse_client_log.sh
@@ -18,18 +18,18 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read client mappings configuration file
 # Check if the client mappings configuration file exists
-if [ ! -e ../TestSpecs/client_script_mappings ]; then
-       echo "Warning: The client mappings config file ../TestSpecs/client_script_mappings does not exist."
+if [ ! -e client_script_mappings ]; then
+       echo "Warning: The client mappings config file client_script_mappings does not exist."
 else
-       source ../TestSpecs/client_script_mappings
+       source client_script_mappings
 fi
 
 client_type=$1

diff --git a/ControlScripts/run_campaign.sh b/ControlScripts/run_campaign.sh
index 3f03b309c5a87f2b34604d944c44f84412ba1f56..dbe0557548a5fd5193f3c45f50bdfd29261ac8fe 100755 (executable)
--- a/ControlScripts/run_campaign.sh
+++ b/ControlScripts/run_campaign.sh
@@ -19,10 +19,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read arguments

diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh
index 64bc8145a55db0c81fa1b9b1a3dc9b871a6d5a69..3787103eaf9a1efed68f7c05f9d9cb78d3d5f590 100755 (executable)
--- a/ControlScripts/run_scenario.sh
+++ b/ControlScripts/run_scenario.sh
@@ -39,10 +39,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read arguments

diff --git a/ControlScripts/schedule_client.sh b/ControlScripts/schedule_client.sh
index 948996eb02422153fdf79a26477be1a71802dbcb..931d8a85179259641a57a2e44402bd482bce3a50 100755 (executable)
--- a/ControlScripts/schedule_client.sh
+++ b/ControlScripts/schedule_client.sh
@@ -12,10 +12,10 @@ _DEBUG="off"
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration file
@@ -28,10 +28,10 @@ fi
 
 # Read client mappings configuration file
 # Check if the client mappings configuration file exists
-if [ ! -e ../TestSpecs/client_script_mappings ]; then
-       echo "Warning: The client mappings config file ../TestSpecs/client_script_mappings does not exist."
+if [ ! -e client_script_mappings ]; then
+       echo "Warning: The client mappings config file client_script_mappings does not exist."
 else
-       source ../TestSpecs/client_script_mappings
+       source client_script_mappings
 fi
 
 client_pid=0

diff --git a/ControlScripts/start_tracker.sh b/ControlScripts/start_tracker.sh
index bb9e8aee576a53ac80d346d5b4978b8852cc7c08..e0a1b2966ee147c80ab427062ce6cffb047b09f1 100755 (executable)
--- a/ControlScripts/start_tracker.sh
+++ b/ControlScripts/start_tracker.sh
@@ -9,10 +9,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 export PYTHONPATH=$PYTHONPATH:.

diff --git a/ControlScripts/stop_client.sh b/ControlScripts/stop_client.sh
index 8bb41b55a7886c2d1cbe127edc4267e3330cc165..21f31b9a50df771957ceb43f0dbe9cb71b6bb688 100755 (executable)
--- a/ControlScripts/stop_client.sh
+++ b/ControlScripts/stop_client.sh
@@ -12,10 +12,10 @@ _DEBUG="off"
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e globalconfig ]; then
+       echo "Warning: The global config file globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source globalconfig
 fi
 
 # Read the node-specific configuration (CLIENT_TYPE)
@@ -28,10 +28,10 @@ fi
 
 # Read client mappings configuration file
 # Check if the client mappings configuration file exists
-if [ ! -e ../TestSpecs/client_script_mappings ]; then
-       echo "Warning: The client mappings config file ../TestSpecs/client_script_mappings does not exist."
+if [ ! -e client_script_mappings ]; then
+       echo "Warning: The client mappings config file client_script_mappings does not exist."
 else
-       source ../TestSpecs/client_script_mappings
+       source client_script_mappings
 fi
 
 stop_client ${CLIENT_TYPE}

diff --git a/Utils/grep_search.sh b/Utils/grep_search.sh
index c8242f292c4bbb3ade1d86327aded1360d925a9a..a68f6b58b87d15ca7a6e4089ae888eea02577e9c 100755 (executable)
--- a/Utils/grep_search.sh
+++ b/Utils/grep_search.sh
@@ -13,10 +13,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 cd $TRIBLER_UTIL_REL_PATH

diff --git a/Utils/show_version.sh b/Utils/show_version.sh
index 327a9ca53d50fee46f036b70e205769f537e2aa2..50bce1512878c066b76e6260c21bdd098cc56859 100755 (executable)
--- a/Utils/show_version.sh
+++ b/Utils/show_version.sh
@@ -9,10 +9,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 export PYTHONPATH=$PYTHONPATH:.

diff --git a/Utils/start_tribler_gui.sh b/Utils/start_tribler_gui.sh
index 5268d142549021e9b38c0b285eee776f363088e2..2cc41557aad20e8ef8430ee19423c7c31c91301b 100755 (executable)
--- a/Utils/start_tribler_gui.sh
+++ b/Utils/start_tribler_gui.sh
@@ -9,10 +9,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../../../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../../../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../../../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 export PYTHONPATH=$PYTHONPATH:.

diff --git a/Utils/sync_cluster.sh b/Utils/sync_cluster.sh
index 39df36f4de1e6e147fdbec87302aa6b5482a3e34..2af39f6f66f65d3bb11a9d5c93f0e69cca53ba57 100755 (executable)
--- a/Utils/sync_cluster.sh
+++ b/Utils/sync_cluster.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH p2p@p2p-next-01.grid.pub.ro:/home/p2p/george/P2P-Next

diff --git a/Utils/sync_cluster_containers.sh b/Utils/sync_cluster_containers.sh
index 20bbac2a137cf0e082cf8369c00ed75217e8ff70..981fc6fbe14c90a058e1134521018187b165c860 100755 (executable)
--- a/Utils/sync_cluster_containers.sh
+++ b/Utils/sync_cluster_containers.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 for host in p2p-next-01.grid.pub.ro p2p-next-03.grid.pub.ro p2p-next-04.grid.pub.ro p2p-next-05.grid.pub.ro p2p-next-06.grid.pub.ro p2p-next-07.grid.pub.ro p2p-next-08.grid.pub.ro p2p-next-09.grid.pub.ro p2p-next-10.grid.pub.ro; do

diff --git a/Utils/sync_kth.sh b/Utils/sync_kth.sh
index c264257c6a4ad3701bd098f63477d61f54941eee..b134e2306f623d340342996c3884693fb715f875 100755 (executable)
--- a/Utils/sync_kth.sh
+++ b/Utils/sync_kth.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH george@p2p-next.xen.ssvl.kth.se:/home/george/P2P-Next

diff --git a/Utils/sync_single_cluster_container.sh b/Utils/sync_single_cluster_container.sh
index f2a2365c7ee5356529ddee5eb77f5689ba59b9d5..4d5f68f97146d37836d12c381f8b055c59ced953 100755 (executable)
--- a/Utils/sync_single_cluster_container.sh
+++ b/Utils/sync_single_cluster_container.sh
@@ -10,10 +10,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 host=$1

diff --git a/Utils/sync_single_cluster_container_scripts.sh b/Utils/sync_single_cluster_container_scripts.sh
index b857312f3a3fd19c2e7aa11e59ecbec82d2f322a..cfa7d6a34b9a40690dc06b228ec38971b581ec60 100755 (executable)
--- a/Utils/sync_single_cluster_container_scripts.sh
+++ b/Utils/sync_single_cluster_container_scripts.sh
@@ -10,10 +10,10 @@ fi
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 host=$1

diff --git a/Utils/sync_swarm.cs.pub.ro.sh b/Utils/sync_swarm.cs.pub.ro.sh
index 048befa0d4743272399b66649e71cd1678cb4093..0abdc463215a5d177a263eee643b7599f54f6995 100755 (executable)
--- a/Utils/sync_swarm.cs.pub.ro.sh
+++ b/Utils/sync_swarm.cs.pub.ro.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH george@swarm.cs.pub.ro:/home/george/P2P-Next

diff --git a/Utils/sync_vm.sh b/Utils/sync_vm.sh
index 757115e2f8067bfcf18c39d140e5032504a937fc..61fb14be3ba9927cc3ae78bc4f5ed28e037eb5a4 100755 (executable)
--- a/Utils/sync_vm.sh
+++ b/Utils/sync_vm.sh
@@ -5,10 +5,10 @@
 
 # Read the global configuration file
 # Check if the global configuration file exists
-if [ ! -e ../TestSpecs/globalconfig ]; then
-       echo "Warning: The global config file ../TestSpecs/globalconfig does not exist."
+if [ ! -e ../ControlScripts/globalconfig ]; then
+       echo "Warning: The global config file ../ControlScripts/globalconfig does not exist."
 else
-       source ../TestSpecs/globalconfig
+       source ../ControlScripts/globalconfig
 fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH george@tracker.local:/home/george/P2P-Next