[taler-grid5k] 115/141: split rspec, change tags

[gnunet]

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

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

commit 6ce1303a50ab8d87c5939009230bd5d793779dae
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Tue Nov 9 10:16:24 2021 +0100

    split rspec, change tags
---
 configs/etc/nginx/sites-available/proxy            |   2 +-
 .../usr/lib/systemd/system/taler-wallet@.service   |   1 +
 docker/entrypoint.sh                               |   2 +-
 .../{taler-perf-minimal.rspec => infra.rspec}      |  18 +--
 experiment/run.sh                                  |   2 +-
 experiment/scripts/database.sh                     |   4 +-
 experiment/scripts/exchange.sh                     |   4 +-
 experiment/scripts/monitor.sh                      |  20 ++-
 experiment/scripts/ping.sh                         |   2 +-
 experiment/scripts/taler-wallet-bench.sh           |   3 +-
 experiment/setup.sh                                |   6 +-
 experiment/taler-perf-any.rspec                    | 162 ---------------------
 .../{taler-perf-minimal.rspec => wallets.rspec}    |  49 ++++---
 13 files changed, 63 insertions(+), 212 deletions(-)

diff --git a/configs/etc/nginx/sites-available/proxy 
b/configs/etc/nginx/sites-available/proxy
index 6ccd1c9..6b90f02 100644
--- a/configs/etc/nginx/sites-available/proxy
+++ b/configs/etc/nginx/sites-available/proxy
@@ -18,7 +18,7 @@ server {
 
   server_name localhost;
 
-  access_log 
syslog:server=localhost,facility=user,tag=taler-proxy,severity=info taler;
+  access_log 
syslog:server=localhost,facility=user,tag=taler_proxy,severity=info taler;
 
   allow 172.16.0.0/12;
   deny all;
diff --git a/configs/usr/lib/systemd/system/taler-wallet@.service 
b/configs/usr/lib/systemd/system/taler-wallet@.service
index 4415f54..cd3fca8 100755
--- a/configs/usr/lib/systemd/system/taler-wallet@.service
+++ b/configs/usr/lib/systemd/system/taler-wallet@.service
@@ -11,6 +11,7 @@ ExecStart=/root/scripts/taler-wallet-bench.sh %I
 
 StandardOutput=journal
 StandardError=journal
+SyslogIdentifier=taler-wallet-cli
 
 [Install]
 WantedBy=multi-user.target
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 1224f8b..f6018aa 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -30,7 +30,7 @@ TALER_HOME=/taler
 function prepare() {
   cd "${TALER_HOME}/$1"
   git checkout master && git pull
-  git checkout "$2" && git pull
+  git checkout "$2" && (git pull || true)
 }
 
 function build() {
diff --git a/experiment/taler-perf-minimal.rspec b/experiment/infra.rspec
similarity index 76%
copy from experiment/taler-perf-minimal.rspec
copy to experiment/infra.rspec
index 1ea30e5..2e49ccd 100644
--- a/experiment/taler-perf-minimal.rspec
+++ b/experiment/infra.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="2021-10-31T14:07:06.369+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="2021-11-09T10:01:35.137+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"/>
@@ -14,12 +14,6 @@
     <hardware_type name="dahu-grenoble"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="300.18072289156623" y="202.25503355704694"/>
   </node>
-  <node client_id="Wallet-0" 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="176.5" 
y="479.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"/>
@@ -37,18 +31,12 @@
     <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="915.0" 
y="316.2046979865771"/>
-  </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="432.5" 
y="474.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="539.5" 
y="228.5"/>
   </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="646.8072289156626" y="126.28859060402684"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="545.5" 
y="44.5"/>
   </node>
 </rspec>
\ No newline at end of file
diff --git a/experiment/run.sh b/experiment/run.sh
index 7052d7f..170a325 100644
--- a/experiment/run.sh
+++ b/experiment/run.sh
@@ -11,7 +11,7 @@ function set_ddn() {
   nsupdate -k /root/ddns.key -v << EOF
 server ${DNS_HOST}
 zone ${DNS_ZONE}
-update add $1 60 A $(hostname -I)
+update add $1 3600 A $(hostname -I)
 send
 EOF
 }
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 9961271..5bd2472 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -21,9 +21,11 @@ then
   # use 25% of the available memory 
   # (https://www.postgresql.org/docs/13/runtime-config-resource.html)
   shared_buffers=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) / 4 ))kB
+  effective_cache_size=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) * 
3/4))kB
   # 
(https://www.postgresql.org/docs/current/runtime-config-wal.html#GUC-MAX-WAL-SIZE)
   max_wal_size=2GB 
-  max_worker_processes=12
+  max_worker_processes=16
+  max_connections=500
   " >> /etc/postgresql/13/main/postgresql.conf
   
   # Enable password for taler since this is commonly the case
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 09da484..9c74b90 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -24,6 +24,7 @@ then
   sleep 1
 
   systemctl restart taler-exchange.target
+  let "NUM_EXCHANGE_PROCESSES-=1"
 
   wait_for_keys "${EXCHANGE_DOMAIN}/management"
   
@@ -34,13 +35,14 @@ then
   taler-exchange-offline upload < sig-res.json
   taler-exchange-offline upload < acct-res.json
   taler-exchange-offline upload < fee-res.json
+
 fi
   
 RUNNING=$(ps -aux | grep "[taler]-exchange-httpd" | wc -l)
 
 for i in $(seq ${NUM_EXCHANGE_PROCESSES});
 do
-  let "i+=${RUNNING}"
+  let "i+=${RUNNING}-1"
   systemctl restart taler-exchange-httpd@100"${i}".socket 
taler-exchange-httpd@100"${i}".service
 done
 
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index a80e393..f233854 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -57,11 +57,25 @@ then
     done
   fi
   
-  systemctl restart prometheus
-  
   # Proxy takes longer to start
   wait_for_keys "${PROXY_DOMAIN}"
   
   systemctl restart prometheus-postgres-exporter \
-                 prometheus-nginx-exporter
+                    prometheus-nginx-exporter
+else 
+
+  if [[ "${ENABLE_EXPORTERS}" == "true" ]];
+  then
+    for WALLET in $(get_wallet_domains);
+    do
+      if ! grep -q "wallet.${WALLET}.perf.taler:9100" 
/etc/monitor/prometheus.yaml; 
+      then
+        sed -i "/<WALLETS_HERE>/a \ \ \ \ \ \ - 
'wallet.${WALLET}.perf.taler:9100'" \
+                /etc/monitor/prometheus.yaml
+      fi
+    done
+  fi
+
 fi
+
+systemctl restart prometheus
diff --git a/experiment/scripts/ping.sh b/experiment/scripts/ping.sh
index 973aaee..9f82ca0 100755
--- a/experiment/scripts/ping.sh
+++ b/experiment/scripts/ping.sh
@@ -5,7 +5,7 @@ DELAY=$(ping -c 2 $1 | sed -n "3p" | awk '{print $(NF-1)$NF}')
 if [[ "$DELAY" == "time="* ]]; 
 then
   logger -s --tcp \
-        --port 1515 \
+        --port 1514 \
         --server ${MONITOR_DOMAIN} \
          --tag taler-network \
         "src=${TALER_HOST} dst=${1} ${DELAY}" \
diff --git a/experiment/scripts/taler-wallet-bench.sh 
b/experiment/scripts/taler-wallet-bench.sh
index be0462f..0ad4159 100755
--- a/experiment/scripts/taler-wallet-bench.sh
+++ b/experiment/scripts/taler-wallet-bench.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LOG_LEVEL=NONE
+LOG_LEVEL=ERROR
 
 case $1 in
    *logging*)
@@ -9,7 +9,6 @@ case $1 in
 esac
 
 taler-wallet-cli \
-    -L ${LOG_LEVEL} \
     advanced bench1 \
       --config-json "
 {
diff --git a/experiment/setup.sh b/experiment/setup.sh
index a530cfb..99bdff7 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -30,11 +30,9 @@ key "ddns-key.perf.taler" {
 };
 EOF
 
-# Add our DNS on taler.net as the first nameserver 
-# if it is not there yet
+# Add our DNS on taler.net as the only nameserver 
 if ! grep -Fxq "nameserver ${NS_IP}" /etc/resolv.conf ; then
-  sed -i "3i\\
-nameserver ${NS_IP}" /etc/resolv.conf
+  echo "nameserver ${NS_IP}" > /etc/resolv.conf
 fi
 
 systemctl daemon-reload
diff --git a/experiment/taler-perf-any.rspec b/experiment/taler-perf-any.rspec
deleted file mode 100644
index ce704a3..0000000
--- a/experiment/taler-perf-any.rspec
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-11-05T08:33:33.364+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="155.12048192771084" y="30.006191950464398"/>
-  </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="300.1807228915663" y="183.52941176470588"/>
-  </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>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="414.87951807228916" 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="304.3975903614458" y="253.61609907120743"/>
-  </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>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="915.0" 
y="288.6594427244582"/>
-  </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="646.8072289156627" y="113.44272445820434"/>
-  </node>
-  <node client_id="Wallet-0" 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="445.5201238390093"/>
-  </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="299.3373493975904" y="447.1888544891641"/>
-  </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="532.5" 
y="447.5"/>
-  </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="85.12048192771084" y="505.59442724458205"/>
-  </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="299.3373493975904" y="502.25696594427245"/>
-  </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="543.5" 
y="503.5"/>
-  </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="305.5" 
y="569.5"/>
-  </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="294.5" 
y="678.5"/>
-  </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="711.5" 
y="621.5"/>
-  </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="549.5" 
y="673.5"/>
-  </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="709.0" 
y="561.5"/>
-  </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="86.0" 
y="625.5"/>
-  </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="545.0" 
y="557.5"/>
-  </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="80.0" 
y="562.5"/>
-  </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="303.0" 
y="631.5"/>
-  </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="720.0" 
y="678.5"/>
-  </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="700.0" 
y="447.5"/>
-  </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="552.0" 
y="615.5"/>
-  </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="702.0" 
y="509.5"/>
-  </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="83.0" 
y="681.5"/>
-  </node>
-</rspec>
\ No newline at end of file
diff --git a/experiment/taler-perf-minimal.rspec b/experiment/wallets.rspec
similarity index 61%
rename from experiment/taler-perf-minimal.rspec
rename to experiment/wallets.rspec
index 1ea30e5..97416f2 100644
--- a/experiment/taler-perf-minimal.rspec
+++ b/experiment/wallets.rspec
@@ -1,54 +1,63 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-31T14:07:06.369+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">
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-11-09T10:01:22.929+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="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>
-    <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="155.12048192771084" y="35.85234899328859"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="127.5" 
y="87.5"/>
   </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <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>
-    <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="300.18072289156623" y="202.25503355704694"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="280.5" 
y="86.5"/>
   </node>
-  <node client_id="Wallet-0" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <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="176.5" 
y="479.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="126.5" 
y="155.5"/>
   </node>
-  <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <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="424.0" 
y="43.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="277.5" 
y="157.5"/>
   </node>
-  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <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>
-    <hardware_type name="dahu-grenoble"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="300.5" 
y="256.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="121.5" 
y="228.5"/>
   </node>
-  <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <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="915.0" 
y="316.2046979865771"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="282.5" 
y="226.5"/>
   </node>
-  <node client_id="Wallet-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <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="124.5" 
y="303.5"/>
+  </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="282.5" 
y="296.5"/>
+  </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="432.5" 
y="474.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="131.5" 
y="361.5"/>
   </node>
-  <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <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="646.8072289156626" y="126.28859060402684"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="279.0" 
y="356.5"/>
   </node>
 </rspec>
\ No newline at end of file

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