From 3ff3d5568e179126c72fba8c0bbf1589411202e3 Mon Sep 17 00:00:00 2001
From: smaguin <smaguin@localhost>
Date: Tue, 24 Jun 2008 07:47:21 +0000
Subject: [PATCH] update the output message to be used by gnuplot
---
opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml | 5
opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java | 49 +++++++-----
opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java | 41 ++++++----
opendj-sdk/opends/tests/system-tests/scenario/singleServer/single.xml | 2
opendj-sdk/opends/tests/system-tests/scenario/singleServer/conf.xml | 141 ++++++++++++++++++++++++++--------
5 files changed, 165 insertions(+), 73 deletions(-)
diff --git a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java
index dc3f4ad..988b241 100644
--- a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java
+++ b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java
@@ -63,7 +63,7 @@
static ArrayList<String> DNList;
static long delayCnx=1000;
static long delaySec=1;
-
+ static long delayPrint=60000;
public Client()
{
@@ -150,12 +150,12 @@
int seconds=0;
// initialize startup
long t1=System.currentTimeMillis();
-
+ long print_t1=System.currentTimeMillis();
// work until Max duration is reached
while (true) {
long new_t1=System.currentTimeMillis();
-
+ long print_t2=System.currentTimeMillis();
// end of the system test. Exit
if ( ( timeTostopTest != 0 ) && ( new_t1 > timeTostopTest ) ) {
@@ -165,11 +165,24 @@
}
break;
}
-
+ // status every delayPrint
+ if ( (print_t2 - print_t1) >= delayPrint ) {
+ duration=((print_t2-print_t1)/1000);
+ println("INFO", "Rate: " + (total_nb_mod/duration) + " mod/sec");
+ print_t1=System.currentTimeMillis();
+ try {
+ synchronized(this) {
+ total_nb_mod=0;
+ }
+ } catch ( Exception e2 ) {
+ System.out.println("E2");
+ e2.printStackTrace();
+ }
+ }
// status every delayCnx
if ( (new_t1 - t1) >= delayCnx) {
- println("INFO", (nb_mod_done/delaySec) + " mod/sec.");
+ // println("INFO", (nb_mod_done/delaySec) + " mod/sec.");
// inform all the threads the max nb searchs has been reached
synchronized (this) {
@@ -196,11 +209,7 @@
e1.printStackTrace();
}
- if ( (seconds++) >= 9 ) {
- duration=((new_t1-startup)/1000);
- println("INFO", "Avg rate: " + (total_nb_mod/duration) + " mod/sec. after " + getTime(duration));
- seconds=0;
- }
+
t1=new_t1;
}
}
@@ -237,52 +246,52 @@
// BaseDN
suffix = System.getProperty("suffix");
- println ("INFO" , "suffix " + suffix);
+ println ("INFO" , "CONFIG suffix " + suffix);
// nb_threads
String snb_threads = System.getProperty("nb_threads");
nb_threads = Integer.parseInt(snb_threads);
- println ("INFO" , "nb_threads " + snb_threads);
+ println ("INFO" , "CONFIG nb_threads " + snb_threads);
// test duration
String sMaxDuration = System.getProperty("maxDuration");
maxDuration = Long.parseLong(sMaxDuration);
- println ("INFO" , "maxDuration " + maxDuration);
+ println ("INFO" , "CONFIG maxDuration " + maxDuration);
// credential for simple bind
bindDN = System.getProperty("bindDN");
bindPW = System.getProperty("bindPW");
- println ("INFO" , "bindDN " + bindDN);
+ println ("INFO" , "CONFIG bindDN " + bindDN);
// Max number of searchs
String sNB_MAX_mod = System.getProperty("NB_MAX_mod");
NB_MAX_mod = Integer.parseInt(sNB_MAX_mod);
- println ("INFO" , "sNB_MAX_mod " + sNB_MAX_mod);
+ println ("INFO" , "CONFIG sNB_MAX_mod " + sNB_MAX_mod);
// attribute to modify or add
attributeName = System.getProperty("attributeName");
- println ("INFO" , "attributeName " + attributeName);
+ println ("INFO" , "CONFIG attributeName " + attributeName);
// operation to perform: modify or add
operation = System.getProperty("operation");
- println ("INFO" , "operation " + operation);
+ println ("INFO" , "CONFIG operation " + operation);
// hostname
hostname = System.getProperty("hostname");
// protocol : SSL or TLS
protocol = System.getProperty("protocol");
- println ("INFO" , "protocol " + protocol);
+ println ("INFO" , "CONFIG protocol " + protocol);
// authentication : EXTERNAL or simple
authentication = System.getProperty("authentication");
- println ("INFO" , "authentication " + authentication);
+ println ("INFO" , "CONFIG authentication " + authentication);
// delay Sec before closing conx
String sdelaySec = System.getProperty("delaySec");
delaySec = Long.parseLong(sdelaySec);
delayCnx = delaySec * 1000;
- println ("INFO" , "delayCnx " + delayCnx);
+ println ("INFO" , "CONFIG delayCnx " + delayCnx);
if ( maxDuration != 0 ) {
maxDuration= maxDuration * 1000;
diff --git a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java
index 89b3a77..bbc5928 100644
--- a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java
+++ b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java
@@ -61,7 +61,7 @@
static ArrayList<String> DNList;
static long delayCnx=1000;
static long delaySec=1;
-
+ static long delayPrint=60000;
public Client()
{
@@ -148,12 +148,13 @@
int seconds=0;
// initialize startup
long t1=System.currentTimeMillis();
+ long print_t1=System.currentTimeMillis();
// work until Max duration is reached
while (true) {
long new_t1=System.currentTimeMillis();
-
+ long print_t2=System.currentTimeMillis();
// end of the system test. Exit
if ( ( timeTostopTest != 0 ) && ( new_t1 > timeTostopTest ) ) {
@@ -163,7 +164,20 @@
}
break;
}
-
+ // status every delayPrint
+ if ( (print_t2 - print_t1) >= delayPrint ) {
+ duration=((print_t2-print_t1)/1000);
+ println("INFO", "Rate: " + (total_nb_mod/duration) + " mods/sec");
+ print_t1=System.currentTimeMillis();
+ try {
+ synchronized(this) {
+ total_nb_mod=0;
+ }
+ } catch ( Exception e2 ) {
+ System.out.println("E2");
+ e2.printStackTrace();
+ }
+ }
// status every delayCnx
if ( (new_t1 - t1) >= delayCnx) {
@@ -194,11 +208,6 @@
e1.printStackTrace();
}
- if ( (seconds++) >= 9 ) {
- duration=((new_t1-startup)/1000);
- println("INFO", "Avg rate: " + (total_nb_mod/duration) + " mod/sec. after " + getTime(duration));
- seconds=0;
- }
t1=new_t1;
}
}
@@ -235,45 +244,45 @@
// BaseDN
suffix = System.getProperty("suffix");
- println ("INFO" , "suffix " + suffix);
+ println ("INFO" , "CONFIG suffix " + suffix);
// nb_threads
String snb_threads = System.getProperty("nb_threads");
nb_threads = Integer.parseInt(snb_threads);
- println ("INFO" , "nb_threads " + snb_threads);
+ println ("INFO" , "CONFIG nb_threads " + snb_threads);
// test duration
String sMaxDuration = System.getProperty("maxDuration");
maxDuration = Long.parseLong(sMaxDuration);
- println ("INFO" , "maxDuration " + maxDuration);
+ println ("INFO" , "CONFIG maxDuration " + maxDuration);
// credential for simple bind
bindDN = System.getProperty("bindDN");
bindPW = System.getProperty("bindPW");
- println ("INFO" , "bindDN " + bindDN);
+ println ("INFO" , "CONFIG bindDN " + bindDN);
// Max number of searchs
String sNB_MAX_mod = System.getProperty("NB_MAX_mod");
NB_MAX_mod = Integer.parseInt(sNB_MAX_mod);
- println ("INFO" , "sNB_MAX_mod " + sNB_MAX_mod);
+ println ("INFO" , "CONFIG sNB_MAX_mod " + sNB_MAX_mod);
// attribute to modify or add
attributeName = System.getProperty("attributeName");
- println ("INFO" , "attributeName " + attributeName);
+ println ("INFO" , "CONFIG attributeName " + attributeName);
// hostname
hostname = System.getProperty("hostname");
// protocol : SSL or TLS
protocol = System.getProperty("protocol");
- println ("INFO" , "protocol " + protocol);
+ println ("INFO" , "CONFIG protocol " + protocol);
// delay Sec before closing conx
String sdelaySec = System.getProperty("delaySec");
delaySec = Long.parseLong(sdelaySec);
delayCnx = delaySec * 1000;
- println ("INFO" , "delayCnx " + delayCnx);
+ println ("INFO" , "CONFIG delayCnx " + delayCnx);
if ( maxDuration != 0 ) {
maxDuration= maxDuration * 1000;
diff --git a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml
index 4e25ac1..9ccff3a 100644
--- a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml
+++ b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml
@@ -133,6 +133,7 @@
<script>
cpt=0
intdelaySec= int(delaySec)
+ intdelayMilliSec = intdelaySec * 1000
intnbTasks= int(nbTasks)
allowednbTasks= duration / intdelaySec
listBackupFolder = []
@@ -168,11 +169,11 @@
BackupFolder = '%s/backup_schedule_asynchronous_%s' % (serverInstance.getInstallDir(),cpt)
listBackupFolder.append(BackupFolder)
</script>
-
+
<!--=== Sleep and wait to start the client when specified ===-->
<call function="'sleep'">
{ 'location' : serverInstance.getHost(),
- 'sleepForMilliSeconds' : intdelaySec,
+ 'sleepForMilliSeconds' : intdelayMilliSec,
'fileFd' : fileFd
}
</call>
diff --git a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/conf.xml b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/conf.xml
index c0641f0..c2a0dd5 100755
--- a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/conf.xml
+++ b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/conf.xml
@@ -97,26 +97,14 @@
<!-- the certAlias must be unique -->
<scheduler>
- <duration unit="m">60</duration>
-
- <!--== Module 1 ==-->
- <module name="task_mod" enabled="false">
-
- <client id="1" name="tasks" host="lehon" start="t0"
- stop="t50">
- <serverInstance>I1</serverInstance>
- <nbTasks>50</nbTasks>
- <delaySec>5000</delaySec>
- </client>
-
- </module>
+ <duration unit="m">900</duration>
<module name="password" enabled="true">
<client id="61" name="secureUserpasswordModify" host="nott" start="t0"
- stop="t20">
+ stop="t10">
<serverInstance>I1</serverInstance>
<baseDn>ou=QA Engineers,dc=com</baseDn>
<nbCnx>1</nbCnx>
@@ -131,8 +119,8 @@
<module name="modify_ssl_sasl" enabled="true">
- <client id="2" name="secureModifyEntries" host="garm" start="t20"
- stop="t50">
+ <client id="2" name="secureModifyEntries" host="aud" start="t10"
+ stop="t30">
<serverInstance>I1</serverInstance>
<baseDn>ou=QA Engineers,dc=com</baseDn>
<nbCnx>10</nbCnx>
@@ -147,8 +135,8 @@
</module>
<module name="modify_ssl_bind" enabled="true">
- <client id="3" name="secureModifyEntries" host="nott" start="t50"
- stop="t70">
+ <client id="3" name="secureModifyEntries" host="aud" start="t30"
+ stop="t50">
<serverInstance>I1</serverInstance>
<baseDn>ou=QA Engineers,dc=com</baseDn>
<nbCnx>10</nbCnx>
@@ -165,8 +153,8 @@
<module name="search_ssl_bind" enabled="true">
- <client id="44" name="secureSearch" host="nott" start="t70"
- stop="t90">
+ <client id="44" name="secureSearch" host="aud" start="t50"
+ stop="t65">
<serverInstance>I1</serverInstance>
<baseDn>ou=QA Engineers,dc=com</baseDn>
<nbCnx>6</nbCnx>
@@ -179,25 +167,42 @@
</client>
</module>
-
- <!--== Module 2 ==-->
- <module name="charge_multipl" enabled="true">
+
- <client id="40" name="secureSearch" host="garm" start="t90"
- stop="t100">
+ <module name="task_mod" enabled="true">
+
+ <client id="1" name="tasks" host="aud" start="t50"
+ stop="t80">
+ <serverInstance>I1</serverInstance>
+ <nbTasks>50</nbTasks>
+ <delaySec>3600</delaySec>
+ </client>
+ </module>
+
+
+
+
+ <module name="search_starttls_bind" enabled="true">
+
+ <client id="50" name="secureSearch" host="aud" start="t65"
+ stop="t80">
<serverInstance>I1</serverInstance>
<baseDn>ou=QA Engineers,dc=com</baseDn>
<nbCnx>6</nbCnx>
<nbMaxOp>450000</nbMaxOp>
- <attribute>mailEXT</attribute>
- <protocol>ssl</protocol>
+ <attribute>description</attribute>
+ <protocol>starttls</protocol>
<authentication>simple</authentication>
- <certAlias>client-cert-40</certAlias>
+ <certAlias>client-cert-50</certAlias>
<delaySec>2</delaySec>
- </client>
-
+ </client>
+
+ </module>
+
+ <!--== Module 2 ==-->
+ <module name="charge_multipl" enabled="true">
- <client id="41" name="secureModifyEntries" host="aud" start="t80"
+ <client id="41" name="secureModifyEntries" host="nott" start="t80"
stop="t100">
<serverInstance>I1</serverInstance>
<baseDn>ou=QA Engineers,dc=com</baseDn>
@@ -205,7 +210,7 @@
<nbMaxOp>100000</nbMaxOp>
<attribute>mailEXT</attribute>
<protocol>ssl</protocol>
- <authentication>EXTERNAL</authentication>
+ <authentication>simple</authentication>
<certAlias>client-cert-41</certAlias>
<operation>modify</operation>
<delaySec>2</delaySec>
@@ -218,7 +223,7 @@
<nbCnx>6</nbCnx>
<nbMaxOp>450000</nbMaxOp>
<attribute>description</attribute>
- <protocol>simple</protocol>
+ <protocol>starttls</protocol>
<authentication>simple</authentication>
<certAlias>client-cert-42</certAlias>
<delaySec>2</delaySec>
@@ -236,7 +241,75 @@
<nbCnx>50</nbCnx>
</client>
</module>
-
+
+ <module name="test" enabled="false">
+
+ <client id="99" name="secureSearch" host="nott" start="t0"
+ stop="t20">
+ <serverInstance>I1</serverInstance>
+ <baseDn>ou=QA Engineers,dc=com</baseDn>
+ <nbCnx>6</nbCnx>
+ <nbMaxOp>450000</nbMaxOp>
+ <attribute>description</attribute>
+ <protocol>starttls</protocol>
+ <authentication>EXTERNAL</authentication>
+ <certAlias>client-cert-99</certAlias>
+ <delaySec>2</delaySec>
+ </client>
+
+ <client id="991" name="secureSearch" host="nott" start="t20"
+ stop="t40">
+ <serverInstance>I1</serverInstance>
+ <baseDn>ou=QA Engineers,dc=com</baseDn>
+ <nbCnx>6</nbCnx>
+ <nbMaxOp>450000</nbMaxOp>
+ <attribute>description</attribute>
+ <protocol>ssl</protocol>
+ <authentication>EXTERNAL</authentication>
+ <certAlias>client-cert-991</certAlias>
+ <delaySec>2</delaySec>
+ </client>
+
+ <client id="992" name="secureSearch" host="nott" start="t40"
+ stop="t60">
+ <serverInstance>I1</serverInstance>
+ <baseDn>ou=QA Engineers,dc=com</baseDn>
+ <nbCnx>6</nbCnx>
+ <nbMaxOp>450000</nbMaxOp>
+ <attribute>description</attribute>
+ <protocol>ssl</protocol>
+ <authentication>simple</authentication>
+ <certAlias>client-cert-992</certAlias>
+ <delaySec>2</delaySec>
+ </client>
+
+ <client id="993" name="secureSearch" host="nott" start="t60"
+ stop="t80">
+ <serverInstance>I1</serverInstance>
+ <baseDn>ou=QA Engineers,dc=com</baseDn>
+ <nbCnx>6</nbCnx>
+ <nbMaxOp>450000</nbMaxOp>
+ <attribute>description</attribute>
+ <protocol>simple</protocol>
+ <authentication>simple</authentication>
+ <certAlias>client-cert-993</certAlias>
+ <delaySec>2</delaySec>
+ </client>
+
+
+ <client id="994" name="secureSearch" host="nott" start="t80"
+ stop="t100">
+ <serverInstance>I1</serverInstance>
+ <baseDn>ou=QA Engineers,dc=com</baseDn>
+ <nbCnx>6</nbCnx>
+ <nbMaxOp>450000</nbMaxOp>
+ <attribute>description</attribute>
+ <protocol>starttls</protocol>
+ <authentication>simple</authentication>
+ <certAlias>client-cert-994</certAlias>
+ <delaySec>2</delaySec>
+ </client>
+ </module>
</scheduler>
</systemTestConfiguration>
diff --git a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/single.xml b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/single.xml
index bc84ad6..5f35f7e 100755
--- a/opendj-sdk/opends/tests/system-tests/scenario/singleServer/single.xml
+++ b/opendj-sdk/opends/tests/system-tests/scenario/singleServer/single.xml
@@ -44,7 +44,7 @@
<!-- directoryName must have the name of the current directory -->
<script>
- DIR_NAME = 'single'
+ DIR_NAME = 'singleServer'
fConf = '%s/scenario/%s/conf.xml' % (TESTS_DIR,DIR_NAME)
fPreConf = '%s/scenario/%s/pre_configuration.xml' % \
(TESTS_DIR,DIR_NAME)
--
Gitblit v1.10.0