perfsonar-dev - nmwg: r240 - in trunk/nmwg/schema: example_instances rnc
Subject: perfsonar development work
List archive
- From:
- To: ,
- Subject: nmwg: r240 - in trunk/nmwg/schema: example_instances rnc
- Date: Thu, 5 Jul 2007 13:28:57 -0400
Author: zurawski
Date: 2007-07-05 13:28:57 -0400 (Thu, 05 Jul 2007)
New Revision: 240
Added:
trunk/nmwg/schema/example_instances/errors.xml
trunk/nmwg/schema/rnc/errors.rnc
Modified:
trunk/nmwg/schema/example_instances/snmp.xml
trunk/nmwg/schema/rnc/snmp.rnc
Log:
Place holder schema/instance document for adding new characteristics
(errors in this case); this will require some thought on what we should
include in the actual definition. I have also added some integration
into the SNMP schema for this.
-jason
Added: trunk/nmwg/schema/example_instances/errors.xml
Modified: trunk/nmwg/schema/example_instances/snmp.xml
===================================================================
--- trunk/nmwg/schema/example_instances/snmp.xml 2007-07-03 12:46:41
UTC (rev 239)
+++ trunk/nmwg/schema/example_instances/snmp.xml 2007-07-05 17:28:57
UTC (rev 240)
@@ -2,11 +2,12 @@
<nmwg:message type="something"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/"
+ xmlns:neterr="http://ggf.org/ns/nmwg/characteristic/errors/2.0/"
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/"
xmlns:snmp="http://ggf.org/ns/nmwg/tools/snmp/2.0/">
<nmwg:metadata xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"
id="192.168.0.202-1">
- <netutil:subject
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/"
id="mead0">
+ <netutil:subject
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/"
id="mead1">
<nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/">
<nmwgt:ifAddress type="ipv4">192.168.0.202</nmwgt:ifAddress>
<nmwgt:hostName>mead</nmwgt:hostName>
@@ -38,7 +39,7 @@
</nmwg:data>
<nmwg:metadata xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"
id="192.168.0.202-2">
- <snmp:subject
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/"
id="mead0">
+ <snmp:subject
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/"
id="mead2">
<nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/">
<nmwgt:ifAddress type="ipv4">192.168.0.202</nmwgt:ifAddress>
<nmwgt:hostName>mead</nmwgt:hostName>
@@ -49,12 +50,12 @@
</nmwgt:interface>
</snmp:subject>
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
- <snmp:parameters xmlns:snmp="http://ggf.org/ns/nmwg/tools/snmp/2.0/"
id="3">
+ <snmp:parameters xmlns:snmp="http://ggf.org/ns/nmwg/tools/snmp/2.0/"
id="2">
<nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
<nmwg:parameter name="SNMPVersion" value="1"/>
<nmwg:parameter name="SNMPCommunity" value="public"/>
- <nmwg:parameter name="OID" value="1.3.6.1.2.1.2.2.1.10"/>
- <nmwg:parameter name="Alias" value="ifInOctets"/>
+ <nmwg:parameter name="OID" value="1.3.6.1.2.1.2.2.1.16" />
+ <nmwg:parameter name="Alias" value="ifOutOctets" />
</snmp:parameters>
</nmwg:metadata>
@@ -69,16 +70,90 @@
</nmwg:key>
</nmwg:data>
- <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/" id="data3"
metadataIdRef="192.168.0.202-1">
+ <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/" id="data1"
metadataIdRef="192.168.0.202-1">
<nmwg:datum timeType="unix" timeValue="1182266520" value="3434.043"
valueUnits="Bps"/>
<nmwg:datum timeType="unix" timeValue="1182266530" value="3423.656"
valueUnits="Bps"/>
<nmwg:datum timeType="unix" timeValue="1182266540" value="3243.454"
valueUnits="Bps"/>
</nmwg:data>
- <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/" id="data4"
metadataIdRef="192.168.0.202-2">
+ <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/" id="data2"
metadataIdRef="192.168.0.202-2">
<snmp:datum timeType="unix" timeValue="1182266520" value="3434.043"
valueUnits="Bps"/>
<snmp:datum timeType="unix" timeValue="1182266530" value="3423.656"
valueUnits="Bps"/>
<snmp:datum timeType="unix" timeValue="1182266540" value="3243.454"
valueUnits="Bps"/>
</nmwg:data>
+
+ <nmwg:metadata xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"
id="192.168.0.202-3">
+ <neterr:subject
xmlns:neterr="http://ggf.org/ns/nmwg/characteristic/errors/2.0/" id="mead3">
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/">
+ <nmwgt:ifAddress type="ipv4">192.168.0.202</nmwgt:ifAddress>
+ <nmwgt:hostName>mead</nmwgt:hostName>
+ <nmwgt:ifName>eth0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>in</nmwgt:direction>
+ </nmwgt:interface>
+ </neterr:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ <snmp:parameters xmlns:snmp="http://ggf.org/ns/nmwg/tools/snmp/2.0/"
id="1">
+ <nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+ <nmwg:parameter name="SNMPVersion" value="1"/>
+ <nmwg:parameter name="SNMPCommunity" value="public"/>
+ <nmwg:parameter name="OID" value="1.3.6.1.2.1.2.2.1.20" />
+ <nmwg:parameter name="Alias" value="ifOutErrors" />
+ </snmp:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/" id="data3"
metadataIdRef="192.168.0.202-3">
+ <nmwg:key id="1">
+ <nmwg:parameters id="2">
+ <nmwg:parameter name="type">rrd</nmwg:parameter>
+ <nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
+ <nmwg:parameter
name="file">/home/jason/perfSONAR-PS/MP/SNMP/mead.rrd</nmwg:parameter>
+ <nmwg:parameter name="dataSource">eth0-in</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+ <nmwg:metadata xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"
id="192.168.0.202-4">
+ <snmp:subject
xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/"
id="mead4">
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/">
+ <nmwgt:ifAddress type="ipv4">192.168.0.202</nmwgt:ifAddress>
+ <nmwgt:hostName>mead</nmwgt:hostName>
+ <nmwgt:ifName>eth0</nmwgt:ifName>
+ <nmwgt:ifIndex>2</nmwgt:ifIndex>
+ <nmwgt:direction>out</nmwgt:direction>
+ </nmwgt:interface>
+ </snmp:subject>
+
<nmwg:eventType>http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:eventType>
+ <snmp:parameters xmlns:snmp="http://ggf.org/ns/nmwg/tools/snmp/2.0/"
id="4">
+ <nmwg:parameter
name="supportedEventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
+ <nmwg:parameter name="SNMPVersion" value="1"/>
+ <nmwg:parameter name="SNMPCommunity" value="public"/>
+ <nmwg:parameter name="OID" value="1.3.6.1.2.1.2.2.1.20" />
+ <nmwg:parameter name="Alias" value="ifOutErrors" />
+ </snmp:parameters>
+ </nmwg:metadata>
+
+
+ <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/" id="data4"
metadataIdRef="192.168.0.202-4">
+ <nmwg:key id="2">
+ <nmwg:parameters id="4">
+ <nmwg:parameter name="type">sqlite</nmwg:parameter>
+ <nmwg:parameter
name="file">/home/jason/perfSONAR-PS/MP/SNMP/data.db</nmwg:parameter>
+ <nmwg:parameter name="table">data</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:data>
+
+ <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/" id="data3"
metadataIdRef="192.168.0.202-3">
+ <nmwg:datum timeType="unix" timeValue="1182266520" value="0" />
+ <nmwg:datum timeType="unix" timeValue="1182266530" value="0" />
+ <nmwg:datum timeType="unix" timeValue="1182266540" value="1" />
+ </nmwg:data>
+ <nmwg:data xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/" id="data4"
metadataIdRef="192.168.0.202-4">
+ <nmwg:datum timeType="unix" timeValue="1182266520" value="0" />
+ <nmwg:datum timeType="unix" timeValue="1182266530" value="0" />
+ <nmwg:datum timeType="unix" timeValue="1182266540" value="1" />
+ </nmwg:data>
+
</nmwg:message>
Added: trunk/nmwg/schema/rnc/errors.rnc
Modified: trunk/nmwg/schema/rnc/snmp.rnc
===================================================================
--- trunk/nmwg/schema/rnc/snmp.rnc 2007-07-03 12:46:41 UTC (rev 239)
+++ trunk/nmwg/schema/rnc/snmp.rnc 2007-07-05 17:28:57 UTC (rev 240)
@@ -17,6 +17,7 @@
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/"
# ##############################################################
# Include additional functionality from other files
@@ -49,7 +50,8 @@
SNMPMetadataBlock =
(
SNMPSubject |
- UtilSubject
+ UtilSubject |
+ ErrSubject
)? &
(
SNMPParameters |
@@ -82,6 +84,11 @@
SNMPSubjectContent
}
+ErrSubject =
+ element neterr:subject {
+ SNMPSubjectContent
+ }
+
SNMPSubjectContent =
Identifier &
MetadataIdentifierRef? &
@@ -127,6 +134,7 @@
SNMPEventType =
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"
}
- nmwg: r240 - in trunk/nmwg/schema: example_instances rnc, svnlog, 07/05/2007
Archive powered by MHonArc 2.6.16.