ControlScripts: configurare relative path to scenario_config file

diff --git a/ControlScripts/detect_complete_client.sh b/ControlScripts/detect_complete_client.sh
index 4a79506241e45a8a502fd69709dab5d96b39c003..64ce19fbce0077d2cd0f30848becf52d565bbfbc 100755 (executable)
--- a/ControlScripts/detect_complete_client.sh
+++ b/ControlScripts/detect_complete_client.sh
@@ -20,7 +20,7 @@ fi
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file (CLIENT_TYPE)
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 # Read client mappings configuration file
 source ../ConfigFiles/client_script_mappings

diff --git a/ControlScripts/post-run_bw_limit.sh b/ControlScripts/post-run_bw_limit.sh
index 6d7d0eb9e81b39bad3615064ef78cb21b69cde65..6b02bb5c1582756addd34d6c517a516e2bfd234d 100755 (executable)
--- a/ControlScripts/post-run_bw_limit.sh
+++ b/ControlScripts/post-run_bw_limit.sh
@@ -5,6 +5,6 @@
 # post-run script for local bandwidth limitation scenarios
 
 # source configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 ./bw_limit.sh del ${IFACE}

diff --git a/ControlScripts/post-run_bw_limit_ct.sh b/ControlScripts/post-run_bw_limit_ct.sh
index b48d0bda3542b11a2168a824d7cebb5bdcfccf44..5a4ea209578104807184ca707a2157b8fb6f407e 100755 (executable)
--- a/ControlScripts/post-run_bw_limit_ct.sh
+++ b/ControlScripts/post-run_bw_limit_ct.sh
@@ -5,6 +5,6 @@
 # post-run script for container bandwidth limitation scenarios
 
 # source configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 ./bw_limit_ct.sh del ${IFACE}

diff --git a/ControlScripts/post-run_nop.sh b/ControlScripts/post-run_nop.sh
index 57207deca85d6b639b5479201d0a043063c89149..73b99f228dbfed9350def944d18c5a7b2704310a 100755 (executable)
--- a/ControlScripts/post-run_nop.sh
+++ b/ControlScripts/post-run_nop.sh
@@ -5,4 +5,4 @@
 # pre-run script for client-based limitation scenarios
 
 # source configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/pre-run_bw_limit.sh b/ControlScripts/pre-run_bw_limit.sh
index fad41f829c79a7d898e55206b43315c506851d00..657a952b3b4e3e696c71c0828c2cf8b624dd362b 100755 (executable)
--- a/ControlScripts/pre-run_bw_limit.sh
+++ b/ControlScripts/pre-run_bw_limit.sh
@@ -5,4 +5,4 @@
 # pre-run script for local bandwidth limitation scenarios
 
 # source configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/pre-run_bw_limit_ct.sh b/ControlScripts/pre-run_bw_limit_ct.sh
index aed7a9d90e9ad993ef5e5e6530be5421433bea1f..a0165b80084148e20d25fd47e214e129c30cef94 100755 (executable)
--- a/ControlScripts/pre-run_bw_limit_ct.sh
+++ b/ControlScripts/pre-run_bw_limit_ct.sh
@@ -5,6 +5,6 @@
 # pre-run script for container bandwidth limitation scenarios
 
 # source configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
-./bw_limit.sh set ${IFACE} ${DL_BW} ${DL_BURST} ${UL_BW} ${UL_BURST}
+./bw_limit_ct.sh set ${IFACE} ${DL_BW} ${DL_BURST} ${UL_BW} ${UL_BURST}

diff --git a/ControlScripts/pre-run_nop.sh b/ControlScripts/pre-run_nop.sh
index 8682bbb24d5a5640a0148b3edf1d4a1539b23245..779bd0a3a6867f5e51dd22dff9def011cf7eaa8c 100755 (executable)
--- a/ControlScripts/pre-run_nop.sh
+++ b/ControlScripts/pre-run_nop.sh
@@ -5,6 +5,6 @@
 # pre-run script for client-based limitation scenarios
 
 # source configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 ./bw_limit_ct.sh set ${IFACE} ${DL_BW} ${DL_BURST} ${UL_BW} ${UL_BURST}

diff --git a/ControlScripts/start_doe.sh b/ControlScripts/start_doe.sh
index 19a87a13535acaa0d3e4d3db4a7e3c71b1086e3c..bcb3711dd0c795fea832668335171d4704eae9bb 100755 (executable)
--- a/ControlScripts/start_doe.sh
+++ b/ControlScripts/start_doe.sh
@@ -12,7 +12,7 @@
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file (TORRENT_FILE)
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 export PYTHONPATH=$PYTHONPATH:.
 

diff --git a/ControlScripts/start_hrk_leecher.sh b/ControlScripts/start_hrk_leecher.sh
index 7f7dd8cab634707c2bccd3709f13ae6b39e192e6..221bad021cb125da26c5be49fb14610bc5dc855c 100755 (executable)
--- a/ControlScripts/start_hrk_leecher.sh
+++ b/ControlScripts/start_hrk_leecher.sh
@@ -13,7 +13,7 @@
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file (TORRENT_FILE)
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 cd $WORKING_FOLDER_REL_PATH/Regular/
 

diff --git a/ControlScripts/start_hrk_seeder.sh b/ControlScripts/start_hrk_seeder.sh
index 0bc2a46b944e7c070b7599d703aa46b4ea6dcf9a..5e1e3b9fecfd198524ecfbab4a2fb40ed64ec573 100755 (executable)
--- a/ControlScripts/start_hrk_seeder.sh
+++ b/ControlScripts/start_hrk_seeder.sh
@@ -13,7 +13,7 @@
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file (TORRENT_FILE)
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 cd $WORKING_FOLDER_REL_PATH/TorrentsAndData/
 

diff --git a/ControlScripts/start_leecher.sh b/ControlScripts/start_leecher.sh
index 5c7c94ef1db916d0361d4fe19be08cadab363955..3581e53508176a06fe9d3b8d0640458875c9b4ee 100755 (executable)
--- a/ControlScripts/start_leecher.sh
+++ b/ControlScripts/start_leecher.sh
@@ -12,7 +12,7 @@
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file (TORRENT_FILE)
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 export PYTHONPATH=$PYTHONPATH:.
 

diff --git a/ControlScripts/start_proxy.sh b/ControlScripts/start_proxy.sh
index 4af2b73a06a1aa071bd3d1c6bc1cf085463b1d3a..af475d43553eedb49d4480f09d3e8375e01f97fb 100755 (executable)
--- a/ControlScripts/start_proxy.sh
+++ b/ControlScripts/start_proxy.sh
@@ -20,7 +20,7 @@ fi
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 # Read arguments
 PROXY_NO=$1

diff --git a/ControlScripts/start_seeder.sh b/ControlScripts/start_seeder.sh
index 1ced71b777b976db4654ab10a5e80baf18940774..c885f13d923cf9ce9d1c45f44223ec20fb553beb 100755 (executable)
--- a/ControlScripts/start_seeder.sh
+++ b/ControlScripts/start_seeder.sh
@@ -11,7 +11,7 @@
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file (TORRENT_FILE)
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 export PYTHONPATH=$PYTHONPATH:.
 

diff --git a/ControlScripts/start_tracker.sh b/ControlScripts/start_tracker.sh
index 3a7ee72dbb72620350cb71358bdb8a3546acda19..65dc392673c2e47a177d7646f55c735ecd2da1a1 100755 (executable)
--- a/ControlScripts/start_tracker.sh
+++ b/ControlScripts/start_tracker.sh
@@ -11,7 +11,7 @@
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 export PYTHONPATH=$PYTHONPATH:.
 

diff --git a/ControlScripts/start_tribler.sh b/ControlScripts/start_tribler.sh
index 616cb9da339308dd159ecddc70defcd82463f0eb..d2b1b6f492840aebfd1752319bffecfd2f1581cc 100755 (executable)
--- a/ControlScripts/start_tribler.sh
+++ b/ControlScripts/start_tribler.sh
@@ -11,7 +11,7 @@
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 export PYTHONPATH=$PYTHONPATH:.
 

diff --git a/ControlScripts/stop_client.sh b/ControlScripts/stop_client.sh
index 821159a2ec627868c097ccf0b1e54b643dbd66d3..733aeb8db9dac00958fd37b03c84f52d1ee9d2dc 100755 (executable)
--- a/ControlScripts/stop_client.sh
+++ b/ControlScripts/stop_client.sh
@@ -14,7 +14,7 @@ _DEBUG="on"
 source ../ConfigFiles/globalconfig
 
 # Read scenarion configuration file (CLIENT_TYPE)
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
+source ../ClientWorkingFolders/TmpLogs/scenario_config
 
 # Read client mappings configuration file
 source ../ConfigFiles/client_script_mappings