[jboss-cvs] JBossAS SVN: r111706 - in branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator: metrics and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 5 15:46:09 EDT 2011
Author: thauser at redhat.com
Date: 2011-07-05 15:46:08 -0400 (Tue, 05 Jul 2011)
New Revision: 111706
Modified:
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/Generator.java
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/ParserNotificationBindings.java
branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/metrics/VarBind.java
Log:
changes to allow the u:* tags in notifications; changes to use the vb object directly in the creation of an MIBObject associated with a notification
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/Generator.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/Generator.java 2011-07-05 17:50:15 UTC (rev 111705)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/Generator.java 2011-07-05 19:46:08 UTC (rev 111706)
@@ -151,7 +151,7 @@
writeMibImports(out);
writeMibObjectDefinitions(out);
writeEntries(out);
- out.println("END");
+ out.print("END");
out.close();
}
catch (Exception e){e.printStackTrace();}
@@ -282,13 +282,14 @@
private String fullOid;
private boolean rowEntry; //internally used to avoid adding an OIDDef for a member of an entry
- MIBObject(String name, String fullOid, String oidDefName){
+ MIBObject(String name, VarBind vb){
super();
this.name = name;
- this.syntax = "DisplayString";
- this.maxAccess = "read-only";
+ this.syntax = (vb.getType()!=null) ? vb.getType() : "DisplayString";
+ this.maxAccess = "not-accessible";
this.status = "current";
- this.description = "";
+ this.description = (vb.getDesc()!=null) ? vb.getDesc() : "";
+ this.fullOid = vb.getOid();
String[] temp = fullOid.split("\\.");
this.objectId = temp[temp.length-1];
String oidPrefix="";
@@ -299,7 +300,7 @@
oidPrefix+=temp[i]+".";
}
this.fullOid = fullOid;
- setOidDef(oidPrefix, oidDefName);
+ setOidDef(oidPrefix, null);
}
MIBObject(MappedAttribute ma){
@@ -313,10 +314,7 @@
this.rowEntry = rowEntry; // default value with this constructor.
//if the ma has an snmpType defined, we use that as the type. Otherwise we cannot know it, use
//the general OCTET STRING type.
- if (ma.getSnmpType()!= null)
- this.syntax = ma.getSnmpType();
- else
- this.syntax = "OCTET STRING (SIZE(0..255))";
+ this.syntax = (ma.getSnmpType()!=null) ? ma.getSnmpType() : "OCTET STRING (SIZE(0..255))";
//there are more values possible here for an MIB, but not for a JMX attr; we only
//need to worry about these possibilities
@@ -431,7 +429,7 @@
while(vbIt.hasNext()){
VarBind vb = (VarBind)vbIt.next();
oids.add(vb.getOid());
- if (vb.getTag().matches("^n:.*")){
+ if (vb.getTag().matches("^n:.*") || vb.getTag().matches("^u:.*")){
createNotifPayloadMibo(vb);
}
}
@@ -460,11 +458,8 @@
String[] tag = vb.getTag().split(":");
//hacky. maybe a cleaner way to do this later?
String name = "jbossJmxNotification"+tag[tag.length-1].substring(0,1).toUpperCase()+tag[tag.length-1].substring(1);
-
-
- MIBObject newMibo = new MIBObject(name,vb.getOid(), null); //null third param for now.
// maybe better way to glean it
- miboList.add(newMibo);
+ miboList.add(new MIBObject(name,vb));
}
public ArrayList<String> getObjects(){
@@ -481,7 +476,7 @@
buf.append("\t\t"+this.objects.get(index)).append(",\n");
}
- buf.append(" }\n");
+ buf.append("\n}\n");
return buf.toString();
}
@@ -686,7 +681,7 @@
this.maxAccess = "not-accessible";
this.status = "current"; // doesn't make sense to define a table that is not current
this.description = "";
- this.indexName = "ObjectName";
+ this.indexName = this.tablePrefix+"ObjectName";
setRowObjects(attrList);
}
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/ParserNotificationBindings.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/ParserNotificationBindings.java 2011-07-05 17:50:15 UTC (rev 111705)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/ParserNotificationBindings.java 2011-07-05 19:46:08 UTC (rev 111706)
@@ -65,6 +65,7 @@
String securityName = attrs.getValue("security-name");
String name = attrs.getValue("name");
String oidDef = attrs.getValue("definition-name");
+ String desc = attrs.getValue("description");
m.setName(name);
m.setOidDef(oidDef);
m.setNotificationType(notificationType);
@@ -73,6 +74,7 @@
m.setEnterprise(enterprise);
m.setInform(Boolean.parseBoolean(inform));
m.setSecurityName(securityName);
+ m.setDesc(desc);
child = m;
} else if ("var-bind-list".equals(localName)) {
Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/metrics/VarBind.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/metrics/VarBind.java 2011-07-05 17:50:15 UTC (rev 111705)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/metrics/VarBind.java 2011-07-05 19:46:08 UTC (rev 111706)
@@ -36,6 +36,7 @@
private String tag;
private String oid;
private String type;
+ private String description;
// Constructors -------------------------------------------------
@@ -77,7 +78,14 @@
public String getType() {
return type;
}
+
+ public String getDesc(){
+ return this.description;
+ }
+ public void setDesc(String desc){
+ this.description = desc;
+ }
// Object overrides ----------------------------------------------
public String toString() {
More information about the jboss-cvs-commits
mailing list