From fc5acf0010e1e9783f25908a1267d1243afdfd8f Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sun, 18 Jul 2010 01:09:52 +0000
Subject: [PATCH] better allied telesis version/model parsing

git-svn-id: http://www.observium.org/svn/observer/trunk@1398 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/polling/device-allied.inc.php | 38 ++++++++++++++++++++++++--
 mibs/alliedtelesis/.index              |  2 ++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/includes/polling/device-allied.inc.php b/includes/polling/device-allied.inc.php
index cf22f42a95..ac623d5736 100644
--- a/includes/polling/device-allied.inc.php
+++ b/includes/polling/device-allied.inc.php
@@ -2,9 +2,15 @@
 
 echo("Doing Allied Telesyn AlliedWare ");
 
+### Allied Telesis have somewhat messy MIBs. It's often hard to work out what is where. :)
+
+
 $hardware = snmp_get($device, "atiswitchProductType.0", "-OsvQU", "+AtiSwitch-MIB", "+".$config['mib_dir']."/alliedtelesis");
-$version = snmp_get($device, "atiswitchSwVersion.0", "-OsvQU", "+AtiSwitch-MIB", "+".$config['mib_dir']."/alliedtelesis");
-$features = snmp_get($device, "atiswitchSw.0", "-OsvQU", "+AtiSwitch-MIB", "+".$config['mib_dir']."/alliedtelesis");
+$version  = snmp_get($device, "atiswitchSwVersion.0", "-OsvQU", "+AtiSwitch-MIB", "+".$config['mib_dir']."/alliedtelesis");
+$software = snmp_get($device, "atiswitchSw.0", "-OsvQU", "+AtiSwitch-MIB", "+".$config['mib_dir']."/alliedtelesis");
+
+if($software && $version)
+  $version = $software . " " . $version;
 
 # sysDescr.0 = STRING: "Allied Telesis AT-8624T/2M version 2.9.1-13 11-Dec-2007"
 # sysDescr.0 = STRING: "Allied Telesyn Ethernet Switch AT-8012M"
@@ -12,6 +18,34 @@ $features = snmp_get($device, "atiswitchSw.0", "-OsvQU", "+AtiSwitch-MIB", "+".$
 # sysDescr.0 = STRING: "Allied Telesyn AT-8624T/2M version 2.8.1-02 05-Sep-2006"
 # sysDescr.0 = STRING: "AT-8126XL, AT-S21 version 1.4.2"
 
+# AtiL2-MIB::atiL2SwProduct.0 = STRING: "AT-8326GB"
+# AtiL2-MIB::atiL2SwVersion.0 = STRING: "AT-S41 v1.1.6 "
+
+if(!$hardware && !$version && !$features) {
+  $hardware = snmp_get($device, "atiL2SwProduct.0", "-OsvQU", "+AtiL2-MIB", "+".$config['mib_dir']."/alliedtelesis");
+  $version = snmp_get($device, "atiL2SwVersion.0", "-OsvQU", "+AtiL2-MIB", "+".$config['mib_dir']."/alliedtelesis");
+}
+
+#Allied Telesyn AT-8948 version 2.7.4-02 22-Aug-2005
+
+list($a,$b,$c,$d,$e,$f) = explode(" ", $sysDescr);
+if(!$hardware && !$version && !$features) {
+  if($a == "Allied" && $d == "version") {
+    $version = $e;
+    $features = $f;
+    $hardware = $c;
+  }
+}
+
+if ($a == "Allied" && $d == "Switch") {
+  $hardware = $e;
+}
+
+
+
+$version = str_replace("\"","", $version);
+$features = str_replace("\"","", $features);
+$hardware = str_replace("\"","", $hardware);
 
 include("hr-mib.inc.php");
 
diff --git a/mibs/alliedtelesis/.index b/mibs/alliedtelesis/.index
index 9aff84fe83..a49e512e14 100644
--- a/mibs/alliedtelesis/.index
+++ b/mibs/alliedtelesis/.index
@@ -24,10 +24,12 @@ SWITCH-CHASSIS-MIB swchasis.mib
 AT-TRIGGER-MIB at-trigger.mib
 AT-FIREWALL-MIB at-firewall.mib
 AT-SETUP-MIB at-setup.mib
+AtiL2-MIB atiL2.mib
 AT-XEM-MIB at-xem.mib
 AT-LOADER-MIB at-loader.mib
 AT-SWITCH-MIB at-switch.mib
 AT-PING-MIB at-ping.mib
+ATI-8324SX-MIB 8324sx.mib
 AT-INSTALL-MIB at-install.mib
 AT-LB-MIB at-lb.mib
 AT-DS3-MIB at-ds3.mib