add new IronWare (Brocade/Foundry) OS type. rename temp/fan/voltage_host to device_id

git-svn-id: http://www.observium.org/svn/observer/trunk@830 61d68cd4-352d-0410-923a-c4978735b2b8

database-update.sql

@@ -73,6 +73,7 @@ ALTER TABLE `devices` MODIFY `type` varchar(8) DEFAULT 'unknown';
 ALTER TABLE `devices` CHANGE `os` `os` VARCHAR( 32 ) NULL DEFAULT NULL;
 ALTER TABLE `temperature` ADD `temp_precision` INT(11) NULL DEFAULT '1';
 UPDATE temperature SET temp_precision=10 WHERE temp_tenths=1;
+ALTER TABLE `temperature` ADD  `temp_index` INT NOT NULL AFTER  `temp_host` , ADD  `temp_mibtype` VARCHAR( 32 ) NOT NULL AFTER  `temp_index`
 ALTER TABLE `temperature` DROP `temp_tenths`;
 CREATE TABLE IF NOT EXISTS `dbSchema` ( `revision` int(11) NOT NULL default '0', PRIMARY KEY (`revision`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 ALTER TABLE `storage` ADD `storage_perc_warn` INT(11) NULL DEFAULT '60';
@@ -82,3 +83,7 @@ ALTER TABLE `voltage` ADD `volt_limit_low` int(11) NULL DEFAULT NULL AFTER `volt
 ALTER TABLE `voltage` CHANGE `volt_current` `volt_current` FLOAT(3) NULL DEFAULT NULL;
 ALTER TABLE `voltage` CHANGE `volt_limit` `volt_limit` FLOAT(3) NULL DEFAULT NULL;
 ALTER TABLE `voltage` CHANGE `volt_limit_low` `volt_limit_low` FLOAT(3) NULL DEFAULT NULL;
+ALTER TABLE  `fanspeed` ADD  `fan_index` INT NOT NULL AFTER  `fan_host` , ADD  `fan_mibtype` VARCHAR( 32 ) NOT NULL AFTER  `fan_index`
+ALTER TABLE  `temperature` CHANGE  `temp_host`  `device_id` INT( 11 ) NOT NULL DEFAULT  '0'
+ALTER TABLE  `fanspeed` CHANGE  `fan_host`  `device_id` INT( 11 ) NOT NULL DEFAULT  '0'
+ALTER TABLE  `voltage` CHANGE  `volt_host`  `device_id` INT( 11 ) NOT NULL DEFAULT  '0'

discovery.php

@@ -84,7 +84,7 @@ foreach ($devices as $device)
   echo("\n");
 
   ## Discover OS Changes
-#  include("includes/discovery/os.inc.php");
+  #include("includes/discovery/os.inc.php");
 
   ## Discover Interfaces 
   include("includes/discovery/interfaces.php");

html/includes/dev-overview-data.inc.php

@@ -2,7 +2,9 @@
 
   echo("<div style='font-family: courier, serif; margin: 10px';><strong>" . $device['sysDescr'] . "</strong></div>");
 
-  $uptime = @mysql_result(mysql_query("SELECT `attrib_value` FROM `devices_attribs` WHERE `device_id` = '" . $device['device_id'] . "' AND `attrib_type` = 'uptime'"), 0);
+#  $uptime = @mysql_result(mysql_query("SELECT `attrib_value` FROM `devices_attribs` WHERE `device_id` = '" . $device['device_id'] . "' AND `attrib_type` = 'uptime'"), 0);
+  $uptime = $device['uptime'];
+
 
   if(is_file("images/devices/" . $device['hardware'] . ".gif")) {
     $dev_img = "<div style='float: left;'><img src='images/devices/" . $device['hardware'] . ".gif' align=absmiddle></img></div>";

html/includes/graphs/device_temperatures.inc.php

@@ -5,7 +5,7 @@ include("common.inc.php");
 $rrd_options .= " -l 0 -E ";
 
 $iter = "1";
-$sql = mysql_query("SELECT * FROM temperature where temp_host = '$device_id'");
+$sql = mysql_query("SELECT * FROM temperature where device_id = '$device_id'");
 $rrd_options .= " COMMENT:'                           Cur   Min   Max\\n'";
 while($temperature = mysql_fetch_array($sql)) 
 {

html/includes/graphs/fanspeed.inc.php

@@ -8,7 +8,7 @@ include("common.inc.php");
 
   $fanspeed = mysql_fetch_array(mysql_query("SELECT * FROM fanspeed where fan_id = '".mres($_GET['id'])."'"));
 
-  $hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $fanspeed['fan_host'] . "'"),0);
+  $hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $fanspeed['device_id'] . "'"),0);
 
   $fanspeed['fan_descr_fixed'] = substr(str_pad($fanspeed['fan_descr'], 28),0,28);
 

html/includes/graphs/temperature.inc.php

@@ -9,7 +9,7 @@ include("common.inc.php");
   $sql = mysql_query("SELECT * FROM temperature where temp_id = '$temp'");
   $temperature = mysql_fetch_array(mysql_query("SELECT * FROM temperature where temp_id = '".mres($_GET['id'])."'"));
 
-  $hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $temperature['temp_host'] . "'"),0);
+  $hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $temperature['device_id'] . "'"),0);
 
   $temperature['temp_descr_fixed'] = substr(str_pad($temperature['temp_descr'], 28),0,28);
 

html/includes/graphs/voltage.inc.php

@@ -8,7 +8,7 @@ include("common.inc.php");
 
   $voltage = mysql_fetch_array(mysql_query("SELECT * FROM voltage where volt_id = '".mres($_GET['id'])."'"));
 
-  $hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $voltage['volt_host'] . "'"),0);
+  $hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $voltage['device_id'] . "'"),0);
 
   $voltage['volt_descr_fixed'] = substr(str_pad($voltage['volt_descr'], 28),0,28);
 

html/includes/print-interface.inc.php

@@ -24,7 +24,7 @@
   } else { $mac = ""; }
 
   echo("<tr style=\"background-color: $row_colour; padding: 5px;\" valign=top onmouseover=\"this.style.backgroundColor='$list_highlight';\" onmouseout=\"this.style.backgroundColor='$row_colour';\" onclick=\"location.href='/device/".$device['device_id']."/interface/".$interface['interface_id']."/'\" style='cursor: hand;'>
-           <td valign=top width=300>");
+           <td valign=top width=350>");
 
   echo("        <span class=list-large>
                 " . generateiflink($interface, $interface['ifIndex'] . ". ".$interface['label']) . " $error_img $mac
@@ -66,10 +66,10 @@
     $interface['out_rate'] = $interface['ifOutOctets_rate'] * 8;
     $in_perc = @round($interface['in_rate']/$interface['ifSpeed']*100);
     $out_perc = @round($interface['in_rate']/$interface['ifSpeed']*100);
-    echo("<img src='images/16/arrow_left.png' align=absmiddle> <span style='color: " . percent_colour($in_perc) . "'>" . 
+    echo("<img src='images/16/arrow_left.png' align=absmiddle> <span style='color: " . percent_colour($in_perc) . "'>".formatRates($interface['in_rate'])."<br />
-      formatRates($interface['in_rate']) . "<br />".format_bi($interface['ifInUcastPkts_rate'])."pps</span><br />");
+          <img align=absmiddle src='images/16/arrow_out.png'> <span style='color: " . percent_colour($out_perc) . "'>".formatRates($interface['out_rate']) . "<br />
-    echo("<img align=absmiddle src='images/16/arrow_out.png'> <span style='color: " . percent_colour($out_perc) . "'>" . 
+          <img src='images/icons/arrow_pps_in.png' align=absmiddle> ".format_bi($interface['ifInUcastPkts_rate'])."pps</span><br />
-      formatRates($interface['out_rate']) . "<br />".format_bi($interface['ifOutUcastPkts_rate'])."pps</span>");  
+          <img src='images/icons/arrow_pps_out.png' align=absmiddle> ".format_bi($interface['ifOutUcastPkts_rate'])."pps</span>");  
   }
 
   echo("</td><td width=75>");

html/pages/device.php

@@ -40,7 +40,7 @@ echo('<li class="' . $select['graphs'] . '">
 </li>');
 
 $health =  mysql_result(mysql_query("select count(*) from storage WHERE host_id = '" . $device['device_id'] . "'"), 0) +
-           mysql_result(mysql_query("select count(temp_id) from temperature WHERE temp_host = '" . $device['device_id'] . "'"), 0) +
+           mysql_result(mysql_query("select count(temp_id) from temperature WHERE device_id = '" . $device['device_id'] . "'"), 0) +
            mysql_result(mysql_query("select count(*) from cempMemPool WHERE device_id = '" . $device['device_id'] . "'"), 0) +
            mysql_result(mysql_query("select count(*) from cpmCPU WHERE device_id = '" . $device['device_id'] . "'"), 0);
 

html/pages/device/graphs/temperatures.inc.php

@@ -1,5 +1,5 @@
 <?php
-if(mysql_result(mysql_query("SELECT count(*) FROM temperature WHERE temp_host = '" . $device['device_id'] . "'"),0)) {
+if(mysql_result(mysql_query("SELECT count(*) FROM temperature WHERE device_id = '" . $device['device_id'] . "'"),0)) {
   $graph_title = "Temperatures";
   $graph_type = "device_temperatures";             include ("includes/print-device-graph.php");
   echo("<br />");

html/pages/device/health.inc.php

@@ -1,13 +1,13 @@
 <?php
 
-$temp = mysql_result(mysql_query("select count(*) from temperature WHERE temp_host = '" . $device['device_id'] . "'"), 0);
+$temp = mysql_result(mysql_query("select count(*) from temperature WHERE device_id = '" . $device['device_id'] . "'"), 0);
 $storage = mysql_result(mysql_query("select count(*) from storage WHERE host_id = '" . $device['device_id'] . "'"), 0);
 $cemp = mysql_result(mysql_query("select count(*) from cempMemPool WHERE device_id = '" . $device['device_id'] . "'"), 0);
 $cmp = mysql_result(mysql_query("select count(*) from cmpMemPool WHERE device_id = '" . $device['device_id'] . "'"), 0);
 $cpm  = mysql_result(mysql_query("select count(*) from cpmCPU WHERE device_id = '" . $device['device_id'] . "'"), 0);
 $hrprocessor  = mysql_result(mysql_query("select count(*) from hrDevice WHERE device_id = '" . $device['device_id'] . "' AND `hrDeviceType` = 'hrDeviceProcessor'"), 0);
-$fans = mysql_result(mysql_query("select count(*) from fanspeed WHERE fan_host = '" . $device['device_id'] . "'"), 0);
+$fans = mysql_result(mysql_query("select count(*) from fanspeed WHERE device_id = '" . $device['device_id'] . "'"), 0);
-$volts = mysql_result(mysql_query("select count(*) from voltage WHERE volt_host = '" . $device['device_id'] . "'"), 0);
+$volts = mysql_result(mysql_query("select count(*) from voltage WHERE device_id = '" . $device['device_id'] . "'"), 0);
 
 
 if ($temp) { $datas[] = 'temp'; }

html/pages/device/health/fanspeeds.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$sql = "SELECT * FROM `fanspeed` WHERE fan_host = '" . $_GET[id] . "' ORDER BY fan_descr";
+$sql = "SELECT * FROM `fanspeed` WHERE device_id = '" . $_GET[id] . "' ORDER BY fan_descr";
 $query = mysql_query($sql);
 
 echo("<table cellspacing=0 cellpadding=5 width=100%>");

html/pages/device/health/temp.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$sql = "SELECT * FROM `temperature` WHERE temp_host = '" . $_GET[id] . "' ORDER BY temp_descr";
+$sql = "SELECT * FROM `temperature` WHERE device_id = '" . $_GET[id] . "' ORDER BY temp_descr";
 $query = mysql_query($sql);
 
 echo("<table cellspacing=0 cellpadding=5 width=100%>");

html/pages/device/health/voltages.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$sql = "SELECT * FROM `voltage` WHERE volt_host = '" . $_GET[id] . "' ORDER BY volt_descr";
+$sql = "SELECT * FROM `voltage` WHERE device_id = '" . $_GET[id] . "' ORDER BY volt_descr";
 $query = mysql_query($sql);
 
 echo("<table cellspacing=0 cellpadding=5 width=100%>");

html/pages/device/overview/fanspeeds.inc.php

@@ -1,13 +1,13 @@
 <?php
 
 unset($fan_seperator);
-if(mysql_result(mysql_query("SELECT count(fan_id) from fanspeed WHERE fan_host = '" . $device['device_id'] . "'"),0)) {
+if(mysql_result(mysql_query("SELECT count(fan_id) from fanspeed WHERE device_id = '" . $device['device_id'] . "'"),0)) {
-  $total = mysql_result(mysql_query("SELECT count(fan_id) from fanspeed WHERE fan_host = '" . $device['device_id'] . "'"),0);
+  $total = mysql_result(mysql_query("SELECT count(fan_id) from fanspeed WHERE device_id = '" . $device['device_id'] . "'"),0);
   $rows = round($total / 2,0);
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p class=sectionhead>Fanspeeds</p>");
   $i = '1';
-  $fans = mysql_query("SELECT * FROM fanspeed WHERE fan_host = '" . $device['device_id'] . "'");
+  $fans = mysql_query("SELECT * FROM fanspeed WHERE device_id = '" . $device['device_id'] . "'");
   echo("<table width=100% valign=top>");
   echo("<tr><td width=50%>");
   echo("<table width=100% cellspacing=0 cellpadding=2>");

html/pages/device/overview/temperatures.inc.php

@@ -1,13 +1,13 @@
 <?php
 
 unset($temp_seperator);
-if(mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE temp_host = '" . $device['device_id'] . "'"),0)) {
+if(mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE device_id = '" . $device['device_id'] . "'"),0)) {
-  $total = mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE temp_host = '" . $device['device_id'] . "'"),0);
+  $total = mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE device_id = '" . $device['device_id'] . "'"),0);
   $rows = round($total / 2,0);
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p class=sectionhead>Temperatures</p>");
   $i = '1';
-  $temps = mysql_query("SELECT * FROM temperature WHERE temp_host = '" . $device['device_id'] . "'");
+  $temps = mysql_query("SELECT * FROM temperature WHERE device_id = '" . $device['device_id'] . "'");
   echo("<table width=100% valign=top>");
   echo("<tr><td width=50%>");
   echo("<table width=100% cellspacing=0 cellpadding=2>");

html/pages/device/overview/voltages.inc.php

@@ -1,13 +1,13 @@
 <?php
 
 unset($volt_seperator);
-if(mysql_result(mysql_query("SELECT count(volt_id) from voltage WHERE volt_host = '" . $device['device_id'] . "'"),0)) {
+if(mysql_result(mysql_query("SELECT count(volt_id) from voltage WHERE device_id = '" . $device['device_id'] . "'"),0)) {
-  $total = mysql_result(mysql_query("SELECT count(volt_id) from voltage WHERE volt_host = '" . $device['device_id'] . "'"),0);
+  $total = mysql_result(mysql_query("SELECT count(volt_id) from voltage WHERE device_id = '" . $device['device_id'] . "'"),0);
   $rows = round($total / 2,0);
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p class=sectionhead>Voltages</p>");
   $i = '1';
-  $volts = mysql_query("SELECT * FROM voltage WHERE volt_host = '" . $device['device_id'] . "'");
+  $volts = mysql_query("SELECT * FROM voltage WHERE device_id = '" . $device['device_id'] . "'");
   echo("<table width=100% valign=top>");
   echo("<tr><td width=50%>");
   echo("<table width=100% cellspacing=0 cellpadding=2>");

html/pages/sensors/fanspeeds.php

@@ -1,9 +1,9 @@
 <?php
 
 if($_SESSION['userlevel'] >= '5') {
-  $sql = "SELECT * FROM `fanspeed` AS F, `devices` AS D WHERE F.fan_host = D.device_id ORDER BY D.hostname, F.fan_descr";
+  $sql = "SELECT * FROM `fanspeed` AS F, `devices` AS D WHERE F.device_id = D.device_id ORDER BY D.hostname, F.fan_descr";
 } else {
-  $sql = "SELECT * FROM `fanspeed` AS F, `devices` AS D, devices_perms as P WHERE F.fan_host = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, F.fan_descr";
+  $sql = "SELECT * FROM `fanspeed` AS F, `devices` AS D, devices_perms as P WHERE F.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, F.fan_descr";
 }
 
 $query = mysql_query($sql);

html/pages/sensors/temperatures.php

@@ -1,9 +1,9 @@
 <?php
 
 if($_SESSION['userlevel'] >= '5') {
-  $sql = "SELECT * FROM `temperature` AS T, `devices` AS D WHERE T.temp_host = D.device_id ORDER BY D.hostname, T.temp_descr";
+  $sql = "SELECT * FROM `temperature` AS T, `devices` AS D WHERE T.device_id = D.device_id ORDER BY D.hostname, T.temp_descr";
 } else {
-  $sql = "SELECT * FROM `temperature` AS T, `devices` AS D, devices_perms as P WHERE T.temp_host = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, T.temp_descr";
+  $sql = "SELECT * FROM `temperature` AS T, `devices` AS D, devices_perms as P WHERE T.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, T.temp_descr";
 }
 
 $query = mysql_query($sql);

html/pages/sensors/voltages.php

@@ -1,9 +1,9 @@
 <?php
 
 if($_SESSION['userlevel'] >= '5') {
-  $sql = "SELECT * FROM `voltage` AS V, `devices` AS D WHERE V.volt_host = D.device_id ORDER BY D.hostname, V.volt_descr";
+  $sql = "SELECT * FROM `voltage` AS V, `devices` AS D WHERE V.device_id = D.device_id ORDER BY D.hostname, V.volt_descr";
 } else {
-  $sql = "SELECT * FROM `voltage` AS V, `devices` AS D, devices_perms as P WHERE V.volt_host = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, V.volt_descr";
+  $sql = "SELECT * FROM `voltage` AS V, `devices` AS D, devices_perms as P WHERE V.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' ORDER BY D.hostname, V.volt_descr";
 }
 
 $query = mysql_query($sql);

includes/discovery/fanspeeds.php

@@ -27,16 +27,16 @@ if ($device['os'] == "linux")
       $fan  = trim(shell_exec($config['snmpget'] . " -m LM-SENSORS-MIB -O qv -$snmpver -c $community $hostname:$port $fan_oid")) / 1000;
       $descr = str_ireplace("temp-", "", $descr);
       $descr = trim($descr);
-      if (mysql_result(mysql_query("SELECT count(fan_id) FROM `fanspeed` WHERE fan_oid = '$fan_oid' AND fan_host = '$id'"),0) == '0') 
+      if (mysql_result(mysql_query("SELECT count(fan_id) FROM `fanspeed` WHERE fan_oid = '$fan_oid' AND device_id = '$id'"),0) == '0') 
       {
-        $query = "INSERT INTO fanspeed (`fan_host`, `fan_oid`, `fan_descr`, `fan_precision`, `fan_limit`, `fan_current`) values ('$id', '$fan_oid', '$descr',1000, " . ($config['defaults']['fan_limit'] ? $config['defaults']['fan_limit'] : '60') . ", '$fan')";
+        $query = "INSERT INTO fanspeed (`device_id`, `fan_oid`, `fan_descr`, `fan_precision`, `fan_limit`, `fan_current`) values ('$id', '$fan_oid', '$descr',1000, " . ($config['defaults']['fan_limit'] ? $config['defaults']['fan_limit'] : '60') . ", '$fan')";
         mysql_query($query);
         echo("+");
       } 
-      elseif (mysql_result(mysql_query("SELECT `fan_descr` FROM fanspeed WHERE `fan_host` = '$id' AND `fan_oid` = '$fan_oid'"), 0) != $descr) 
+      elseif (mysql_result(mysql_query("SELECT `fan_descr` FROM fanspeed WHERE `device_id` = '$id' AND `fan_oid` = '$fan_oid'"), 0) != $descr) 
       {
         echo("U");
-        mysql_query("UPDATE fanspeed SET `fan_descr` = '$descr' WHERE `fan_host` = '$id' AND `fan_oid` = '$fan_oid'");
+        mysql_query("UPDATE fanspeed SET `fan_descr` = '$descr' WHERE `device_id` = '$id' AND `fan_oid` = '$fan_oid'");
       } 
       else 
       {
@@ -75,9 +75,9 @@ if ($device['os'] == "linux")
         if ($monitor == 'true')
         {
           $descr = trim(str_replace(" Fan","",str_ireplace("Speed", "", $descr)));
-          if (mysql_result(mysql_query("SELECT count(fan_id) FROM `fanspeed` WHERE fan_oid = '$fan_oid' AND fan_host = '$id'"),0) == '0') 
+          if (mysql_result(mysql_query("SELECT count(fan_id) FROM `fanspeed` WHERE fan_oid = '$fan_oid' AND device_id = '$id'"),0) == '0') 
           {
-            $query = "INSERT INTO fanspeed (`fan_host`, `fan_oid`, `fan_descr`, `fan_current`, `fan_limit`) values ('$id', '$fan_oid', '$descr', '$fan', '$limit')";
+            $query = "INSERT INTO fanspeed (`device_id`, `fan_oid`, `fan_descr`, `fan_current`, `fan_limit`) values ('$id', '$fan_oid', '$descr', '$fan', '$limit')";
             mysql_query($query);
             echo("+");
           } 
@@ -94,7 +94,7 @@ if ($device['os'] == "linux")
 
 ## Delete removed sensors
 
-$sql = "SELECT * FROM fanspeed AS V, devices AS D WHERE V.fan_host = D.device_id AND D.device_id = '".$device['device_id']."'";
+$sql = "SELECT * FROM fanspeed AS V, devices AS D WHERE V.device_id = D.device_id AND D.device_id = '".$device['device_id']."'";
 if ($query = mysql_query($sql))
 {
   while ($sensor = mysql_fetch_array($query)) 
@@ -103,7 +103,7 @@ if ($query = mysql_query($sql))
     $i = 0;
     while ($i < count($fan_exists) && !$exists) 
     {
-      $thisfan = $sensor['fan_host'] . " " . $sensor['fan_oid'];
+      $thisfan = $sensor['device_id'] . " " . $sensor['fan_oid'];
       if ($fan_exists[$i] == $thisfan) { $exists = 1; }
       $i++;
     }

includes/discovery/temperatures.php

@@ -7,6 +7,50 @@ $port = $device['port'];
 
 echo("Temperatures : ");
 
+
+if($device['os'] == "ironware")
+{
+  echo("IronWare ");
+  $oids = shell_exec($config['snmpwalk'] . " -$snmpver -CI -Osqn -m FOUNDRY-SN-AGENT-MIB:FOUNDRY-SN-ROOT-MIB -c $community $hostname:$port snAgentTempSensorDescr");
+  $oids = trim($oids);
+  $oids = str_replace(".1.3.6.1.4.1.1991.1.1.2.13.1.1.3.", "", $oids);
+  foreach(explode("\n", $oids) as $data)
+  {
+    $data = trim($data);
+    if ($data != "")
+    {
+      list($oid) = explode(" ", $data);
+      $temp_oid  = ".1.3.6.1.4.1.1991.1.1.2.13.1.1.4.$oid";
+      $descr_oid = ".1.3.6.1.4.1.1991.1.1.2.13.1.1.3.$oid";
+      $descr = trim(shell_exec($config['snmpget'] . " -m JUNIPER-MIB -O qv -$snmpver -c $community $hostname:$port $descr_oid"));
+      $temp = trim(shell_exec($config['snmpget'] . " -m JUNIPER-MIB -O qv -$snmpver -c $community $hostname:$port $temp_oid"));
+      if (!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" && $temp != "0")
+      {
+        $descr = str_replace("\"", "", $descr);
+        $descr = str_replace("temperature", "", $descr);
+        $descr = str_replace("temp", "", $descr);
+        $descr = str_replace("sensor", "Sensor", $descr);
+	$descr = str_replace("Line module", "Line Mod", $descr);
+        $descr = str_replace("  ", " ", $descr);
+        $descr = trim($descr);
+        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND device_id = '$id'"),0) == '0')
+        {
+          $query = "INSERT INTO temperature (`device_id`, `temp_oid`, `temp_descr`, `temp_limit`, `temp_current`, `temp_precision`) values ('$id', '$temp_oid', '$descr'," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp', '2')";
+          mysql_query($query);
+          echo("+");
+        } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `device_id` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) {
+          mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `device_id` = '$id' AND `temp_oid` = '$temp_oid' AND `temp_precision` = '2'");
+          echo("U");
+        } else {
+          echo(".");
+        }
+        $temp_exists[] = "$id $temp_oid";
+      }
+    }
+  }
+}
+
+
 ## JunOS Temperatures
 if ($device['os'] == "junos") 
 {
@@ -31,13 +75,13 @@ if ($device['os'] == "junos")
         $descr = str_replace("temp", "", $descr);
         $descr = str_replace("sensor", "", $descr);
         $descr = trim($descr);
-        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0')
+        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND device_id = '$id'"),0) == '0')
         {
-          $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr'," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
+          $query = "INSERT INTO temperature (`device_id`, `temp_oid`, `temp_descr`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr'," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
           mysql_query($query);
           echo("+");
-        } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) {
+        } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `device_id` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) {
-          mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'");
+          mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `device_id` = '$id' AND `temp_oid` = '$temp_oid'");
           echo("U");
         } else { 
           echo("."); 
@@ -59,15 +103,15 @@ if ($device['os'] == "papouch-tme")
   {
     $temp_oid = "SNMPv2-SMI::enterprises.18248.1.1.1.0";
     $descr = trim(str_replace("\"", "", $descr));
-    if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
+    if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND device_id = '$id'"),0) == '0') 
     {
-      $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_precision`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr',10," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
+      $query = "INSERT INTO temperature (`device_id`, `temp_oid`, `temp_descr`, `temp_precision`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr',10," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
       mysql_query($query);
       echo("+");
-    } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr)
+    } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `device_id` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr)
     {
       echo("U");
-      mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'");
+      mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `device_id` = '$id' AND `temp_oid` = '$temp_oid'");
     } else {
       echo(".");
     }
@@ -89,15 +133,15 @@ if ($device['os'] == "linux")
       $descr_query = $config['snmpget'] . " -$snmpver -m SNMPv2-SMI -Osqn -c $community $hostname:$port .1.3.6.1.4.1.2021.7891.$oid.2.1 | sed s/.1.3.6.1.4.1.2021.7891.$oid.2.1\ //";
       $descr = trim(str_replace("\"", "", shell_exec($descr_query)));
       $fulloid = ".1.3.6.1.4.1.2021.7891.$oid.101.1";
-      if (!mysql_result(mysql_query("SELECT count(temp_id) FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0)) 
+      if (!mysql_result(mysql_query("SELECT count(temp_id) FROM temperature WHERE `device_id` = '$id' AND `temp_oid` = '$fulloid'"), 0)) 
       {
         echo("+");
-        mysql_query("INSERT INTO `temperature` (`temp_host`,`temp_oid`,`temp_descr`,`temp_limit`) VALUES ('$id', '$fulloid', '$descr'," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ")");
+        mysql_query("INSERT INTO `temperature` (`device_id`,`temp_oid`,`temp_descr`,`temp_limit`) VALUES ('$id', '$fulloid', '$descr'," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ")");
       } 
-      elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0) != $descr) 
+      elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `device_id` = '$id' AND `temp_oid` = '$fulloid'"), 0) != $descr) 
       {
         echo("U");
-	  mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
+	  mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `device_id` = '$id' AND `temp_oid` = '$fulloid'");
       }
       else 
       {
@@ -123,15 +167,15 @@ if (strstr($device['hardware'], "dell"))
       $descr_query = $config['snmpget'] . " -m MIB-Dell-10892 -$snmpver  -Onvq -c $community $hostname:$port .1.3.6.1.4.1.674.10892.1.700.20.1.8.$oid";
       $descr = trim(str_replace("\"", "", shell_exec($descr_query)));
       $fulloid = ".1.3.6.1.4.1.674.10892.1.700.20.1.6.$oid";
-      if (!mysql_result(mysql_query("SELECT count(temp_id) FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0)) 
+      if (!mysql_result(mysql_query("SELECT count(temp_id) FROM temperature WHERE `device_id` = '$id' AND `temp_oid` = '$fulloid'"), 0)) 
       {
-        mysql_query("INSERT INTO `temperature` (`temp_host`,`temp_oid`,`temp_descr`, `temp_precision`, `temp_limit`) VALUES ('$id', '$fulloid', '$descr', '10', " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ")");
+        mysql_query("INSERT INTO `temperature` (`device_id`,`temp_oid`,`temp_descr`, `temp_precision`, `temp_limit`) VALUES ('$id', '$fulloid', '$descr', '10', " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ")");
 	  echo("+");
       } 
-      elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0) != $descr) 
+      elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `device_id` = '$id' AND `temp_oid` = '$fulloid'"), 0) != $descr) 
       {
-        mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
+        mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `device_id` = '$id' AND `temp_oid` = '$fulloid'");
-        echo("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
+        echo("UPDATE temperature SET `temp_descr` = '$descr' WHERE `device_id` = '$id' AND `temp_oid` = '$fulloid'");
         echo("U");
       }
       else
@@ -162,16 +206,16 @@ if ($device['os'] == "linux")
       $temp  = trim(shell_exec($config['snmpget'] . " -m LM-SENSORS-MIB -O qv -$snmpver -c $community $hostname:$port $temp_oid")) / 1000;
       $descr = str_ireplace("temp-", "", $descr);
       $descr = trim($descr);
-      if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
+      if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND device_id = '$id'"),0) == '0') 
       {
-        $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_precision`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr',1000, " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
+        $query = "INSERT INTO temperature (`device_id`, `temp_oid`, `temp_descr`, `temp_precision`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr',1000, " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
         mysql_query($query);
         echo("+");
       } 
-      elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) 
+      elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `device_id` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) 
       {
         echo("U");
-        mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'");
+        mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `device_id` = '$id' AND `temp_oid` = '$temp_oid'");
       } 
       else 
       {
@@ -209,9 +253,9 @@ if ($device['os'] == "linux")
         if ($monitor == 'true')
         {
           $descr = trim(str_ireplace("temperature", "", $descr));
-          if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
+          if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND device_id = '$id'"),0) == '0') 
           {
-            $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_current`, `temp_limit`, `temp_precision`) values ('$id', '$temp_oid', '$descr', '$temp', '$limit','$divisor')";
+            $query = "INSERT INTO temperature (`device_id`, `temp_oid`, `temp_descr`, `temp_current`, `temp_limit`, `temp_precision`) values ('$id', '$temp_oid', '$descr', '$temp', '$limit','$divisor')";
             mysql_query($query);
             echo("+");
           } 
@@ -248,9 +292,9 @@ if ($device['os'] == "ios")
         $descr = str_replace("temperature", "", $descr);
         $descr = str_replace("temp", "", $descr);
         $descr = trim($descr);
-        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
+        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND device_id = '$id'"),0) == '0') 
         {
-          $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr', " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
+          $query = "INSERT INTO temperature (`device_id`, `temp_oid`, `temp_descr`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr', " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
           mysql_query($query);
           echo("+");
         }
@@ -266,7 +310,7 @@ if ($device['os'] == "ios")
 
 ## Delete removed sensors
 
-$sql = "SELECT * FROM temperature AS T, devices AS D WHERE T.temp_host = D.device_id AND D.device_id = '".$device['device_id']."'";
+$sql = "SELECT * FROM temperature AS T, devices AS D WHERE T.device_id = D.device_id AND D.device_id = '".$device['device_id']."'";
 
 if ($query = mysql_query($sql))
 {
@@ -276,7 +320,7 @@ if ($query = mysql_query($sql))
     $i = 0;
     while ($i < count($temp_exists) && !$exists) 
     {
-      $thistemp = $sensor['temp_host'] . " " . $sensor['temp_oid'];
+      $thistemp = $sensor['device_id'] . " " . $sensor['temp_oid'];
       if ($temp_exists[$i] == $thistemp) { $exists = 1; }
       $i++;
     }

includes/discovery/voltages.php

@@ -27,16 +27,16 @@ if ($device['os'] == "linux")
       $volt  = trim(shell_exec($config['snmpget'] . " -m LM-SENSORS-MIB -O qv -$snmpver -c $community $hostname:$port $volt_oid")) / 1000;
       $descr = str_ireplace("temp-", "", $descr);
       $descr = trim($descr);
-      if (mysql_result(mysql_query("SELECT count(volt_id) FROM `voltage` WHERE volt_oid = '$volt_oid' AND volt_host = '$id'"),0) == '0') 
+      if (mysql_result(mysql_query("SELECT count(volt_id) FROM `voltage` WHERE volt_oid = '$volt_oid' AND device_id = '$id'"),0) == '0') 
       {
-        $query = "INSERT INTO voltage (`volt_host`, `volt_oid`, `volt_descr`, `volt_precision`, `volt_limit`, `volt_current`) values ('$id', '$volt_oid', '$descr',1000, " . ($config['defaults']['volt_limit'] ? $config['defaults']['volt_limit'] : '60') . ", '$volt')";
+        $query = "INSERT INTO voltage (`device_id`, `volt_oid`, `volt_descr`, `volt_precision`, `volt_limit`, `volt_current`) values ('$id', '$volt_oid', '$descr',1000, " . ($config['defaults']['volt_limit'] ? $config['defaults']['volt_limit'] : '60') . ", '$volt')";
         mysql_query($query);
         echo("+");
       } 
-      elseif (mysql_result(mysql_query("SELECT `volt_descr` FROM voltage WHERE `volt_host` = '$id' AND `volt_oid` = '$volt_oid'"), 0) != $descr) 
+      elseif (mysql_result(mysql_query("SELECT `volt_descr` FROM voltage WHERE `device_id` = '$id' AND `volt_oid` = '$volt_oid'"), 0) != $descr) 
       {
         echo("U");
-        mysql_query("UPDATE voltage SET `volt_descr` = '$descr' WHERE `volt_host` = '$id' AND `volt_oid` = '$volt_oid'");
+        mysql_query("UPDATE voltage SET `volt_descr` = '$descr' WHERE `device_id` = '$id' AND `volt_oid` = '$volt_oid'");
       } 
       else 
       {
@@ -75,9 +75,9 @@ if ($device['os'] == "linux")
         if ($monitor == 'true')
         {
           $descr   = trim(str_ireplace("Voltage", "", $descr));
-          if (mysql_result(mysql_query("SELECT count(volt_id) FROM `voltage` WHERE volt_oid = '$volt_oid' AND volt_host = '$id'"),0) == '0') 
+          if (mysql_result(mysql_query("SELECT count(volt_id) FROM `voltage` WHERE volt_oid = '$volt_oid' AND device_id = '$id'"),0) == '0') 
           {
-            $query = "INSERT INTO voltage (`volt_host`, `volt_oid`, `volt_descr`, `volt_current`, `volt_limit`, `volt_limit_low`, `volt_precision`) values ('$id', '$volt_oid', '$descr', '$volt', '$limit','$lowlimit','1000')";
+            $query = "INSERT INTO voltage (`device_id`, `volt_oid`, `volt_descr`, `volt_current`, `volt_limit`, `volt_limit_low`, `volt_precision`) values ('$id', '$volt_oid', '$descr', '$volt', '$limit','$lowlimit','1000')";
             mysql_query($query);
             echo("+");
           } 
@@ -94,7 +94,7 @@ if ($device['os'] == "linux")
 
 ## Delete removed sensors
 
-$sql = "SELECT * FROM voltage AS V, devices AS D WHERE V.volt_host = D.device_id AND D.device_id = '".$device['device_id']."'";
+$sql = "SELECT * FROM voltage AS V, devices AS D WHERE V.device_id = D.device_id AND D.device_id = '".$device['device_id']."'";
 
 if ($query = mysql_query($sql))
 {
@@ -104,7 +104,7 @@ if ($query = mysql_query($sql))
     $i = 0;
     while ($i < count($volt_exists) && !$exists) 
     {
-      $thisvolt = $sensor['volt_host'] . " " . $sensor['volt_oid'];
+      $thisvolt = $sensor['device_id'] . " " . $sensor['volt_oid'];
       if ($volt_exists[$i] == $thisvolt) { $exists = 1; }
       $i++;
     }

includes/functions.php

@@ -425,7 +425,7 @@ function delHost($id)
   mysql_query("DELETE FROM `devices_attribs` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `devices_perms` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `bgpPeers` WHERE `device_id` = '$id'");
-  mysql_query("DELETE FROM `temperature` WHERE `temp_host` = '$id'");
+  mysql_query("DELETE FROM `temperature` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `vlans` WHERE `device_id` = '$id'");  
   mysql_query("DELETE FROM `vrfs` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `storage` WHERE `host_id` = '$id'");
@@ -458,7 +458,7 @@ function retireHost($id)
     echo("Removed interface $int_id ($int_if)<br />");
   }
   mysql_query("DELETE FROM `entPhysical` WHERE `device_id` = '$id'");
-  mysql_query("DELETE FROM `temperature` WHERE `temp_host` = '$id'");
+  mysql_query("DELETE FROM `temperature` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `storage` WHERE `host_id` = '$id'");
   mysql_query("DELETE FROM `alerts` WHERE `device_id` = '$id'");
   mysql_query("DELETE FROM `services` WHERE `service_host` = '$id'");

includes/polling/fanspeeds.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$query = "SELECT * FROM fanspeed WHERE fan_host = '" . $device['device_id'] . "'";
+$query = "SELECT * FROM fanspeed WHERE device_id = '" . $device['device_id'] . "'";
 $fan_data = mysql_query($query);
 while($fanspeed = mysql_fetch_array($fan_data)) {
 

includes/polling/temperatures.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$query = "SELECT * FROM temperature WHERE temp_host = '" . $device['device_id'] . "'";
+$query = "SELECT * FROM temperature WHERE device_id = '" . $device['device_id'] . "'";
 $temp_data = mysql_query($query);
 while($temperature = mysql_fetch_array($temp_data)) {
 

includes/polling/voltages.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-$query = "SELECT * FROM voltage WHERE volt_host = '" . $device['device_id'] . "'";
+$query = "SELECT * FROM voltage WHERE device_id = '" . $device['device_id'] . "'";
 $volt_data = mysql_query($query);
 while($voltage = mysql_fetch_array($volt_data)) {
 

includes/rewrites.php

@@ -97,6 +97,438 @@ function translate_ifAdminStatus ($ifAdminStatus) {
   return $ifAdminStatus;
 }
 
+$rewrite_ironware_hardware = array(
+    'snFIWGSwitch' => 'Stackable FastIron workgroup',
+    'snFIBBSwitch' => 'Stackable FastIron backbone',
+    'snNIRouter' => 'Stackable NetIron',
+    'snSI' => 'Stackable ServerIron',
+    'snSIXL' => 'Stackable ServerIronXL',
+    'snSIXLTCS' => 'Stackable ServerIronXL TCS',
+    'snTISwitch' => 'Stackable TurboIron',
+    'snTIRouter' => 'Stackable TurboIron',
+    'snT8Switch' => 'Stackable TurboIron 8',
+    'snT8Router' => 'Stackable TurboIron 8',
+    'snT8SIXLG' => 'Stackable ServerIronXLG',
+    'snBI4000Switch' => 'BigIron 4000',
+    'snBI4000Router' => 'BigIron 4000',
+    'snBI4000SI' => 'BigServerIron',
+    'snBI8000Switch' => 'BigIron 8000',
+    'snBI8000Router' => 'BigIron 8000',
+    'snBI8000SI' => 'BigServerIron',
+    'snFI2Switch' => 'FastIron II',
+    'snFI2Router' => 'FastIron II',
+    'snFI2PlusSwitch' => 'FastIron II Plus',
+    'snFI2PlusRouter' => 'FastIron II Plus',
+    'snNI400Router' => 'NetIron 400',
+    'snNI800Router' => 'NetIron 800',
+    'snFI2GCSwitch' => 'FastIron II GC',
+    'snFI2GCRouter' => 'FastIron II GC',
+    'snFI2PlusGCSwitch' => 'FastIron II Plus GC',
+    'snFI2PlusGCRouter' => 'FastIron II Plus GC',
+    'snBI15000Switch' => 'BigIron 15000',
+    'snBI15000Router' => 'BigIron 15000',
+    'snNI1500Router' => 'NetIron 1500',
+    'snFI3Switch' => 'FastIron III',
+    'snFI3Router' => 'FastIron III',
+    'snFI3GCSwitch' => 'FastIron III GC',
+    'snFI3GCRouter' => 'FastIron III GC',
+    'snSI400Switch' => 'ServerIron 400',
+    'snSI400Router' => 'ServerIron 400',
+    'snSI800Switch' => 'ServerIron800',
+    'snSI800Router' => 'ServerIron800',
+    'snSI1500Switch' => 'ServerIron1500',
+    'snSI1500Router' => 'ServerIron1500',
+    'sn4802Switch' => 'Stackable 4802',
+    'sn4802Router' => 'Stackable 4802',
+    'sn4802SI' => 'Stackable 4802 ServerIron',
+    'snFI400Switch' => 'FastIron 400',
+    'snFI400Router' => 'FastIron 400',
+    'snFI800Switch' => 'FastIron800',
+    'snFI800Router' => 'FastIron800',
+    'snFI1500Switch' => 'FastIron1500',
+    'snFI1500Router' => 'FastIron1500',
+    'snFES2402' => 'FastIron Edge Switch(FES) 2402',
+    'snFES2402Switch' => 'FES2402',
+    'snFES2402Router' => 'FES2402',
+    'snFES4802' => 'FastIron Edge Switch(FES) 4802',
+    'snFES4802Switch' => 'FES4802',
+    'snFES4802Router' => 'FES4802',
+    'snFES9604' => 'FastIron Edge Switch(FES) 9604',
+    'snFES9604Switch' => 'FES9604',
+    'snFES9604Router' => 'FES9604',
+    'snFES12GCF' => 'FastIron Edge Switch(FES) 12GCF ',
+    'snFES12GCFSwitch' => 'snFES12GCF ',
+    'snFES12GCFRouter' => 'snFES12GCF',
+    'snFES2402P' => 'FastIron Edge Switch(FES) 2402 POE ',
+    'snFES2402P' => 'snFES2402POE ',
+    'snFES2402P' => 'snFES2402POE',
+    'snFES4802P' => 'FastIron Edge Switch (FES) 4802 POE ',
+    'snFES4802P' => 'snFES4802POE ',
+    'snFES4802P' => 'snFES4802POE',
+    'snNI4802Switch' => 'NetIron 4802',
+    'snNI4802Router' => 'NetIron 4802',
+    'snBIMG8Switch' => 'BigIron MG8',
+    'snBIMG8Router' => 'BigIron MG8',
+    'snNI40GRouter' => 'NetIron 40G',
+    'snFESX424' => 'FastIron Edge Switch(FES) 24G',
+    'snFESX424Switch' => 'FESX424',
+    'snFESX424Router' => 'FESX424',
+    'snFESX424Prem' => 'FastIron Edge Switch(FES) 24G-PREM',
+    'snFESX424PremSwitch' => 'FESX424-PREM',
+    'snFESX424PremRouter' => 'FESX424-PREM',
+    'snFESX424Plus1XG' => 'FastIron Edge Switch(FES) 24G + 1 10G',
+    'snFESX424Plus1XGSwitch' => 'FESX424+1XG',
+    'snFESX424Plus1XGRouter' => 'FESX424+1XG',
+    'snFESX424Plus1XGPrem' => 'FastIron Edge Switch(FES) 24G + 1 10G-PREM',
+    'snFESX424Plus1XGPremSwitch' => 'FESX424+1XG-PREM',
+    'snFESX424Plus1XGPremRouter' => 'FESX424+1XG-PREM',
+    'snFESX424Plus2XG' => 'FastIron Edge Switch(FES) 24G + 2 10G',
+    'snFESX424Plus2XGSwitch' => 'FESX424+2XG',
+    'snFESX424Plus2XGRouter' => 'FESX424+2XG',
+    'snFESX424Plus2XGPrem' => 'FastIron Edge Switch(FES) 24G + 2 10G-PREM',
+    'snFESX424Plus2XGPremSwitch' => 'FESX424+2XG-PREM',
+    'snFESX424Plus2XGPremRouter' => 'FESX424+2XG-PREM',
+    'snFESX448' => 'FastIron Edge Switch(FES) 48G',
+    'snFESX448Switch' => 'FESX448',
+    'snFESX448Router' => 'FESX448',
+    'snFESX448Prem' => 'FastIron Edge Switch(FES) 48G-PREM',
+    'snFESX448PremSwitch' => 'FESX448-PREM',
+    'snFESX448PremRouter' => 'FESX448-PREM',
+    'snFESX448Plus1XG' => 'FastIron Edge Switch(FES) 48G + 1 10G',
+    'snFESX448Plus1XGSwitch' => 'FESX448+1XG',
+    'snFESX448Plus1XGRouter' => 'FESX448+1XG',
+    'snFESX448Plus1XGPrem' => 'FastIron Edge Switch(FES) 48G + 1 10G-PREM',
+    'snFESX448Plus1XGPremSwitch' => 'FESX448+1XG-PREM',
+    'snFESX448Plus1XGPremRouter' => 'FESX448+1XG-PREM',
+    'snFESX448Plus2XG' => 'FastIron Edge Switch(FES) 48G + 2 10G',
+    'snFESX448Plus2XGSwitch' => 'FESX448+2XG',
+    'snFESX448Plus2XGRouter' => 'FESX448+2XG',
+    'snFESX448Plus2XGPrem' => 'FastIron Edge Switch(FES) 48G + 2 10G-PREM',
+    'snFESX448Plus2XGPremSwitch' => 'FESX448+2XG-PREM',
+    'snFESX448Plus2XGPremRouter' => 'FESX448+2XG-PREM',
+    'snFESX424Fiber' => 'FastIron Edge Switch(FES)Fiber 24G',
+    'snFESX424FiberSwitch' => 'FESX424Fiber',
+    'snFESX424FiberRouter' => 'FESX424Fiber',
+    'snFESX424FiberPrem' => 'FastIron Edge Switch(FES)Fiber 24G-PREM',
+    'snFESX424FiberPremSwitch' => 'FESX424Fiber-PREM',
+    'snFESX424FiberPremRouter' => 'FESX424Fiber-PREM',
+    'snFESX424FiberPlus1XG' => 'FastIron Edge Switch(FES)Fiber 24G + 1 10G',
+    'snFESX424FiberPlus1XGSwitch' => 'FESX424Fiber+1XG',
+    'snFESX424FiberPlus1XGRouter' => 'FESX424Fiber+1XG',
+    'snFESX424FiberPlus1XGPrem' => 'FastIron Edge Switch(FES)Fiber 24G + 1 10G-PREM',
+    'snFESX424FiberPlus1XGPremSwitch' => 'FESX424Fiber+1XG-PREM',
+    'snFESX424FiberPlus1XGPremRouter' => 'FESX424Fiber+1XG-PREM',
+    'snFESX424FiberPlus2XG' => 'FastIron Edge Switch(FES)Fiber 24G + 2 10G',
+    'snFESX424FiberPlus2XGSwitch' => 'FESX424Fiber+2XG',
+    'snFESX424FiberPlus2XGRouter' => 'FESX424Fiber+2XG',
+    'snFESX424FiberPlus2XGPrem' => 'FastIron Edge Switch(FES)Fiber 24G + 2 10G-PREM',
+    'snFESX424FiberPlus2XGPremSwitch' => 'FESX424Fiber+2XG-PREM',
+    'snFESX424FiberPlus2XGPremRouter' => 'FESX424Fiber+2XG-PREM',
+    'snFESX448Fiber' => 'FastIron Edge Switch(FES)Fiber 48G',
+    'snFESX448FiberSwitch' => 'FESX448Fiber',
+    'snFESX448FiberRouter' => 'FESX448Fiber',
+    'snFESX448FiberPrem' => 'FastIron Edge Switch(FES)Fiber 48G-PREM',
+    'snFESX448FiberPremSwitch' => 'FESX448Fiber-PREM',
+    'snFESX448FiberPremRouter' => 'FESX448Fiber-PREM',
+    'snFESX448FiberPlus1XG' => 'FastIron Edge Switch(FES)Fiber 48G + 1 10G',
+    'snFESX448FiberPlus1XGSwitch' => 'FESX448Fiber+1XG',
+    'snFESX448FiberPlus1XGRouter' => 'FESX448Fiber+1XG',
+    'snFESX448FiberPlus1XGPrem' => 'FastIron Edge Switch(FES)Fiber 48G + 1 10G-PREM',
+    'snFESX448FiberPlus1XGPremSwitch' => 'FESX448Fiber+1XG-PREM',
+    'snFESX448FiberPlus1XGPremRouter' => 'FESX448Fiber+1XG-PREM',
+    'snFESX448FiberPlus2XG' => 'FastIron Edge Switch(FES)Fiber 48G + 2 10G',
+    'snFESX448FiberPlus2XGSwitch' => 'FESX448Fiber+2XG',
+    'snFESX448FiberPlus2XGRouter' => 'FESX448+2XG',
+    'snFESX448FiberPlus2XGPrem' => 'FastIron Edge Switch(FES)Fiber 48G + 2 10G-PREM',
+    'snFESX448FiberPlus2XGPremSwitch' => 'FESX448Fiber+2XG-PREM',
+    'snFESX448FiberPlus2XGPremRouter' => 'FESX448Fiber+2XG-PREM',
+    'snFESX424P' => 'FastIron Edge Switch(FES) 24G POE',
+    'snFESX424P' => 'FESX424POE',
+    'snFESX424P' => 'FESX424POE',
+    'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE-PREM',
+    'snFESX424P' => 'FESX424POE-PREM',
+    'snFESX424P' => 'FESX424POE-PREM',
+    'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE + 1 10G',
+    'snFESX424P' => 'FESX424POE+1XG',
+    'snFESX424P' => 'FESX424POE+1XG',
+    'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE + 1 10G-PREM',
+    'snFESX424P' => 'FESX424POE+1XG-PREM',
+    'snFESX424P' => 'FESX424POE+1XG-PREM',
+    'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE + 2 10G',
+    'snFESX424P' => 'FESX424POE+2XG',
+    'snFESX424P' => 'FESX424POE+2XG',
+    'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE + 2 10G-PREM',
+    'snFESX424P' => 'FESX424POE+2XG-PREM',
+    'snFESX424P' => 'FESX424POE+2XG-PREM',
+    'snFESX624' => 'FastIron Edge V6 Switch(FES) 24G',
+    'snFESX624Switch' => 'FESX624',
+    'snFESX624Router' => 'FESX624',
+    'snFESX624Prem' => 'FastIron Edge V6 Switch(FES) 24G-PREM',
+    'snFESX624PremSwitch' => 'FESX624-PREM',
+    'snFESX624PremRouter' => 'FESX624-PREM',
+    'snFESX624Plus1XG' => 'FastIron Edge V6 Switch(FES) 24G + 1 10G',
+    'snFESX624Plus1XGSwitch' => 'FESX624+1XG',
+    'snFESX624Plus1XGRouter' => 'FESX624+1XG',
+    'snFESX624Plus1XGPrem' => 'FastIron Edge V6 Switch(FES) 24G + 1 10G-PREM',
+    'snFESX624Plus1XGPremSwitch' => 'FESX624+1XG-PREM',
+    'snFESX624Plus1XGPremRouter' => 'FESX624+1XG-PREM',
+    'snFESX624Plus2XG' => 'FastIron Edge V6 Switch(FES) 24G + 2 10G',
+    'snFESX624Plus2XGSwitch' => 'FESX624+2XG',
+    'snFESX624Plus2XGRouter' => 'FESX624+2XG',
+    'snFESX624Plus2XGPrem' => 'FastIron Edge V6 Switch(FES) 24G + 2 10G-PREM',
+    'snFESX624Plus2XGPremSwitch' => 'FESX624+2XG-PREM',
+    'snFESX624Plus2XGPremRouter' => 'FESX624+2XG-PREM',
+    'snFESX648' => 'FastIron Edge V6 Switch(FES) 48G',
+    'snFESX648Switch' => 'FESX648',
+    'snFESX648Router' => 'FESX648',
+    'snFESX648Prem' => 'FastIron Edge V6 Switch(FES) 48G-PREM',
+    'snFESX648PremSwitch' => 'FESX648-PREM',
+    'snFESX648PremRouter' => 'FESX648-PREM',
+    'snFESX648Plus1XG' => 'FastIron Edge V6 Switch(FES) 48G + 1 10G',
+    'snFESX648Plus1XGSwitch' => 'FESX648+1XG',
+    'snFESX648Plus1XGRouter' => 'FESX648+1XG',
+    'snFESX648Plus1XGPrem' => 'FastIron Edge V6 Switch(FES) 48G + 1 10G-PREM',
+    'snFESX648Plus1XGPremSwitch' => 'FESX648+1XG-PREM',
+    'snFESX648Plus1XGPremRouter' => 'FESX648+1XG-PREM',
+    'snFESX648Plus2XG' => 'FastIron Edge V6 Switch(FES) 48G + 2 10G',
+    'snFESX648Plus2XGSwitch' => 'FESX648+2XG',
+    'snFESX648Plus2XGRouter' => 'FESX648+2XG',
+    'snFESX648Plus2XGPrem' => 'FastIron Edge V6 Switch(FES) 48G + 2 10G-PREM',
+    'snFESX648Plus2XGPremSwitch' => 'FESX648+2XG-PREM',
+    'snFESX648Plus2XGPremRouter' => 'FESX648+2XG-PREM',
+    'snFESX624Fiber' => 'FastIron V6 Edge Switch(FES)Fiber 24G',
+    'snFESX624FiberSwitch' => 'FESX624Fiber',
+    'snFESX624FiberRouter' => 'FESX624Fiber',
+    'snFESX624FiberPrem' => 'FastIron Edge V6 Switch(FES)Fiber 24G-PREM',
+    'snFESX624FiberPremSwitch' => 'FESX624Fiber-PREM',
+    'snFESX624FiberPremRouter' => 'FESX624Fiber-PREM',
+    'snFESX624FiberPlus1XG' => 'FastIron Edge V6 Switch(FES)Fiber 24G + 1 10G',
+    'snFESX624FiberPlus1XGSwitch' => 'FESX624Fiber+1XG',
+    'snFESX624FiberPlus1XGRouter' => 'FESX624Fiber+1XG',
+    'snFESX624FiberPlus1XGPrem' => 'FastIron Edge V6 Switch(FES)Fiber 24G + 1 10G-PREM',
+    'snFESX624FiberPlus1XGPremSwitch' => 'FESX624Fiber+1XG-PREM',
+    'snFESX624FiberPlus1XGPremRouter' => 'FESX624Fiber+1XG-PREM',
+    'snFESX624FiberPlus2XG' => 'FastIron Edge V6 Switch(FES)Fiber 24G + 2 10G',
+    'snFESX624FiberPlus2XGSwitch' => 'FESX624Fiber+2XG',
+    'snFESX624FiberPlus2XGRouter' => 'FESX624Fiber+2XG',
+    'snFESX624FiberPlus2XGPrem' => 'FastIron Edge V6 Switch(FES)Fiber 24G + 2 10G-PREM',
+    'snFESX624FiberPlus2XGPremSwitch' => 'FESX624Fiber+2XG-PREM',
+    'snFESX624FiberPlus2XGPremRouter' => 'FESX624Fiber+2XG-PREM',
+    'snFESX648Fiber' => 'FastIron Edge V6 Switch(FES)Fiber 48G',
+    'snFESX648FiberSwitch' => 'FESX648Fiber',
+    'snFESX648FiberRouter' => 'FESX648Fiber',
+    'snFESX648FiberPrem' => 'FastIron Edge V6 Switch(FES)Fiber 48G-PREM',
+    'snFESX648FiberPremSwitch' => 'FESX648Fiber-PREM',
+    'snFESX648FiberPremRouter' => 'FESX648Fiber-PREM',
+    'snFESX648FiberPlus1XG' => 'FastIron Edge V6 Switch(FES)Fiber 48G + 1 10G',
+    'snFESX648FiberPlus1XGSwitch' => 'FESX648Fiber+1XG',
+    'snFESX648FiberPlus1XGRouter' => 'FESX648Fiber+1XG',
+    'snFESX648FiberPlus1XGPrem' => 'FastIron Edge V6 Switch(FES)Fiber 48G + 1 10G-PREM',
+    'snFESX648FiberPlus1XGPremSwitch' => 'FESX648Fiber+1XG-PREM',
+    'snFESX648FiberPlus1XGPremRouter' => 'FESX648Fiber+1XG-PREM',
+    'snFESX648FiberPlus2XG' => 'FastIron Edge V6 Switch(FES)Fiber 48G + 2 10G',
+    'snFESX648FiberPlus2XGSwitch' => 'FESX648Fiber+2XG',
+    'snFESX648FiberPlus2XGRouter' => 'FESX648+2XG',
+    'snFESX648FiberPlus2XGPrem' => 'FastIron Edge V6 Switch(FES)Fiber 48G + 2 10G-PREM',
+    'snFESX648FiberPlus2XGPremSwitch' => 'FESX648Fiber+2XG-PREM',
+    'snFESX648FiberPlus2XGPremRouter' => 'FESX648Fiber+2XG-PREM',
+    'snFESX624P' => 'FastIron Edge V6 Switch(FES) 24G POE',
+    'snFESX624P' => 'FESX624POE',
+    'snFESX624P' => 'FESX624POE',
+    'snFESX624P' => 'FastIron Edge V6 Switch(FES) 24GPOE-PREM',
+    'snFESX624P' => 'FESX624POE-PREM',
+    'snFESX624P' => 'FESX624POE-PREM',
+    'snFESX624P' => 'FastIron Edge V6 Switch(FES) 24GPOE + 1 10G',
+    'snFESX624P' => 'FESX624POE+1XG',
+    'snFESX624P' => 'FESX624POE+1XG',
+    'snFESX624P' => 'FastIron Edge V6 Switch(FES) 24GPOE + 1 10G-PREM',
+    'snFESX624P' => 'FESX624POE+1XG-PREM',
+    'snFESX624P' => 'FESX624POE+1XG-PREM',
+    'snFESX624P' => 'FastIron Edge V6 Switch(FES) 24GPOE + 2 10G',
+    'snFESX624P' => 'FESX624POE+2XG',
+    'snFESX624P' => 'FESX624POE+2XG',
+    'snFESX624P' => 'FastIron Edge V6 Switch(FES) 24GPOE + 2 10G-PREM',
+    'snFESX624P' => 'FESX624POE+2XG-PREM',
+    'snFESX624P' => 'FESX624POE+2XG-PREM',
+    'snFWSX424' => 'FastIron WorkGroup Switch(FWS) 24G',
+    'snFWSX424Switch' => 'FWSX424',
+    'snFWSX424Router' => 'FWSX424',
+    'snFWSX424Plus1XG' => 'FastIron WorkGroup Switch(FWS) 24G + 1 10G',
+    'snFWSX424Plus1XGSwitch' => 'FWSX424+1XG',
+    'snFWSX424Plus1XGRouter' => 'FWSX424+1XG',
+    'snFWSX424Plus2XG' => 'FastIron WorkGroup Switch(FWS) 24G + 2 10G',
+    'snFWSX424Plus2XGSwitch' => 'FWSX424+2XG',
+    'snFWSX424Plus2XGRouter' => 'FWSX424+2XG',
+    'snFWSX448' => 'FastIron WorkGroup Switch(FWS) 48G',
+    'snFWSX448Switch' => 'FWSX448',
+    'snFWSX448Router' => 'FWSX448',
+    'snFWSX448Plus1XG' => 'FastIron WorkGroup Switch(FWS) 48G + 1 10G',
+    'snFWSX448Plus1XGSwitch' => 'FWSX448+1XG',
+    'snFWSX448Plus1XGRouter' => 'FWSX448+1XG',
+    'snFWSX448Plus2XG' => 'FastIron WorkGroup Switch(FWS) 48G + 2 10G',
+    'snFWSX448Plus2XGSwitch' => 'FWSX448+2XG',
+    'snFWSX448Plus2XGRouter' => 'FWSX448+2XG',
+    'snFastIronSuperXFamily' => 'FastIron SuperX Family',
+    'snFastIronSuperX' => 'FastIron SuperX',
+    'snFastIronSuperXSwitch' => 'FastIron SuperX Switch',
+    'snFastIronSuperXRouter' => 'FastIron SuperX Router',
+    'snFastIronSuperXBaseL3Switch' => 'FastIron SuperX Base L3 Switch',
+    'snFastIronSuperXPrem' => 'FastIron SuperX Premium',
+    'snFastIronSuperXPremSwitch' => 'FastIron SuperX Premium Switch',
+    'snFastIronSuperXPremRouter' => 'FastIron SuperX Premium Router',
+    'snFastIronSuperXPremBaseL3Switch' => 'FastIron SuperX Premium Base L3 Switch',
+    'snFastIronSuperX800' => 'FastIron SuperX 800 ',
+    'snFastIronSuperX800Switch' => 'FastIron SuperX 800 Switch',
+    'snFastIronSuperX800Router' => 'FastIron SuperX 800 Router',
+    'snFastIronSuperX800BaseL3Switch' => 'FastIron SuperX 800 Base L3 Switch',
+    'snFastIronSuperX800Prem' => 'FastIron SuperX 800 Premium',
+    'snFastIronSuperX800PremSwitch' => 'FastIron SuperX 800 Premium Switch',
+    'snFastIronSuperX800PremRouter' => 'FastIron SuperX 800 Premium Router',
+    'snFastIronSuperX800PremBaseL3Switch' => 'FastIron SuperX 800 Premium Base L3 Switch',
+    'snFastIronSuperX1600' => 'FastIron SuperX 1600 ',
+    'snFastIronSuperX1600Switch' => 'FastIron SuperX 1600 Switch',
+    'snFastIronSuperX1600Router' => 'FastIron SuperX 1600 Router',
+    'snFastIronSuperX1600BaseL3Switch' => 'FastIron SuperX 1600 Base L3 Switch',
+    'snFastIronSuperX1600Prem' => 'FastIron SuperX 1600 Premium',
+    'snFastIronSuperX1600PremSwitch' => 'FastIron SuperX 1600 Premium Switch',
+    'snFastIronSuperX1600PremRouter' => 'FastIron SuperX 1600 Premium Router',
+    'snFastIronSuperX1600PremBaseL3Switch' => 'FastIron SuperX 1600 Premium Base L3 Switch',
+    'snFastIronSuperXV6' => 'FastIron SuperX V6 ',
+    'snFastIronSuperXV6Switch' => 'FastIron SuperX V6 Switch',
+    'snFastIronSuperXV6Router' => 'FastIron SuperX V6 Router',
+    'snFastIronSuperXV6BaseL3Switch' => 'FastIron SuperX V6 Base L3 Switch',
+    'snFastIronSuperXV6Prem' => 'FastIron SuperX V6 Premium',
+    'snFastIronSuperXV6PremSwitch' => 'FastIron SuperX V6 Premium Switch',
+    'snFastIronSuperXV6PremRouter' => 'FastIron SuperX V6 Premium Router',
+    'snFastIronSuperXV6PremBaseL3Switch' => 'FastIron SuperX V6 Premium Base L3 Switch',
+    'snFastIronSuperX800V6' => 'FastIron SuperX 800 V6 ',
+    'snFastIronSuperX800V6Switch' => 'FastIron SuperX 800 V6 Switch',
+    'snFastIronSuperX800V6Router' => 'FastIron SuperX 800 V6 Router',
+    'snFastIronSuperX800V6BaseL3Switch' => 'FastIron SuperX 800 V6 Base L3 Switch',
+    'snFastIronSuperX800V6Prem' => 'FastIron SuperX 800 V6 Premium',
+    'snFastIronSuperX800V6PremSwitch' => 'FastIron SuperX 800 Premium V6 Switch',
+    'snFastIronSuperX800V6PremRouter' => 'FastIron SuperX 800 Premium V6 Router',
+    'snFastIronSuperX800V6PremBaseL3Switch' => 'FastIron SuperX 800 Premium V6 Base L3 Switch',
+    'snFastIronSuperX1600V6' => 'FastIron SuperX 1600 V6 ',
+    'snFastIronSuperX1600V6Switch' => 'FastIron SuperX 1600 V6 Switch',
+    'snFastIronSuperX1600V6Router' => 'FastIron SuperX 1600 V6 Router',
+    'snFastIronSuperX1600V6BaseL3Switch' => 'FastIron SuperX 1600 V6 Base L3 Switch',
+    'snFastIronSuperX1600V6Prem' => 'FastIron SuperX 1600 Premium V6',
+    'snFastIronSuperX1600V6PremSwitch' => 'FastIron SuperX 1600 Premium V6 Switch',
+    'snFastIronSuperX1600V6PremRouter' => 'FastIron SuperX 1600 Premium V6 Router',
+    'snFastIronSuperX1600V6PremBaseL3Switch' => 'FastIron SuperX 1600 Premium V6 Base L3 Switch',
+    'snBigIronSuperXFamily' => 'BigIron SuperX Family',
+    'snBigIronSuperX' => 'BigIron SuperX',
+    'snBigIronSuperXSwitch' => 'BigIron SuperX Switch',
+    'snBigIronSuperXRouter' => 'BigIron SuperX Router',
+    'snBigIronSuperXBaseL3Switch' => 'BigIron SuperX Base L3 Switch',
+    'snTurboIronSuperXFamily' => 'TurboIron SuperX Family',
+    'snTurboIronSuperX' => 'TurboIron SuperX',
+    'snTurboIronSuperXSwitch' => 'TurboIron SuperX Switch',
+    'snTurboIronSuperXRouter' => 'TurboIron SuperX Router',
+    'snTurboIronSuperXBaseL3Switch' => 'TurboIron SuperX Base L3 Switch',
+    'snTurboIronSuperXPrem' => 'TurboIron SuperX Premium',
+    'snTurboIronSuperXPremSwitch' => 'TurboIron SuperX Premium Switch',
+    'snTurboIronSuperXPremRouter' => 'TurboIron SuperX Premium Router',
+    'snTurboIronSuperXPremBaseL3Switch' => 'TurboIron SuperX Premium Base L3 Switch',
+    'snNIIMRRouter' => 'NetIron IMR',
+    'snBIRX16Switch' => 'BigIron RX16',
+    'snBIRX16Router' => 'BigIron RX16',
+    'snBIRX8Switch' => 'BigIron RX8',
+    'snBIRX8Router' => 'BigIron RX8',
+    'snBIRX4Switch' => 'BigIron RX4',
+    'snBIRX4Router' => 'BigIron RX4',
+    'snBIRX32Switch' => 'BigIron RX32',
+    'snBIRX32Router' => 'BigIron RX32',
+    'snNIXMR16000Router' => 'NetIron XMR16000',
+    'snNIXMR8000Router' => 'NetIron XMR8000',
+    'snNIXMR4000Router' => 'NetIron XMR4000',
+    'snNIXMR32000Router' => 'NetIron XMR32000',
+    'snSecureIronLS100' => 'SecureIronLS 100',
+    'snSecureIronLS100Switch' => 'SecureIronLS 100 Switch',
+    'snSecureIronLS100Router' => 'SecureIronLS 100 Router',
+    'snSecureIronLS300' => 'SecureIronLS 300',
+    'snSecureIronLS300Switch' => 'SecureIronLS 300 Switch',
+    'snSecureIronLS300Router' => 'SecureIronLS 300 Router',
+    'snSecureIronTM100' => 'SecureIronTM 100',
+    'snSecureIronTM100Switch' => 'SecureIronTM 100 Switch',
+    'snSecureIronTM100Router' => 'SecureIronTM 100 Router',
+    'snSecureIronTM300' => 'SecureIronTM 300',
+    'snSecureIronTM300Switch' => 'SecureIronTM 300 Switch',
+    'snSecureIronTM300Router' => 'SecureIronTM 300 Router',
+    'snNetIronMLX16Router' => 'NetIron MLX-16',
+    'snNetIronMLX8Router' => 'NetIron MLX-8',
+    'snNetIronMLX4Router' => 'NetIron MLX-4',
+    'snNetIronMLX32Router' => 'NetIron MLX-32',
+    'snFGS624P' => 'FastIron GS Switch(FGS) 24-port 10/100/1000 POE Ready',
+    'snFGS624PSwitch' => 'FGS624P',
+    'snFGS624PRouter' => 'FGS624P',
+    'snFGS624XGP' => 'FastIron GS Switch(FGS) 24-port 10/100/1000 POE Ready + 1 10G',
+    'snFGS624XGPSwitch' => 'FGS624XGP',
+    'snFGS624XGPRouter' => 'FGS624XGP',
+    'snFGS624PP' => 'FastIron GS Switch(FGS) 24-port 10/100/1000 POE ',
+    'snFGS624PP' => 'snFGS624P-POE',
+    'snFGS624PP' => 'snFGS624P-POE',
+    'snFGS624XGPP' => 'FastIron GS Switch(FGS) 24-port 10/100/1000 POE + 1 10G',
+    'snFGS624XGPP' => 'FGS624XGP-POE',
+    'snFGS624XGPP' => 'FGS624XGP-POE',
+    'snFGS648P' => 'FastIron GS Switch(FGS) 48-port 10/100/1000 POE Ready',
+    'snFGS648PSwitch' => 'FGS648P',
+    'snFGS648PRouter' => 'FGS648P',
+    'snFGS648PP' => 'FastIron GS Switch(FGS) 48-port 10/100/1000 POE ',
+    'snFGS648PP' => 'snFGS648P-POE',
+    'snFGS648PP' => 'snFGS648P-POE',
+    'snFLS624' => 'FastIron LS Switch(FLS) 24-port 10/100/1000 ',
+    'snFLS624Switch' => 'FLS624',
+    'snFLS624Router' => 'FLS624',
+    'snFLS648' => 'FastIron LS Switch(FLS) 48-port 10/100/1000',
+    'snFLS648Switch' => 'FLS648',
+    'snFLS648Router' => 'FLS648',
+    'snSI100' => 'ServerIron 100 series',
+    'snSI100Switch' => 'SI100',
+    'snSI100Router' => 'SI100',
+    'snSI350' => 'ServerIron 350 series',
+    'snSI350Switch' => 'SI350',
+    'snSI350Router' => 'SI350',
+    'snSI450' => 'ServerIron 450 series',
+    'snSI450Switch' => 'SI450',
+    'snSI450Router' => 'SI450',
+    'snSI850' => 'ServerIron 850 series',
+    'snSI850Switch' => 'SI850',
+    'snSI850Router' => 'SI850',
+    'snSI350Plus' => 'ServerIron 350 Plus series',
+    'snSI350PlusSwitch' => 'SI350 Plus',
+    'snSI350PlusRouter' => 'SI350 Plus',
+    'snSI450Plus' => 'ServerIron 450 Plus series',
+    'snSI450PlusSwitch' => 'SI450 Plus',
+    'snSI450PlusRouter' => 'SI450 Plus',
+    'snSI850Plus' => 'ServerIron 850 Plus series',
+    'snSI850PlusSwitch' => 'SI850 Plus',
+    'snSI850PlusRouter' => 'SI850 Plus',
+    'snServerIronGTc' => 'ServerIronGT C series',
+    'snServerIronGTcSwitch' => 'ServerIronGT C',
+    'snServerIronGTcRouter' => 'ServerIronGT C',
+    'snServerIronGTe' => 'ServerIronGT E series',
+    'snServerIronGTeSwitch' => 'ServerIronGT E',
+    'snServerIronGTeRouter' => 'ServerIronGT E',
+    'snServerIronGTePlus' => 'ServerIronGT E Plus series',
+    'snServerIronGTePlusSwitch' => 'ServerIronGT E Plus',
+    'snServerIronGTePlusRouter' => 'ServerIronGT E Plus',
+    'snServerIron4G' => 'ServerIron4G series',
+    'snServerIron4GSwitch' => 'ServerIron4G',
+    'snServerIron4GRouter' => 'ServerIron4G',
+    'wirelessAp' => 'wireless access point',
+    'wirelessProbe' => 'wireless probe',
+    'ironPointMobility' => 'IronPoint Mobility Series',
+    'ironPointMC' => 'IronPoint Mobility Controller',
+    'dcrs7504Switch' => 'DCRS-7504',
+    'dcrs7504Router' => 'DCRS-7504',
+    'dcrs7508Switch' => 'DCRS-7508',
+    'dcrs7508Router' => 'DCRS-7508',
+    'dcrs7515Switch' => 'DCRS-7515',
+    'dcrs7515Router' => 'DCRS-7515',
+);
+
 $rewrite_ios_features = array(
   "PK9S" => "IP w/SSH LAN Only",
   "LANBASEK9" => "Lan Base Crypto",
@@ -217,6 +649,13 @@ function rewrite_ios_features ($features)
   return ($features);
 }
 
+function rewrite_ironware_hardware ($hardware)
+{
+  global $rewrite_ironware_hardware;
+  $hardware = array_str_replace($rewrite_ironware_hardware, $hardware);
+  return ($hardware);
+}
+
 
 function fixiftype ($type)
 {

includes/static-config.php

@@ -41,6 +41,7 @@ $os_text['catos']        = "Cisco CatOS";
 $os_text['nxos']         = "Cisco NX-OS";
 $os_text['asa']          = "Cisco ASA";
 $os_text['pix']          = "Cisco PIX";
+$os_text['ironware']	 = "Brocade IronWare";
 $os_text['freebsd']      = "FreeBSD";
 $os_text['openbsd']      = "OpenBSD";
 $os_text['netbsd']       = "NetBSD";