perfsonar-dev - perfsonar: r2607 - in branches/new-structure/trunk/surfnet_java-flowsa-ma/doc: samples schemas
Subject: perfsonar development work
List archive
perfsonar: r2607 - in branches/new-structure/trunk/surfnet_java-flowsa-ma/doc: samples schemas
Chronological Thread
- From:
- To:
- Subject: perfsonar: r2607 - in branches/new-structure/trunk/surfnet_java-flowsa-ma/doc: samples schemas
- Date: Wed, 8 Aug 2007 11:11:14 -0400
Author: hans.trompert
Date: 2007-08-08 11:11:13 -0400 (Wed, 08 Aug 2007)
New Revision: 2607
Modified:
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-rawFlows.xml
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-rawFlows.xml
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/schemas/FlowsaMA.rnc
Log:
Made parameters position independent.
Restricted some parameter values.
Removed value from showFieldTcpFlags.
Modified:
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-rawFlows.xml
===================================================================
---
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-rawFlows.xml
2007-08-08 13:21:02 UTC (rev 2606)
+++
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataRequest-rawFlows.xml
2007-08-08 15:11:13 UTC (rev 2607)
@@ -11,6 +11,7 @@
version 0.10, 24 July 2007, Hans Trompert, fixed some typos, added
subnamespace raw
version 0.11, 07 Aug 2007, Hans Trompert, now using RouterGroup (==
BaseNetwork) as a subject, cleanup
version 0.12, 08 Aug 2007, Hans Trompert, fixed eventType
+version 0.13, 08 Aug 2007, Hans Trompert, showFieldTcpFlags does not take an
argument
This request will return information about all flows whithin the specified
time range from the given router(s), the flows are optionally filtered on
@@ -63,7 +64,7 @@
<nmwg:parameter name="showFieldDstAS"/>
<nmwg:parameter name="showFieldInputIF"/>
<nmwg:parameter name="showFieldOutputIF"/>
- <nmwg:parameter name="showFieldTcpFlags">6</nmwg:parameter>
+ <nmwg:parameter name="showFieldTcpFlags"/>
<nmwg:parameter name="showFieldTos"/>
<nmwg:parameter name="showFieldPackets"/>
<nmwg:parameter name="showFieldBytes"/>
Modified:
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-rawFlows.xml
===================================================================
---
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-rawFlows.xml
2007-08-08 13:21:02 UTC (rev 2606)
+++
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/samples/SetupDataResponse-rawFlows.xml
2007-08-08 15:11:13 UTC (rev 2607)
@@ -10,6 +10,7 @@
version 0.10, 24 July 2007, Hans Trompert, fixed some typos, added
subnamespace raw
version 0.11, 07 Aug 2007, Hans Trompert, now using RouterGroup (==
BaseNetwork) as a subject, cleanup
version 0.12, 08 Aug 2007, Hans Trompert, fixed eventType
+version 0.13, 08 Aug 2007, Hans Trompert, showFieldTcpFlags does not take an
argument
This response will return information about all flows whithin the specified
time range from the given router(s), the flows are optionally filtered on
@@ -82,7 +83,7 @@
<nmwg:parameter name="showFieldDstAS"/>
<nmwg:parameter name="showFieldInputIF"/>
<nmwg:parameter name="showFieldOutputIF"/>
- <nmwg:parameter name="showFieldTcpFlags">6</nmwg:parameter>
+ <nmwg:parameter name="showFieldTcpFlags"/>
<nmwg:parameter name="showFieldTos"/>
<nmwg:parameter name="showFieldPackets"/>
<nmwg:parameter name="showFieldBytes"/>
Modified:
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/schemas/FlowsaMA.rnc
===================================================================
---
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/schemas/FlowsaMA.rnc
2007-08-08 13:21:02 UTC (rev 2606)
+++
branches/new-structure/trunk/surfnet_java-flowsa-ma/doc/schemas/FlowsaMA.rnc
2007-08-08 15:11:13 UTC (rev 2607)
@@ -3,7 +3,7 @@
# File: Flowsa.rnc - Specialized schema for the Flow Selection
# and Aggregation MA.
# Author: Hans Trompert, SURFnet
-# Version: 14
+# Version: 15
# Date: August 08, 2007
# Purpose: Describes specific elements to be used in the
# FlowsaMA messages.
@@ -123,19 +123,30 @@
TopStatistics =
element nmwg:parameter {
attribute name { "topStatistic" } &
- xsd:string
+ (
+ "record" | "srcip" | "dstip" | "ip" |
+ "addresses" | "srcport" | "dstport" |
+ "port" | "ports" | "srcas" | "dstas" |
+ "as" | "numbers" | "inif" | "outif" |
+ "if" | "interface" | "proto"
+ )
}
OrderBy =
element nmwg:parameter {
attribute name { "orderBy" } &
- xsd:string
+ (
+ "flows" | "packets" | "bytes" | "pps" |
+ "bps" | "bpp"
+ )
}
SplitProtocol =
element nmwg:parameter {
attribute name { "splitProtocol" } &
- xsd:string
+ (
+ "yes" | "no"
+ )
}
TopN =
@@ -160,9 +171,7 @@
element nmwg:parameter {
attribute name { "flowVersion" } &
(
- "netflow_v9" |
- "netflow_v5" |
- "sflow"
+ "netflow_v9" | "netflow_v5" | "sflow"
)
}
@@ -191,44 +200,42 @@
"showFieldOutputIF" |
"showFieldTos" |
"showFieldPackets" |
- "showFieldBytes"
+ "showFieldBytes" |
+ "showFieldTcpFlags"
}
}
-ShowFieldTcpFlags =
- element nmwg:parameter {
- attribute name { "showFieldTcpFlags" } &
- xsd:string
- }
-
FlowsaStatParameters =
element stat:parameters {
- Identifier,
- FlowVersion?,
- FlowSampleRate?
+ Identifier &
+ (
+ FlowVersion? |
+ FlowSampleRate?
+ )+
}
FlowsaTopParameters =
element top:parameters {
- Identifier,
- FlowVersion?,
- FlowSampleRate?,
- TopStatistics?,
- OrderBy?,
- SplitProtocol?,
- TopN?
+ Identifier &
+ (
+ FlowVersion? |
+ FlowSampleRate? |
+ TopStatistics? |
+ OrderBy? |
+ SplitProtocol? |
+ TopN?
+ )+
}
FlowsaRawParameters =
element raw:parameters {
- Identifier,
- FlowVersion?,
- FlowSampleRate?,
- AggregationRule?,
- FilterRule?,
+ Identifier &
(
- ShowFieldParameter |
- ShowFieldTcpFlags
+ FlowVersion? |
+ FlowSampleRate? |
+ AggregationRule? |
+ FilterRule? |
+ ShowFieldParameter?
)+
}
- perfsonar: r2607 - in branches/new-structure/trunk/surfnet_java-flowsa-ma/doc: samples schemas, svnlog, 08/08/2007
Archive powered by MHonArc 2.6.16.