Renaming: das4_node_command -> das_node_command

Tribler · May 1, 2022 · 106d769 · 106d769
1 parent bae6420
commit 106d769
Show file tree

Hide file tree

Showing 28 changed files with 30 additions and 30 deletions.
diff --git a/docs/tutorials/synchronized_instances_das.conf b/docs/tutorials/synchronized_instances_das.conf
@@ -18,4 +18,4 @@ node_amount = 2
 node_timeout = 20
 
 # What command do we want to run?
-das4_node_command = launch_scenario.py
+das_node_command = launch_scenario.py
diff --git a/experiments/algorand/algorand_experiment.conf b/experiments/algorand/algorand_experiment.conf
@@ -20,7 +20,7 @@ node_timeout = 45
 instances_to_run = 1
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "algorand_simple.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/algorand/algorand_surfnet_experiment.conf b/experiments/algorand/algorand_surfnet_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "algorand_short.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/avalanche/avalanche_surfnet_experiment.conf b/experiments/avalanche/avalanche_surfnet_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "avalanche_short.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/bandwidth_accounting/bandwidth_accounting.conf b/experiments/bandwidth_accounting/bandwidth_accounting.conf
@@ -21,7 +21,7 @@ node_timeout = 350
 instances_to_run = 100
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 
 scenario_file = 'bandwidth_accounting_basic.scenario'
 

diff --git a/experiments/basalt/basalt_das5.conf b/experiments/basalt/basalt_das5.conf
@@ -21,7 +21,7 @@ node_timeout = 350
 instances_to_run = 100
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 
 scenario_file = 'basalt_basic.scenario'
 

diff --git a/experiments/bitshares/bitshares_experiment.conf b/experiments/bitshares/bitshares_experiment.conf
@@ -20,7 +20,7 @@ node_timeout = 20
 instances_to_run = 1
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "bitshares_experiment_simple.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/bitshares/bitshares_surfnet_experiment.conf b/experiments/bitshares/bitshares_surfnet_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "bitshares_experiment_short.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/burrow/burrow_experiment.conf b/experiments/burrow/burrow_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "burrow_energy_trading.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/burrow/burrow_surfnet_experiment.conf b/experiments/burrow/burrow_surfnet_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "transfers_short.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/dht/dht_experiment.das4.conf b/experiments/dht/dht_experiment.das4.conf
@@ -22,7 +22,7 @@ node_timeout = 120
 instances_to_run = 100
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "dht_experiment.das4.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/ethereum/ethereum_experiment.conf b/experiments/ethereum/ethereum_experiment.conf
@@ -20,7 +20,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "ethereum_basic.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/ethereum/ethereum_surfnet_experiment.conf b/experiments/ethereum/ethereum_surfnet_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "ethereum_basic.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/gigachannel/gigachannel_das5.conf b/experiments/gigachannel/gigachannel_das5.conf
@@ -21,7 +21,7 @@ node_timeout = 190
 instances_to_run = 20
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 
 scenario_file = 'gigachannel_small.scenario'
 

diff --git a/experiments/hyperledger/hyperledger_experiment.conf b/experiments/hyperledger/hyperledger_experiment.conf
@@ -20,7 +20,7 @@ node_timeout = 45
 instances_to_run = 1
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "hyperledger_simple.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/hyperledger/hyperledger_surfnet_experiment.conf b/experiments/hyperledger/hyperledger_surfnet_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "hyperledger_short.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/ipv8/ipv8_experiment.conf b/experiments/ipv8/ipv8_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 120
 instances_to_run = 50
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "ipv8_walking.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/libra/libra_experiment.conf b/experiments/libra/libra_experiment.conf
@@ -20,7 +20,7 @@ node_timeout = 45
 instances_to_run = 1
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "libra_simple.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/libra/libra_surfnet_experiment.conf b/experiments/libra/libra_surfnet_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "libra_short.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/market/market_experiment.conf b/experiments/market/market_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 120
 instances_to_run = 1
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "market_experiment_100.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/popularity/popularity_experiment.conf b/experiments/popularity/popularity_experiment.conf
@@ -21,7 +21,7 @@ node_timeout = 120
 instances_to_run = 20
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "popularity_experiment.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/stellar/stellar_experiment.conf b/experiments/stellar/stellar_experiment.conf
@@ -20,7 +20,7 @@ node_timeout = 45
 instances_to_run = 1
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "stellar_simple.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/stellar/stellar_surfnet_experiment.conf b/experiments/stellar/stellar_surfnet_experiment.conf
@@ -22,7 +22,7 @@ node_timeout = 45
 instances_to_run = 7
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "stellar_short.scenario"
 
 # The following options are used by the sync server

diff --git a/experiments/trustchain/trustchain.conf b/experiments/trustchain/trustchain.conf
@@ -21,7 +21,7 @@ node_timeout = 350
 instances_to_run = 100
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 
 scenario_file = 'trustchain_basic.scenario'
 

diff --git a/experiments/tunnels/tunnel_das4.conf b/experiments/tunnels/tunnel_das4.conf
@@ -21,7 +21,7 @@ node_timeout = 120
 instances_to_run = 1
 
 # What command do we want to run?
-das4_node_command = "launch_scenario.py"
+das_node_command = "launch_scenario.py"
 scenario_file = "anondownload-1-hop.scenario"
 
 # The following options are used by the sync server

diff --git a/scripts/das_node_run_job.sh b/scripts/das_node_run_job.sh
@@ -16,7 +16,7 @@ fi
 
 export PROCESSES_IN_THIS_NODE
 
-echo "$(hostname) here, spawning $PROCESSES_IN_THIS_NODE instances of command: $DAS4_NODE_COMMAND"
+echo "$(hostname) here, spawning $PROCESSES_IN_THIS_NODE instances of command: $DAS_NODE_COMMAND"
 
 OUTPUT_DIR=/local/$USER/Experiment_${EXPERIMENT_NAME}_output
 rm -fR "$OUTPUT_DIR"
@@ -25,9 +25,9 @@ cd "$OUTPUT_DIR"
 
 CMDFILE=$(mktemp --tmpdir=/local/$USER/ process_guard_XXXXXXXXXXXXX_$USER)
 
-# @CONF_OPTION DAS4_NODE_COMMAND: The command that will be repeatedly launched in the worker nodes of the cluster. (required)
+# @CONF_OPTION DAS_NODE_COMMAND: The command that will be repeatedly launched in the worker nodes of the cluster. (required)
 for INSTANCE in $(seq 1 1 $PROCESSES_IN_THIS_NODE); do
-    echo "$DAS4_NODE_COMMAND" >> $CMDFILE
+    echo "$DAS_NODE_COMMAND" >> $CMDFILE
 done
 
 # @CONF_OPTION NODE_TIMEOUT: Time in seconds to wait for the sub-processes to run before killing them. (required)

diff --git a/scripts/surfnet_deploy.sh b/scripts/surfnet_deploy.sh
@@ -2,7 +2,7 @@
 
 while read -r SERVER
 do
-  cmd="INSTANCES_TO_RUN=$INSTANCES_TO_RUN NODE_AMOUNT=$NODE_AMOUNT EXPERIMENT_NAME=$EXPERIMENT_NAME INSTANCE_COMMAND=$DAS4_NODE_COMMAND NODE_TIMEOUT=$NODE_TIMEOUT ACCOUNTS_PER_CLIENT=$ACCOUNTS_PER_CLIENT GOPATH=$GOPATH SYNC_PORT=$SYNC_PORT SCENARIO_FILE=$SCENARIO_FILE NUM_VALIDATORS=$NUM_VALIDATORS NUM_CLIENTS=$NUM_CLIENTS QUORUM=$QUORUM TX_RATE=$TX_RATE EXPERIMENT_DIR=$SCENARIO_DIR VENV=/home/martijn/venv3 gumby/scripts/surfnet_run.sh"
+  cmd="INSTANCES_TO_RUN=$INSTANCES_TO_RUN NODE_AMOUNT=$NODE_AMOUNT EXPERIMENT_NAME=$EXPERIMENT_NAME INSTANCE_COMMAND=$DAS_NODE_COMMAND NODE_TIMEOUT=$NODE_TIMEOUT ACCOUNTS_PER_CLIENT=$ACCOUNTS_PER_CLIENT GOPATH=$GOPATH SYNC_PORT=$SYNC_PORT SCENARIO_FILE=$SCENARIO_FILE NUM_VALIDATORS=$NUM_VALIDATORS NUM_CLIENTS=$NUM_CLIENTS QUORUM=$QUORUM TX_RATE=$TX_RATE EXPERIMENT_DIR=$SCENARIO_DIR VENV=/home/martijn/venv3 gumby/scripts/surfnet_run.sh"
   ssh -n martijn@$SERVER $cmd &
   pids[${i}]=$!
 done < "$SURFNET_SERVERS_FILE"

diff --git a/scripts/surfnet_run.sh b/scripts/surfnet_run.sh
@@ -24,7 +24,7 @@ echo "CMD file: $CMDFILE"
 # Make the file empty
 > $CMDFILE
 
-# @CONF_OPTION DAS4_NODE_COMMAND: The command that will be repeatedly launched in the worker nodes of the cluster. (required)
+# @CONF_OPTION DAS_NODE_COMMAND: The command that will be repeatedly launched in the worker nodes of the cluster. (required)
 for INSTANCE in $(seq 1 1 $PROCESSES_IN_THIS_NODE); do
     echo "$INSTANCE_COMMAND" >> $CMDFILE
 done