Skip to Content.
Sympa Menu

perfsonar-dev - nmwg: r246 - in branches/snmp: . example_instances example_instances/discards example_instances/errors example_instances/snmp example_instances/utilization rnc

Subject: perfsonar development work

List archive

nmwg: r246 - in branches/snmp: . example_instances example_instances/discards example_instances/errors example_instances/snmp example_instances/utilization rnc


Chronological Thread 
  • From:
  • To: ,
  • Subject: nmwg: r246 - in branches/snmp: . example_instances example_instances/discards example_instances/errors example_instances/snmp example_instances/utilization rnc
  • Date: Fri, 27 Jul 2007 08:26:27 -0400
Author: zurawski
Date: 2007-07-27 08:26:26 -0400 (Fri, 27 Jul 2007)
New Revision: 246

Added:
branches/snmp/example_instances/discards/
branches/snmp/example_instances/discards/MDKRequest1.xml
branches/snmp/example_instances/discards/MDKRequest2.xml
branches/snmp/example_instances/discards/MDKResponse1.xml
branches/snmp/example_instances/discards/MDKResponse2.xml
branches/snmp/example_instances/discards/SDRequest1.xml
branches/snmp/example_instances/discards/SDRequest2.xml
branches/snmp/example_instances/discards/SDResponse1.xml
branches/snmp/example_instances/discards/SDResponse2.xml
branches/snmp/example_instances/discards/store.xml
branches/snmp/example_instances/errors/
branches/snmp/example_instances/errors/MDKRequest1.xml
branches/snmp/example_instances/errors/MDKRequest2.xml
branches/snmp/example_instances/errors/MDKResponse1.xml
branches/snmp/example_instances/errors/MDKResponse2.xml
branches/snmp/example_instances/errors/SDRequest1.xml
branches/snmp/example_instances/errors/SDRequest2.xml
branches/snmp/example_instances/errors/SDResponse1.xml
branches/snmp/example_instances/errors/SDResponse2.xml
branches/snmp/example_instances/errors/store.xml
branches/snmp/example_instances/snmp/
branches/snmp/example_instances/snmp/MDKRequest1.xml
branches/snmp/example_instances/snmp/MDKRequest2.xml
branches/snmp/example_instances/snmp/MDKResponse1.xml
branches/snmp/example_instances/snmp/MDKResponse2.xml
branches/snmp/example_instances/snmp/SDRequest1.xml
branches/snmp/example_instances/snmp/SDRequest2.xml
branches/snmp/example_instances/snmp/SDResponse1.xml
branches/snmp/example_instances/snmp/SDResponse2.xml
branches/snmp/example_instances/snmp/store.xml
branches/snmp/example_instances/utilization/
branches/snmp/example_instances/utilization/MDKRequest1.xml
branches/snmp/example_instances/utilization/MDKRequest2.xml
branches/snmp/example_instances/utilization/MDKResponse1.xml
branches/snmp/example_instances/utilization/MDKResponse2.xml
branches/snmp/example_instances/utilization/SDRequest1.xml
branches/snmp/example_instances/utilization/SDRequest2.xml
branches/snmp/example_instances/utilization/SDResponse1.xml
branches/snmp/example_instances/utilization/SDResponse2.xml
branches/snmp/example_instances/utilization/store.xml
branches/snmp/rnc/discards.rnc
branches/snmp/snmp-test.sh
Modified:
branches/snmp/rnc/errors.rnc
branches/snmp/rnc/snmp.rnc
branches/snmp/rnc/utilization.rnc
Log:
Work to integrate new characteristics for errors/discards/(utilization)
with the SNMP namespace.

--jason



Added: branches/snmp/example_instances/discards/MDKRequest1.xml

Added: branches/snmp/example_instances/discards/MDKRequest2.xml

Added: branches/snmp/example_instances/discards/MDKResponse1.xml

Added: branches/snmp/example_instances/discards/MDKResponse2.xml

Added: branches/snmp/example_instances/discards/SDRequest1.xml

Added: branches/snmp/example_instances/discards/SDRequest2.xml

Added: branches/snmp/example_instances/discards/SDResponse1.xml

Added: branches/snmp/example_instances/discards/SDResponse2.xml

Added: branches/snmp/example_instances/discards/store.xml

Added: branches/snmp/example_instances/errors/MDKRequest1.xml

Added: branches/snmp/example_instances/errors/MDKRequest2.xml

Added: branches/snmp/example_instances/errors/MDKResponse1.xml

Added: branches/snmp/example_instances/errors/MDKResponse2.xml

Added: branches/snmp/example_instances/errors/SDRequest1.xml

Added: branches/snmp/example_instances/errors/SDRequest2.xml

Added: branches/snmp/example_instances/errors/SDResponse1.xml

Added: branches/snmp/example_instances/errors/SDResponse2.xml

Added: branches/snmp/example_instances/errors/store.xml

Added: branches/snmp/example_instances/snmp/MDKRequest1.xml

Added: branches/snmp/example_instances/snmp/MDKRequest2.xml

Added: branches/snmp/example_instances/snmp/MDKResponse1.xml

Added: branches/snmp/example_instances/snmp/MDKResponse2.xml

Added: branches/snmp/example_instances/snmp/SDRequest1.xml

Added: branches/snmp/example_instances/snmp/SDRequest2.xml

Added: branches/snmp/example_instances/snmp/SDResponse1.xml

Added: branches/snmp/example_instances/snmp/SDResponse2.xml

Added: branches/snmp/example_instances/snmp/store.xml

Added: branches/snmp/example_instances/utilization/MDKRequest1.xml

Added: branches/snmp/example_instances/utilization/MDKRequest2.xml

Added: branches/snmp/example_instances/utilization/MDKResponse1.xml

Added: branches/snmp/example_instances/utilization/MDKResponse2.xml

Added: branches/snmp/example_instances/utilization/SDRequest1.xml

Added: branches/snmp/example_instances/utilization/SDRequest2.xml

Added: branches/snmp/example_instances/utilization/SDResponse1.xml

Added: branches/snmp/example_instances/utilization/SDResponse2.xml

Added: branches/snmp/example_instances/utilization/store.xml

Added: branches/snmp/rnc/discards.rnc

Modified: branches/snmp/rnc/errors.rnc
===================================================================
--- branches/snmp/rnc/errors.rnc 2007-07-27 12:15:52 UTC (rev 245)
+++ branches/snmp/rnc/errors.rnc 2007-07-27 12:26:26 UTC (rev 246)
@@ -1,8 +1,8 @@
# ##############################################################
#
# File: errors.rnc - Specialized schema for the
-# measure of interface errors
-# Version: $Id: errors.rnc 205 2007-02-05 17:33:00Z zurawski $
+# measure of interface errors
+# Version: $Id:$
# Purpose: Describes specific elements to be used in the
# representation and handling of interface
# errors
@@ -49,11 +49,9 @@
#
# <!-- TBD OPTIONAL PARAMETERS -->
#
-# <!-- TBD OPTIONAL EVENTTYPE -->
+# <!-- EVENTTYPE -->
#
# <!-- TBD OPTIONAL KEY -->
-#
-# <!-- ANY OPTIONAL (MULTIPLE) ELEMENT IN ANY NAMESPACE -->
#
# </nmwg:metadata>
#
@@ -78,7 +76,7 @@
ErrorsMetadataBlock |
FilterMetadataBlock
) &
- EventType? &
+ ErrorsEventType &
Key?


@@ -90,36 +88,10 @@
#
# <errors:subject id="REQUIRED_ID"
# metadataIdRef="OPTIONAL_REFERENCE_ID"
-# xmlns:nmwg="http://ggf.org/ns/nmwg/tools/errors/2.0/";>
+#
xmlns:nmwg="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";>
#
-# <nmwgtopo:interface
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";>
-#
-# <nmwgtopo:ipAddress type='REQUIRED_TYPE'> TEXT </nmwgtopo:ipAddress>
-#
-# <nmwgtopo:hostName> TEXT </nmwgtopo:hostName>
-#
-# <nmwgtopo:ifName> TEXT </nmwgtopo:ifName>
-#
-# <nmwgtopo:ifDescription> TEXT </nmwgtopo:ifDescription>
-#
-# <nmwgtopo:ifAddress type='REQUIRED_TYPE'> TEXT </nmwgtopo:ifAddress>
-#
-# <nmwgtopo:ifHostName> TEXT </nmwgtopo:ifHostName>
-#
-# <nmwgtopo:ifIndex> TEXT </nmwgtopo:ifIndex>
-#
-# <nmwgtopo:type> TEXT </nmwgtopo:type>
-#
-# <nmwgtopo:direction> TEXT </nmwgtopo:direction>
-#
-# <nmwgtopo:authRealm> TEXT </nmwgtopo:authRealm>
-#
-# <nmwgtopo:classOfService> TEXT </nmwgtopo:classOfService>
-#
-# <nmwgtopo:capacity> TEXT </nmwgtopo:capacity>
+# <!-- INTERFACE DESCRIPTION -->
#
-# </nmwgtopo:interface>
-#
# </errors:subject>
#
# ##############################################################
@@ -138,6 +110,19 @@


# ##############################################################
+#
+# EventType must be errors for this specific metadata.
+#
+# ##############################################################
+
+ErrorsEventType =
+ element nmwg:eventType {
+ "http://ggf.org/ns/nmwg/characteristic/errors/2.0"; |
+ xsd:string
+ }
+
+
+# ##############################################################
# This is simply the regular method of doing parameters with an
# enumeration to limit what 'names' are accepted and an outer
# errors: namespace for the parameters.
@@ -145,9 +130,9 @@
# Example:
#
# <errors:parameters id="REQUIRED_ID"
-# xmlns:nmwg="http://ggf.org/ns/nmwg/tools/errors/2.0/";>
+#
xmlns:nmwg="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";>
#
-# <nmwg:parameter name="REQUIRED_ENUM_NAME" value="OPTIONAL_VALUE"
+# <nmwg:parameter name="REQUIRED_NAME" value="OPTIONAL_VALUE"
# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
#
# <!-- ANY TEXT, (IF YOU DID NOT USE THE VALUE ATTRIBUTE) -->
@@ -170,8 +155,8 @@
element nmwg:parameter {
attribute name { "interval" | "valueUnits" } &
(
- attribute value { text } |
- text
+ attribute value { xsd:string } |
+ xsd:string
)
}

@@ -202,10 +187,6 @@
# <!-- OR -->
#
# <!-- OPTIONAL (MULTIPLE) KEY ELEMENTS -->
-#
-# <!-- OR -->
-#
-# <!-- ANY OPTIONAL (MULTIPLE) ELEMENT IN ANY NAMESPACE -->
#
# </nmwg:data>
#
@@ -293,7 +274,7 @@
# valueUnits="OPTIONAL_VALUE_UNITS"
# timeType="OPTIONAL_TIME_TYPE"
# timeValue="OPTIONAL_TIME_VALUE"
-# xmlns:nmwg="http://ggf.org/ns/nmwg/tools/errors/2.0/";>
+#
xmlns:nmwg="http://ggf.org/ns/nmwg/characteristic/errors/2.0/";>
#
# <!-- TIME ELEMENT (IF ATTRIBUTES NOT USED) -->
#
@@ -303,9 +284,22 @@

ErrorsDatum =
element errors:datum {
- attribute value { xsd:float } &
- attribute valueUnits { xsd:string }? &
(
+ (
+ attribute value { xsd:integer } &
+ attribute valueUnits { xsd:string }?
+ ) |
+ (
+ element nmwg:value {
+ attribute valueUnits {xsd:string }? &
+ (
+ xsd:integer |
+ attribute value { xsd:integer }
+ )
+ }
+ )
+ ) &
+ (
(
attribute timeType { xsd:string } &
attribute timeValue { xsd:string }

Modified: branches/snmp/rnc/snmp.rnc
===================================================================
--- branches/snmp/rnc/snmp.rnc 2007-07-27 12:15:52 UTC (rev 245)
+++ branches/snmp/rnc/snmp.rnc 2007-07-27 12:26:26 UTC (rev 246)
@@ -2,7 +2,7 @@
#
# File: snmp.rnc - Specialized schema for snmp
#
-# Version: $Id$
+# Version: $Id:$
# Purpose: Describes specific elements to be used in the
# representation and handling of snmp
# Reference: http://books.xmlschemata.org/relaxng/page2.html
@@ -14,11 +14,13 @@
# Namespace definitions
# ##############################################################
namespace nmwg = "http://ggf.org/ns/nmwg/base/2.0/";
-namespace snmp = "http://ggf.org/ns/nmwg/tools/snmp/2.0/";
namespace nmwgr = "http://ggf.org/ns/nmwg/result/2.0/";
namespace netutil = "http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";
namespace neterr = "http://ggf.org/ns/nmwg/characteristic/errors/2.0/";
+namespace netdisc = "http://ggf.org/ns/nmwg/characteristic/discards/2.0/";
+namespace snmp = "http://ggf.org/ns/nmwg/tools/snmp/2.0/";

+
# ##############################################################
# Include additional functionality from other files
# ##############################################################
@@ -48,13 +50,10 @@
}

SNMPMetadataBlock =
+ SNMPSubject? &
(
- SNMPSubject |
- UtilSubject |
- ErrSubject
- )? &
- (
SNMPParameters |
+ FilterParameters |
Parameters
)?

@@ -63,7 +62,7 @@
SNMPMetadataBlock |
FilterMetadataBlock
) &
- SNMPEventType? &
+ SNMPEventType+ &
Key?


@@ -78,17 +77,7 @@
element snmp:subject {
SNMPSubjectContent
}
-
-UtilSubject =
- element netutil:subject {
- SNMPSubjectContent
- }
-
-ErrSubject =
- element neterr:subject {
- SNMPSubjectContent
- }
-
+
SNMPSubjectContent =
Identifier &
MetadataIdentifierRef? &
@@ -114,8 +103,8 @@

SNMPParameter =
element nmwg:parameter {
- attribute name { "supportedEventType" | "SNMPVersion" |
- "SNMPCommunity" | "OID" | "Alias" } &
+ attribute name { "supportedEventType" | "version" |
+ "community" | "oid" | "alias" } &
(
attribute value { text } |
text
@@ -135,7 +124,9 @@
element nmwg:eventType {
"http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; |
"http://ggf.org/ns/nmwg/characteristic/errors/2.0"; |
- "http://ggf.org/ns/nmwg/tools/snmp/2.0";
+ "http://ggf.org/ns/nmwg/characteristic/discards/2.0"; |
+ "http://ggf.org/ns/nmwg/tools/snmp/2.0"; |
+ "http://ggf.org/ns/nmwg/ops/select/2.0";
}

# ##############################################################
@@ -163,7 +154,9 @@
SNMPKeyParameter =
element nmwg:parameter {
attribute name { "type" | "valueUnits" | "file" |
- "dataSource" | "table" } &
+ "dataSource" | "table" | "startTime" |
+ "endTime" | "resolution" |
+ "consolidationFunction" } &
(
attribute value { text } |
text
@@ -199,9 +192,22 @@

SNMPDatum =
element snmp:datum {
- attribute value { xsd:string } &
- attribute valueUnits { xsd:string }? &
(
+ (
+ attribute value { xsd:integer } &
+ attribute valueUnits { xsd:string }?
+ ) |
+ (
+ element nmwg:value {
+ attribute valueUnits {xsd:string }? &
+ (
+ xsd:integer |
+ attribute value { xsd:integer }
+ )
+ }
+ )
+ ) &
+ (
(
attribute timeType { xsd:string } &
attribute timeValue { xsd:string }

Modified: branches/snmp/rnc/utilization.rnc
===================================================================
--- branches/snmp/rnc/utilization.rnc 2007-07-27 12:15:52 UTC (rev 245)
+++ branches/snmp/rnc/utilization.rnc 2007-07-27 12:26:26 UTC (rev 246)
@@ -2,7 +2,7 @@
#
# File: utilization.rnc - Specialized schema for the
# measure of interface utilization
-# Version: $Id$
+# Version: $Id:$
# Purpose: Describes specific elements to be used in the
# representation and handling of interface
# utilization
@@ -49,11 +49,9 @@
#
# <!-- TBD OPTIONAL PARAMETERS -->
#
-# <!-- TBD OPTIONAL EVENTTYPE -->
+# <!-- EVENTTYPE -->
#
# <!-- TBD OPTIONAL KEY -->
-#
-# <!-- ANY OPTIONAL (MULTIPLE) ELEMENT IN ANY NAMESPACE -->
#
# </nmwg:metadata>
#
@@ -78,7 +76,7 @@
UtilizationMetadataBlock |
FilterMetadataBlock
) &
- EventType? &
+ UtilizationEventType &
Key?


@@ -90,36 +88,10 @@
#
# <utilization:subject id="REQUIRED_ID"
# metadataIdRef="OPTIONAL_REFERENCE_ID"
-# xmlns:nmwg="http://ggf.org/ns/nmwg/tools/utilization/2.0/";>
+#
xmlns:nmwg="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
#
-# <nmwgtopo:interface
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";>
-#
-# <nmwgtopo:ipAddress type='REQUIRED_TYPE'> TEXT </nmwgtopo:ipAddress>
-#
-# <nmwgtopo:hostName> TEXT </nmwgtopo:hostName>
-#
-# <nmwgtopo:ifName> TEXT </nmwgtopo:ifName>
-#
-# <nmwgtopo:ifDescription> TEXT </nmwgtopo:ifDescription>
-#
-# <nmwgtopo:ifAddress type='REQUIRED_TYPE'> TEXT </nmwgtopo:ifAddress>
-#
-# <nmwgtopo:ifHostName> TEXT </nmwgtopo:ifHostName>
-#
-# <nmwgtopo:ifIndex> TEXT </nmwgtopo:ifIndex>
-#
-# <nmwgtopo:type> TEXT </nmwgtopo:type>
-#
-# <nmwgtopo:direction> TEXT </nmwgtopo:direction>
-#
-# <nmwgtopo:authRealm> TEXT </nmwgtopo:authRealm>
-#
-# <nmwgtopo:classOfService> TEXT </nmwgtopo:classOfService>
-#
-# <nmwgtopo:capacity> TEXT </nmwgtopo:capacity>
+# <!-- INTERFACE DESCRIPTION -->
#
-# </nmwgtopo:interface>
-#
# </utilization:subject>
#
# ##############################################################
@@ -138,6 +110,19 @@


# ##############################################################
+#
+# EventType must be utilization for this specific metadata.
+#
+# ##############################################################
+
+UtilizationEventType =
+ element nmwg:eventType {
+ "http://ggf.org/ns/nmwg/characteristic/utilization/2.0"; |
+ xsd:string
+ }
+
+
+# ##############################################################
# This is simply the regular method of doing parameters with an
# enumeration to limit what 'names' are accepted and an outer
# utilization: namespace for the parameters.
@@ -145,9 +130,9 @@
# Example:
#
# <utilization:parameters id="REQUIRED_ID"
-#
xmlns:nmwg="http://ggf.org/ns/nmwg/tools/utilization/2.0/";>
+#
xmlns:nmwg="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
#
-# <nmwg:parameter name="REQUIRED_ENUM_NAME" value="OPTIONAL_VALUE"
+# <nmwg:parameter name="REQUIRED_NAME" value="OPTIONAL_VALUE"
# xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
#
# <!-- ANY TEXT, (IF YOU DID NOT USE THE VALUE ATTRIBUTE) -->
@@ -170,8 +155,8 @@
element nmwg:parameter {
attribute name { "interval" | "valueUnits" } &
(
- attribute value { text } |
- text
+ attribute value { xsd:string } |
+ xsd:string
)
}

@@ -202,10 +187,6 @@
# <!-- OR -->
#
# <!-- OPTIONAL (MULTIPLE) KEY ELEMENTS -->
-#
-# <!-- OR -->
-#
-# <!-- ANY OPTIONAL (MULTIPLE) ELEMENT IN ANY NAMESPACE -->
#
# </nmwg:data>
#
@@ -293,7 +274,7 @@
# valueUnits="OPTIONAL_VALUE_UNITS"
# timeType="OPTIONAL_TIME_TYPE"
# timeValue="OPTIONAL_TIME_VALUE"
-#
xmlns:nmwg="http://ggf.org/ns/nmwg/tools/utilization/2.0/";>
+#
xmlns:nmwg="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
#
# <!-- TIME ELEMENT (IF ATTRIBUTES NOT USED) -->
#
@@ -303,9 +284,22 @@

UtilizationDatum =
element utilization:datum {
- attribute value { xsd:float } &
- attribute valueUnits { xsd:string }? &
(
+ (
+ attribute value { xsd:integer } &
+ attribute valueUnits { xsd:string }?
+ ) |
+ (
+ element nmwg:value {
+ attribute valueUnits {xsd:string }? &
+ (
+ xsd:integer |
+ attribute value { xsd:integer }
+ )
+ }
+ )
+ ) &
+ (
(
attribute timeType { xsd:string } &
attribute timeValue { xsd:string }

Added: branches/snmp/snmp-test.sh


Property changes on: branches/snmp/snmp-test.sh
___________________________________________________________________
Name: svn:executable
+ *


  • nmwg: r246 - in branches/snmp: . example_instances example_instances/discards example_instances/errors example_instances/snmp example_instances/utilization rnc, svnlog, 07/27/2007

Archive powered by MHonArc 2.6.16.

Top of Page