Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4160 - in trunk/ps-mdm-flowsa-ma: . conf conf/axis-1.4/WEB-INF src/main/java/org/perfsonar/service/measurementArchive/flowsa src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard

Subject: perfsonar development work

List archive

perfsonar: r4160 - in trunk/ps-mdm-flowsa-ma: . conf conf/axis-1.4/WEB-INF src/main/java/org/perfsonar/service/measurementArchive/flowsa src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4160 - in trunk/ps-mdm-flowsa-ma: . conf conf/axis-1.4/WEB-INF src/main/java/org/perfsonar/service/measurementArchive/flowsa src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard
  • Date: Thu, 10 Jul 2008 19:01:50 -0400
Author: michael.bischoff
Date: 2008-07-10 19:01:49 -0400 (Thu, 10 Jul 2008)
New Revision: 4160

Added:

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/AuthenticatorImpl.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/BasicServiceConfig.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/ConfigurationHandler.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/ImmutableServiceConfig.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/ServiceConfig.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/SimpleHandler.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/Wizard.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizardHandler.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardRequest.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardResponse.java
Modified:
trunk/ps-mdm-flowsa-ma/.project
trunk/ps-mdm-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
trunk/ps-mdm-flowsa-ma/conf/service.properties
trunk/ps-mdm-flowsa-ma/conf/wizard.properties

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java

trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
Log:
Webadmin wizzard

Modified: trunk/ps-mdm-flowsa-ma/.project
===================================================================
--- trunk/ps-mdm-flowsa-ma/.project 2008-07-10 12:48:15 UTC (rev 4159)
+++ trunk/ps-mdm-flowsa-ma/.project 2008-07-10 23:01:49 UTC (rev 4160)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>flowsa-ma</name>
+ <name>ps-mdm-flowsa-ma</name>
<comment></comment>
<projects>
</projects>

Modified: trunk/ps-mdm-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/ps-mdm-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml 2008-07-10
12:48:15 UTC (rev 4159)
+++ trunk/ps-mdm-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml 2008-07-10
23:01:49 UTC (rev 4160)
@@ -56,7 +56,7 @@
<servlet>
<servlet-name>Wizard</servlet-name>
<servlet-class>
- perfSONARWebAdmin.admin.wizard.Wizard
+
org.perfsonar.service.measurementArchive.flowsa.wizard.Wizard
</servlet-class>
</servlet>


Modified: trunk/ps-mdm-flowsa-ma/conf/service.properties
===================================================================
--- trunk/ps-mdm-flowsa-ma/conf/service.properties 2008-07-10 12:48:15
UTC (rev 4159)
+++ trunk/ps-mdm-flowsa-ma/conf/service.properties 2008-07-10 23:01:49
UTC (rev 4160)
@@ -39,59 +39,74 @@
service.ma.conf_file=config.xml

# === Flowsa specific properties ===
-# service.ma.flowsa.exporter.1.hostname - required
-# service.ma.flowsa.exporter.1.port - required
-# service.ma.flowsa.exporter.1.description - optional
-# service.ma.flowsa.exporter.1.flow-version - required
-# service.ma.flowsa.exporter.1.sample-rate - required
-# service.ma.flowsa.exporter.1.operating-system - optional
-# service.ma.flowsa.exporter.1.location.institution - optional
-# service.ma.flowsa.exporter.1.location.city - optional
-# service.ma.flowsa.exporter.1.location.country - optional
-# service.ma.flowsa.exporter.1.location.latitude - optional
-# service.ma.flowsa.exporter.1.location.longitude - optional
+# service.common.flow.exporter.1.hostname - required
+# service.common.flow.exporter.1.port - required
+# service.common.flow.exporter.1.description - optional
+# service.common.flow.exporter.1.flow-version - required
+# service.common.flow.exporter.1.sample-rate - required
+# service.common.flow.exporter.1.operating-system - optional
+# service.common.flow.exporter.1.location.institution - optional
+# service.common.flow.exporter.1.location.city - optional
+# service.common.flow.exporter.1.location.country - optional
+# service.common.flow.exporter.1.location.latitude - optional
+# service.common.flow.exporter.1.location.longitude - optional

-service.ma.flowsa.exporter.1.hostname=xsr01.asd001a.surf.net
-service.ma.flowsa.exporter.1.port=29001
-service.ma.flowsa.exporter.1.description=SURFnet6 Core Router Amsterdam1
-service.ma.flowsa.exporter.1.flow-version=netflow_v9
-service.ma.flowsa.exporter.1.sample-rate=100
-service.ma.flowsa.exporter.2.hostname=xsr01.asd002a.surf.net
-service.ma.flowsa.exporter.2.port=29003
-service.ma.flowsa.exporter.2.description=SURFnet6 Core Router Amsterdam2
-service.ma.flowsa.exporter.2.flow-version=netflow_v9
-service.ma.flowsa.exporter.2.sample-rate=100
-service.ma.flowsa.exporter.3.hostname=xsr03.asd001a.surf.net
-service.ma.flowsa.exporter.3.port=29002
-service.ma.flowsa.exporter.3.description=SURFnet6 Border Router Amsterdam1
-service.ma.flowsa.exporter.3.flow-version=netflow_v9
-service.ma.flowsa.exporter.3.sample-rate=100
-service.ma.flowsa.exporter.4.hostname=xsr03.asd002a.surf.net
-service.ma.flowsa.exporter.4.port=29004
-service.ma.flowsa.exporter.4.description=SURFnet6 Border Router Amsterdam2
-service.ma.flowsa.exporter.4.flow-version=netflow_v9
-service.ma.flowsa.exporter.4.sample-rate=100
-service.ma.flowsa.exporter.5.hostname=jnr01.asd001a.surf.net
-service.ma.flowsa.exporter.5.port=27005
-service.ma.flowsa.exporter.5.description=SURFnet6 Core Router Amsterdam1
-service.ma.flowsa.exporter.5.flow-version=netflow_v9
-service.ma.flowsa.exporter.5.sample-rate=100
-service.ma.flowsa.exporter.6.hostname=jnr01.asd002a.surf.net
-service.ma.flowsa.exporter.6.port=27007
-service.ma.flowsa.exporter.6.description=SURFnet6 Core Router Amsterdam2
-service.ma.flowsa.exporter.6.flow-version=netflow_v9
-service.ma.flowsa.exporter.6.sample-rate=100
-service.ma.flowsa.exporter.7.hostname=jnr02.asd001a.surf.net
-service.ma.flowsa.exporter.7.port=27006
-service.ma.flowsa.exporter.7.description=SURFnet6 Border Router Amsterdam1
-service.ma.flowsa.exporter.7.flow-version=netflow_v9
-service.ma.flowsa.exporter.7.sample-rate=100
-service.ma.flowsa.exporter.8.hostname=jnr02.asd002a.surf.net
-service.ma.flowsa.exporter.8.port=29008
-service.ma.flowsa.exporter.8.description=SURFnet6 Border Router Amsterdam2
-service.ma.flowsa.exporter.8.flow-version=netflow_v9
-service.ma.flowsa.exporter.8.sample-rate=100
+service.common.flow.exporter.1.enabled=false
+service.common.flow.exporter.1.address=xsr01.asd001a.surf.net
+service.common.flow.exporter.1.port=29001
+service.common.flow.exporter.1.description=SURFnet6 Core Router Amsterdam1
+service.common.flow.exporter.1.flow-version=netflow_v9
+service.common.flow.exporter.1.sample-rate=100

+service.common.flow.exporter.2.enabled=false
+service.common.flow.exporter.2.address=xsr01.asd002a.surf.net
+service.common.flow.exporter.2.port=29003
+service.common.flow.exporter.2.description=SURFnet6 Core Router Amsterdam2
+service.common.flow.exporter.2.flow-version=netflow_v9
+service.common.flow.exporter.2.sample-rate=100
+
+service.common.flow.exporter.3.enabled=false
+service.common.flow.exporter.3.address=xsr03.asd001a.surf.net
+service.common.flow.exporter.3.port=29002
+service.common.flow.exporter.3.description=SURFnet6 Border Router Amsterdam1
+service.common.flow.exporter.3.flow-version=netflow_v9
+service.common.flow.exporter.3.sample-rate=100
+
+service.common.flow.exporter.4.enabled=false
+service.common.flow.exporter.4.hostname=xsr03.asd002a.surf.net
+service.common.flow.exporter.4.port=29004
+service.common.flow.exporter.4.description=SURFnet6 Border Router Amsterdam2
+service.common.flow.exporter.4.flow-version=netflow_v9
+service.common.flow.exporter.4.sample-rate=100
+
+service.common.flow.exporter.5.enabled=false
+service.common.flow.exporter.5.address=jnr01.asd001a.surf.net
+service.common.flow.exporter.5.port=27005
+service.common.flow.exporter.5.description=SURFnet6 Core Router Amsterdam1
+service.common.flow.exporter.5.flow-version=netflow_v9
+service.common.flow.exporter.5.sample-rate=100
+
+service.common.flow.exporter.6.enabled=false
+service.common.flow.exporter.6.address=jnr01.asd002a.surf.net
+service.common.flow.exporter.6.port=27007
+service.common.flow.exporter.6.description=SURFnet6 Core Router Amsterdam2
+service.common.flow.exporter.6.flow-version=netflow_v9
+service.common.flow.exporter.6.sample-rate=100
+
+service.common.flow.exporter.7.enabled=false
+service.common.flow.exporter.7.address=jnr02.asd001a.surf.net
+service.common.flow.exporter.7.port=27006
+service.common.flow.exporter.7.description=SURFnet6 Border Router Amsterdam1
+service.common.flow.exporter.7.flow-version=netflow_v9
+service.common.flow.exporter.7.sample-rate=100
+
+service.common.flow.exporter.8.enabled=false
+service.common.flow.exporter.8.address=jnr02.asd002a.surf.net
+service.common.flow.exporter.8.port=29008
+service.common.flow.exporter.8.description=SURFnet6 Border Router Amsterdam2
+service.common.flow.exporter.8.flow-version=netflow_v9
+service.common.flow.exporter.8.sample-rate=100
+
# --- query properties ---
# query.timeout - timeout/max execution time of a query (value is in seconds)
# query.max-results - if more then <value> results are encountered stop
processing

Modified: trunk/ps-mdm-flowsa-ma/conf/wizard.properties
===================================================================
--- trunk/ps-mdm-flowsa-ma/conf/wizard.properties 2008-07-10 12:48:15
UTC (rev 4159)
+++ trunk/ps-mdm-flowsa-ma/conf/wizard.properties 2008-07-10 23:01:49
UTC (rev 4160)
@@ -129,65 +129,144 @@
</property>

<property>
- <entry key="service.ma.flowsa.exporters">1</entry>
- <Comment>The number of exporters</Comment>
- <ProposedValue>1</ProposedValue>
- <Group order="1">Exporters</Group>
- </property>
-
- <property>
- <entry key="service.ma.wizzard.flowsa.exporter1"
required="true">yes</entry>
+ <entry key="service.common.flow.exporter.1.enabled"
required="true">true</entry>
<Comment>Use exporter 1</Comment>
- <ProposedValue>no</ProposedValue>
+ <ProposedValue>false</ProposedValue>
<Group order="1" check="true">Exporter1</Group>
- <AcceptedValue>yes</AcceptedValue>
- <AcceptedValue>no</AcceptedValue>
+ <AcceptedValue>true</AcceptedValue>
+ <AcceptedValue>false</AcceptedValue>
</property>
<property>
- <entry key="service.ma.flowsa.exporter1.hostname"
required="true">1</entry>
- <Comment>Hostname</Comment>
- <ProposedValue>1</ProposedValue>
+ <entry key="service.common.flow.exporter.1.address"
required="true">exporter.hostname</entry>
+ <Comment>Address / Hostname</Comment>
+ <ProposedValue>exporter.hostname</ProposedValue>
<Group order="2">Exporter1</Group>
</property>
<property>
- <entry key="service.ma.flowsa.exporter1.port" required="true">1</entry>
+ <entry key="service.common.flow.exporter.1.port"
required="true">6999</entry>
<Comment>Port</Comment>
- <ProposedValue>1</ProposedValue>
+ <ProposedValue>6999</ProposedValue>
<Group order="3">Exporter1</Group>
</property>
<property>
- <entry key="service.ma.flowsa.exporter1.description"
required="true">description</entry>
+ <entry key="service.common.flow.exporter.1.description"
required="true">description</entry>
<Comment>Description</Comment>
- <ProposedValue>1</ProposedValue>
+ <ProposedValue>description of what the exporter function
is</ProposedValue>
<Group order="4">Exporter1</Group>
</property>

- <property>
- <entry key="service.ma.wizzard.flowsa.exporter2"
required="true">no</entry>
- <Comment>Use exporter 2</Comment>
- <ProposedValue>no</ProposedValue>
- <Group order="1" check="true">Exporter2</Group>
- <AcceptedValue>yes</AcceptedValue>
- <AcceptedValue>no</AcceptedValue>
- </property>
- <property>
- <entry key="service.ma.flowsa.exporter2.hostname"
required="true">1</entry>
- <Comment>Hostname</Comment>
- <ProposedValue>1</ProposedValue>
- <Group order="2">Exporter2</Group>
- </property>
- <property>
- <entry key="service.ma.flowsa.exporter2.port" required="true">1</entry>
- <Comment>Port</Comment>
- <ProposedValue>1</ProposedValue>
- <Group order="3">Exporter2</Group>
- </property>
- <property>
- <entry key="service.ma.flowsa.exporter2.description"
required="true">description</entry>
- <Comment>Description</Comment>
- <ProposedValue>1</ProposedValue>
- <Group order="4">Exporter2</Group>
- </property>
+
+ <property>
+ <entry key="service.common.flow.exporter.2.enabled"
required="true">true</entry>
+ <Comment>Use exporter 2</Comment>
+ <ProposedValue>false</ProposedValue>
+ <Group order="1" check="true">Exporter2</Group>
+ <AcceptedValue>true</AcceptedValue>
+ <AcceptedValue>false</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.2.address"
required="true">exporter.hostname</entry>
+ <Comment>Address / Hostname</Comment>
+ <ProposedValue>exporter.hostname</ProposedValue>
+ <Group order="2">Exporter2</Group>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.2.port"
required="true">6999</entry>
+ <Comment>Port</Comment>
+ <ProposedValue>6999</ProposedValue>
+ <Group order="3">Exporter2</Group>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.2.description"
required="true">description</entry>
+ <Comment>Description</Comment>
+ <ProposedValue>description of what the exporter function
is</ProposedValue>
+ <Group order="4">Exporter2</Group>
+ </property>
+
+
+ <property>
+ <entry key="service.common.flow.exporter.3.enabled"
required="true">true</entry>
+ <Comment>Use exporter 3</Comment>
+ <ProposedValue>false</ProposedValue>
+ <Group order="1" check="true">Exporter3</Group>
+ <AcceptedValue>true</AcceptedValue>
+ <AcceptedValue>false</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.3.address"
required="true">exporter.hostname</entry>
+ <Comment>Address / Hostname</Comment>
+ <ProposedValue>exporter.hostname</ProposedValue>
+ <Group order="2">Exporter3</Group>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.3.port"
required="true">6999</entry>
+ <Comment>Port</Comment>
+ <ProposedValue>6999</ProposedValue>
+ <Group order="3">Exporter3</Group>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.3.description"
required="true">description</entry>
+ <Comment>Description</Comment>
+ <ProposedValue>description of what the exporter function
is</ProposedValue>
+ <Group order="4">Exporter3</Group>
+ </property>
+
+
+ <property>
+ <entry key="service.common.flow.exporter.4.enabled"
required="true">true</entry>
+ <Comment>Use exporter 4</Comment>
+ <ProposedValue>false</ProposedValue>
+ <Group order="1" check="true">Exporter4</Group>
+ <AcceptedValue>true</AcceptedValue>
+ <AcceptedValue>false</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.4.address"
required="true">exporter.hostname</entry>
+ <Comment>Address / Hostname</Comment>
+ <ProposedValue>exporter.hostname</ProposedValue>
+ <Group order="2">Exporter4</Group>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.4.port"
required="true">6999</entry>
+ <Comment>Port</Comment>
+ <ProposedValue>6999</ProposedValue>
+ <Group order="3">Exporter4</Group>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.4.description"
required="true">description</entry>
+ <Comment>Description</Comment>
+ <ProposedValue>description of what the exporter function
is</ProposedValue>
+ <Group order="4">Exporter4</Group>
+ </property>
+
+
+ <property>
+ <entry key="service.common.flow.exporter.5.enabled"
required="true">true</entry>
+ <Comment>Use exporter 5</Comment>
+ <ProposedValue>false</ProposedValue>
+ <Group order="1" check="true">Exporter5</Group>
+ <AcceptedValue>true</AcceptedValue>
+ <AcceptedValue>false</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.5.address"
required="true">exporter.hostname</entry>
+ <Comment>Address / Hostname</Comment>
+ <ProposedValue>exporter.hostname</ProposedValue>
+ <Group order="2">Exporter5</Group>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.5.port"
required="true">6999</entry>
+ <Comment>Port</Comment>
+ <ProposedValue>6999</ProposedValue>
+ <Group order="3">Exporter5</Group>
+ </property>
+ <property>
+ <entry key="service.common.flow.exporter.5.description"
required="true">description</entry>
+ <Comment>Description</Comment>
+ <ProposedValue>description of what the exporter function
is</ProposedValue>
+ <Group order="4">Exporter5</Group>
+ </property>
+

</properties>


Modified:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
===================================================================
---
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
2008-07-10 12:48:15 UTC (rev 4159)
+++
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/FlowsaMAServiceEngine.java
2008-07-10 23:01:49 UTC (rev 4160)
@@ -71,9 +71,8 @@
protected static final String NFCAPDLOCATION_PROPERTY_KEY =
"service.ma.flowsa.nfcapd.location";
protected static final String SHOULDSTARTNFCAPDPROCESSES_PROPERTY_KEY
= "service.ma.flowsa.nfcapd.start-processes";
protected static final String NFCAPDINTERVAL_PROPERTY_KEY =
"service.ma.flowsa.nfcapd.interval";
- protected static final String EXPORTERS_PROPERTY_KEY =
"service.ma.flowsa.exporters";
- protected static final String EXPORTER_PROPERTY_PART =
"service.ma.flowsa.exporter.";
- protected static final String EXPORTERHOST_PROPERTY_PART =
".hostname";
+ protected static final String EXPORTER_PROPERTY_PART =
"service.common.flow.exporter.";
+ protected static final String EXPORTERHOST_PROPERTY_PART = ".address";
protected static final String EXPORTERPORT_PROPERTY_PART = ".port";
protected static final String EXPORTERDESCRIPTION_PROPERTY_PART =
".description";
protected static final String EXPORTEROS_PROPERTY_PART =
".operating-system";
@@ -421,11 +420,12 @@
Set<Exporter> exporters = new TreeSet<Exporter>();
for(int i = 0; ;i++) {
try {
-
configuration.getProperty(EXPORTER_PROPERTY_PART+i+".name");
+ String value =
configuration.getProperty(EXPORTER_PROPERTY_PART+i+".enabled");
+ if(!value.equalsIgnoreCase("true")) continue;
} catch (PerfSONARException e) {
break;
}
- logger.debug("FlowsaMAServiceEngine.getExporters:
found some information about an exporter with number "+i);
+ logger.debug("FlowsaMAServiceEngine.getExporters:
found an enabled exporter with number "+i);

Exporter exporter = getExporter(i, sourceDir, source);
if(exporter!=null) {

Modified:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
===================================================================
---
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
2008-07-10 12:48:15 UTC (rev 4159)
+++
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
2008-07-10 23:01:49 UTC (rev 4160)
@@ -76,11 +76,11 @@
}
/**
* method that should call the reader and return the result of this
task
- * @param reader created by the supplied readerFactory
+ * @param outputReader created by the supplied readerFactory
* @return Result of this task
* @throws Exception to allow exceptions to be wrapped in a
{@link
ExecutionException} lateron.
*/
- abstract Type call(NfdumpOutputReader reader) throws Exception;
+ abstract Type call(NfdumpOutputReader outputReader) throws Exception;
}

private final NfdumpOutputReaderFactory readerFactory;
@@ -104,11 +104,12 @@
* @param outputReaderFactoryClassName className of a factory, passing
null will load the
default(org.perfsonar.service.mesurementArchive.flowType.nfdump.outputreaders.Nfdump152OutputReaderFactory).
* @param maxResults the max amount of results a query can return
* @param timeoutValue the max time in milliseconds a query can take
+ * @param anonymiseKey the key used for anonymising
* @throws IllegalArgumentException
* when Nfdump executable is not found this should be an
* configuration issue.
*/
- public NfdumpControll(final File nfdumpExecutable, final String
outputReaderFactoryClassName, final int maxResults, final int timeoutValue,
final String key) throws IllegalArgumentException {
+ public NfdumpControll(final File nfdumpExecutable, final String
outputReaderFactoryClassName, final int maxResults, final int timeoutValue,
final String anonymiseKey) throws IllegalArgumentException {
if (!nfdumpExecutable.exists()) {
throw new IllegalArgumentException("Nfdump executable not
found.");
}
@@ -120,8 +121,8 @@
this.nfdumpExecutable = nfdumpExecutable;
this.maxResults = maxResults;
this.timeoutValue = timeoutValue;
- if(key!=null) {
- this.anonymiseKey = key;
+ if(anonymiseKey!=null) {
+ this.anonymiseKey = anonymiseKey;
} else {
char[] chars = new char[32];
Random random = new Random();
@@ -164,10 +165,10 @@

NfdumpTask<List<Flow>> task = new
NfdumpTask<List<Flow>>(commands,readerFactory) {
@Override
- List<Flow> call(NfdumpOutputReader reader) throws Exception {
+ List<Flow> call(NfdumpOutputReader outputReader) throws
Exception {
List<Flow> result = new ArrayList<Flow>();
Flow record = null;
- while(( record = reader.readRecord()) != null) {
+ while(( record = outputReader.readRecord()) != null) {
result.add(record);
if(result.size() > maxResults) {
throw new TooManyResultsException(maxResults);
@@ -197,8 +198,8 @@

NfdumpTask<Statistics> task = new
NfdumpTask<Statistics>(commands,readerFactory) {
@Override
- public Statistics call(NfdumpOutputReader reader) throws
Exception {
- return reader.readStatistics();
+ public Statistics call(NfdumpOutputReader ouputReader) throws
Exception {
+ return ouputReader.readStatistics();
}
};

@@ -223,10 +224,10 @@

NfdumpTask<List<TopDatum>> task = new
NfdumpTask<List<TopDatum>>(commands,readerFactory) {
@Override
- public List<TopDatum> call(NfdumpOutputReader reader) throws
Exception {
+ public List<TopDatum> call(NfdumpOutputReader outputReader)
throws Exception {
List<TopDatum> result = new ArrayList<TopDatum>();
TopDatum record = null;
- while(( record = reader.readTopDatum()) != null) {
+ while(( record = outputReader.readTopDatum()) != null) {
result.add(record);
if(result.size() > maxResults) {
throw new TooManyResultsException(maxResults);

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/AuthenticatorImpl.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/BasicServiceConfig.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/ConfigurationHandler.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/ImmutableServiceConfig.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/ServiceConfig.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/SimpleHandler.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/Wizard.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizardHandler.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardRequest.java

Added:
trunk/ps-mdm-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard/WizzardResponse.java


  • perfsonar: r4160 - in trunk/ps-mdm-flowsa-ma: . conf conf/axis-1.4/WEB-INF src/main/java/org/perfsonar/service/measurementArchive/flowsa src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump src/main/java/org/perfsonar/service/measurementArchive/flowsa/wizard, svnlog, 07/10/2008

Archive powered by MHonArc 2.6.16.

Top of Page