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 ece7307..818062e 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 0418677..2bf9ee8 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 bf28ed3..9a280b8 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 9f9c37e..7353376 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 55c3725..ada6fde 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 1cbb18c..023d4e9 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 12a6f05..9a711b8 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 4989a6f..4ca5df6 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 3f03b30..dbe0557 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 64bc814..3787103 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 948996e..931d8a8 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 bb9e8ae..e0a1b29 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 8bb41b5..21f31b9 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 c8242f2..a68f6b5 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 327a9ca..50bce15 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 5268d14..2cc4155 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 39df36f..2af39f6 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 20bbac2..981fc6f 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 c264257..b134e23 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 f2a2365..4d5f68f 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 b857312..cfa7d6a 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 048befa..0abdc46 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 757115e..61fb14b 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