X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fst-client%2Fconfigure.sh;h=5c4e8aaa58d3a3963a69ed0e9bf00aab41bda65e;hb=b8a974c5eaba39f0891dfd17b64f7dd6411688dc;hp=9030c46f32350ce467e95005a401ecac11a3cbd7;hpb=0df06e9ac54caeec9d29bb11e0b61befec83110b;p=anna.git

diff --git a/example/diameter/launcher/deployments/st-client/configure.sh b/example/diameter/launcher/deployments/st-client/configure.sh
index 9030c46..5c4e8aa 100755
--- a/example/diameter/launcher/deployments/st-client/configure.sh
+++ b/example/diameter/launcher/deployments/st-client/configure.sh
@@ -37,7 +37,7 @@ calculate_deployment_layout() {
   read max_server_accepted_connections
   [ "$max_server_accepted_connections" = "" ] && max_server_accepted_connections=5000
 
-  echo "Input the maximum test case rate per second:"
+  echo "Input the maximum desired test case rate per second:"
   read desired_rate
   while [ -z "$desired_rate" ]; do read desired_rate; done
 
@@ -47,49 +47,49 @@ calculate_deployment_layout() {
     G_ADML_CONNECTIONS=1
     G_ADML_INSTANCES=1
     return
-  fi
-  max_adml_instances=$((max_server_accepted_connections/MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE))
-  if [ $max_connections -gt $max_server_accepted_connections ]
+  elif [ $max_connections -gt $max_server_accepted_connections ]
   then
-    echo
-    echo "Maximum rate reached for $max_server_accepted_connections server connections:"
-    G_ADML_CONNECTIONS=$MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE
-    G_ADML_INSTANCES=$max_adml_instances
-    return
+    _exit "Not enough server connections to fit the desired rate (requires $max_connections connections)."
   fi
 
   echo
   echo "==========================================================================================================="
   echo "Orientative table"
   echo "-----------------------------------------------------------------------------------------------------------"
-  echo -e "Connects per instance:\t1\t2\t3\t4\t5\t6\t7\t8\t9\t10"
   echo -n "Number of instances:  "
-  for conn in `seq 1 $MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE`
+  for conn in `seq 1 $MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE | tac`
   do
     instances=$(ceil $max_connections $conn)
     echo -n -e "\t$instances"
   done
   echo
+  echo -e "Connects per instance:\t10\t9\t8\t7\t6\t5\t4\t3\t2\t1"
   echo "==========================================================================================================="
   echo
-  echo "Input selection (connections per instance 1..$MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE) [1]:"
-  read G_ADML_CONNECTIONS
-  [ -z "$G_ADML_CONNECTIONS" ] && G_ADML_CONNECTIONS=1
-  [ $G_ADML_CONNECTIONS -lt 1 ] && G_ADML_CONNECTIONS=1
-#  if [ $G_ADML_CONNECTIONS -gt 1 ]
-#  then
-#    echo "Remember to add 'diameterServerSessions="$G_ADML_CONNECTIONS"' on servers services.xml file (node tag)"
-#    echo " in case that you are testing against ADML servers."
-#    echo
-#    echo "Press ENTER to continue, CTRL-C to abort ..."
-#    read dummy
-#  fi
+  #echo "Input selection (connections per instance 1..$MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE) [1]:"
+  instances__dflt=$(ceil $max_connections $MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE)
+  echo "Input the desired number of ADML instances [$instances__dflt]:"
+  echo " (more than $instances instances, implies 1 single connection/instance)"
+  read G_ADML_INSTANCES
+  [ -z "$G_ADML_INSTANCES" ] && G_ADML_INSTANCES=$instances__dflt
+  [ $G_ADML_INSTANCES -lt 1 ] && G_ADML_INSTANCES=1
+  G_ADML_CONNECTIONS=$(ceil $max_connections $G_ADML_INSTANCES)
   if [ $G_ADML_CONNECTIONS -gt $MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE ]
   then
-    G_ADML_CONNECTIONS=$MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE
+    echo "Warning: the number of connections per ADML instance ($G_ADML_CONNECTIONS) is greater"
+    echo "         than the maximum suggested: $MAXIMUM_SUGGESTED_CLIENT_CONNECTION_PER_ADML_INSTANCE"
+    echo
+    echo "Press ENTER to continue, CTRL-C to abort ..."
+    read dummy
+  fi
+  client_connections=$((G_ADML_INSTANCES*G_ADML_CONNECTIONS))
+  if [ $client_connections -gt $max_server_accepted_connections ]
+  then
+    echo
+    echo "Insufficient server connections available ($max_server_accepted_connections) to accept"
+    echo " launcher client connections: $G_ADML_INSTANCES x $G_ADML_CONNECTIONS = $client_connections."
+    _exit "Configuration error"
   fi
-  
-  G_ADML_INSTANCES=$(ceil $max_connections $G_ADML_CONNECTIONS)
 }
 
 #############
@@ -103,8 +103,35 @@ echo "====================================="
 echo "ADML SYSTEM TEST CONFIGURATION WIZARD"
 echo "====================================="
 echo
-[ -d ADMLS ] && _exit "ADMLS directory still exists. Please remove it to continue (perhaps you have to 'pkill ADML' before) !"
-[ ! -d realms ] && _exit "Missing realms configuration (expecting '$PWD/realms' directory). Try with 'realms-example' and see README inside it !"
+if [ -d ADMLS ]
+then
+  echo
+  echo "Detected configured layout (*):"
+  echo
+  ADML_INSTANCES=`cat $ADML_INSTANCES__ST_CONF_FILE 2>/dev/null`
+  ADML_CONNECTIONS=`cat $ADML_CONNECTIONS__ST_CONF_FILE 2>/dev/null`
+  RATE_PER_INSTANCE=`cat $ADML_RATE_PER_INSTANCE__ST_CONF_FILE 2>/dev/null`
+  DESIRED_RATE=`cat $ADML_DESIRED_RATE__ST_CONF_FILE 2>/dev/null`
+  REPEATS=`cat $CYCLE_REPEATS__ST_CONF_FILE 2>/dev/null`
+  N_TESTCASES=`cat $N_TESTCASES__ST_CONF_FILE 2>/dev/null`
+
+  [ -n "$ADML_INSTANCES" ] && echo "  $ADML_INSTANCES ADML instances."
+  [ -n "$ADML_CONNECTIONS" ] && echo "  $ADML_CONNECTIONS connections per ADML instance."
+  [ -n "$RATE_PER_INSTANCE" ] && echo "  Rate of $RATE_PER_INSTANCE TCs/second and instance."
+  [ -n "$DESIRED_RATE" ] && echo "  Desired rate was: $DESIRED_RATE TCs/second and instance."
+  [ -n "$REPEATS" ] && echo "  Number of cycles: $((REPEATS + 1))."
+  [ -n "$N_TESTCASES" ] && echo "  $N_TESTCASES test cases programmed."
+  echo
+  operation_result=$(echo "scale=3 ; (1 + $REPEATS) * $N_TESTCASES / $ADML_INSTANCES / $RATE_PER_INSTANCE" | bc)
+  echo "  Time covered: $((REPEATS + 1)) cycles x ($N_TESTCASES/(${ADML_INSTANCES}x${RATE_PER_INSTANCE})) = $operation_result seconds"
+  echo
+
+  echo "  (*) As ADMLS directory still exists you should move/remove it to continue."
+  echo "      You may have to 'pkill ADML' before (resources busy)."
+  _exit
+fi
+
+[ ! -d services ] && _exit "Missing services configuration (expecting '$PWD/services' directory) !"
 
 calculate_deployment_layout
 
@@ -120,20 +147,38 @@ echo $rate_per_instance > $ADML_RATE_PER_INSTANCE__ST_CONF_FILE
 echo $desired_rate > $ADML_DESIRED_RATE__ST_CONF_FILE
 
 echo
-echo "Suggested layout:"
+echo "Layout:"
+echo
 echo " - $G_ADML_INSTANCES ADML instances"
 echo " - $G_ADML_CONNECTIONS client connections per ADML instance"
+#maximum_rate_1c=$((G_ADML_INSTANCES*MAXIMUM_ADML_ASYNC_RATE))
 maximum_rate=$((G_ADML_INSTANCES*G_ADML_CONNECTIONS*MAXIMUM_ADML_ASYNC_RATE))
-echo " - Maximum rate: $maximum_rate test cases per second"
+overcommit_rate_per_instance=$((G_ADML_CONNECTIONS*MAXIMUM_ADML_ASYNC_RATE))
+echo
+echo " - Desired rate: $desired_rate test cases per second:"
+echo "   Remember the command to send the needed rate per instance ($rate_per_instance TCs/sec):"
+echo "       ./operation.sh \"test|ttps|$rate_per_instance\""
 echo
-echo "Usually, you will program a test case per subscriber. Input the number of test cases to program:"
+if [ $maximum_rate -ne $desired_rate ]
+then
+  echo " - Maximum bunch rate ($G_ADML_CONNECTIONS connections per instance): $maximum_rate testcases/second"
+  echo "   For this, configure instances rate to $overcommit_rate_per_instance test cases per second:"
+  echo "       ./operation.sh \"test|ttps|$overcommit_rate_per_instance\""
+  echo
+fi
+echo "Usually, you will program a test case per subscriber."
+echo "Input the number of test cases to program:"
 read N_TESTCASES
 while [ -z "$N_TESTCASES" ]; do read N_TESTCASES; done
 echo $N_TESTCASES > $N_TESTCASES__ST_CONF_FILE
 testcase_per_adml_instance=$N_TESTCASES
+echo "Input the first test id to program [1]:"
+read first_value
+[ "$first_value" = "" ] && first_value=1
+[ $first_value -lt 1 ] && first_value=1
 echo
-time_covered_1=$(ceil $N_TESTCASES $maximum_rate)
-time_covered=$(ceil $N_TESTCASES $((maximum_rate*G_ADML_INSTANCES)))
+time_covered_1=$(ceil $N_TESTCASES $desired_rate)
+time_covered=$(ceil $N_TESTCASES $((desired_rate*G_ADML_INSTANCES)))
 echo "That amount covers $time_covered_1 seconds for one running ADML instance."
 if [ $G_ADML_INSTANCES -gt 1 ]
 then
@@ -146,8 +191,8 @@ fi
 for instance in `seq 1 $G_ADML_INSTANCES`
 do
   offset=$((testcase_per_adml_instance * (instance-1)))
-  ini=$((offset + 1))
-  fin=$((offset + testcase_per_adml_instance))
+  ini=$((offset + first_value))
+  fin=$((offset + first_value + testcase_per_adml_instance - 1))
   echo "$instance $ini $fin" >> $N_TESTCASES_PROGRAM_LAYOUT__ST_CONF_FILE
 done
 
@@ -160,13 +205,22 @@ then
   echo " obtain a greater total time of testing."
 fi
 echo
-echo "How many total time do you want to cover (in minutes):"
+echo "How many total time you need to cover (in minutes):"
 read minutes
 while [ -z "$minutes" ]; do read minutes; done
 seconds=$((minutes*60))
 repeats=$(ceil $seconds $time_covered)
-echo $repeats > $CYCLE_REPEATS__ST_CONF_FILE
-[ $repeats -gt 0 ] && echo "Configured $repeats cycle repeats ($repeats x $time_covered seconds ~ $seconds seconds (desired $minutes minutes)"
+if [ $repeats -gt 0 ]
+then
+  echo "You will need $repeats cycles to cover $minutes minutes."
+  echo "Input the number of cyles [$repeats]: "
+  echo " (providing 0, you will cover $time_covered seconds)"
+  echo
+  read wanted_repeats
+  [ -z "$wanted_repeats" ] && wanted_repeats=$repeats
+  echo $wanted_repeats > $CYCLE_REPEATS__ST_CONF_FILE
+  [ $wanted_repeats -gt 0 ] && echo "Configured $wanted_repeats cycle repeats ($((wanted_repeats+1)) x $time_covered seconds ~ $(((wanted_repeats+1)*time_covered)) seconds of testing)."
+fi
 echo
 echo "System test configuration completed."
 echo
@@ -174,7 +228,7 @@ echo "Ready to clone/start the ADML instances: press ENTER to continue, CTRL+C t
 read dummy
 
 # Update services.xml regarding the number of client connections:
-cd realms
+cd services 
 cp services.msk services.xml
 sed -i 's/__CLIENT_CONNECTIONS__/'$G_ADML_CONNECTIONS'/g' services.xml
 cd - >/dev/null
@@ -182,16 +236,18 @@ cd - >/dev/null
 
 for instance in `seq 1 $G_ADML_INSTANCES`
 do
-  echo "Creating ADMLS/$instance ..."
-  mkdir -p ADMLS/$instance
-  cd ADMLS/$instance
+  echo "Creating ADML instance $instance ..."
+  mkdir -p ADMLS/ADML-$instance
+  cd ADMLS/ADML-$instance
+  mkdir counters
+  mkdir test-reports
   # Create resources:
   ln -s ../../.operation-one.sh operation.sh
   ln -s ../../pre-start.sh
   cp ../../.run-one.sh run.sh
   sed -i 's/^EXE=.*/EXE=ADML-'$instance'/' run.sh
   ln -s ../../ADML-launcher ADML-$instance
-  for xml in `ls ../../realms/*xml`; do ln -s $xml; done
+  for xml in `ls ../../services/*xml`; do ln -s $xml; done
   cd - >/dev/null
 done