Merge pull request #1 from gtalton/master

Fix to AIX zenpack to correct SWInstalledMap not loading and Software link not rendering
zenoss · Dec 4, 2011 · c921d43 · c921d43
2 parents 8a9aa3a + a147ebf
commit c921d43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ZenPacks/community/AIX/AIXBase.py b/ZenPacks/community/AIX/AIXBase.py
@@ -41,6 +41,11 @@ def __init__(self, id, buildRelations=True):
                 , 'action'        : 'aixdeviceOsDetail'
                 , 'permissions'   : (ZEN_VIEW, )
                 },
+                { 'id'            : 'swdetail'
+                , 'name'          : 'Software'
+                , 'action'        : 'deviceSoftwareDetail'
+                , 'permissions'   : (ZEN_VIEW, )
+                },
                 { 'id'            : 'hwdetail'
                 , 'name'          : 'Hardware'
                 , 'action'        : 'aixdeviceHardwareDetail'

diff --git a/ZenPacks/community/AIX/modeler/plugins/community/snmp/AIXSWInstalledMap.py b/ZenPacks/community/AIX/modeler/plugins/community/snmp/AIXSWInstalledMap.py
@@ -11,7 +11,7 @@
 #
 ###########################################################################
 
-from Products.DataCollector.CollectorPlugin import SnmpPlugin, GetTableMap
+from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap
 from Products.DataCollector.plugins.DataMaps import MultiArgs
 
 class AIXSWInstalledMap(SnmpPlugin):