gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-grid5k] 83/189: finished configuration for secondary exchanges


From: gnunet
Subject: [taler-grid5k] 83/189: finished configuration for secondary exchanges
Date: Thu, 28 Apr 2022 10:47:33 +0200

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit e5d7c576c147ffb5e6ee6d10f56498666b31d7b9
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Mar 16 18:57:22 2022 +0100

    finished configuration for secondary exchanges
---
 additional/plots/config.yaml     |   4 +
 experiment/scripts/benchmark.sh  |   2 +-
 experiment/scripts/database.sh   |  12 ++-
 experiment/scripts/exchange.sh   |   4 +-
 experiment/scripts/helpers.sh    |  32 +++++---
 experiment/scripts/monitor.sh    |  57 ++++++++-----
 experiment/scripts/proxy.sh      |  43 +++++-----
 experiment/scripts/taler-perf.sh |  21 ++++-
 experiment/taler.many.rspec      | 171 +++++++++++++++++++++++----------------
 experiment/taler.rspec           |   3 +-
 10 files changed, 221 insertions(+), 128 deletions(-)

diff --git a/additional/plots/config.yaml b/additional/plots/config.yaml
index 1c63783..9b063a1 100644
--- a/additional/plots/config.yaml
+++ b/additional/plots/config.yaml
@@ -41,6 +41,10 @@ dashboards:
     graph:
       width: 1200
       height: 400
+  - uid: NYO0EIE7k # Exchange
+    graph:
+      width: 1200
+      heigth: 400
 
 prometheus:
   node_exporter_job_name: nodes
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index 11977e6..e3a11e1 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -37,7 +37,7 @@ function start_wallet_bench() {
     \"iterations\": 100000,
     \"deposits\": $((RANDOM %21)),
     \"restartAfter\": 2
-  }" | grep -v getRecords
+  }"
 }
 
 case $1 in
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index a9d209a..3dd376f 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -79,13 +79,13 @@ function setup_config() {
   shared_preload_libraries='pg_stat_statements,auto_explain'
   auto_explain.log_min_duration='${DB_MIN_DURATION_STATEMENT}ms'
   auto_explain.log_verbose=true
-  auto_explain.log_nested_statements=off
+  auto_explain.log_nested_statements=true
   auto_explain.log_analyze=true
   auto_explain.log_buffers=true
   auto_explain.log_wal=true
 
   # Should be set locally
-  join_collapse_limit=2
+  join_collapse_limit=1
 
   enable_seqscan=off
 
@@ -98,7 +98,11 @@ function setup_config() {
   default_statistics_target=300
   autovacuum_vacuum_cost_limit=400
   autovacuum_vacuum_scale_factor=0.1
-  # autovacuum_vacuum_threshold=1000
+  autovacuum_vacuum_threshold=1000
+  
+  # Default 50, 0.1
+  autovacuum_analyze_threshold=50
+  autovacuum_analyze_scale_factor=0.1
 
   # use 25% of the available memory 
   # (https://www.postgresql.org/docs/13/runtime-config-resource.html)
@@ -311,7 +315,7 @@ EOF
 case ${1} in 
   init)
     setup_config
-    setup_disks
+    # setup_disks
     # setup_ram_storage
     init_db
     setup_pgbouncer
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 93e36e7..90f8411 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -60,11 +60,11 @@ function setup_primary_exchange() {
     mkdir -p /home/${G5K_USER}/taler/exchange-secmod-{cs,rsa,eddsa}
   fi
 
-  systemctl restart taler-exchange-httpd@80.service
+  systemctl restart taler-exchange-httpd@10000.service
 
   start_other_exchange_binaries
 
-  wait_for_keys "${EXCHANGE_DOMAIN}/management"
+  wait_for_keys "${EXCHANGE_DOMAIN}:10000/management"
 
   sleep 5
   
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index a461bce..948d73b 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -135,8 +135,9 @@ function setup_exchange_config_without_master_key() {
   sed -i "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
        /etc/taler/secrets/exchange-accountcredentials.secret.conf
 
+  # TODO Secondary exchanges base url?
   sed -i -e "s/<BANK_HOST_HERE>/${BANK_DOMAIN}/g" \
-         -e "s\<BASE_URL_HERE>\http://${EXCHANGE_DOMAIN}/\g"; \
+         -e "s\<BASE_URL_HERE>\http://${EXCHANGE_DOMAIN}:10000/\g"; \
          -e "s/<MAX_REQUESTS_HERE>/${EXCHANGE_MAX_REQUESTS:-8192}/g" \
          -e "s/<AGGREGATOR_SHARD_SIZE_HERE>/${AGGREGATOR_SHARD_SIZE}/g" \
        /etc/taler/conf.d/exchange-business.conf
@@ -190,24 +191,33 @@ function stop_numbered_services() {
   done
 }
 
-# Get all Grid5000 hosts which host wallets
+# Get all Grid5000 hosts which are registered under $1
 # Returns only the Grid5000 node - e.g. graoully-1
-function get_wallet_hosts() {
-  IFS=$'\n' read -r -d '' -a WALLETS < <(\
+# $1: the domain, can contain a wildcard
+function get_hosts() {
+  IFS=$'\n' read -r -d '' -a HOSTS < <(\
     dig -t AXFR "${DNS_ZONE}" "@${DNS_HOSTS}" \
-    | grep ${WALLET_DOMAIN} | awk '{print $1}' | cut -d '.' -f 2 \
+    | grep ${1} | awk '{print $1}' | cut -d '.' -f 2 \
   )
-  echo ${WALLETS[@]}
+  echo ${HOSTS[@]}
+}
+
+# Get all Grid5000 hosts which host wallets
+# Returns only the Grid5000 node - e.g. graoully-1
+function get_wallet_hosts() {
+  get_hosts "${WALLET_DOMAIN}"
 }
 
 # Get all Grid5000 hosts which host shards
 # Returns only the Grid5000 node - e.g. graoully-1
 function get_shard_hosts() {
-  IFS=$'\n' read -r -d '' -a SHARDS < <(\
-    dig -t AXFR "${DNS_ZONE}" "@${DNS_HOSTS}" \
-    | grep ${SHARD_DOMAIN} | awk '{print $1}' | cut -d '.' -f 2 \
-  )
-  echo ${SHARDS[@]}
+  get_hosts "${SHARD_DOMAIN}"
+}
+
+# Get all Grid5000 hosts which host secondary exchanges
+# Rerurns only the Grid5000 node - e.g. graoully-1
+function get_secondary_exchange_hosts() {
+  get_hosts "${SECONDARY_EXCH_DOMAIN}"
 }
 
 # Get all exchanges which are registered in the nginx proxy config
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index 5a0041f..63ec0c4 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -93,16 +93,18 @@ function add_wallet_nodes_to_prometheus() {
 # Add new exchanges to be monitored
 # Requires no argument since exchanges are retrieved from the proxy
 function add_exchanges_to_prometheus() {
-  if ! grep -q "${EXCHANGE_DOMAIN}:80" /etc/monitor/prometheus.yaml; then
+  if ! grep -q "${EXCHANGE_DOMAIN}:10000" /etc/monitor/prometheus.yaml; then
     # unfortunately we do not have access to the other hosts when running from 
ESpec
     # But when initializing there are no hosts listed in the yaml yet, thus
     # it's sufficient to search for the exchange from the target
-    sed -i "/<EXCHANGES_HERE>/a  \ \ \ \ \ \ - '${EXCHANGE_DOMAIN}:80'" \
-            /etc/monitor/prometheus.yaml
-    for i in $(seq $((${NUM_EXCHANGE_PROCESSES:-10}-1)) ); do
-      let "i+=10000"
+    for i in $(seq $((${NUM_EXCHANGE_PROCESSES:-10})) ); do
+      let "i+=10000-1"
       sed -i "/<EXCHANGES_HERE>/a  \ \ \ \ \ \ - '${EXCHANGE_DOMAIN}:${i}'" \
               /etc/monitor/prometheus.yaml
+      for SECEXCH in $(get_secondary_exchange_hosts); do
+        sed -i "/<EXCHANGES_HERE>/a  \ \ \ \ \ \ - 
'${SECONDARY_EXCH_DOMAIN//\*/${SECEXCH}}:${i}'" \
+                /etc/monitor/prometheus.yaml
+      done
     done
     return
   fi
@@ -116,8 +118,8 @@ function add_exchanges_to_prometheus() {
 }
 
 # Add shard servers to be monitored
-# Requires no argument, since shard servers are retrieved from
-function add_shards_to_prometheus() {
+# Requires no argument, since shard servers are retrieved from dns
+function add_shard_nodes_to_prometheus() {
   for SHARD in $(get_shard_hosts); do
     if ! grep -q "${SHARD}" /etc/monitor/prometheus.yaml;
     then
@@ -127,20 +129,36 @@ function add_shards_to_prometheus() {
   done
 }
 
+# Add secondary exchange nodes to be monitored
+# Requires no argument, since nodes are retrieved from dns
+function add_secondary_exchange_nodes_to_prometheus() {
+  for SECEXCH in $(get_secondary_exchange_hosts); do
+    if ! grep -q "${SECEXCH}" /etc/monitor/prometheus.yaml;
+    then
+      sed -i "/<SECEXCH_HERE/a \ \ \ \ \ \ - 
'${SECONDARY_EXCH_DOMAIN//\*/${SECEXCH}}:9100'" \
+              /etc/monitor/prometheus.yaml
+    fi
+  done
+}
+
 # Remove N exchanges which have been stopped
 # from the config so they will not be scraped anymore
-# $1: N - number of exchanges to remove
+# $1: N - number of exchanges currently running
+# $2: N - number of exchanges to remove
 function remove_exchanges_from_prometheus() {
-  TO_STOP=$(\
-    get_exchanges | \
-    tr " " "\n" | \
-    sort -t ":" -k 2 -n -r | \
-    head -n ${1}\
-  ) 
-
-  for EXCH in ${TO_STOP}; do
-    sed -i "/${EXCH}/d" \
+
+  # We know we started from port 10000
+  # get the highest port numbers and start removing from there
+  let "START=$1+10000"
+  let "END=$START-$2"
+
+  for PORT in $(seq $START $END); do
+    sed -i "/${EXCHANGE_DOMAIN}:${PORT}/d" \
             /etc/monitor/prometheus.yaml
+    for SECEXCH in $(get_secondary_exchange_hosts); do
+      sed -i "/${SECONDARY_EXCH_DOMAIN//\*/${SECEXCH}}:${PORT}/d" \
+              /etc/monitor/prometheus.yaml
+    done
   done
 }
 
@@ -169,7 +187,8 @@ function init_monitor() {
     add_exchanges_to_prometheus
   fi
 
-  add_shards_to_prometheus
+  add_shards_nodes_to_prometheus
+  add_secondary_exchange_nodes_to_prometheus
   configure_prometheus_and_exporters
 
   systemctl restart prometheus-nginx-exporter \
@@ -188,7 +207,7 @@ case $1 in
     add_exchanges_to_prometheus
     ;;
   stop-exchanges)
-    remove_exchanges_from_prometheus $2
+    remove_exchanges_from_prometheus $2 $3
     ;;
   *)
     taler_perf_help $0 "$INFO_MSG" "$OPT_MSG"
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
index 915656c..10ea755 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/proxy.sh
@@ -29,18 +29,18 @@ function add_exchanges() {
   sed -i -e "s/<PROXY_DOMAIN_HERE>/${PROXY_DOMAIN}/g" \
          /etc/nginx/sites-enabled/proxy
 
+  
   for i in $(seq ${1}); do
-    if [[ "${ADDED}" -eq "0" ]] && [[ "${i}" -eq "1" ]]; then
-      # The first exchange to add is the default one from the target on port 80
-      i="80"
-    else 
-      # seq starts at 1 so remove it again
-      # (0 N cannot be used since seq 0 0 would yield 0 while seq N=0 yields 
nothing)
-      let "i+=${ADDED}-1"
-      let "i+=10000"
-    fi
+    # seq starts at 1 so remove it again
+    # (0 N cannot be used since seq 0 0 would yield 0 while seq N=0 yields 
nothing)
+    let "i+=${ADDED}-1" || true # result might be zero, make sure its still no 
failure
+    let "i+=10000"
     sed -i -e "/<SERVERS_HERE>/a \ \ server ${EXCHANGE_DOMAIN}:${i};" \
             /etc/nginx/sites-enabled/proxy
+    for SECEXCH in $(get_secondary_exchange_hosts); do
+      sed -i -e "/<SERVERS_HERE>/a \ \ server 
${SECONDARY_EXCH_DOMAIN//\*/${SECEXCH}}:${i};" \
+              /etc/nginx/sites-enabled/proxy
+    done
   done
 }
 
@@ -95,7 +95,7 @@ function init_proxy() {
   
   # Nginx does not start until the destination server is reachable - wait here
   # nginx: [emerg] host not found in upstream "exch.perf.taler" ...
-  wait_for_keys "${EXCHANGE_DOMAIN}"
+  wait_for_keys "${EXCHANGE_DOMAIN}:10000"
   
   systemctl restart nginx
 }
@@ -103,16 +103,19 @@ function init_proxy() {
 # Remove N exchanges from the upstream list
 # $1: N - number of exchanges to remove
 function remove_exchanges() {
-  TO_STOP=$(\
-    get_exchanges | \
-    tr " " "\n" | \
-    sort -t ":" -k 2 -n -r | \
-    head -n ${1}\
-  ) 
-
-  for EXCH in ${TO_STOP}; do
-    sed -i "/${EXCH};/d" \
+
+  # We know we started from port 10000
+  # get the highest port numbers and start removing from there
+  let "START=$1+10000"
+  let "END=$START-$2"
+
+  for PORT in $(seq $START $END); do
+    sed -i "/${EXCHANGE_DOMAIN}:${PORT};/d" \
+            /etc/nginx/sites-enabled/proxy
+    for SECEXCH in $(get_secondary_exchange_hosts); do
+      sed -i "/${SECONDARY_EXCH_DOMAIN//\*/${SECEXCH}}:${PORT};/d" \
             /etc/nginx/sites-enabled/proxy
+    done
   done
 }
 
@@ -124,7 +127,7 @@ case $1 in
     add_exchanges $2
     ;;
   stop)
-    remove_exchanges $2
+    remove_exchanges $2 $3
     ;;
   *)
     taler_perf_help $0 "$INFO_MSG" "$OPT_MSG"
diff --git a/experiment/scripts/taler-perf.sh b/experiment/scripts/taler-perf.sh
index 9cddc36..ead861f 100644
--- a/experiment/scripts/taler-perf.sh
+++ b/experiment/scripts/taler-perf.sh
@@ -32,9 +32,21 @@ function stop_wallets() {
   wait
 }
 
+function get_running_exchanges_per_host() {
+  RUNNING=$(\
+    ssh -o StrictHostKeyChecking=no ${EXCHANGE_DOMAIN} \
+           "/bin/bash ps -aux | grep [taler-exchange-httpd]@*.service | wc -l" 
\
+  )
+  echo "${RUNNING}"
+}
+
 function start_exchanges() {
   ssh -o StrictHostKeyChecking=no ${EXCHANGE_DOMAIN} \
          "/bin/bash /root/scripts/exchange.sh start 
${1:-${NUM_EXCHANGE_PROCESSES}}" 
+  for SECEXCH in $(get_secondary_exchange_hosts); do
+    ssh -o StrictHostKeyChecking=no ${SECONDARY_EXCH_DOMAIN//\*/${SECEXCH}} \
+           "/bin/bash /root/scripts/exchange.sh start 
${1:-${NUM_EXCHANGE_PROCESSES}}" 
+  done
   ssh -o StrictHostKeyChecking=no ${PROXY_DOMAIN} \
          "/bin/bash /root/scripts/proxy.sh start 
${1:-${NUM_EXCHANGE_PROCESSES}}"
   update_processes "prometheus"
@@ -43,13 +55,18 @@ function start_exchanges() {
 function stop_exchanges() {
   # must remove the exchange form the monitor host before the one from the 
nginx
   # since helpers.sh gets all exchanges from the nginx config
+  RUNNING=$(get_running_exchanges_per_host)
   ssh -A -o StrictHostKeyChecking=no ${MONITOR_DOMAIN} \
-         "/bin/bash /root/scripts/monitor.sh stop-exchanges 
${1:-${NUM_EXCHANGE_PROCESSES}}"
+         "/bin/bash /root/scripts/monitor.sh stop-exchanges ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
   ssh -A -o StrictHostKeyChecking=no ${PROXY_DOMAIN} \
-         "/bin/bash /root/scripts/proxy.sh stop 
${1:-${NUM_EXCHANGE_PROCESSES}}"
+         "/bin/bash /root/scripts/proxy.sh stop ${RUNNING} 
${1:-${NUM_EXCHANGE_PROCESSES}}"
   sleep 5
   ssh -o StrictHostKeyChecking=no ${EXCHANGE_DOMAIN} \
          "/bin/bash /root/scripts/exchange.sh stop 
${1:-${NUM_EXCHANGE_PROCESSES}}" 
+  for SECEXCH in $(get_secondary_exchange_hosts); do
+    ssh -o StrictHostKeyChecking=no ${SECONDARY_EXCH_DOMAIN//\*/${SECEXCH}} \
+           "/bin/bash /root/scripts/exchange.sh stop 
${1:-${NUM_EXCHANGE_PROCESSES}}" 
+  done
 }
 
 function start_processes() {
diff --git a/experiment/taler.many.rspec b/experiment/taler.many.rspec
index 20b7707..1c45d9e 100644
--- a/experiment/taler.many.rspec
+++ b/experiment/taler.many.rspec
@@ -1,411 +1,446 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-09T12:03:46.775+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-16T16:55:54.522+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="105.24472573839662" y="25.0"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="97.68354430379748" y="25.0"/>
   </node>
   <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="345.31223628691987" y="83.37404670271292"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="221.0" 
y="72.5"/>
   </node>
   <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="608.0632911392405" y="25.0"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="474.7974683544304" y="25.0"/>
   </node>
   <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="348.1476793248945" y="141.24049299931528"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="279.8607594936709" y="114.76164144216466"/>
   </node>
   <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="1195.0" 
y="112.81487025712465"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="915.0" 
y="92.81119637333838"/>
   </node>
   <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="858.5274261603374" y="112.81487025712465"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="662.6455696202531" y="92.81119637333838"/>
   </node>
   <node client_id="DNS" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
     <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1016.3670886075948" y="25.0"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="781.0253164556962" y="25.0"/>
+  </node>
+  <node client_id="Aggregator" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="500.5" 
y="138.5"/>
+  </node>
+  <node client_id="Wirewatch" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="649.5" 
y="139.5"/>
+  </node>
+  <node client_id="Transfer" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="790.5" 
y="138.5"/>
+  </node>
+  <node client_id="Closer" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="913.5" 
y="137.5"/>
+  </node>
+  <node client_id="SecExch" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="356.0" 
y="77.5"/>
   </node>
   <node client_id="Wallet-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="75.0" 
y="258.49618681085167"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="75.0" 
y="205.30722735107315"/>
   </node>
   <node client_id="Wallet-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="339.6413502109705" y="258.49618681085167"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="273.4810126582279" y="205.30722735107315"/>
   </node>
   <node client_id="Wallet-3" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="604.282700421941" y="258.49618681085167"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="471.9620253164557" y="205.30722735107315"/>
   </node>
   <node client_id="Wallet-4" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="868.9240506329113" y="258.49618681085167"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="660.5" 
y="202.5"/>
   </node>
   <node client_id="Wallet-5" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1133.565400843882" y="258.49618681085167"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="868.9240506329114" y="205.30722735107315"/>
   </node>
   <node client_id="Wallet-6" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="75.0" 
y="299.10421929969544"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="75.0" 
y="236.665006020825"/>
   </node>
   <node client_id="Wallet-7" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="339.6413502109705" y="299.10421929969544"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="273.4810126582279" y="236.665006020825"/>
   </node>
   <node client_id="Wallet-8" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="604.282700421941" y="299.10421929969544"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="471.9620253164557" y="236.665006020825"/>
   </node>
   <node client_id="Wallet-9" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="868.9240506329113" y="299.10421929969544"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="670.4430379746834" y="236.665006020825"/>
   </node>
   <node client_id="Wallet-10" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1133.565400843882" y="299.10421929969544"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="868.9240506329114" y="236.665006020825"/>
   </node>
   <node client_id="Wallet-11" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="75.0" 
y="339.7122517885392"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="75.0" 
y="268.0227846905768"/>
   </node>
   <node client_id="Wallet-12" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="339.6413502109705" y="339.7122517885392"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="273.4810126582279" y="268.0227846905768"/>
   </node>
   <node client_id="Wallet-13" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="604.282700421941" y="339.7122517885392"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="471.9620253164557" y="268.0227846905768"/>
   </node>
   <node client_id="Wallet-14" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="868.9240506329113" y="339.7122517885392"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="670.4430379746834" y="268.0227846905768"/>
   </node>
   <node client_id="Wallet-15" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1133.565400843882" y="339.7122517885392"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="868.9240506329114" y="268.0227846905768"/>
   </node>
   <node client_id="Wallet-16" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="75.0" 
y="380.320284277383"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="75.0" 
y="299.3805633603287"/>
   </node>
   <node client_id="Wallet-17" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="339.6413502109705" y="380.320284277383"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="273.4810126582279" y="299.3805633603287"/>
   </node>
   <node client_id="Wallet-18" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="604.282700421941" y="380.320284277383"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="471.9620253164557" y="299.3805633603287"/>
   </node>
   <node client_id="Wallet-19" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="868.9240506329113" y="380.320284277383"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="670.4430379746834" y="299.3805633603287"/>
   </node>
   <node client_id="Wallet-20" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1133.565400843882" y="380.320284277383"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="868.9240506329114" y="299.3805633603287"/>
   </node>
   <node client_id="Wallet-21" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="82.56118143459916" y="424.48151960900054"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="80.67088607594937" y="333.4821476636838"/>
   </node>
   <node client_id="Wallet-22" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="347.2025316455696" y="424.48151960900054"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="279.15189873417717" y="333.4821476636838"/>
   </node>
   <node client_id="Wallet-23" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="611.8438818565401" y="425.49672042122165"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="477.63291139240505" y="334.26609213042764"/>
   </node>
   <node client_id="Wallet-24" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="878.3755274261604" y="424.48151960900054"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="677.5316455696203" y="333.4821476636838"/>
   </node>
   <node client_id="Wallet-25" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1143.0168776371306" y="422.4511179845584"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="876.012658227848" y="331.91425873019625"/>
   </node>
   <node client_id="Wallet-26" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="90.12236286919831" y="464.07435128562327"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="86.34177215189874" y="364.0559818666919"/>
   </node>
   <node client_id="Wallet-27" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="350.9831223628692" y="465.0895520978444"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="281.9873417721519" y="364.8399263334357"/>
   </node>
   <node client_id="Wallet-28" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="612.3333333333333" y="472.98466898954706"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="477.99999999999994" y="370.93658536585366"/>
   </node>
   <node client_id="Wallet-29" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="884.0464135021098" y="467.11995372228654"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="681.7848101265823" y="366.40781526692325"/>
   </node>
   <node client_id="Wallet-30" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1150.57805907173" y="467.11995372228654"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="881.6835443037975" y="366.40781526692325"/>
   </node>
   <node client_id="Wallet-31" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="82.56118143459916" y="502.6519821500248"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="80.67088607594937" y="393.84587160295615"/>
   </node>
   <node client_id="Wallet-32" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="350.9831223628692" y="507.72798621113037"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="281.9873417721519" y="397.7655939366752"/>
   </node>
   <node client_id="Wallet-33" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="621.295358649789" y="509.7583878355724"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="484.72151898734177" y="399.33348287016264"/>
   </node>
   <node client_id="Wallet-34" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="880.2658227848101" y="507.72798621113037"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="678.9493670886076" y="397.7655939366752"/>
   </node>
   <node client_id="Wallet-35" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1154.3586497890294" y="504.68238377446704"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="884.5189873417721" y="395.41376053644376"/>
   </node>
   <node client_id="Wallet-36" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="82.56118143459916" y="545.2904162633107"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="80.67088607594937" y="426.77153920619554"/>
   </node>
   <node client_id="Wallet-37" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="360.4345991561181" y="547.3208178877529"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="289.0759493670886" y="428.33942813968315"/>
   </node>
   <node client_id="Wallet-38" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="626.9662447257383" y="549.3512195121951"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="488.97468354430373" y="429.90731707317076"/>
   </node>
   <node client_id="Wallet-39" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="893.4978902953586" y="545.2904162633107"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="688.873417721519" y="426.77153920619554"/>
   </node>
   <node client_id="Wallet-40" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1163.8101265822784" y="546.3056170755319"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="891.6075949367088" y="427.55548367293943"/>
   </node>
   <node client_id="Wallet-41" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="87.0" 
y="592.64181184669"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="84.0" 
y="463.3365853658537"/>
   </node>
   <node client_id="Wallet-42" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="368.3333333333333" y="588.7505226480837"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="295.0" 
y="460.3317073170732"/>
   </node>
   <node client_id="Wallet-43" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="621.6666666666666" y="588.7505226480837"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="485.0" 
y="460.3317073170732"/>
   </node>
   <node client_id="Wallet-44" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="888.3333333333333" y="582.9135888501743"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="685.0" 
y="455.8243902439025"/>
   </node>
   <node client_id="Wallet-45" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1164.3333333333333" y="588.7505226480837"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="892.0" 
y="460.3317073170732"/>
   </node>
   <node client_id="Wallet-46" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="91.0" 
y="637.391637630662"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="87.0" 
y="497.89268292682925"/>
   </node>
   <node client_id="Wallet-47" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="371.0" 
y="630.5818815331011"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="297.0" 
y="492.63414634146346"/>
   </node>
   <node client_id="Wallet-48" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="629.6666666666666" y="635.4459930313589"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="491.0" 
y="496.390243902439"/>
   </node>
   <node client_id="Wallet-49" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="893.6666666666666" y="623.77212543554"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="689.0" 
y="487.37560975609756"/>
   </node>
   <node client_id="Wallet-50" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="1171.0" 
y="630.5818815331011"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="897.0" 
y="492.63414634146346"/>
   </node>
   <node client_id="Wallet-51" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="89.66666666666667" y="679.2229965156795"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="86.0" 
y="530.1951219512196"/>
   </node>
   <node client_id="Wallet-52" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="376.3333333333333" y="673.3860627177701"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="301.0" 
y="525.6878048780488"/>
   </node>
   <node client_id="Wallet-53" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="632.3333333333333" y="678.2501742160279"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="492.99999999999994" y="529.4439024390244"/>
   </node>
   <node client_id="Wallet-54" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="897.6666666666666" y="674.3588850174216"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="692.0" 
y="526.439024390244"/>
   </node>
   <node client_id="Wallet-55" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1177.6666666666665" y="678.2501742160279"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="901.9999999999999" y="529.4439024390244"/>
   </node>
   <node client_id="Wallet-56" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="95.0" 
y="716.1902439024391"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="90.0" 
y="558.7414634146342"/>
   </node>
   <node client_id="Wallet-57" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="380.3333333333333" y="716.1902439024391"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="304.0" 
y="558.7414634146342"/>
   </node>
   <node client_id="Wallet-58" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="633.6666666666666" y="718.1358885017422"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="494.0" 
y="560.2439024390244"/>
   </node>
   <node client_id="Wallet-59" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="903.0" 
y="714.2445993031359"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="696.0" 
y="557.2390243902439"/>
   </node>
   <node client_id="Wallet-60" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="1181.6666666666665" y="723.0"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="904.9999999999999" y="564.0"/>
   </node>
 </rspec>
\ No newline at end of file
diff --git a/experiment/taler.rspec b/experiment/taler.rspec
index 44b2bd4..14cc3c8 100644
--- a/experiment/taler.rspec
+++ b/experiment/taler.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-12T18:04:35.785+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2022-03-16T16:01:13.787+01:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -32,6 +32,7 @@
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
+    <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="669.5" 
y="104.5"/>
   </node>
   <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]