1 files changed, 60 insertions, 5 deletions
diff --git a/moonv4/tests/11_user_scalability/plot.sh b/moonv4/tests/11_user_scalability/plot.sh
index 1eb120c6..e1601bfa 100644
--- a/moonv4/tests/11_user_scalability/plot.sh
+++ b/moonv4/tests/11_user_scalability/plot.sh
@@ -2,7 +2,7 @@
 
 DIR=$1
 
-cd ${DIR}
+# cd ${DIR}
 
 #JSON=data_1_1.json,data_1_5.json,data_1_10.json,data_1_15.json,data_1_20.json,data_1_25.json,data_2_1.json,data_2_5.json,data_2_10.json,data_2_15.json,data_2_20.json,data_2_25.json
 #LEGEND="rbac 1 req/s,rbac 5 req/s,rbac 10 req/s,rbac 15 req/s,rbac 20 req/s,rbac 25 req/s,rbac+session 1 req/s,rbac+session 5 req/s,rbac+session 10 req/s,rbac+session 15 req/s,rbac+session 20 req/s,rbac+session 25 req/s"
@@ -10,11 +10,66 @@ cd ${DIR}
 #    --input="${JSON}" \
 #    --legend="${LEGEND}" \
 #    -d
-JSON=data_1_1.json,data_1_5.json,data_1_10.json,data_2_1.json,data_2_5.json,data_2_10.json
-LEGEND="rbac 1 req/s,rbac 5 req/s,rbac 10 req/s,rbac+session 1 req/s,rbac+session 5 req/s,rbac+session 10 req/s"
+
+cd results/01
+
+JSON=data_rbac_1_01.json,data_rbac_2_01.json,data_rbac_3_01.json,data_rbac_4_01.json,data_rbac_5_01.json
+LEGEND="10 users,20 users,30 users,40 users,50 users"
+python3 ${MOON_HOME}/moon_interface/tests/apitests/plot_json.py \
+    --legend="${LEGEND}" \
+    --plot-result="*" \
+    --write-html="rbac_10-50users_1reqs.html" \
+    digraph \
+    average \
+    "${JSON}"
+
+sleep 1
+
+JSON=data_rbac_1_10.json,data_rbac_2_10.json,data_rbac_3_10.json,data_rbac_4_10.json,data_rbac_5_10.json
+LEGEND="10 users,20 users,30 users,40 users,50 users"
+python3 ${MOON_HOME}/moon_interface/tests/apitests/plot_json.py \
+    --legend="${LEGEND}" \
+    --plot-result="*" \
+    --write-html="rbac_10-50users_10reqs.html" \
+    digraph \
+    average \
+    "${JSON}"
+
+sleep 1
+
+JSON=data_rbac_1_20.json,data_rbac_2_20.json,data_rbac_3_20.json,data_rbac_4_20.json,data_rbac_5_20.json
+LEGEND="10 users,20 users,30 users,40 users,50 users"
+python3 ${MOON_HOME}/moon_interface/tests/apitests/plot_json.py \
+    --legend="${LEGEND}" \
+    --plot-result="*" \
+    --write-html="rbac_20-50users_20reqs.html" \
+    digraph \
+    average \
+    "${JSON}"
+
+sleep 1
+
+JSON=data_rbac_1_30.json,data_rbac_2_30.json,data_rbac_3_30.json,data_rbac_4_30.json,data_rbac_5_30.json
+LEGEND="10 users,20 users,30 users,40 users,50 users"
+python3 ${MOON_HOME}/moon_interface/tests/apitests/plot_json.py \
+    --legend="${LEGEND}" \
+    --plot-result="*" \
+    --write-html="rbac_30-50users_30reqs.html" \
+    digraph \
+    average \
+    "${JSON}"
+
+sleep 1
+
+JSON=data_rbac_1_39.json,data_rbac_2_39.json,data_rbac_3_39.json,data_rbac_4_39.json,data_rbac_5_39.json
+LEGEND="10 users,20 users,30 users,40 users,50 users"
 python3 ${MOON_HOME}/moon_interface/tests/apitests/plot_json.py \
-    --input="${JSON}" \
     --legend="${LEGEND}" \
-    -d
+    --plot-result="*" \
+    --write-html="rbac_39-50users_39reqs.html" \
+    digraph \
+    average \
+    "${JSON}"
 
+sleep 1