[Hyperic-hq-discuss] hq r14236 - in trunk: src/org/hyperic/hq/ui src/org/hyperic/hq/ui/action/admin/config web/WEB-INF/classes

[<pn...@hy...>]

Author: pnguyen
Date: 2010-01-26 23:09:16 -0800 (Tue, 26 Jan 2010)
New Revision: 14236
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14236

Modified:
   trunk/src/org/hyperic/hq/ui/AttrConstants.java
   trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java
   trunk/web/WEB-INF/classes/ApplicationResources.properties
Log:
[HPD-207] Display the HQ SNMP local engine ID in the UI; Improve error handling with missing Security Names for SNMPv3

Modified: trunk/src/org/hyperic/hq/ui/AttrConstants.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/AttrConstants.java	2010-01-26 17:49:34 UTC (rev 14235)
+++ trunk/src/org/hyperic/hq/ui/AttrConstants.java	2010-01-27 07:09:16 UTC (rev 14236)
@@ -943,4 +943,9 @@
      */
     public static final String XLIB_INSTALLED = "xlib";
     
+    /**
+     * Attribute name for the SNMP local engine ID
+     */
+    public static final String SNMP_LOCAL_ENGINE_ID = "snmpLocalEngineID";
+    
 }

Modified: trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java	2010-01-26 17:49:34 UTC (rev 14235)
+++ trunk/src/org/hyperic/hq/ui/action/admin/config/EditConfigPrepAction.java	2010-01-27 07:09:16 UTC (rev 14236)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of
  * "derived work".
  * 
- * Copyright (C) [2004-2009], Hyperic, Inc.
+ * Copyright (C) [2004-2010], Hyperic, Inc.
  * This file is part of HQ.
  * 
  * HQ is free software; you can redistribute it and/or modify
@@ -41,8 +41,11 @@
 import org.hyperic.hq.bizapp.server.session.UpdateStatusMode;
 import org.hyperic.hq.bizapp.shared.ConfigBoss;
 import org.hyperic.hq.bizapp.shared.UpdateBoss;
+import org.hyperic.hq.ui.Constants;
 import org.hyperic.hq.ui.util.ContextUtils;
 import org.hyperic.hq.ui.util.RequestUtils;
+import org.snmp4j.mp.MPv3;
+import org.snmp4j.smi.OctetString;
 
 public class EditConfigPrepAction extends TilesAction {
 
@@ -70,6 +73,10 @@
         UpdateStatusMode upMode = uboss.getUpdateMode();
         cForm.setUpdateMode(upMode.getCode());
         
+        // Set the HQ SNMP local engine id
+        String localEngineID = "0x" + new OctetString(MPv3.createLocalEngineID());
+        request.setAttribute(Constants.SNMP_LOCAL_ENGINE_ID, localEngineID);
+        
         return null;
     }
 }

Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-01-26 17:49:34 UTC (rev 14235)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-01-27 07:09:16 UTC (rev 14236)
@@ -657,6 +657,7 @@
 admin.settings.SNMPCommunity=Community:
 admin.settings.SNMPContextName=Context Name:
 admin.settings.SNMPSecurityName=Security Name:
+admin.settings.SNMPLocalEngineID=Local Engine ID:
 admin.settings.SNMPEngineID=Context Engine ID:
 admin.settings.SNMPTrapOID=SNMP Trap OID:
 admin.settings.SNMPEnterpriseOID=Enterprise OID: