[jboss-cvs] JBossAS SVN: r109500 - branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system.

[jboss-cvs-commits at lists.jboss.org]

Author: thauser at redhat.com
Date: 2010-11-26 17:02:47 -0500 (Fri, 26 Nov 2010)
New Revision: 109500

Modified:
   branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system/MIB2SystemGroupService.java
   branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system/MIB2SystemGroupServiceMBean.java
Log:
change properties "sysObjectId" and "sysUpTime" to variables found in the snmp4j stack rather than opennms

Modified: branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system/MIB2SystemGroupService.java
===================================================================
--- branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system/MIB2SystemGroupService.java	2010-11-26 20:50:50 UTC (rev 109499)
+++ branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system/MIB2SystemGroupService.java	2010-11-26 22:02:47 UTC (rev 109500)
@@ -27,8 +27,12 @@
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.system.server.ServerConfigLocator;
 import org.jboss.system.server.ServerInfoMBean;
-import org.opennms.protocols.snmp.SnmpObjectId;
-import org.opennms.protocols.snmp.SnmpTimeTicks;
+//import org.opennms.protocols.snmp.SnmpObjectId;
+//import org.opennms.protocols.snmp.SnmpTimeTicks;
+import org.snmp4j.smi.OID;
+// TODO: make a better representation of the time, similar to SnmpTimeTicks, 0m 0w 0d 0h 0s 00ms
+// maybe even extend timeticks and simply override it's toString method;
+import org.snmp4j.smi.TimeTicks;
 
 /**
  * An MBean service that defines the MIB-2 system group an agent
@@ -57,7 +61,7 @@
    // Private Data --------------------------------------------------
    
 	private String sysDescr;            // system.1
-	private SnmpObjectId sysObjectId;   // system.2
+	private OID sysObjectId;   // system.2
 	// private long sysUpTime;          // system.3
 	private String sysContact;          // system.4
 	private String sysName;             // system.5  usually fqdn
@@ -112,7 +116,7 @@
    /**
     * @jmx:managed-attribute
     */
-   public SnmpObjectId getSysObjectId()
+   public OID getSysObjectId()
    {
       return sysObjectId;
    }   
@@ -121,14 +125,14 @@
     * The system uptime in hundreth of a second (TimeTicks)
     * @jmx:managed-attribute
     */
-   public SnmpTimeTicks getSysUpTime()
+   public TimeTicks getSysUpTime()
    {
       if (snmpAgent !=null)
       {
          try
          {
             Long upTime = (Long)server.getAttribute(snmpAgent, "Uptime");
-            return new SnmpTimeTicks(upTime.longValue() / 10);
+            return new TimeTicks(upTime.longValue() / 10);
          }
          catch (Exception e)
          {
@@ -136,7 +140,7 @@
          }
       }
       // fallback
-      return new SnmpTimeTicks(System.currentTimeMillis() / 10);
+      return new TimeTicks(System.currentTimeMillis() / 10);
    }   
    
    /**
@@ -209,7 +213,7 @@
          this.sysName = serverConfig + "@" + hostAddress;
          log.debug("Setting sysName name to " + sysName);
       }
-      this.sysObjectId = new SnmpObjectId(JBOSS_PREFIX + PRODUCT + VERSION);   
+      this.sysObjectId = new OID(JBOSS_PREFIX + PRODUCT + VERSION);   
    }
    
 }

Modified: branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system/MIB2SystemGroupServiceMBean.java
===================================================================
--- branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system/MIB2SystemGroupServiceMBean.java	2010-11-26 20:50:50 UTC (rev 109499)
+++ branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/system/MIB2SystemGroupServiceMBean.java	2010-11-26 22:02:47 UTC (rev 109500)
@@ -25,8 +25,10 @@
 
 import org.jboss.mx.util.ObjectNameFactory;
 import org.jboss.system.ServiceMBean;
-import org.opennms.protocols.snmp.SnmpObjectId;
-import org.opennms.protocols.snmp.SnmpTimeTicks;
+//import org.opennms.protocols.snmp.SnmpObjectId;
+//import org.opennms.protocols.snmp.SnmpTimeTicks;
+import org.snmp4j.smi.OID;
+import org.snmp4j.smi.TimeTicks;
 
 /**
  * MIB2SystemGroupService MBean interface
@@ -51,10 +53,10 @@
    String getSysDescr();
 
    /** The oid of the system (system.2) -- not yet supported */
-   SnmpObjectId getSysObjectId();
+   OID getSysObjectId();
 
    /** The uptime of the system (system.3) */
-   SnmpTimeTicks getSysUpTime();
+   TimeTicks getSysUpTime();
    
    /** The system contact person (system.4) */   
    void setSysContact(String sysContact);