newdevice: Aruba Instant AP wireless sensor support (Freq, NoiseFloor, Power, Util) (#6564)

A few other fixes elsewhere

LibreNMS/Device/Sensor.php

@@ -95,7 +95,6 @@ class Sensor implements DiscoveryModule, PollerModule
         $entPhysicalIndex = null,
         $entPhysicalMeasured = null
     ) {
-        //
         $this->type = $type;
         $this->device_id = $device_id;
         $this->oids = (array)$oids;
@@ -113,6 +112,11 @@ class Sensor implements DiscoveryModule, PollerModule
         $this->high_warn = $high_warn;
         $this->low_warn = $low_warn;
 
+        // ensure leading dots
+        array_walk($this->oids, function (&$oid) {
+            $oid = '.' . ltrim($oid, '.');
+        });
+
         $sensor = $this->toArray();
         // validity not checked yet
         if (is_null($this->current)) {
@@ -547,10 +551,10 @@ class Sensor implements DiscoveryModule, PollerModule
     {
         $table = static::$table;
         $params = array($device_id, $type);
-        $where = '`device_id`=? AND `sensor_class`=? AND `sensor_id`';
+        $where = '`device_id`=? AND `sensor_class`=?';
 
         if (!empty($sensor_ids)) {
-            $where .= ' NOT IN ' . dbGenPlaceholders(count($sensor_ids));
+            $where .= ' AND `sensor_id` NOT IN ' . dbGenPlaceholders(count($sensor_ids));
             $params = array_merge($params, $sensor_ids);
         }
 

LibreNMS/OS.php

@@ -80,7 +80,7 @@ class OS
         }
 
         if (!isset($this->$oid)) {
-            $data = snmp_cache_oid($oid, $this->getDevice(), array(), $mib);
+            $data = snmpwalk_cache_oid($this->getDevice(), $oid, array(), $mib);
             $this->$oid = array_map('current', $data);
         }
 
@@ -109,10 +109,11 @@ class OS
     /**
      * Poll a channel based OID, but return data in MHz
      *
-     * @param $sensors
+     * @param array $sensors
+     * @param callable $callback Function to modify the value before converting it to a frequency
      * @return array
      */
-    protected function pollWirelessChannelAsFrequency($sensors)
+    protected function pollWirelessChannelAsFrequency($sensors, $callback = null)
     {
         if (empty($sensors)) {
             return array();
@@ -127,7 +128,13 @@ class OS
 
         $data = array();
         foreach ($oids as $id => $oid) {
-            $data[$id] = WirelessSensor::channelToFrequency($snmp_data[$oid]);
+            if (isset($callback)) {
+                $channel = call_user_func($callback, $snmp_data[$oid]);
+            } else {
+                $channel = $snmp_data[$oid];
+            }
+
+            $data[$id] = WirelessSensor::channelToFrequency($channel);
         }
 
         return $data;

LibreNMS/OS/Arubaos.php

@@ -27,9 +27,20 @@ namespace LibreNMS\OS;
 
 use LibreNMS\Device\WirelessSensor;
 use LibreNMS\Interfaces\Discovery\Sensors\WirelessClientsDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessFrequencyDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessNoiseFloorDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessPowerDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessUtilizationDiscovery;
+use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling;
 use LibreNMS\OS;
 
-class Arubaos extends OS implements WirelessClientsDiscovery
+class Arubaos extends OS implements
+    WirelessClientsDiscovery,
+    WirelessFrequencyDiscovery,
+    WirelessFrequencyPolling,
+    WirelessNoiseFloorDiscovery,
+    WirelessPowerDiscovery,
+    WirelessUtilizationDiscovery
 {
     /**
      * Discover wireless client counts. Type is clients.
@@ -44,4 +55,98 @@ class Arubaos extends OS implements WirelessClientsDiscovery
             new WirelessSensor('clients', $this->getDeviceId(), $oid, 'arubaos', 1, 'Clients')
         );
     }
+
+    /**
+     * Discover wireless frequency.  This is in MHz. Type is frequency.
+     * Returns an array of LibreNMS\Device\Sensor objects that have been discovered
+     *
+     * @return array Sensors
+     */
+    public function discoverWirelessFrequency()
+    {
+        // instant
+        return $this->discoverInstantRadio('frequency', 'aiRadioChannel');
+    }
+
+    /**
+     * Discover wireless noise floor. This is in dBm/Hz. Type is noise-floor.
+     * Returns an array of LibreNMS\Device\Sensor objects that have been discovered
+     *
+     * @return array
+     */
+    public function discoverWirelessNoiseFloor()
+    {
+        // instant
+        return $this->discoverInstantRadio('noise-floor', 'aiRadioNoiseFloor');
+    }
+
+    /**
+     * Discover wireless tx or rx power. This is in dBm. Type is power.
+     * Returns an array of LibreNMS\Device\Sensor objects that have been discovered
+     *
+     * @return array
+     */
+    public function discoverWirelessPower()
+    {
+        // instant
+        return $this->discoverInstantRadio('power', 'aiRadioTransmitPower', "Radio %s: Tx Power");
+    }
+
+    protected function decodeChannel($channel)
+    {
+        return $channel & 255; // mask off the channel width information
+    }
+
+    private function discoverInstantRadio($type, $oid, $desc = 'Radio %s')
+    {
+        $data = snmpwalk_cache_oid_num($this->getDevice(), $oid, array(), 'AI-AP-MIB');
+
+        $sensors = array();
+        foreach ($data as $oid => $entry) {
+            $oid_parts = explode('.', $oid);
+            $index = end($oid_parts);
+
+            if ($type == 'frequency') {
+                $current = WirelessSensor::channelToFrequency($this->decodeChannel($entry[$oid]));
+            } else {
+                $current = $entry[$oid];
+            }
+
+            $sensors[] = new WirelessSensor(
+                $type,
+                $this->getDeviceId(),
+                $oid,
+                'arubaos-iap',
+                $index,
+                sprintf($desc, $index),
+                $current
+            );
+        }
+
+        return $sensors;
+    }
+
+    /**
+     * Discover wireless utilization.  This is in %. Type is utilization.
+     * Returns an array of LibreNMS\Device\Sensor objects that have been discovered
+     *
+     * @return array Sensors
+     */
+    public function discoverWirelessUtilization()
+    {
+        // instant
+        return $this->discoverInstantRadio('utilization', 'aiRadioUtilization64');
+    }
+
+    /**
+     * Poll wireless frequency as MHz
+     * The returned array should be sensor_id => value pairs
+     *
+     * @param array $sensors Array of sensors needed to be polled
+     * @return array of polled data
+     */
+    public function pollWirelessFrequency(array $sensors)
+    {
+        return $this->pollWirelessChannelAsFrequency($sensors, array($this, 'decodeChannel'));
+    }
 }

mibs/arubaos/ARUBA-MGMT-MIB

@@ -1,4 +1,4 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- ***********************************************************
 --  ARUBA-MGMT-MIB
 --
@@ -36,7 +36,7 @@ ARUBA-MGMT-MIB DEFINITIONS ::= BEGIN
 --                        
 
     arubaMgmtExtensions MODULE-IDENTITY
-    		LAST-UPDATED "0601221834Z"
+    		LAST-UPDATED "0804160206Z"
     		ORGANIZATION "Aruba Wireless Networks"
     		CONTACT-INFO 
 				"Postal: 	1322 Crossman Avenue
@@ -121,7 +121,7 @@ ARUBA-MGMT-MIB DEFINITIONS ::= BEGIN
 						the table.
 			moreTable -- indicates that there are some more rows 
 						 in the table.
-			retrieveError -- indicates an error occured while
+			retrieveError -- indicates an error occurred while
 							processing the getTable request.
 							(Will be expanded ).
 			A Get request on this object returns 0 .

mibs/arubaos/ARUBA-MIB

@@ -1,4 +1,4 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 ARUBA-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
@@ -80,8 +80,54 @@ a3400 OBJECT IDENTIFIER ::= { switchProducts 15}
 a3400-32 OBJECT IDENTIFIER ::= { switchProducts 16}
 
 a3600 OBJECT IDENTIFIER ::= { switchProducts 17}
+
 a3600-64 OBJECT IDENTIFIER ::= { switchProducts 18}
 
+a650 OBJECT IDENTIFIER ::= { switchProducts 19}
+a651 OBJECT IDENTIFIER ::= { switchProducts 20}
+reserved1 OBJECT IDENTIFIER ::= { switchProducts 21}
+reserved2 OBJECT IDENTIFIER ::= { switchProducts 22}
+a620 OBJECT IDENTIFIER ::= { switchProducts 23}
+
+s3500-24P   OBJECT IDENTIFIER ::= { switchProducts 24 }
+s3500-24T   OBJECT IDENTIFIER ::= { switchProducts 25 }
+s3500-48P   OBJECT IDENTIFIER ::= { switchProducts 26 }
+s3500-48T   OBJECT IDENTIFIER ::= { switchProducts 27 }
+
+s2500-24P   OBJECT IDENTIFIER ::= { switchProducts 28 }
+s2500-24T   OBJECT IDENTIFIER ::= { switchProducts 29 }
+s2500-48P   OBJECT IDENTIFIER ::= { switchProducts 30 }
+s2500-48T   OBJECT IDENTIFIER ::= { switchProducts 31 }
+
+a7210   OBJECT IDENTIFIER ::= { switchProducts 32 }
+a7220   OBJECT IDENTIFIER ::= { switchProducts 33 }
+a7240   OBJECT IDENTIFIER ::= { switchProducts 34 }
+
+s3500-24F   OBJECT IDENTIFIER ::= { switchProducts 35 }
+
+s1500-48P   OBJECT IDENTIFIER ::= { switchProducts 36 }
+s1500-24P   OBJECT IDENTIFIER ::= { switchProducts 37 }
+s1500-12P   OBJECT IDENTIFIER ::= { switchProducts 38 }
+
+a7005   OBJECT IDENTIFIER ::= { switchProducts 39 }
+a7010   OBJECT IDENTIFIER ::= { switchProducts 40 }
+a7030   OBJECT IDENTIFIER ::= { switchProducts 41 }
+a7205   OBJECT IDENTIFIER ::= { switchProducts 42 }
+a7024   OBJECT IDENTIFIER ::= { switchProducts 43 }
+a7215   OBJECT IDENTIFIER ::= { switchProducts 44 }
+vmc-tact   OBJECT IDENTIFIER ::= { switchProducts 45 }
+vmc-sp10k   OBJECT IDENTIFIER ::= { switchProducts 46 }
+a7240xm OBJECT IDENTIFIER ::= { switchProducts 47 }
+a7008   OBJECT IDENTIFIER ::= { switchProducts 48 }
+vmc-tact8   OBJECT IDENTIFIER ::= { switchProducts 49 }
+mm-va   OBJECT IDENTIFIER ::= { switchProducts 50 }
+a7280   OBJECT IDENTIFIER ::= { switchProducts 51 }
+mc-va   OBJECT IDENTIFIER ::= { switchProducts 52 }
+mm-hw-1K   OBJECT IDENTIFIER ::= { switchProducts 53 }
+mm-hw-5K   OBJECT IDENTIFIER ::= { switchProducts 54 }
+mm-hw-10K   OBJECT IDENTIFIER ::= { switchProducts 55 }
+
+
 --Undefined switch.
 aUndefined OBJECT IDENTIFIER ::= { switchProducts 9999}
 
@@ -165,6 +211,256 @@ ap80SB OBJECT IDENTIFIER ::= {apProducts 19}
 
 ap85 OBJECT IDENTIFIER ::= {apProducts 20}
 
+--ap124, this object is the SYSOID
+
+ap124 OBJECT IDENTIFIER ::= {apProducts 21}
+
+--ap125, this object is the SYSOID
+
+ap125 OBJECT IDENTIFIER ::= {apProducts 22}
+
+--ap120, this object is the SYSOID
+
+ap120 OBJECT IDENTIFIER ::= {apProducts 23}
+
+--ap121, this object is the SYSOID
+
+ap121 OBJECT IDENTIFIER ::= {apProducts 24}
+
+--ap1250, this object is the SYSOID
+
+ap1250 OBJECT IDENTIFIER ::= {apProducts 25}
+
+--ap120abg, this object is the SYSOID
+
+ap120abg OBJECT IDENTIFIER ::= {apProducts 26}
+
+--ap121abg, this object is the SYSOID
+
+ap121abg OBJECT IDENTIFIER ::= {apProducts 27}
+
+--ap124abg, this object is the SYSOID
+
+ap124abg OBJECT IDENTIFIER ::= {apProducts 28}
+
+--ap125abg, this object is the SYSOID
+
+ap125abg OBJECT IDENTIFIER ::= {apProducts 29}
+
+-- rap5wn, this object is the SYSOID
+
+rap5wn OBJECT IDENTIFIER ::= {apProducts 30}
+
+-- rap5, this object is the SYSOID
+
+rap5 OBJECT IDENTIFIER ::= {apProducts 31}
+
+-- rap2wg, this object is the SYSOID
+
+rap2wg OBJECT IDENTIFIER ::= {apProducts 32}
+
+--reserved-4, this object is the SYSOID
+
+reserved4 OBJECT IDENTIFIER ::= {apProducts 33}
+
+--ap105, this object is the SYSOID
+
+ap105 OBJECT IDENTIFIER ::= {apProducts 34}
+
+--ap65wb, this object is the SYSOID
+
+ap65wb OBJECT IDENTIFIER ::= {apProducts 35}
+
+--ap651, this object is the SYSOID
+
+ap651 OBJECT IDENTIFIER ::= {apProducts 36}
+
+--reserved-6, this object is the SYSOID
+
+reserved6 OBJECT IDENTIFIER ::= {apProducts 37}
+
+--ap60p, this object is the SYSOID
+
+ap60p OBJECT IDENTIFIER ::= {apProducts 38}
+
+--reserved-7, this object is the SYSOID
+
+reserved7 OBJECT IDENTIFIER ::= {apProducts 39}
+
+--ap92, this object is the SYSOID
+
+ap92 OBJECT IDENTIFIER ::= {apProducts 40}
+
+--ap93, this object is the SYSOID
+
+ap93 OBJECT IDENTIFIER ::= {apProducts 41}
+
+--ap68, this object is the SYSOID
+
+ap68 OBJECT IDENTIFIER ::= {apProducts 42}
+
+--ap68p, this object is the SYSOID
+
+ap68p OBJECT IDENTIFIER ::= {apProducts 43}
+
+--ap175p, this object is the SYSOID
+
+ap175p OBJECT IDENTIFIER ::= {apProducts 44}
+
+--ap175ac, this object is the SYSOID
+
+ap175ac OBJECT IDENTIFIER ::= {apProducts 45}
+
+--ap175dc, this object is the SYSOID
+
+ap175dc OBJECT IDENTIFIER ::= {apProducts 46}
+
+--ap134, this object is the SYSOID
+
+ap134 OBJECT IDENTIFIER ::= {apProducts 47}
+
+--ap135, this object is the SYSOID
+
+ap135 OBJECT IDENTIFIER ::= {apProducts 48}
+
+--reserved-8, this object is the SYSOID
+
+reserved8 OBJECT IDENTIFIER ::= {apProducts 49}
+
+--ap93h, this object is the SYSOID
+
+ap93h OBJECT IDENTIFIER ::= {apProducts 50}
+
+--rap3wn, this object is the SYSOID
+
+rap3wn OBJECT IDENTIFIER ::= {apProducts 51}
+
+--rap3wnp, this object is the SYSOID
+
+rap3wnp OBJECT IDENTIFIER ::= {apProducts 52}
+
+--ap104, this object is the SYSOID
+
+ap104 OBJECT IDENTIFIER ::= {apProducts 53}
+
+--rap155, this object is the SYSOID
+rap155 OBJECT IDENTIFIER ::= {apProducts 54}
+
+--rap155p, this object is the SYSOID
+rap155p OBJECT IDENTIFIER ::= {apProducts 55}
+
+--rap108, this object is the SYSOID
+rap108 OBJECT IDENTIFIER ::= {apProducts 56}
+
+--rap109, this object is the SYSOID
+rap109 OBJECT IDENTIFIER ::= {apProducts 57}
+
+--ap224, this object is the SYSOID
+ap224 OBJECT IDENTIFIER ::= {apProducts 58}
+
+--ap225, this object is the SYSOID
+ap225 OBJECT IDENTIFIER ::= {apProducts 59}
+
+--ap114, this object is the SYSOID
+ap114 OBJECT IDENTIFIER ::= {apProducts 60}
+
+--ap115, this object is the SYSOID
+ap115 OBJECT IDENTIFIER ::= {apProducts 61}
+
+--rap109L, this object is the SYSOID
+rap109L OBJECT IDENTIFIER ::= {apProducts 62}
+
+--ap274, this object is the SYSOID
+ap274 OBJECT IDENTIFIER ::= {apProducts 63}
+
+--ap275, this object is the SYSOID
+ap275 OBJECT IDENTIFIER ::= {apProducts 64}
+
+--ap214a, this object is the SYSOID
+ap214a OBJECT IDENTIFIER ::= {apProducts 65}
+
+--ap215a, this object is the SYSOID
+ap215a OBJECT IDENTIFIER ::= {apProducts 66}
+
+--ap204, this object is the SYSOID
+ap204 OBJECT IDENTIFIER ::= {apProducts 67}
+
+--ap205, this object is the SYSOID
+ap205 OBJECT IDENTIFIER ::= {apProducts 68}
+
+--ap103, this object is the SYSOID
+ap103 OBJECT IDENTIFIER ::= {apProducts 69}
+
+--ap103H, this object is the SYSOID
+ap103H OBJECT IDENTIFIER ::= {apProducts 70}
+
+--iapvc, this object is the SYSOID
+iapvc OBJECT IDENTIFIER ::= {apProducts 71}
+
+--ap277, this object is the SYSOID
+ap277 OBJECT IDENTIFIER ::= {apProducts 72}
+
+--ap214, this object is the SYSOID
+ap214 OBJECT IDENTIFIER ::= {apProducts 73}
+
+--ap215, this object is the SYSOID
+ap215 OBJECT IDENTIFIER ::= {apProducts 74}
+
+--ap228, this object is the SYSOID
+ap228 OBJECT IDENTIFIER ::= {apProducts 75}
+
+--ap205H, this object is the SYSOID
+ap205H OBJECT IDENTIFIER ::= {apProducts 76}
+
+--ap324, this object is the SYSOID
+ap324 OBJECT IDENTIFIER ::= {apProducts 77}
+
+--ap325, this object is the SYSOID
+ap325 OBJECT IDENTIFIER ::= {apProducts 78}
+
+--ap334, this object is the SYSOID
+ap334 OBJECT IDENTIFIER ::= {apProducts 79}
+
+--ap335, this object is the SYSOID
+ap335 OBJECT IDENTIFIER ::= {apProducts 80}
+
+--ap314, this object is the SYSOID
+ap314 OBJECT IDENTIFIER ::= {apProducts 81}
+
+--ap315, this object is the SYSOID
+ap315 OBJECT IDENTIFIER ::= {apProducts 82}
+
+--apm210, this object is the SYSOID
+apm210 OBJECT IDENTIFIER ::= {apProducts 83}
+
+--ap207, this object is the SYSOID
+ap207 OBJECT IDENTIFIER ::= {apProducts 84}
+
+--ap304, this object is the SYSOID
+ap304 OBJECT IDENTIFIER ::= {apProducts 85}
+
+--ap305, this object is the SYSOID
+ap305 OBJECT IDENTIFIER ::= {apProducts 86}
+
+--ap303h, this object is the SYSOID
+ap303h OBJECT IDENTIFIER ::= {apProducts 87}
+
+--ap365, this object is the SYSOID
+ap365 OBJECT IDENTIFIER ::= {apProducts 88}
+
+--ap367, this object is the SYSOID
+ap367 OBJECT IDENTIFIER ::= {apProducts 89}
+
+
+--ap203H, this object is the SYSOID
+ap203H OBJECT IDENTIFIER ::= {apProducts 90}
+
+--ap203R, this object is the SYSOID
+ap203R OBJECT IDENTIFIER ::= {apProducts 91}
+
+--ap203RP, this object is the SYSOID
+ap203RP OBJECT IDENTIFIER ::= {apProducts 92}
+
 --Undefined ap.
 apUndefined OBJECT IDENTIFIER ::= { apProducts 9999}
 
@@ -180,6 +476,9 @@ ecsE100C  OBJECT IDENTIFIER ::= {partnerProducts 2}
 ecsE100A  OBJECT IDENTIFIER ::= {partnerProducts 3}
 ecsENSM   OBJECT IDENTIFIER ::= {partnerProducts 4}
 
+--Amigopod
+amigopodProducts OBJECT IDENTIFIER ::= { products 5 }
+
 -- List of all the Enterprise MIB Modules.
 
 -- common node will contain all the objects which can be shared between
@@ -196,6 +495,9 @@ arubaAp OBJECT IDENTIFIER ::= { arubaEnterpriseMibModules 3 }
 
 arubaEcs	OBJECT IDENTIFIER ::= {arubaEnterpriseMibModules 4}
 
+-- Common MIB Modules shared across Aruba products.
+arubaMIBModules OBJECT IDENTIFIER ::= { common 1 }
+
 -- Switch Mib Modules.
 wlsxEnterpriseMibModules OBJECT IDENTIFIER ::= { switch 1 }
 
@@ -203,8 +505,10 @@ wlsxEnterpriseMibModules OBJECT IDENTIFIER ::= { switch 1 }
 wlsrEnterpriseMibModules OBJECT IDENTIFIER ::= { arubaAp 1 }
 
 -- Outdoor AP Mib definition.
-
 wlsrOutDoorApMibModules OBJECT IDENTIFIER ::= { arubaAp 2 }
 
+-- Instant Mib definition.
+aiEnterpriseMibModules OBJECT IDENTIFIER ::= { arubaAp 3 }
+
 
 END

mibs/arubaos/ARUBA-TC

@@ -1,4 +1,4 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 ARUBA-TC DEFINITIONS ::= BEGIN
 
@@ -33,10 +33,11 @@ ArubaFrameType ::= TEXTUAL-CONVENTION
 						auth(11),
 						deauth(12)
 				 }
+
 ArubaPhyType ::= TEXTUAL-CONVENTION
 	STATUS		current
 	DESCRIPTION
-  		" Represents the PHY-type of the access point.  Wired clients will
+  		" Represents the PHY-type of the access point or client.  Wired clients will
 		  show 'wired' in user MIB entries.
 		"
 	SYNTAX       INTEGER {
@@ -47,6 +48,69 @@ ArubaPhyType ::= TEXTUAL-CONVENTION
 						wired(5)
 					  }
         
+ArubaHTMode ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the HT status of the access point or client.
+		"
+	SYNTAX       INTEGER {
+		 				none(1),
+						ht20(2),
+						ht40(3),
+						vht20(4),
+						vht40(5),
+						vht80(6),
+						vht160(7),
+						vht80plus80(8)
+					  }
+        
+ArubaHTExtChannel ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the extension channel offset relative to the current channel."
+	SYNTAX       INTEGER {
+		 				none(1),
+						above(2),
+						below(3),
+						eighty(4),
+                        onesixty(5)
+					  }
+        
+ArubaMonEncryptionType ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the encryption type supported by the access point."
+	SYNTAX       INTEGER {
+		 				open(0),
+						wep(1),
+						wpa(2),
+						wpa2(3)
+					  }
+
+ArubaMonEncryptionCipher ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the WPA encryption cipher supported by the access point."
+	SYNTAX       INTEGER {
+		 				none(0),
+						wep40(1),
+						wep104(2),
+						tkip(3),
+                        aesccmp(4),
+                        other(5)
+					  }
+
+ArubaMonAuthAlgorithm ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the WPA authentication algorithm supported by the access point."
+	SYNTAX       INTEGER {
+		 				none(0),
+						psk(1),
+						dot1x(2),
+                        other(3)
+					  }
+                      
 ArubaSwitchRole ::= TEXTUAL-CONVENTION
 	STATUS		current
 	DESCRIPTION
@@ -142,6 +206,7 @@ ArubaAuthenticationMethods ::= TEXTUAL-CONVENTION
 						pubcookie(15),
 						xSec(16),
 						xSecMachine(17),
+						via-vpn(28),
 						other(255)
 					  }
      
@@ -157,7 +222,42 @@ ArubaSubAuthenticationMethods ::= TEXTUAL-CONVENTION
 						eapTLS(5),
 						eapTTLS(6),
 						eapLEAP(7),
-						eapMD5(8)
+						eapMD5(8),
+						eapPEAP(9)
+					  }
+
+ArubaEncryptionType ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Encryption Method."
+	SYNTAX       INTEGER {
+		 				none(0),
+		 				static-wep(1),
+					    dynamic-wep(2),
+						wpa-psk-tkip(3),
+						wpa-tkip(4),
+						wpa-psk-aes(5),
+						wpa-aes(6),
+						wpa2-psk-tkip(7),
+						wpa2-tkip(8),
+						wpa2-psk-aes(9),
+						wpa2-aes(10),
+                        xSec(11),
+                        bSec-128(12),
+                        bSec-256(13),
+                        aes-128-cmac(14),
+                        unknown(15)
+					  }
+     
+ArubaUserForwardMode ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" User Forwarding Mode."
+	SYNTAX       INTEGER {
+		 				tunnel-encrypted(0),
+                        bridge(1),
+		 				tunnel-decrypted(2),
+					    split-tunnel(3)
 					  }
 
 ArubaRogueApType ::= TEXTUAL-CONVENTION
@@ -187,7 +287,13 @@ ArubaAPMatchType ::= TEXTUAL-CONVENTION
 						manual(5),
 						baseBSSIDOverride(6),
 						mms(7),
-						ethernetGatewayWiredMac(8)
+						ethernetGatewayWiredMac(8),
+						classificationDisabled(9),
+						apBSSID(10),
+						propagatedEthernetWiredMac(11),
+						apRule(12),
+						systemWiredMac(13),
+						systemGatewayMac(14)
 					 }
 
 ArubaAPMatchMethod ::= TEXTUAL-CONVENTION
@@ -198,7 +304,8 @@ ArubaAPMatchMethod ::= TEXTUAL-CONVENTION
 						notApplicable(0),
 						exactMatch(1),
 						plusOneMatch(2),
-						minusOneMatch(3)
+						minusOneMatch(3),
+						ouiMatch(4)
 					 }
 
 ArubaStationType ::= TEXTUAL-CONVENTION
@@ -206,6 +313,7 @@ ArubaStationType ::= TEXTUAL-CONVENTION
    DESCRIPTION
    		"Represents the station type. "
    SYNTAX      INTEGER {
+						unknown(0),
 						valid(1),
 						interfering(2),
 		 				dos(3)
@@ -267,6 +375,20 @@ ArubaDot1dState ::= TEXTUAL-CONVENTION
 					forwarding(5)
 				}
   
+ArubaAPDot1dState ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+		"Represents the AP port spanning tree state."
+	SYNTAX		INTEGER {
+					notAvailable(1),
+					off(2),
+					disabled(3),
+					listening(4),
+					learning(5),
+					forwarding(6),
+					blocking(7)
+				}
+  
 ArubaPoeState ::= TEXTUAL-CONVENTION
 	STATUS		current
 	DESCRIPTION
@@ -274,7 +396,8 @@ ArubaPoeState ::= TEXTUAL-CONVENTION
 	SYNTAX		INTEGER {
 					disabled(1),
 					enabled(2),
-					enabledCisco(3)
+					enabledCisco(3),
+                                        notAvailable(4)
 				}
  
 ArubaCardType ::= TEXTUAL-CONVENTION
@@ -294,7 +417,25 @@ ArubaCardType ::= TEXTUAL-CONVENTION
 					m3mk1(8),
 					sw3200(9),
 					sw3400(10),
-					sw3600(11)
+					sw3600(11),
+					sw650(12),
+					sw651(13),
+					reserved1(14),
+					reserved2(15),
+					sw620(16),
+					sw7210(17),
+					sw7220(18),
+					sw7240(19),
+					sw3500(20),
+					sw2500(21),
+					sw1500(22),
+					sw7010(23),
+					sw7005(24),
+					sw7030(25),
+					sw7205(26),
+					sw7024(27),
+					sw7240xm(28),
+					sw7008(29)
 				}
  
 ArubaESIServerMode ::= TEXTUAL-CONVENTION
@@ -343,8 +484,10 @@ ArubaVoipProtocolType ::= TEXTUAL-CONVENTION
 		 				sccp(1),
 						svp(2),
 						vocera(3),
-						sip(4),
+						sip(9),
-						unknown(10)
+						ua(11),
+						h323(13),
+						unknown(15)
 		 		 }
 
 ArubaAccessPointMode ::= TEXTUAL-CONVENTION
@@ -358,7 +501,9 @@ ArubaAccessPointMode ::= TEXTUAL-CONVENTION
 						accessPoint(2),
 						accessPointAndMonitor(3),
 						meshPortal(4),
-						meshPoint(5)
+						meshPoint(5),
+						rfprotectSensor(6),
+						spectrumSensor(7)
 		 		 }
 
 ArubaAuthServerType ::= TEXTUAL-CONVENTION
@@ -463,7 +608,9 @@ ArubaPortSpeed ::= TEXTUAL-CONVENTION
 						  speed100Mbps(2), 
 						  speed1000Mbps(3), 
 						  speedAuto(4),
-						  speed10Gbps(5)
+						  speed10Gbps(5),
+						  speed2Gbps(6),
+						  speed5Gbps(7)
 						}
 
 ArubaPortDuplex ::= TEXTUAL-CONVENTION
@@ -485,7 +632,9 @@ ArubaPortType ::= TEXTUAL-CONVENTION
 		"
 	SYNTAX		INTEGER { fastethernet(1), 
 						  gigabitethernet(2),
-						  xgigabitethernet(3) 
+						  xgigabitethernet(3),
+						  twogigabitethernet(4), 
+						  fivegigabitethernet(5) 
 						}
 
 ArubaEnet1Mode ::= TEXTUAL-CONVENTION
@@ -496,7 +645,8 @@ ArubaEnet1Mode ::= TEXTUAL-CONVENTION
 		 				activeStandby(1),
 						tunnel(2),
 						bridge(3),
-						notApplicable(4)
+						notApplicable(4),
+						split(5)
 					  }
  
 ArubaUnprovisionedStatus ::= TEXTUAL-CONVENTION
@@ -554,12 +704,13 @@ ArubaCallStates ::= TEXTUAL-CONVENTION
 				alerting(6),
 				releasing(7),
 				cancelling(8),
-				transient(9),
+				challenging(9),
-				dummy503(10),
+				transient(10),
-				succ(11),
+				blockwait(11),
-				fail(12),
+				succ(12),
-				aborted(13),
+				fail(13),
-				blocked(14)
+				aborted(14),
+				blocked(15)
 			}
    
 ArubaVoipProtocol ::= TEXTUAL-CONVENTION
@@ -572,7 +723,9 @@ ArubaVoipProtocol ::= TEXTUAL-CONVENTION
 			sccp(1), 
 			svp(2), 
 			vocera(3), 
-			sip(9), ua(11) 
+			sip(9), 
+			ua(11), 
+			h323(13)
 	}
 
 ArubaVoipRegState ::= TEXTUAL-CONVENTION
@@ -582,7 +735,7 @@ ArubaVoipRegState ::= TEXTUAL-CONVENTION
 		  VoIP registered state
 		"
 	SYNTAX		INTEGER {
-			unkown(0), 
+			unknown(0), 
 			registering(1), 
 			unregistering(2), 
 			challenge(3), 
@@ -626,6 +779,316 @@ ArubaMeshRole ::= TEXTUAL-CONVENTION
 			portal(2)
 	}
 
+ArubaHTRate ::= TEXTUAL-CONVENTION
+   	STATUS       current
+   	DESCRIPTION
+           "Represents HT rate"
+    SYNTAX       INTEGER {
+					unknown(0),
+					ht6dot5(1),
+					ht13(2),
+					ht13dot5(3),
+					ht15(4),
+					ht19dot5(5),
+					ht26(6),
+					ht27(7),
+					ht30(8),
+					ht39(9),
+					ht40dot5(10),
+					ht45(11),
+					ht52(12),
+					ht54(13),
+					ht58dot5(14),
+					ht60(15),
+					ht65(16),
+					ht78(17),
+					ht81(18),
+					ht90(19),
+					ht104(20),
+					ht108(21),
+					ht117(22),
+					ht120(23),
+					ht121dot5(24),
+					ht130(25),
+					ht135(26),
+					ht150(27),
+					ht162(28),
+					ht180(29),
+					ht216(30),
+					ht240(31),
+					ht243(32),
+					ht270(33),
+					ht300(34)
+				 }
 
 
+ArubaARMChangeReason ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+		"
+		The reason for ARM or AirMatch based change.
+		"
+	SYNTAX       INTEGER {
+                       radarDetected(1),
+                       radarCleared(2),
+                       txHang(3),
+                       txHangClear(4),
+                       fortyMhzIntol(5),
+                       cancel40mhzIntol(6),
+                       fortyMhzAlign(7),
+                       armInterference(8),
+                       armInvalidCh(9),
+                       armErrorThresh(10),
+                       armNoiseThresh(11),
+                       armEmptyCh(12),
+                       armRogueCont(13),
+                       armDecreasePower(14),
+                       armIncreasePower(15),
+                       armTurnOffRadio(16),
+                       armTurnOnRadio(17),
+                       armChannelQualityThresh(18),
+                       armDynamicBW(19),
+                       armInterferenceCCA(20),
+                       airmatchNoise(21),
+                       airmatchSolver(22),
+                       airmatchFreeze(23),
+                       airmatchUnfreeze(24),
+                       random(25),
+                       airmatchInit(26),
+                       unknown(27),
+                       airmatchNoiseCleared(28),
+                       airmatchRogueCont(29)
+   }
+
+ArubaAPMasterStatus ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+		"
+		  AP status as seen by the master controller
+          (used to indicate a status change).
+		"
+	SYNTAX		INTEGER {
+			up(1),
+			down(2), 
+			move(3)
+	}
+
+ArubaDot3azStatus ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the state of Energy Efficient Ethernet (802.3az)."
+    SYNTAX      BITS {
+						disabled(0),
+						unsupported(1),
+						eee100BaseTX(2),
+						eee1000BaseT(3),
+						eee10GBaseT(4),
+						eee1000BaseKX(5),
+						eee10GBaseKX4(6),
+						eee10GBaseKR(7)
+					 }
+		
+ArubaThresholdResourceType ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the Threshold Resource Types"
+    SYNTAX      INTEGER {
+					dataPathCpu(0),
+					controlPathCpu(1),
+					controlPathMemory(2),
+					totalTunnelCapacity(3),
+					userCapacity(4),
+					noofAps(5) ,
+					noofLocals(6)
+				}
+
+ArubaStackState ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The state of the stack element in the stack.
+
+        primary   - the stack element is in primary state.
+        secondary - the stack element is in secondary state.
+        linecard  - the stack element is in linecard state.
+        away      - the stack element is in inactive state.
+
+        primary, secondary and linecard implies active state of the stack
+        element."
+    SYNTAX      INTEGER {
+                   primary(1),
+                   secondary(2),
+                   linecard(3),
+                   away(4)
+    }
+
+ArubaStackChangeEvent  ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "Used to specify the event which caused change in topology in stack."
+    SYNTAX      INTEGER {
+                      other(1),
+                      primarySlotChanged(2),
+                      secondarySlotChanged(3),
+                      lineCardSlotChanged(4),
+                      roleChanged(5),
+                      priorityChanged(6),
+                      versionMismatch(7),
+                      slotExceeded(8)
+    }
+
+ArubaStackIfTopoJoined ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "Used to specify whether an interface has joined the stacking
+        topology or left the topology."
+    SYNTAX      INTEGER {
+        connected(1),   -- An interface has joined stacking topology.
+        disconnected(2) -- An interface has left stacking topology.
+    }
+
+InterfaceIndex ::= TEXTUAL-CONVENTION
+    STATUS       current
+    DESCRIPTION
+            "A unique value, greater than zero, for each interface or
+            interface sub-layer in the managed system.  It is
+            recommended that values are assigned contiguously starting
+            from 1.  The value for each interface sub-layer must remain
+            constant at least from one re-initialization of the entity's
+            network management system to the next re-initialization."
+    SYNTAX       Integer32 (1..2147483647)
+
+ArubaIfState ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "Used to specify the state of an interface.
+
+        linkUp   - Operational state of this interface is up.
+        linkDown - Operational state of this interface is down."
+    SYNTAX  INTEGER {
+        linkUp(1),
+        linkDown(2)
+    }
+
+ArubaIfStateChangeReason ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "Used to specify the reason for interface state change.
+
+        admin       - User has explicitly issued 'shutdown' or 'no shutdown'
+                      configuration from CLI on this interface.
+        loopProtect - If ifState of an interface changes to linkDown, then
+                      it is used to specify that a loop has been detected on
+                      this interface by loop protect mechanism.
+                      If ifState of an interface changes to linkUp, then
+                      it is used to specify that loop-protect error has been
+                      cleared out on this interface through port auto-recovery
+                      mechanism or through explicit clear error-recovery
+                      command.
+        macLimit    - If ifState of an interface changes to linkDown, then
+                      it is used to specify that number of learnt MACs on this
+                      interface exceeds the limit configured.
+                      If ifState of an interface changes to linkUp, then it is
+                      used to specify that mac-limit error has been cleared out
+                      on this interface through port auto-recovery mechanism or
+                      through explicit clear error-recovery command.
+        raGuard     - If ifState of an interface changes to linkDown, then it
+                      is used to specify that invalid router advertisement has
+                      been identified on this interface, resulting shutting
+                      down of this interface.
+                      If ifState of an interface changes to linkUp, then it is
+                      used to specify that raGuard error has been cleared out on
+                      this interface through port auto-recovery mechanism or
+                      through explicit clear error-recovery command.
+        bpduGuard   - If ifState of an interface changes to linkDown, then it
+                      is used to specify that BPDU is received on this interface
+                      resulting shutting down of this interface.
+                      If ifState of an interface changes to linkUp, then it is
+                      used to specify that BPDU Guard error has been cleared out
+                      on this interface through port auto-recovery mechanism or
+                      through explicit clear error-recovery command."
+    SYNTAX  INTEGER {
+        admin(1),
+        loopProtect(2),
+        macLimit(3),
+        raGuard(4),
+        bpduGuard(5)
+    }
+
+ArubaAPUplinkType ::= TEXTUAL-CONVENTION
+    STATUS       current
+    DESCRIPTION
+        "
+          AP uplink type
+        "
+    SYNTAX       INTEGER {
+            ethernet(1),
+            usb(2),
+            pppoe(3),
+            wifi(4)
+    }
+
+ArubaAPUplinkChangeReason ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "Used to specify the reason for AP uplink change.
+
+        linkFailure - The uplink went down
+        vpnFailure  - VPN tunnel could not be sustained using the uplink
+        preemption  - The uplink was pre-empted by a higher-priority uplink"
+    SYNTAX  INTEGER {
+        linkFailure(1),
+        vpnFailure(2),
+        preemption(3)
+    }
+
+ArubaPortalServerDownReason ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "Used to specify the reason for Portal server down.
+
+        connectFail - Connect Portal server fail"
+    SYNTAX  INTEGER {
+        connectFail(1)
+    }
+
+ArubaHaRole ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the HA role of the Aruba controller"
+	SYNTAX       INTEGER {
+                             dual(0),
+                             active(1),
+                             standby(2),
+                             disabled(3)
+                         }
+
+ArubaHaConnectivityStatus ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+  		" Represents the HA standby connectivity status of the Access Point"
+	SYNTAX      INTEGER {
+                            haSuccess(0),
+                            haNetUnreach(1),
+                            haCpUnreach(2),
+                            haImageMissMatch(3),
+                            haApDenied(4),
+                            haHbtFailure(5),
+                            haInvalidHelloResponse(6),
+                            haStandbyTunnelDown(7)
+					    }
+
+ArubaFlexRadioMode ::= TEXTUAL-CONVENTION
+	STATUS		current
+	DESCRIPTION
+		"
+		  Flex Radio Operating Mode
+		"
+	SYNTAX		INTEGER {
+                            single2GHzBand(0),
+                            single5GHzBand(1),
+                            dual2GHzplus5GHzBand(2), 
+                            unknown(3),
+                            notApplicable(4)
+                       }
+
 END

mibs/arubaos/WLSX-AUTH-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 WLSX-AUTH-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -38,7 +39,7 @@ WLSX-AUTH-MIB DEFINITIONS ::= BEGIN
 	   		FROM ARUBA-TC;
 
    wlsxAuthMIB MODULE-IDENTITY 
-       LAST-UPDATED "0601221834Z"
+       LAST-UPDATED "0611272030Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -49,7 +50,7 @@ WLSX-AUTH-MIB DEFINITIONS ::= BEGIN
            "This MIB module defines MIB objects which provide
             information about the authentication servers known to an 
 			Aruba controller."
-       REVISION        "0601221834Z"
+       REVISION        "0611272030Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 8 }
@@ -87,7 +88,7 @@ WLSX-AUTH-MIB DEFINITIONS ::= BEGIN
 
 		authServerName 					DisplayString,
 		authServerType					ArubaAuthServerType,
-		authServerAddress				IpAddress,
+		authServerAddress				DisplayString,
 		authServerPort					Integer32,
 		authServerRetryCount			Integer32,
 		authServerTimeOutValue			Integer32,
@@ -124,7 +125,7 @@ WLSX-AUTH-MIB DEFINITIONS ::= BEGIN
         ::= { wlsxAuthenticationServerEntry 2 }
 
     authServerAddress OBJECT-TYPE
-         SYNTAX       IpAddress
+         SYNTAX       DisplayString(SIZE(0..48))
          MAX-ACCESS   read-create
          STATUS       current
          DESCRIPTION

mibs/arubaos/WLSX-CTS-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 WLSX-CTS-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -32,7 +33,7 @@ WLSX-CTS-MIB DEFINITIONS ::= BEGIN
 			FROM ARUBA-MIB;
 
    wlsxCtsMIB MODULE-IDENTITY 
-       LAST-UPDATED "0704101823Z"
+       LAST-UPDATED "0708060518Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -43,7 +44,7 @@ WLSX-CTS-MIB DEFINITIONS ::= BEGIN
            "This MIB module defines MIB objects which provide
             information about the Controller Transport Service (Cts) in the 
 			Aruba controller."
-       REVISION        "0704101823Z"
+       REVISION        "0708060518Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 11 }

mibs/arubaos/WLSX-ESI-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 WLSX-ESI-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -36,7 +37,7 @@ WLSX-ESI-MIB DEFINITIONS ::= BEGIN
 			FROM ARUBA-MIB;
 
    wlsxESIMIB MODULE-IDENTITY 
-       LAST-UPDATED "0601221834Z"
+       LAST-UPDATED "1001261806Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -47,7 +48,7 @@ WLSX-ESI-MIB DEFINITIONS ::= BEGIN
            "This MIB module defines MIB objects which provide
             information about the External Services Interface (ESI) in the 
 			Aruba controller."
-       REVISION        "0601221834Z"
+       REVISION        "1001261806Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 10 }
@@ -84,7 +85,9 @@ WLSX-ESI-MIB DEFINITIONS ::= BEGIN
 			esiServerTrustedPort	Integer32,
 			esiServerUntrustedSlot	Integer32,
 			esiServerUntrustedPort	Integer32,
-			esiServerStatus 		ArubaESIServerStatus
+			esiServerStatus 		ArubaESIServerStatus,
+			esiServerTrustedModule	Integer32,
+			esiServerUntrustedModule Integer32
 		}
 
 	esiServerName OBJECT-TYPE
@@ -170,4 +173,20 @@ WLSX-ESI-MIB DEFINITIONS ::= BEGIN
 			"Indicates the status of this ESI server."
 		::= { wlsxESIServerEntry 10 }
 
+	esiServerTrustedModule OBJECT-TYPE
+		SYNTAX		Integer32
+		MAX-ACCESS	read-only
+		STATUS		current
+		DESCRIPTION
+			"The module number of the trusted interface for this server."
+		::= { wlsxESIServerEntry 11 }
+
+	esiServerUntrustedModule OBJECT-TYPE
+		SYNTAX		Integer32
+		MAX-ACCESS	read-only
+		STATUS		current
+		DESCRIPTION
+			"The module number of the untrusted interface for this server."
+		::= { wlsxESIServerEntry 12 }
+
 END

mibs/arubaos/WLSX-IFEXT-MIB

@@ -1,10 +1,11 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 
 WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+       
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -47,7 +48,7 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
            FROM ARUBA-MIB;
 
 	wlsxIfExtMIB MODULE-IDENTITY 
-       LAST-UPDATED "0704162151Z"
+       LAST-UPDATED "201207120000Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -57,7 +58,13 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
        DESCRIPTION
            "This MIB module defines MIB objects which provide
             System level information about the Aruba controller."
-       REVISION        "0704162151Z"
+
+       REVISION        "201207120000Z" -- 12th July, 2012
+       DESCRIPTION
+            "Deprecated wlsxIfExtPortTable and added new table
+             wlsxIfExtNPortTable"
+
+       REVISION        "1001261806Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 3 }
@@ -69,17 +76,18 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
    wlsxIfExtPortTable  OBJECT-TYPE 
 	  SYNTAX       SEQUENCE OF WlsxIfExtPortEntry 
 	  MAX-ACCESS   not-accessible		
-      STATUS       current 
+      STATUS       deprecated
       DESCRIPTION 
 	  	"
-			The table of processors contained by the controller.
+			The table of processors contained by the controller. This table is
+            deprecated in favor of wlsxIfExtNPortTable.
 		"
       ::= { wlsxIfExtGroup 1 } 
 
    wlsxIfExtPortEntry OBJECT-TYPE 
 	  SYNTAX       WlsxIfExtPortEntry 
 	  MAX-ACCESS   not-accessible		
-      STATUS       current 
+      STATUS       deprecated
       DESCRIPTION 
 	  "
 	  	An entry for one processor contained by the controller.
@@ -113,13 +121,14 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
 		 ifExtPortSpeed				ArubaPortSpeed,
 		 ifExtPortDuplex			ArubaPortDuplex,
 		 ifExtPortType				ArubaPortType,
-		 ifExtDescr					DisplayString
+		 ifExtDescr					DisplayString,
+		 ifExtUserModuleNumber		Integer32
 	 }
 
    ifExtSlotNumber OBJECT-TYPE
          SYNTAX       Integer32
 	  	 MAX-ACCESS   not-accessible		
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			This object represents the Physical Slot of the Interface.
@@ -129,7 +138,7 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
    ifExtPortNumber OBJECT-TYPE
         SYNTAX      Integer32
 	  	MAX-ACCESS   not-accessible		
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
             "
 			This object represents the Physical Port of the Interface. 
@@ -139,20 +148,22 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
    ifExtPortIfIndex OBJECT-TYPE
         SYNTAX      Integer32
 	  	MAX-ACCESS   read-only		
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
             "
 			This is the ifIndex in ifTable, representing this slot and port. 
+            This object is deprecated in favour of ifExtNPortIfIndex.
             "
         ::= { wlsxIfExtPortEntry 3 }
 
    ifExtAdminState OBJECT-TYPE
         SYNTAX       ArubaEnableValue
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
-			The desired state of the interface.
+			The desired state of the interface. This object is deprecated in
+            favour of ifExtNAdminState.
 			"
         ::= { wlsxIfExtPortEntry 4 }
  
@@ -163,89 +174,104 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
 						testing(3)
 					 }
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
-			The current operational state of the interface.
+			The current operational state of the interface. This object is
+            deprecated in favour of ifExtNOperState.
 			"
         ::= { wlsxIfExtPortEntry 5 }
         
    ifExtPoeState OBJECT-TYPE
         SYNTAX       ArubaPoeState
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			The current state of the power over ethernet capability of the
-			port.
+			port. This object is deprecated in favour of ifExtNPoeState.
 			"
         ::= { wlsxIfExtPortEntry 6 }
    ifExtIsTrusted OBJECT-TYPE
         SYNTAX       TruthValue
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			The object indicates if the port is used in the trusted side of the
-			network or the untrusted side.
+			network or the untrusted side. This object is deprecated in favour
+            of ifExtNIsTrusted.
 			"
         ::= { wlsxIfExtPortEntry 7 }
 
    ifExtDot1DState OBJECT-TYPE
         SYNTAX       ArubaDot1dState
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			Current Dot1d state of the Port. 
+            This object provides default switch port value if ifExtIsMonitoring
+            is true(1).
+            This object is deprecated in favour of ifExtNDot1DState.
 			"
         ::= { wlsxIfExtPortEntry 8 }
 
    ifExtMode OBJECT-TYPE
         SYNTAX       ArubaPortMode
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This object indicates if the port is in a Trunk mode or access mode.
+            This object provides default switch port value if ifExtIsMonitoring
+            is true(1).
+            This object is deprecated in favour of ifExtNMode.
 			"
         ::= { wlsxIfExtPortEntry 9 }
 
    ifExtAccessVlanId OBJECT-TYPE
         SYNTAX       ArubaVlanValidRange
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
-			The VLAN Id when the port is in Access Mode.
+			The VLAN Id when the port is in Access Mode. This object provides
+            default switch port value if ifExtIsMonitoring is true(1). This object is
+            deprecated in favour of ifExtNAccessVlanId.
 			"
         ::= { wlsxIfExtPortEntry 10 }
 
    ifExtTrunkNativeVlanId OBJECT-TYPE
         SYNTAX       ArubaVlanValidRange
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
-			The native VLAN Id of the Port, when the port is in dot1q mode.
+			The native VLAN Id of the Port, when the port is in dot1q mode. This
+            object provides default switch port value if ifExtIsMonitoring is
+            true(1). 
+            This object is deprecated in favour of ifExtNTrunkNativeVlanId.
 			"
         ::= { wlsxIfExtPortEntry 11 }
 
    ifExtTrunkIsAllowedAll OBJECT-TYPE
         SYNTAX       TruthValue
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			When the mode of the port is Trunk, this Object indicates 
-			if the port is part of all the configured Vlans.
+			if the port is part of all the configured Vlans. This object
+            provides default switch port value if ifExtIsMonitoring is true(1).
+            This object is deprecated in favour of ifExtNTrunkIsAllowedAll.
 			"
         ::= { wlsxIfExtPortEntry 12 }
 
    ifExtTrunkAllowedVlanList OBJECT-TYPE
         SYNTAX       OCTET STRING(SIZE(0..512))
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			    A string of octets containing one bit per VLAN for a
@@ -258,79 +284,93 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
 				first. Note that if the length of this string is less than
 				512 octets, any 'missing' octets are assumed to contain
 				the value zero. 
+                This object provides default switch port value if
+                ifExtIsMonitoring is true(1).
+                This object is deprecated in favour of
+                ifExtNTrunkAllowedVlanList.
 			"
         ::= { wlsxIfExtPortEntry 13 }
 
    ifExtIngressACLName OBJECT-TYPE
         SYNTAX       DisplayString(SIZE(0..64))
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This object represents the Ingress ACL name applied to the port.
 			An Empty string indicates that there is not ACL applied on this 
-			port.
+			port. This object is deprecated in favour of ifExtNIngressACLName.
 			"
         ::= { wlsxIfExtPortEntry 14 }
 
    ifExtEgressACLName OBJECT-TYPE
         SYNTAX       DisplayString(SIZE(0..64))
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This object represents the Egress ACL name applied to the port.
 			An Empty string indicates that there is not ACL applied on this 
-			port.
+			port. This object is deprecated in favour of ifExtNEgressACLName.
 			"
         ::= { wlsxIfExtPortEntry 15 }
 
    ifExtSessionACLName OBJECT-TYPE
         SYNTAX       DisplayString(SIZE(0..64))
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This object represents the Session ACL name applied to the port.
 			An Empty string indicates that there is not ACL applied on this 
-			port.
+			port. This object is deprecated in favour of ifExtNEgressACLName.
 			"
         ::= { wlsxIfExtPortEntry 16 }
 
    ifExtXsecVlan OBJECT-TYPE
         SYNTAX       ArubaVlanValidRange
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
-			This object indicates if the port is an Xsec Port.
+			This object indicates if the port is an Xsec Port. This object is
+            deprecated in favour of ifExtNXsecVlan.
 			"
         ::= { wlsxIfExtPortEntry 17 }
 
    ifExtIsMonitoring OBJECT-TYPE
         SYNTAX       TruthValue
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This object indicates if the port is used for Port monitoring.
+            When the value of this object is true(1), then below objects provide
+            default switch port values configured on this port.
+            ifExtMode,
+            ifExtAccessVlanId,
+            ifExtTrunkNativeVlanId,
+            ifExtTrunkIsAllowedAll,
+            ifExtTrunkAllowedVlanList
+            This object is deprecated in favour of ifExtNIsMonitoring.
 			"
         ::= { wlsxIfExtPortEntry 18 }
 
    ifExtIsMux OBJECT-TYPE
         SYNTAX       TruthValue
         MAX-ACCESS   read-write
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
-			This object indicates if the port is used as a MUX Port.
+			This object indicates if the port is used as a MUX Port. This object
+            is deprecated in favour of ifExtNIsMux.
 			"
         ::= { wlsxIfExtPortEntry 19 }
 
    ifExtUserSlotNumber OBJECT-TYPE
         SYNTAX      Integer32
 	  	MAX-ACCESS   read-only		
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
             "
 			The user-visible (zero-based) slot number.
@@ -340,7 +380,7 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
    ifExtUserPortNumber OBJECT-TYPE
         SYNTAX      Integer32
 	  	MAX-ACCESS   read-only		
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
             "
 			The user-visible (zero-based) port number.
@@ -350,43 +390,57 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
    ifExtPortSpeed OBJECT-TYPE
         SYNTAX      ArubaPortSpeed
 	  	MAX-ACCESS   read-only		
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
             "
-			Speed of the Port.	
+			Speed of the Port. This object is deprecated in favour of
+            ifExtNPortSpeed.
             "
         ::= { wlsxIfExtPortEntry 22 }
 
    ifExtPortDuplex OBJECT-TYPE
         SYNTAX      ArubaPortDuplex
 	  	MAX-ACCESS   read-only		
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
             "
-			Duplexity of the Port.
+			Duplexity of the Port. This object is deprecated in favour of
+            ifExtNPortDuplex.
 			"
         ::= { wlsxIfExtPortEntry 23 }
 
    ifExtPortType OBJECT-TYPE
         SYNTAX      ArubaPortType
 	  	MAX-ACCESS   read-only		
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
             "
-			Type of the Port.
+			Type of the Port. This object is deprecated in favour of
+            ifExtNPortType.
             "
         ::= { wlsxIfExtPortEntry 24 }
 
    ifExtDescr OBJECT-TYPE
         SYNTAX      DisplayString
 	  	MAX-ACCESS   read-only		
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
             "
-			Port Description.
+			Port Description. This object is deprecated in favour of
+            ifExtNDescr.
             "
         ::= { wlsxIfExtPortEntry 25 }
 
+   ifExtUserModuleNumber OBJECT-TYPE
+        SYNTAX      Integer32
+	  	MAX-ACCESS   read-only		
+        STATUS       deprecated
+        DESCRIPTION
+            "
+			The user-visible (zero-based) module number.
+            "
+        ::= { wlsxIfExtPortEntry 26 }
+
 
 -- VLAN Table defines all the VLAN in the controller.
 
@@ -573,7 +627,7 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
         STATUS       current
         DESCRIPTION
          "
-			This Object indicates the discription of the Interface.
+			This Object indicates the description of the Interface.
 		 "
         ::= { wlsxIfExtVlanInterfaceEntry 2 }
 
@@ -679,4 +733,332 @@ WLSX-IFEXT-MIB DEFINITIONS ::= BEGIN
 		 "
         ::= { wlsxIfExtVlanInterfaceEntry 12 }
 
+   wlsxIfExtNPortTable  OBJECT-TYPE
+      SYNTAX       SEQUENCE OF WlsxIfExtNPortEntry
+      MAX-ACCESS   not-accessible
+      STATUS       current
+      DESCRIPTION
+        "
+            The table of interface details.
+        "
+      ::= { wlsxIfExtGroup 5 }
+
+   wlsxIfExtNPortEntry OBJECT-TYPE
+      SYNTAX       WlsxIfExtNPortEntry
+      MAX-ACCESS   not-accessible
+      STATUS       current
+      DESCRIPTION
+      "
+        An entry in wlsxIfExtNPortTable.
+      "
+      INDEX { ifExtNSlotNumber, ifExtNModuleNumber, ifExtNPortNumber }
+      ::= { wlsxIfExtNPortTable 1 }
+
+   WlsxIfExtNPortEntry ::=
+     SEQUENCE {
+         ifExtNSlotNumber             Integer32,
+         ifExtNModuleNumber          Integer32,
+         ifExtNPortNumber             Integer32,
+         ifExtNPortIfIndex           Integer32,
+         ifExtNAdminState            ArubaEnableValue,
+         ifExtNOperState             INTEGER,
+         ifExtNPoeState              ArubaPoeState,
+         ifExtNIsTrusted             TruthValue,
+         ifExtNDot1DState            ArubaDot1dState,
+         ifExtNMode                  ArubaPortMode,
+         ifExtNAccessVlanId          ArubaVlanValidRange,
+         ifExtNTrunkNativeVlanId     ArubaVlanValidRange,
+         ifExtNTrunkIsAllowedAll     TruthValue,
+         ifExtNTrunkAllowedVlanList  OCTET STRING,
+         ifExtNIngressACLName        DisplayString,
+         ifExtNEgressACLName         DisplayString,
+         ifExtNSessionACLName        DisplayString,
+         ifExtNXsecVlan              ArubaVlanValidRange,
+         ifExtNIsMonitoring          TruthValue,
+         ifExtNIsMux                 TruthValue,
+         ifExtNPortSpeed             ArubaPortSpeed,
+         ifExtNPortDuplex            ArubaPortDuplex,
+         ifExtNPortType              ArubaPortType,
+         ifExtNDescr                 DisplayString
+     }
+
+   ifExtNSlotNumber  OBJECT-TYPE
+        SYNTAX       Integer32
+        MAX-ACCESS   not-accessible
+        STATUS       current
+        DESCRIPTION
+            "
+            This object represents the user-visible (zero-based) Physical Slot of the Interface.
+            "
+        ::= { wlsxIfExtNPortEntry 1 }
+
+   ifExtNModuleNumber   OBJECT-TYPE
+        SYNTAX      Integer32
+        MAX-ACCESS  not-accessible
+        STATUS       current
+        DESCRIPTION
+            "
+            This object represents the user-visible (zero-based) Physical Module of the Interface.
+            "
+        ::= { wlsxIfExtNPortEntry 2 }
+
+   ifExtNPortNumber OBJECT-TYPE
+        SYNTAX      Integer32
+        MAX-ACCESS  not-accessible
+        STATUS       current
+        DESCRIPTION
+            "
+            This object represents the user-visible (zero-based) Physical Port of the Interface.
+            "
+        ::= { wlsxIfExtNPortEntry 3 }
+
+   ifExtNPortIfIndex OBJECT-TYPE
+        SYNTAX      Integer32
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+            "
+            This is the ifIndex in ifTable, representing this slot, module and port.
+            "
+        ::= { wlsxIfExtNPortEntry 4 }
+
+   ifExtNAdminState OBJECT-TYPE
+        SYNTAX       ArubaEnableValue
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            The desired state of the interface.
+            "
+        ::= { wlsxIfExtNPortEntry 5 }
+
+   ifExtNOperState OBJECT-TYPE
+        SYNTAX       INTEGER{
+                        up(1),
+                        down(2),
+                        testing(3)
+                     }
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+            "
+            The current operational state of the interface.
+            "
+        ::= { wlsxIfExtNPortEntry 6 }
+
+   ifExtNPoeState OBJECT-TYPE
+        SYNTAX       ArubaPoeState
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            The current state of the power over ethernet capability of the
+            port.
+            "
+        ::= { wlsxIfExtNPortEntry 7 }
+
+   ifExtNIsTrusted OBJECT-TYPE
+        SYNTAX       TruthValue
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            The object indicates if the port is used in the trusted side of the
+            network or the untrusted side.
+            "
+        ::= { wlsxIfExtNPortEntry 8 }
+
+   ifExtNDot1DState OBJECT-TYPE
+        SYNTAX       ArubaDot1dState
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            Current Dot1d state of the Port.
+            "
+        ::= { wlsxIfExtNPortEntry 9 }
+
+   ifExtNMode OBJECT-TYPE
+        SYNTAX       ArubaPortMode
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            This object indicates if the port is in a Trunk mode or access mode.
+            This object provides default switch port value if ifExtIsMonitoring
+            is true(1).
+            "
+        ::= { wlsxIfExtNPortEntry 10 }
+
+   ifExtNAccessVlanId OBJECT-TYPE
+        SYNTAX       ArubaVlanValidRange
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            The VLAN Id when the port is in Access Mode. This object provides 
+            default switch port value if ifExtIsMonitoring is true(1).
+            "
+        ::= { wlsxIfExtNPortEntry 11 }
+
+   ifExtNTrunkNativeVlanId OBJECT-TYPE
+        SYNTAX       ArubaVlanValidRange
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            The native VLAN Id of the Port, when the port is in dot1q mode.
+            This object provides default switch port value if ifExtIsMonitoring
+            is true(1).
+            "
+        ::= { wlsxIfExtNPortEntry 12 }
+
+   ifExtNTrunkIsAllowedAll OBJECT-TYPE
+        SYNTAX       TruthValue
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            When the mode of the port is Trunk, this Object indicates
+            if the port is part of all the configured Vlans.
+            This object provides default switch port value if ifExtIsMonitoring
+            is true(1).
+            "
+        ::= { wlsxIfExtNPortEntry 13 }
+
+   ifExtNTrunkAllowedVlanList OBJECT-TYPE
+        SYNTAX       OCTET STRING(SIZE(0..512))
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+                A string of octets containing one bit per VLAN for a
+                total of 4096 VLANs in the management domain.
+                The most significant bit of the octet string is the
+                lowest value VLAN of 4096 VLANs.
+                By setting the bit(1) we indicate that the vlan is part of the
+                interface.
+                The most significant bit of the bitmap is transmitted
+                first. Note that if the length of this string is less than
+                512 octets, any 'missing' octets are assumed to contain
+                the value zero.
+                This object provides default switch port value if
+                ifExtIsMonitoring is true(1).
+            "
+        ::= { wlsxIfExtNPortEntry 14 }
+
+   ifExtNIngressACLName OBJECT-TYPE
+        SYNTAX       DisplayString(SIZE(0..64))
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            This object represents the Ingress ACL name applied to the port.
+            An Empty string indicates that there is not ACL applied on this
+            port.
+            "
+        ::= { wlsxIfExtNPortEntry 15 }
+
+   ifExtNEgressACLName OBJECT-TYPE
+        SYNTAX       DisplayString(SIZE(0..64))
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            This object represents the Egress ACL name applied to the port.
+            An Empty string indicates that there is not ACL applied on this
+            port.
+            "
+        ::= { wlsxIfExtNPortEntry 16 }
+
+   ifExtNSessionACLName OBJECT-TYPE
+        SYNTAX       DisplayString(SIZE(0..64))
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            This object represents the Session ACL name applied to the port.
+            An Empty string indicates that there is not ACL applied on this
+            port.
+            "
+        ::= { wlsxIfExtNPortEntry 17 }
+
+   ifExtNXsecVlan OBJECT-TYPE
+        SYNTAX       ArubaVlanValidRange
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            This object indicates if the port is an Xsec Port.
+            "
+        ::= { wlsxIfExtNPortEntry 18 }
+
+   ifExtNIsMonitoring OBJECT-TYPE
+        SYNTAX       TruthValue
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            This object indicates if the port is used for Port monitoring.
+            When the value of this object is true(1), then below objects provide
+            default switch port values configured on this port.
+            ifExtNMode,
+            ifExtNAccessVlanId,
+            ifExtNTrunkNativeVlanId,
+            ifExtNTrunkIsAllowedAll,
+            ifExtNTrunkAllowedVlanList
+            "
+        ::= { wlsxIfExtNPortEntry 19 }
+
+   ifExtNIsMux OBJECT-TYPE
+        SYNTAX       TruthValue
+        MAX-ACCESS   read-write
+        STATUS       current
+        DESCRIPTION
+            "
+            This object indicates if the port is used as a MUX Port.
+            "
+        ::= { wlsxIfExtNPortEntry 20 }
+
+   ifExtNPortSpeed OBJECT-TYPE
+        SYNTAX      ArubaPortSpeed
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+            "
+            Speed of the Port.
+            "
+        ::= { wlsxIfExtNPortEntry 21 }
+
+   ifExtNPortDuplex OBJECT-TYPE
+        SYNTAX      ArubaPortDuplex
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+            "
+            Duplexity of the Port.
+            "
+        ::= { wlsxIfExtNPortEntry 22 }
+
+   ifExtNPortType OBJECT-TYPE
+        SYNTAX      ArubaPortType
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+            "
+            Type of the Port.
+            "
+        ::= { wlsxIfExtNPortEntry 23 }
+
+   ifExtNDescr OBJECT-TYPE
+        SYNTAX      DisplayString
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+            "
+            Port Description.
+            "
+        ::= { wlsxIfExtNPortEntry 24 }
+
 END
+

mibs/arubaos/WLSX-MESH-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 WLSX-MESH-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+              
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -39,7 +40,7 @@ WLSX-MESH-MIB DEFINITIONS ::= BEGIN
 			FROM ARUBA-MIB;
 
    wlsxMeshMIB MODULE-IDENTITY 
-       LAST-UPDATED "0707040044Z"
+       LAST-UPDATED "0708060518Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -50,7 +51,7 @@ WLSX-MESH-MIB DEFINITIONS ::= BEGIN
            "This MIB module defines MIB objects which provides
             information about Mesh portal and topology 
 		in the Aruba controller."
-       REVISION        "0707040044Z"
+       REVISION        "0708060518Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 13 }
@@ -90,15 +91,23 @@ WLSX-MESH-MIB DEFINITIONS ::= BEGIN
       
    MeshEntry ::=
      SEQUENCE {
-		wlsxMeshRole           ArubaMeshRole,
+		wlsxMeshRole                    ArubaMeshRole,
-		wlsxMeshNodeParent    MacAddress,
+		wlsxMeshNodeParent              MacAddress,
-		wlsxMeshNodeChildrenCount  Unsigned32,
+		wlsxMeshNodeChildrenCount       Unsigned32,
-		wlsxMeshNodeCluster      DisplayString,
+		wlsxMeshNodeCluster             DisplayString,
-		wlsxMeshNodeRfBand    ArubaPhyType,
+		wlsxMeshNodeRfBand              ArubaPhyType,
-		wlsxMeshNodePathCost  Integer32,
+		wlsxMeshNodePathCost            Integer32,
-		wlsxMeshNodeNodeCost  Integer32,
+		wlsxMeshNodeNodeCost            Integer32,
-		wlsxMeshNodeLinkCost  Integer32,
+		wlsxMeshNodeLinkCost            Integer32,
-		wlsxMeshNodeHopCount  Integer32
+		wlsxMeshNodeHopCount            Integer32,
+                wlsxMeshSNR                     Unsigned32,
+                wlsxMeshTxRate                  Unsigned32,
+                wlsxMeshRxRate                  Unsigned32,
+                wlsxMeshUplinkAge               TimeTicks,
+                wlsxMeshNumRecoveryChildren     Unsigned32,
+                wlsxMeshTopologyUpdateAge       TimeTicks,
+                wlsxMeshIsRecovery              TruthValue,
+                wlsxMeshIs11n                   TruthValue
     } 
 	wlsxMeshRole OBJECT-TYPE
          SYNTAX       ArubaMeshRole
@@ -116,7 +125,7 @@ WLSX-MESH-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			Mesh node parent
+			Wired MAC address of mesh node's parent
             "
         ::= { wlsxMeshNodeEntry 2 }
 
@@ -136,7 +145,7 @@ WLSX-MESH-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			Mesh cluster name. Value in float.
+			Mesh cluster name.
             "
         ::= { wlsxMeshNodeEntry 4 }
 
@@ -186,8 +195,88 @@ WLSX-MESH-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			Mesh topology hop cost
+			Mesh topology hop count.
             "
         ::= { wlsxMeshNodeEntry 9 }
 
+  	wlsxMeshSNR OBJECT-TYPE
+         SYNTAX       Unsigned32
+  		 MAX-ACCESS   read-only		
+         STATUS       current
+         DESCRIPTION
+            "
+			Signal-to-noise ratio mesh point sees its parent at. 
+            "
+        ::= { wlsxMeshNodeEntry 10 }
+
+  	wlsxMeshTxRate OBJECT-TYPE
+         SYNTAX       Unsigned32
+  		 MAX-ACCESS   read-only		
+         STATUS       current
+         DESCRIPTION
+            "
+			Transmit rate for mesh-uplink [mbps].
+            "
+        ::= { wlsxMeshNodeEntry 11 }
+
+  	wlsxMeshRxRate OBJECT-TYPE
+         SYNTAX       Unsigned32
+  		 MAX-ACCESS   read-only		
+         STATUS       current
+         DESCRIPTION
+            "
+			Receive rate for mesh-uplink [mbps].
+            "
+        ::= { wlsxMeshNodeEntry 12 }
+
+  	wlsxMeshUplinkAge OBJECT-TYPE
+         SYNTAX       TimeTicks
+  		 MAX-ACCESS   read-only		
+         STATUS       current
+         DESCRIPTION
+            "
+			Time elapsed since the mesh-uplink was formed.
+            "
+        ::= { wlsxMeshNodeEntry 13 }
+
+  	wlsxMeshNumRecoveryChildren OBJECT-TYPE
+         SYNTAX       Unsigned32
+  		 MAX-ACCESS   read-only		
+         STATUS       current
+         DESCRIPTION
+            "
+			The number of children in recovery this mesh node has.
+            "
+        ::= { wlsxMeshNodeEntry 14 }
+
+  	wlsxMeshTopologyUpdateAge OBJECT-TYPE
+         SYNTAX       TimeTicks
+  		 MAX-ACCESS   read-only		
+         STATUS       current
+         DESCRIPTION
+            "
+			Time elapsed since the last mesh topology update was received from this node.
+            "
+        ::= { wlsxMeshNodeEntry 15 }
+
+  	wlsxMeshIsRecovery OBJECT-TYPE
+         SYNTAX       TruthValue
+  		 MAX-ACCESS   read-only		
+         STATUS       current
+         DESCRIPTION
+            "
+			True if this mesh point is in recovery.
+            "
+        ::= { wlsxMeshNodeEntry 16 }
+
+  	wlsxMeshIs11n OBJECT-TYPE
+         SYNTAX       TruthValue
+  		 MAX-ACCESS   read-only		
+         STATUS       current
+         DESCRIPTION
+            "
+			True if this mesh node is 11n-enabled.
+            "
+        ::= { wlsxMeshNodeEntry 17 }
+
 END        

mibs/arubaos/WLSX-MOBILITY-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+              
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -42,7 +43,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
 			FROM ARUBA-MIB;
 
    wlsxMobilityMIB MODULE-IDENTITY 
-       LAST-UPDATED "0611040527Z"
+       LAST-UPDATED "0804160206Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -53,7 +54,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
            "This MIB module defines MIB objects which provide
             information about the mobility subsystem in the
 			Aruba controller."
-       REVISION        "0611040527Z"
+       REVISION        "0804160206Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 9 }
@@ -289,7 +290,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of packet Proxy State machine Received
+			This describes the number of packet Proxy State machine Received
             "
         ::= { wlsxMobilityProxyStatsGroup 1 }
 
@@ -299,7 +300,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of packet Proxy State machine Processed
+			This describes the number of packet Proxy State machine Processed
             "
         ::= { wlsxMobilityProxyStatsGroup 2 }
 
@@ -309,7 +310,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of packet Proxy State machine Forwarded back to Datapath
+			This describes the number of packet Proxy State machine Forwarded back to Datapath
             "
         ::= { wlsxMobilityProxyStatsGroup 3 }
 
@@ -319,7 +320,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of packet Proxy State machine Dropped
+			This describes the number of packet Proxy State machine Dropped
             "
         ::= { wlsxMobilityProxyStatsGroup 4 }
 
@@ -329,7 +330,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of mobility events Proxy State machine ignored as it is busy.
+			This describes the number of mobility events Proxy State machine ignored as it is busy.
             "
         ::= { wlsxMobilityProxyStatsGroup 5 }
 
@@ -339,7 +340,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of mobility clients with <No Mobility Service>
+			This describes the number of mobility clients with <No Mobility Service>
 			
             "
         ::= { wlsxMobilityProxyStatsGroup 6 }
@@ -350,7 +351,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of times mobility detected client IP change
+			This describes the number of times mobility detected client IP change
             "
         ::= { wlsxMobilityProxyStatsGroup 7 }
 
@@ -360,7 +361,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of times mobility detected client ESSID change
+			This describes the number of times mobility detected client ESSID change
             "
         ::= { wlsxMobilityProxyStatsGroup 8 }
 
@@ -372,7 +373,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of DHCP Bootp messages received
+			This describes the number of DHCP Bootp messages received
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup 1 }
 
@@ -383,7 +384,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of DHCP messages Processed
+			This describes the number of DHCP messages Processed
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup 2 }
 
@@ -394,7 +395,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of DHCP messages forwarded
+			This describes the number of DHCP messages forwarded
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup 3 }
 
@@ -405,7 +406,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of DHCP messages Dropped
+			This describes the number of DHCP messages Dropped
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup  4 }
 
@@ -415,7 +416,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of DHCP NAK received from the server.
+			This describes the number of DHCP NAK received from the server.
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup  5 }
 
@@ -426,7 +427,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of DHCP packets marked invalid by mobility
+			This describes the number of DHCP packets marked invalid by mobility
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup  6 }
 
@@ -437,7 +438,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Non-DHCP frames received by DHCP state machine
+			This describes the number of Non-DHCP frames received by DHCP state machine
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup  7 }
 
@@ -448,7 +449,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of DHCP requested IP for which home vlan does not exist.
+			This describes the number of DHCP requested IP for which home vlan does not exist.
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup  8 }
 
@@ -459,7 +460,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of unexpected DHCP frames received from client
+			This describes the number of unexpected DHCP frames received from client
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup  9 }
 
@@ -469,7 +470,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of unexpected DHCP frames received from remote HA/FA.
+			This describes the number of unexpected DHCP frames received from remote HA/FA.
             "
         ::= { wlsxMobilityProxyDHCPStatsGroup  10 }
 
@@ -482,7 +483,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request received by HA
+			This describes the number of Registration request received by HA
             "
         ::= { wlsxMobilityHAStatsGroup  1 }
 
@@ -493,7 +494,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request reply sent by HA
+			This describes the number of Registration request reply sent by HA
             "
         ::= { wlsxMobilityHAStatsGroup  2 }
 
@@ -504,7 +505,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request accepted by HA
+			This describes the number of Registration request accepted by HA
             "
         ::= { wlsxMobilityHAStatsGroup  3 }
 
@@ -515,7 +516,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request denied by HA
+			This describes the number of Registration request denied by HA
             "
         ::= { wlsxMobilityHAStatsGroup  4 }
 
@@ -526,7 +527,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request Ignored by HA
+			This describes the number of Registration request Ignored by HA
             "
         ::= { wlsxMobilityHAStatsGroup  5 }
 
@@ -537,7 +538,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request denied for Administrative reasons by HA
+			This describes the number of Registration request denied for Administrative reasons by HA
             "
         ::= { wlsxMobilityHAStatsGroup  6 }
 
@@ -548,7 +549,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request denied due to lack of resources by HA
+			This describes the number of Registration request denied due to lack of resources by HA
             "
         ::= { wlsxMobilityHAStatsGroup  7 }
 
@@ -559,7 +560,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of times MN-HA authentication failed
+			This describes the number of times MN-HA authentication failed
             "
         ::= { wlsxMobilityHAStatsGroup  8 }
 
@@ -570,7 +571,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of HA-FA authentication failed
+			This describes the number of HA-FA authentication failed
             "
         ::= { wlsxMobilityHAStatsGroup  9 }
 
@@ -581,7 +582,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of mobileIP messages rejected by HA due to bad Identication
+			This describes the number of mobileIP messages rejected by HA due to bad identification
             "
         ::= { wlsxMobilityHAStatsGroup  10 }
 
@@ -591,7 +592,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of mobileIP messages rejected by HA as they are poorly formed
+			This describes the number of mobileIP messages rejected by HA as they are poorly formed
             "
         ::= { wlsxMobilityHAStatsGroup  11 }
 
@@ -601,7 +602,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration Request rejected due to too many bindings at HA
+			This describes the number of Registration Request rejected due to too many bindings at HA
             "
         ::= { wlsxMobilityHAStatsGroup  12 }
 
@@ -611,7 +612,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of times binding expired
+			This describes the number of times binding expired
             "
         ::= { wlsxMobilityHAStatsGroup  13 }
 
@@ -623,7 +624,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request sent by FA
+			This describes the number of Registration request sent by FA
             "
         ::= { wlsxMobilityFAStatsGroup  1 }
 
@@ -634,7 +635,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request reply received by FA
+			This describes the number of Registration request reply received by FA
             "
         ::= { wlsxMobilityFAStatsGroup  2 }
 
@@ -645,7 +646,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request accepted by HA
+			This describes the number of Registration request accepted by HA
             "
         ::= { wlsxMobilityFAStatsGroup  3 }
 
@@ -656,7 +657,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration request rejected by HA
+			This describes the number of Registration request rejected by HA
             "
         ::= { wlsxMobilityFAStatsGroup  4 }
 
@@ -667,7 +668,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of times MN-HA authentication failed
+			This describes the number of times MN-HA authentication failed
             "
         ::= { wlsxMobilityFAStatsGroup  5 }
 
@@ -678,7 +679,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of FA-HA authentication failed
+			This describes the number of FA-HA authentication failed
             "
         ::= { wlsxMobilityFAStatsGroup  6 }
 
@@ -689,7 +690,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of mobileIP messages rejected by FA due to bad Identication
+			This describes the number of mobileIP messages rejected by FA due to bad identification
             "
         ::= { wlsxMobilityFAStatsGroup  7 }
 
@@ -699,7 +700,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of mobileIP messages rejected by FA as they are poorly formed
+			This describes the number of mobileIP messages rejected by FA as they are poorly formed
             "
         ::= { wlsxMobilityFAStatsGroup  8 }
 
@@ -712,7 +713,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration revocation request sent 
+			This describes the number of Registration revocation request sent 
             "
         ::= { wlsxMobilityHAFARevocationStatsGroup  1 }
 
@@ -722,7 +723,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration revocation ack received
+			This describes the number of Registration revocation ack received
             "
         ::= { wlsxMobilityHAFARevocationStatsGroup  2 }
 
@@ -732,7 +733,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration revocation request received
+			This describes the number of Registration revocation request received
             "
         ::= { wlsxMobilityHAFARevocationStatsGroup  3 }
 
@@ -742,7 +743,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of received Registration revocation request ack sent
+			This describes the number of received Registration revocation request ack sent
             "
         ::= { wlsxMobilityHAFARevocationStatsGroup  4 }
 
@@ -752,7 +753,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration revocation request ignored
+			This describes the number of Registration revocation request ignored
             "
         ::= { wlsxMobilityHAFARevocationStatsGroup  5 }
 
@@ -762,7 +763,7 @@ WLSX-MOBILITY-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			This desribes the number of Registration revocation ack Ignored
+			This describes the number of Registration revocation ack Ignored
             "
         ::= { wlsxMobilityHAFARevocationStatsGroup  6 }
 

mibs/arubaos/WLSX-MON-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4: 
 WLSX-MON-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -31,7 +32,12 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
 	   ArubaStationType,
 	   ArubaPhyType,
 	   ArubaAPMatchType,
-	   ArubaAPMatchMethod
+	   ArubaAPMatchMethod,
+	   ArubaHTMode,
+	   ArubaHTRate,
+	   ArubaMonEncryptionType,
+       ArubaMonEncryptionCipher,
+       ArubaMonAuthAlgorithm
 	   		FROM ARUBA-TC
 
        OBJECT-GROUP
@@ -40,7 +46,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
 			FROM ARUBA-MIB;
 
    wlsxMonMIB MODULE-IDENTITY 
-       LAST-UPDATED "0701172333Z"
+       LAST-UPDATED "0804160206Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -52,7 +58,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
 		   This MIB module defines MIB objects which provide
            information about the Monitored Access Points.
 		   "
-       REVISION        "0701172333Z"
+       REVISION        "0804160206Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 6 }
@@ -357,7 +363,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
         ::= { wlsxMonAPStatsEntry 23 }
 	
 -- This table breaks down the AP statistics observed into different
--- rate catagories.
+-- rate categories.
 
    wlsxMonAPRateStatsTable  OBJECT-TYPE 
 	  SYNTAX       SEQUENCE OF WlsxMonAPRateStatsEntry 
@@ -366,7 +372,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
       DESCRIPTION 
 	  	"
 		This table contains all the monitored AP Packet and Byte Counts
-		but represented in terms of rate catagories.
+		but represented in terms of rate categories.
 		"
 	
       ::= { wlsxMonAccessPointStatsGroup 2 } 
@@ -382,29 +388,29 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
 	
      WlsxMonAPRateStatsEntry ::=
      SEQUENCE {
-		 monAPStatsTotPktsAt1Mbps			Counter32  ,
+		 monAPStatsTotPktsAt1Mbps			Counter32,
-		 monAPStatsTotBytesAt1Mbps			Counter32  ,
+		 monAPStatsTotBytesAt1Mbps			Counter32,
-		 monAPStatsTotPktsAt2Mbps			Counter32  ,
+		 monAPStatsTotPktsAt2Mbps			Counter32,
-		 monAPStatsTotBytesAt2Mbps			Counter32  ,
+		 monAPStatsTotBytesAt2Mbps			Counter32,
-		 monAPStatsTotPktsAt5Mbps			Counter32  ,
+		 monAPStatsTotPktsAt5Mbps			Counter32,
-		 monAPStatsTotBytesAt5Mbps			Counter32  ,
+		 monAPStatsTotBytesAt5Mbps			Counter32,
-		 monAPStatsTotPktsAt11Mbps			Counter32  ,
+		 monAPStatsTotPktsAt11Mbps			Counter32,
-		 monAPStatsTotBytesAt11Mbps		Counter32  ,
+		 monAPStatsTotBytesAt11Mbps		Counter32,
-		 monAPStatsTotPktsAt6Mbps			Counter32  ,
+		 monAPStatsTotPktsAt6Mbps			Counter32,
-		 monAPStatsTotBytesAt6Mbps			Counter32  ,
+		 monAPStatsTotBytesAt6Mbps			Counter32,
-		 monAPStatsTotPktsAt12Mbps			Counter32  ,
+		 monAPStatsTotPktsAt12Mbps			Counter32,
-		 monAPStatsTotBytesAt12Mbps		Counter32  ,
+		 monAPStatsTotBytesAt12Mbps		Counter32,
-		 monAPStatsTotPktsAt18Mbps			Counter32  ,
+		 monAPStatsTotPktsAt18Mbps			Counter32,
-		 monAPStatsTotBytesAt18Mbps		Counter32  ,
+		 monAPStatsTotBytesAt18Mbps		Counter32,
-		 monAPStatsTotPktsAt24Mbps			Counter32  ,
+		 monAPStatsTotPktsAt24Mbps			Counter32,
-		 monAPStatsTotBytesAt24Mbps		Counter32  ,
+		 monAPStatsTotBytesAt24Mbps		Counter32,
-		 monAPStatsTotPktsAt36Mbps			Counter32  ,
+		 monAPStatsTotPktsAt36Mbps			Counter32,
-		 monAPStatsTotBytesAt36Mbps		Counter32  ,
+		 monAPStatsTotBytesAt36Mbps		Counter32,
-		 monAPStatsTotPktsAt48Mbps			Counter32  ,
+		 monAPStatsTotPktsAt48Mbps			Counter32,
-		 monAPStatsTotBytesAt48Mbps		Counter32  ,
+		 monAPStatsTotBytesAt48Mbps		Counter32,
-		 monAPStatsTotPktsAt54Mbps			Counter32 ,
+		 monAPStatsTotPktsAt54Mbps			Counter32,
 		 monAPStatsTotBytesAt54Mbps		Counter32, 
-		 monAPStatsTotPktsAt9Mbps			Counter32 ,
+		 monAPStatsTotPktsAt9Mbps			Counter32,
 		 monAPStatsTotBytesAt9Mbps		Counter32
      }
 
@@ -976,6 +982,67 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
             "
         ::= { wlsxMonAPPktSizeStatsEntry 6 }
 
+-- This table breaks down the AP statistics observed into different
+-- HT rate categories.
+
+   wlsxMonAPHTRateStatsTable  OBJECT-TYPE 
+	  SYNTAX       SEQUENCE OF WlsxMonAPHTRateStatsEntry 
+	  MAX-ACCESS   not-accessible		
+      STATUS       current 
+      DESCRIPTION 
+	  	"
+		This table contains all the monitored AP Packet and Byte Counts
+		but represented in terms of HT rate categories.
+		"
+	
+      ::= { wlsxMonAccessPointStatsGroup 6 } 
+
+     wlsxMonAPHTRateStatsEntry OBJECT-TYPE 
+	  SYNTAX       WlsxMonAPHTRateStatsEntry 
+	  MAX-ACCESS   not-accessible		
+      STATUS       current 
+      DESCRIPTION 
+             "Data rate based packet and byte count entry for a monitored AP"
+	  INDEX { monPhyAddress, monRadioNumber, monitoredApBSSID, monHTRate }
+      ::= { wlsxMonAPHTRateStatsTable 1 } 
+	
+     WlsxMonAPHTRateStatsEntry ::=
+     SEQUENCE {
+	 	 monHTRate					    ArubaHTRate,
+		 monAPStatsTotHTPkts			Counter32,
+		 monAPStatsTotHTBytes			Counter32
+	 }
+
+	monHTRate OBJECT-TYPE
+         SYNTAX       ArubaHTRate
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			The rate at which the counters apply
+            "
+        ::= { wlsxMonAPHTRateStatsEntry 1 }
+
+	monAPStatsTotHTPkts OBJECT-TYPE
+         SYNTAX       Counter32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			The total number of packets processed at the indicated rate 
+            "
+        ::= { wlsxMonAPHTRateStatsEntry 2 }
+
+	monAPStatsTotHTBytes OBJECT-TYPE
+         SYNTAX       Counter32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			The total number of bytes processed at the indicated rate 
+            "
+        ::= { wlsxMonAPHTRateStatsEntry 3 }
+
 -- wlsxMonStationStatsGroup contains all the statistics observed by different 
 -- Air Monitors attached to this controller. 
 -- Station Statatistics are observed by the Air Monitor for that 
@@ -1324,7 +1391,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
         ::= { wlsxMonStationStatsEntry 27 }
 
 -- This table breaks down the Station statistics into different
--- rate catagories.
+-- rate categories.
 
    wlsxMonStaRateStatsTable  OBJECT-TYPE 
 	  SYNTAX       SEQUENCE OF WlsxMonStaRateStatsEntry 
@@ -1333,7 +1400,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
       DESCRIPTION 
 	  	"
 		This table contains all the Packet and Byte Counts for a monitored station
-		represented in terms of rate catagories.
+		represented in terms of rate categories.
 		"
       ::= { wlsxMonStationStatsGroup 2} 
 
@@ -1348,56 +1415,54 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
 	
      WlsxMonStaRateStatsEntry ::=
      SEQUENCE {
-		 monStaTxPktsAt1Mbps			Counter32  ,
+		 monStaTxPktsAt1Mbps				Counter32,
-		 monStaTxBytesAt1Mbps			Counter32  ,
+		 monStaTxBytesAt1Mbps				Counter32,
-		 monStaTxPktsAt2Mbps			Counter32  ,
+		 monStaTxPktsAt2Mbps				Counter32,
-		 monStaTxBytesAt2Mbps			Counter32  ,
+		 monStaTxBytesAt2Mbps				Counter32,
-		 monStaTxPktsAt5Mbps			Counter32  ,
+		 monStaTxPktsAt5Mbps				Counter32,
-		 monStaTxBytesAt5Mbps			Counter32  ,
+		 monStaTxBytesAt5Mbps				Counter32,
-		 monStaTxPktsAt11Mbps			Counter32  ,
+		 monStaTxPktsAt11Mbps				Counter32,
-		 monStaTxBytesAt11Mbps			Counter32  ,
+		 monStaTxBytesAt11Mbps				Counter32,
-		 monStaTxPktsAt6Mbps			Counter32  ,
+		 monStaTxPktsAt6Mbps				Counter32,
-		 monStaTxBytesAt6Mbps			Counter32  ,
+		 monStaTxBytesAt6Mbps				Counter32,
-		 monStaTxPktsAt12Mbps			Counter32  ,
+		 monStaTxPktsAt12Mbps				Counter32,
-		 monStaTxBytesAt12Mbps			Counter32  ,
+		 monStaTxBytesAt12Mbps				Counter32,
-		 monStaTxPktsAt18Mbps			Counter32  ,
+		 monStaTxPktsAt18Mbps				Counter32,
-		 monStaTxBytesAt18Mbps			Counter32  ,
+		 monStaTxBytesAt18Mbps				Counter32,
-		 monStaTxPktsAt24Mbps			Counter32  ,
+		 monStaTxPktsAt24Mbps				Counter32,
-		 monStaTxBytesAt24Mbps			Counter32  ,
+		 monStaTxBytesAt24Mbps				Counter32,
-		 monStaTxPktsAt36Mbps			Counter32  ,
+		 monStaTxPktsAt36Mbps				Counter32,
-		 monStaTxBytesAt36Mbps			Counter32  ,
+		 monStaTxBytesAt36Mbps				Counter32,
-		 monStaTxPktsAt48Mbps			Counter32  ,
+		 monStaTxPktsAt48Mbps				Counter32,
-		 monStaTxBytesAt48Mbps			Counter32  ,
+		 monStaTxBytesAt48Mbps				Counter32,
-		 monStaTxPktsAt54Mbps			Counter32  ,
+		 monStaTxPktsAt54Mbps				Counter32,
-		 monStaTxBytesAt54Mbps			Counter32  ,
+		 monStaTxBytesAt54Mbps				Counter32,
-		 monStaRxPktsAt1Mbps			Counter32  ,
+		 monStaRxPktsAt1Mbps				Counter32,
-		 monStaRxBytesAt1Mbps			Counter32  ,
+		 monStaRxBytesAt1Mbps				Counter32,
-		 monStaRxPktsAt2Mbps			Counter32  ,
+		 monStaRxPktsAt2Mbps				Counter32,
-		 monStaRxBytesAt2Mbps			Counter32  ,
+		 monStaRxBytesAt2Mbps				Counter32,
-		 monStaRxPktsAt5Mbps			Counter32  ,
+		 monStaRxPktsAt5Mbps				Counter32,
-		 monStaRxBytesAt5Mbps			Counter32  ,
+		 monStaRxBytesAt5Mbps				Counter32,
-		 monStaRxPktsAt11Mbps			Counter32  ,
+		 monStaRxPktsAt11Mbps				Counter32,
-		 monStaRxBytesAt11Mbps			Counter32  ,
+		 monStaRxBytesAt11Mbps				Counter32,
-		 monStaRxPktsAt6Mbps			Counter32  ,
+		 monStaRxPktsAt6Mbps				Counter32,
-		 monStaRxBytesAt6Mbps			Counter32  ,
+		 monStaRxBytesAt6Mbps				Counter32,
-		 monStaRxPktsAt12Mbps			Counter32  ,
+		 monStaRxPktsAt12Mbps				Counter32,
-		 monStaRxBytesAt12Mbps			Counter32  ,
+		 monStaRxBytesAt12Mbps				Counter32,
-		 monStaRxPktsAt18Mbps			Counter32  ,
+		 monStaRxPktsAt18Mbps				Counter32,
-		 monStaRxBytesAt18Mbps			Counter32  ,
+		 monStaRxBytesAt18Mbps				Counter32,
-		 monStaRxPktsAt24Mbps			Counter32  ,
+		 monStaRxPktsAt24Mbps				Counter32,
-		 monStaRxBytesAt24Mbps			Counter32  ,
+		 monStaRxBytesAt24Mbps				Counter32,
-		 monStaRxPktsAt36Mbps			Counter32  ,
+		 monStaRxPktsAt36Mbps				Counter32,
-		 monStaRxBytesAt36Mbps			Counter32  ,
+		 monStaRxBytesAt36Mbps				Counter32,
-		 monStaRxPktsAt48Mbps			Counter32  ,
+		 monStaRxPktsAt48Mbps				Counter32,
-		 monStaRxBytesAt48Mbps			Counter32  ,
+		 monStaRxBytesAt48Mbps				Counter32,
-		 monStaRxPktsAt54Mbps			Counter32  ,
+		 monStaRxPktsAt54Mbps				Counter32,
-		 monStaRxBytesAt54Mbps			Counter32  ,
+		 monStaRxBytesAt54Mbps				Counter32,
-		 monStaTxPktsAt9Mbps			Counter32  ,
+		 monStaTxPktsAt9Mbps				Counter32,
-		 monStaTxBytesAt9Mbps			Counter32  ,
+		 monStaTxBytesAt9Mbps				Counter32,
-		 monStaRxPktsAt9Mbps			Counter32  ,
+		 monStaRxPktsAt9Mbps				Counter32,
-		 monStaRxBytesAt9Mbps			Counter32 
+		 monStaRxBytesAt9Mbps				Counter32
-
-
      }
 
      monStaTxPktsAt1Mbps OBJECT-TYPE
@@ -1825,7 +1890,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
          DESCRIPTION
             "
 			 This attribute indicates the number of Packets Received by the 
-			 station at 36Mpbs rate.
+			 station at 36Mbps rate.
             "
         ::= { wlsxMonStaRateStatsEntry 39 }
 
@@ -1836,7 +1901,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
          DESCRIPTION
             "
 			 This attribute indicates the number of Octets Received by the 
-			 station at 36Mpbs rate.
+			 station at 36Mbps rate.
             "
         ::= { wlsxMonStaRateStatsEntry 40 }
 
@@ -1930,6 +1995,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
             "
         ::= { wlsxMonStaRateStatsEntry 48 }
 
+
 -- This table breaks down the Station statistics based on the
 -- Destination Address Types. 
 
@@ -2415,7 +2481,12 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
 		 monAPInfoStatus                INTEGER,
 		 monAPInfoConfidence			Integer32,
 		 monAPInfoMatchType				ArubaAPMatchType,
-		 monAPInfoMatchMethod			ArubaAPMatchMethod
+		 monAPInfoMatchMethod			ArubaAPMatchMethod,
+		 monAPInfoHTMode				ArubaHTMode,
+		 monAPInfoEncryptionType        ArubaMonEncryptionType,
+		 monAPInfoWPAUnicastCipher      ArubaMonEncryptionCipher,
+		 monAPInfoWPAAuthAlgorithm      ArubaMonAuthAlgorithm,
+		 monAPInfoIBSS                  TruthValue
    }
 
 	monAPInfoPhyType OBJECT-TYPE
@@ -2539,7 +2610,7 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			The method used to classify the AP as a rouge or suspected rogue AP.
+			The method used to classify the AP as a rogue or suspected rogue AP.
             "
         ::= { wlsxMonAPInfoEntry 12 }
 
@@ -2549,11 +2620,63 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			Indicates how the match occured for rouge or suspect-rogue
+			Indicates how the match occurred for rogue or suspect-rogue
 			classification: an exact or +1 or -1 MAC match.
             "
         ::= { wlsxMonAPInfoEntry 13 }
 
+   monAPInfoHTMode OBJECT-TYPE
+         SYNTAX       ArubaHTMode
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Indicates the HT mode of the monitored AP, if any.
+            "
+        ::= { wlsxMonAPInfoEntry 14 }
+
+   monAPInfoEncryptionType OBJECT-TYPE
+         SYNTAX       ArubaMonEncryptionType
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Indicates the Encryption type of the monitored AP.
+            "
+        ::= { wlsxMonAPInfoEntry 15 }
+
+   monAPInfoWPAUnicastCipher OBJECT-TYPE
+         SYNTAX       ArubaMonEncryptionCipher
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Indicates the WPA/WPA2 unicast cipher supported by the monitored AP.
+            If multiple ciphers are supported, the weakest will be indicated. 
+            "
+        ::= { wlsxMonAPInfoEntry 16 }
+
+   monAPInfoWPAAuthAlgorithm OBJECT-TYPE
+         SYNTAX       ArubaMonAuthAlgorithm
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Indicates the WPA/WPA2 authentication algorithm supported by the monitored AP.
+            If multiple authentication algorithms are supported, the weakest will be indicated. 
+            "
+        ::= { wlsxMonAPInfoEntry 17 }
+
+   monAPInfoIBSS OBJECT-TYPE
+         SYNTAX       TruthValue
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Indicates if the monitored AP is part of an adhoc network.
+            "
+        ::= { wlsxMonAPInfoEntry 18 }
+
    wlsxMonStationInfoTable  OBJECT-TYPE 
 	  SYNTAX       SEQUENCE OF MonStationInfoEntry 
 	  MAX-ACCESS   not-accessible		
@@ -2586,7 +2709,8 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
 		 monStaInfoInactivityTime		TimeTicks,
 		 monStaInfoSnrSignalPkts		Integer32,
 		 monStaInfoSnrSampleTime        Integer32,
-		 monStaInfoStatus               INTEGER
+		 monStaInfoStatus               INTEGER,
+		 monStaInfoHTMode				ArubaHTMode
    }
 
 	monStaInfoChannelNum OBJECT-TYPE
@@ -2701,6 +2825,16 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
             "
         ::= { wlsxMonStationInfoEntry 11 }
 
+   monStaInfoHTMode OBJECT-TYPE
+         SYNTAX       ArubaHTMode
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Indicates the HT mode of the station, if any.
+            "
+        ::= { wlsxMonStationInfoEntry 12 }
+
 -- Event table contains the event ID and the number of events of that type
 -- raised so far
 
@@ -2749,5 +2883,76 @@ WLSX-MON-MIB DEFINITIONS ::= BEGIN
             "
         ::= { wlsxMonEventCountEntry 2 }
 
+-- This table breaks down the station statistics observed into different
+-- HT rate categories.
+
+   wlsxMonStationHTRateStatsTable  OBJECT-TYPE 
+	  SYNTAX       SEQUENCE OF WlsxMonStationHTRateStatsEntry 
+	  MAX-ACCESS   not-accessible		
+      STATUS       current 
+      DESCRIPTION 
+	  	"
+		This table contains all the monitored AP Packet and Byte Counts
+		but represented in terms of HT rate categories.
+		"
+	
+      ::= { wlsxMonStationStatsGroup 7 } 
+
+     wlsxMonStationHTRateStatsEntry OBJECT-TYPE 
+	  SYNTAX       WlsxMonStationHTRateStatsEntry 
+	  MAX-ACCESS   not-accessible		
+      STATUS       current 
+      DESCRIPTION 
+             "HT Data rate based packet and byte count entry for a monitored station"
+	  INDEX { monPhyAddress, monRadioNumber, monitoredStaPhyAddress, monHTRate }
+      ::= { wlsxMonStationHTRateStatsTable 1 } 
+	
+     WlsxMonStationHTRateStatsEntry ::=
+     SEQUENCE {
+		 monStaTxHTPkts				Counter32,
+		 monStaTxHTBytes			Counter32,
+		 monStaRxHTPkts				Counter32,
+		 monStaRxHTBytes			Counter32
+	 }
+
+	 monStaTxHTPkts OBJECT-TYPE
+         SYNTAX       Counter32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			The total number of packets transmitted at the indicated rate 
+            "
+        ::= { wlsxMonStationHTRateStatsEntry 1 }
+
+	 monStaTxHTBytes OBJECT-TYPE
+         SYNTAX       Counter32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			The total number of bytes transmitted at the indicated rate 
+            "
+        ::= { wlsxMonStationHTRateStatsEntry 2 }
+
+	 monStaRxHTPkts OBJECT-TYPE
+         SYNTAX       Counter32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			The total number of packets received at the indicated rate 
+            "
+        ::= { wlsxMonStationHTRateStatsEntry 3 }
+
+	 monStaRxHTBytes OBJECT-TYPE
+         SYNTAX       Counter32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			The total number of bytes received at the indicated rate 
+            "
+        ::= { wlsxMonStationHTRateStatsEntry 4 }
 
 END

mibs/arubaos/WLSX-SNR-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim: set ts=4 sw=4:
 WLSX-SNR-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+       
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -36,7 +37,7 @@ WLSX-SNR-MIB DEFINITIONS ::= BEGIN
 			FROM ARUBA-MIB;
 
    wlsxSNRMIB MODULE-IDENTITY 
-       LAST-UPDATED "0601221834Z"
+       LAST-UPDATED "0611272030Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -49,7 +50,7 @@ WLSX-SNR-MIB DEFINITIONS ::= BEGIN
            information about the Wireless Management System (WMS) in the 
 		   Aruba controller.
 		   "
-       REVISION        "0601221834Z"
+       REVISION        "0611272030Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 7 }

mibs/arubaos/WLSX-SWITCH-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
    WLSX-SWITCH-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+       
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -31,7 +32,7 @@
 			FROM ARUBA-MIB;
 
    wlsxSwitchMIB MODULE-IDENTITY 
-       LAST-UPDATED "0602222204Z"
+       LAST-UPDATED "0804160206Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -41,7 +42,7 @@
        DESCRIPTION
            "This MIB module defines MIB objects which provide
             System level information about the Aruba switches."
-       REVISION        "0602222204Z"
+       REVISION        "0804160206Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 1 }
@@ -82,7 +83,8 @@
         SYNTAX      INTEGER {
 						master(1),
 						local(2),
-						standbymaster(3)
+						standbymaster(3),
+						branch(4)
 						}
         MAX-ACCESS   read-only
         STATUS       current
@@ -145,7 +147,8 @@
         SYNTAX      INTEGER {
 						master(1),
 						local(2),
-						standbymaster(3)
+						standbymaster(3),
+						branch(4)
 					}
          MAX-ACCESS   read-only
          STATUS       current
@@ -305,7 +308,7 @@
         STATUS       current
         DESCRIPTION
             "
-			desription of the processor.
+			description of the processor.
             "
         ::= { wlsxSysXProcessorEntry 2 }
 
@@ -528,7 +531,8 @@
 		 userConnectedSlot			Integer32,
 		 userConnectedPort			Integer32,
 		 userBWContractName			DisplayString,
-		 userBWContractUsage		INTEGER
+		 userBWContractUsage		INTEGER,
+		 userConnectedModule		INTEGER
 
      }
 
@@ -676,6 +680,17 @@
             "
         ::= { wlsxSwitchUserEntry 13 }
 
+     userConnectedModule OBJECT-TYPE
+         SYNTAX       Integer32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+            The module to which the user is connected, if wired.
+            "
+        ::= { wlsxSwitchUserEntry 14 }
+
+
   -- StationMgmt Table
   --Station Management Table contains all the station associated with this AP.
 
@@ -1237,7 +1252,7 @@
    wlsxSwitchGlobalAPTable  OBJECT-TYPE 
 	  SYNTAX       SEQUENCE OF MxSwitchGlobalAPEntry 
 	  MAX-ACCESS   not-accessible		
-      STATUS       current 
+      STATUS       deprecated 
       DESCRIPTION 
 	  	"
 			This Table lists all the Access Points Connected in the 
@@ -1249,7 +1264,7 @@
    wlsxSwitchGlobalAPEntry OBJECT-TYPE 
 	  SYNTAX       MxSwitchGlobalAPEntry 
 	  MAX-ACCESS   not-accessible		
-      STATUS       current 
+      STATUS       deprecated 
       DESCRIPTION 
              "Station Management Entry"
 	  INDEX {globalAPLocation, globalAPAddress}
@@ -1269,7 +1284,7 @@
    	globalAPLocation OBJECT-TYPE
          SYNTAX       DisplayString(SIZE(0..32))
          MAX-ACCESS   not-accessible
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Physical Location of the AP, defined in Building.Floor.Location
@@ -1280,7 +1295,7 @@
    	globalAPAddress OBJECT-TYPE
          SYNTAX       IpAddress
          MAX-ACCESS   not-accessible
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Address of the Access Point.
@@ -1290,7 +1305,7 @@
    	globalAPLocalSwitch OBJECT-TYPE
          SYNTAX       IpAddress
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			IP Address of the Local Switch this Access Point is connected to.
@@ -1300,7 +1315,7 @@
    	globalAPdot11aPhyAddr OBJECT-TYPE
          SYNTAX       MacAddress
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Physical Mac address of the module supporting dot11a in the
@@ -1312,7 +1327,7 @@
    	globalAPdot11bPhyAddr OBJECT-TYPE
          SYNTAX       MacAddress
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Physical Mac address of the module supporting dot11b in the
@@ -1324,7 +1339,7 @@
    	globalAPState OBJECT-TYPE
          SYNTAX       INTEGER(1..7)
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			State of the AP.
@@ -1337,7 +1352,7 @@
    	globalAPdot11gPhyAddr OBJECT-TYPE
          SYNTAX       MacAddress
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Physical Mac address of the module supporting dot11g in the
@@ -2135,7 +2150,7 @@ wlsxPowerSupplyMissing NOTIFICATION-TYPE
 
 wlsxAccessPointIsUp NOTIFICATION-TYPE        
 	OBJECTS {apLocation, apIpAddress}
-    STATUS  current
+    STATUS  deprecated
     DESCRIPTION
 			"
 			A trap which indicates that an Access point at Location 
@@ -2145,7 +2160,7 @@ wlsxAccessPointIsUp NOTIFICATION-TYPE
 
 wlsxAccessPointIsDown NOTIFICATION-TYPE        
 	OBJECTS {apLocation, apIpAddress}
-    STATUS  current
+    STATUS  deprecated
     DESCRIPTION
 			"
 			A trap which indicates that an Access point at Location 
@@ -2265,6 +2280,5 @@ wlsxLicenseExpiry NOTIFICATION-TYPE
 			switch will expire in <wlsxLicenseDaysRemaining> days
 			"
     ::= { wlsxSwitchTraps 1042}
-
 END
 

mibs/arubaos/WLSX-SYSTEMEXT-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+       
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -37,7 +38,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
            FROM ARUBA-MIB;
 
    wlsxSystemExtMIB MODULE-IDENTITY 
-       LAST-UPDATED "0707300652Z"
+       LAST-UPDATED "0812112108Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -47,7 +48,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
        DESCRIPTION
            "This MIB module defines MIB objects which provide
             System level information about the Aruba controller."
-       REVISION        "0707300652Z"
+       REVISION        "0812112108Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 2 }
@@ -146,7 +147,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
         STATUS       current
         DESCRIPTION
 			"
-			Internal temparature in the controller.
+			Internal temperature in the controller.
 			"
         ::= { wlsxSystemExtGroup 10 }
 
@@ -434,7 +435,8 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
 		 sysExtCardFpgaRevision				DisplayString,
 		 sysExtCardSwitchChip				DisplayString,
 		 sysExtCardStatus					ArubaActiveState,
-		 sysExtCardUserSlot					Integer32
+		 sysExtCardUserSlot					Integer32,
+		 sysExtCardServiceTag				DisplayString
    }
 
    sysExtCardSlot OBJECT-TYPE
@@ -574,6 +576,16 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
             "
         ::= { wlsxSysExtCardEntry 13 }
 
+   sysExtCardServiceTag OBJECT-TYPE
+        SYNTAX      DisplayString(SIZE(0..64))
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Service Tag of the card.
+            "
+        ::= { wlsxSysExtCardEntry 14 }
+
 -- This table lists the Fans in the controller.
 
    wlsxSysExtFanTable  OBJECT-TYPE 
@@ -582,7 +594,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
       STATUS       current 
       DESCRIPTION 
 		"
-		The table of all the fans in the controller.
+		The table of all supported fans in the controller. Not supported in Aruba 200/800 and 2400 controllers.
 		"
 	
       ::= { wlsxSystemExtGroup 17 } 
@@ -632,7 +644,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
       STATUS       current 
       DESCRIPTION 
 		"
-		The table of Power supplies in the controller.
+		The table of all supported Power supplies in the controller. Not supported in Aruba 200, 800 and 2400 controllers.
 		"
 	
       ::= { wlsxSystemExtGroup 18 } 
@@ -931,11 +943,59 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
 			"
         ::= { wlsxSystemExtGroup 26 }
 
+   wlsxSysExtHwVersion OBJECT-TYPE
+        SYNTAX       DisplayString (SIZE(1..64))
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+                        "Hardware version of the switch."
+        ::= { wlsxSystemExtGroup 27 }
+
+   wlsxSysExtSwVersion OBJECT-TYPE
+        SYNTAX       DisplayString (SIZE(1..64))
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+                        "Software version of the switch."
+        ::= { wlsxSystemExtGroup 28 }
+
+   wlsxSysExtSerialNumber OBJECT-TYPE
+        SYNTAX       DisplayString (SIZE(1..64))
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+                        "The serial number of the switch."
+        ::= { wlsxSystemExtGroup 29 }
+
+   wlsxSysExtCpuUsedPercent OBJECT-TYPE
+        SYNTAX       Gauge32
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+                        "The CPU used percent of the switch"
+        ::= { wlsxSystemExtGroup 30 }
+
+   wlsxSysExtMemoryUsedPercent OBJECT-TYPE
+        SYNTAX       Gauge32
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+                        "The memory used percent of the switch"
+        ::= { wlsxSystemExtGroup 31 }
+
+   wlsxSysExtPacketLossPercent OBJECT-TYPE
+        SYNTAX       Integer32
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+                        "The packet loss count of the switch"
+        ::= { wlsxSystemExtGroup 32 }
+
 
    wlsxSysExtUserTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This objects denotes the number of times the user table was 
@@ -946,7 +1006,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtAPBssidTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This objects denotes the number of times the AP BSSID table was 
@@ -958,7 +1018,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtAPRadioTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This objects denotes the number of times the Radio table was 
@@ -970,7 +1030,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtAPTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated 
         DESCRIPTION
 			"
 			This objects denotes the number of times the AP table was 
@@ -982,7 +1042,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtSwitchListTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated 
         DESCRIPTION
 			"
 			This objects denotes the number of times the Switch list table was 
@@ -994,7 +1054,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtPortTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This objects denotes the number of times the port table was 
@@ -1006,7 +1066,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtVlanTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated 
         DESCRIPTION
 			"
 			This objects denotes the number of times the Vlan table was 
@@ -1018,7 +1078,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtVlanInterfaceTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated 
         DESCRIPTION
 			"
 			This objects denotes the number of times the Vlan Interface table 
@@ -1029,7 +1089,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtLicenseTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated
         DESCRIPTION
 			"
 			This objects denotes the number of times the license table
@@ -1040,7 +1100,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtMonAPTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated 
         DESCRIPTION
 			"
 			This objects denotes the number of times the monitored AP table
@@ -1051,7 +1111,7 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
    wlsxSysExtMonStationTableGenNumber OBJECT-TYPE
         SYNTAX       Integer32
         MAX-ACCESS   read-only
-        STATUS       current
+        STATUS       deprecated 
         DESCRIPTION
 			"
 			This objects denotes the number of times the monitored station table
@@ -1060,5 +1120,13 @@ WLSX-SYSTEMEXT-MIB DEFINITIONS ::= BEGIN
         ::= { wlsxSystemExtTableGenNumberGroup 11 }
 
 
+   wlsxSysExtPoweredViaPoe OBJECT-TYPE
+        SYNTAX       Integer32
+        MAX-ACCESS   read-only
+        STATUS       current
+        DESCRIPTION
+                        "Switch is powered using POE power."
+        ::= { wlsxSystemExtGroup 33 }
+
 END
 

mibs/arubaos/WLSX-USER-MIB

@@ -1,15 +1,18 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
    WLSX-USER-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+       
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
        Integer32,
+       Unsigned32,
 	   Counter32,
 	   IpAddress,
+       Counter64,
 	   NOTIFICATION-TYPE
            FROM SNMPv2-SMI
 
@@ -30,7 +33,10 @@
 
 	   ArubaAuthenticationMethods,
 	   ArubaSubAuthenticationMethods,
-	   ArubaPhyType
+	   ArubaEncryptionType,
+	   ArubaPhyType,
+	   ArubaHTMode,
+       ArubaUserForwardMode
 	   		FROM ARUBA-TC
 		wlsxEnterpriseMibModules
 			FROM ARUBA-MIB
@@ -38,7 +44,7 @@
 			FROM WLSX-WLAN-MIB;
 
    wlsxUserMIB MODULE-IDENTITY 
-       LAST-UPDATED "0704110326Z"
+       LAST-UPDATED "1001261806Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -48,7 +54,7 @@
        DESCRIPTION
            "This MIB module defines MIB objects which provide
             information about the users in an Aruba controller."
-       REVISION        "0704110326Z"
+       REVISION        "1001261806Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 4 }
@@ -58,7 +64,7 @@
 -- wlsxUserAllInfoGroup contains information about the users in the controller.
  
   wlsxTotalNumOfUsers OBJECT-TYPE
-         SYNTAX       Counter32
+         SYNTAX       Unsigned32
          MAX-ACCESS   read-only
          STATUS       current
          DESCRIPTION
@@ -123,7 +129,18 @@
 	 	nUserUPBWContractId				Integer32,
 	 	nUserDNBWContractName			DisplayString,
 	 	nUserDNBWContractUsage			INTEGER,
-	 	nUserDNBWContractId				Integer32
+	 	nUserDNBWContractId				Integer32,
+		nUserHTMode   				    ArubaHTMode,
+        nUserForwardMode                ArubaUserForwardMode,
+		nUserEncryptionMethod			ArubaEncryptionType,
+		nUserDeviceID				    DisplayString,
+		nUserConnectedModule            Integer32,
+		nUserDeviceType				DisplayString,
+		nUserRxDataPkts64               Counter64,
+		nUserTxDataPkts64               Counter64,
+		nUserRxDataOctets64             Counter64,
+		nUserTxDataOctets64             Counter64,
+		nVIAUserDeviceID 				MacAddress
      }
 
      nUserPhyAddress OBJECT-TYPE
@@ -244,7 +261,7 @@
      nUserIsOnHomeAgent OBJECT-TYPE
          SYNTAX       TruthValue
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			The Object will indicate if the controller is the home controller 
@@ -255,7 +272,7 @@
      nUserHomeAgentIpAddress OBJECT-TYPE
          SYNTAX       IpAddress
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			The Home agent IP Address of the user. If this user is already on 
@@ -270,7 +287,8 @@
 		 				visitor(1),
 						away(2),
 						associated(3),
-						wired(4)
+						wired(4),
+                        wireless(5)
 		 				}
          MAX-ACCESS   read-only
          STATUS       current
@@ -284,7 +302,7 @@
      nUserHomeVlan OBJECT-TYPE
          SYNTAX       Integer32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Home VLAN of the User. If the user is on the home controller 
@@ -483,6 +501,124 @@
             "
         ::= { wlsxUserEntry 33 }
 
+     nUserHTMode OBJECT-TYPE
+         SYNTAX       ArubaHTMode
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			The HT mode of this user, if any.
+            "
+        ::= { wlsxUserEntry 34 }
+
+     nUserEncryptionMethod OBJECT-TYPE
+         SYNTAX       ArubaEncryptionType
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Encryption method.
+            "
+        ::= { wlsxUserEntry 35 }
+ 
+     nUserForwardMode OBJECT-TYPE
+         SYNTAX       ArubaUserForwardMode
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			User mode.
+            "
+        ::= { wlsxUserEntry 36 }
+        
+     nUserDeviceID OBJECT-TYPE
+         SYNTAX       DisplayString(SIZE(0..128))
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Device ID
+            "
+        ::= { wlsxUserEntry 37 }
+
+     nUserConnectedModule OBJECT-TYPE
+         SYNTAX       Integer32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+            The module to which the user is connected, if wired.
+
+            "
+        ::= { wlsxUserEntry 38 }
+
+     nUserDeviceType OBJECT-TYPE
+         SYNTAX       DisplayString(SIZE(0..31))
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Device type
+            "
+        ::= { wlsxUserEntry 39 }
+
+     nUserRxDataPkts64 OBJECT-TYPE
+         SYNTAX       Counter64
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+            This object specifies number of packets received by this IP
+            for which this user is connected to the controller.
+            "
+         ::= { wlsxUserEntry 40 }
+
+     nUserTxDataPkts64 OBJECT-TYPE
+         SYNTAX       Counter64
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+            This object specifies number of packets transmitted by this IP
+            for which this user is connected to the controller.
+            "
+         ::= { wlsxUserEntry 41 }
+
+     nUserRxDataOctets64 OBJECT-TYPE
+         SYNTAX       Counter64
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+            This object specifies number of octets received by this IP
+            for which this user is connected to the controller.
+            "
+         ::= { wlsxUserEntry 42 }
+
+     nUserTxDataOctets64 OBJECT-TYPE
+         SYNTAX       Counter64
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+            This object specifies number of octets transmitted by this IP
+            for which this user is connected to the controller.
+            "
+        ::= { wlsxUserEntry 43 }
+
+    nVIAUserDeviceID OBJECT-TYPE
+         SYNTAX       MacAddress
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+                MAC address of the station from which the user connected to
+                the controller using VIA.
+            "
+        ::= { wlsxUserEntry 44 }
+
+
+
   wlsxUserSessionTimeTable OBJECT-TYPE
 	  SYNTAX		SEQUENCE OF WlsxUserSessionTimeEntry
 	  MAX-ACCESS	not-accessible
@@ -534,4 +670,60 @@
             "
         ::= { wlsxUserSessionTimeEntry 2 }
 
+-- wlsxUserStatsGroup 
+-- This group lists the user count information based on the auth type
+
+  wlsxUserStatsGroup               OBJECT IDENTIFIER ::= { wlsxUserAllInfoGroup 4 }
+
+     wlsxNumOfUsers8021x    OBJECT-TYPE
+         SYNTAX       Unsigned32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			 Number of 802.1x users.
+            "
+        ::= { wlsxUserStatsGroup 1 }
+
+     wlsxNumOfUsersVPN      OBJECT-TYPE
+         SYNTAX       Unsigned32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Number of VPN users.
+            "
+        ::= { wlsxUserStatsGroup 2 }
+
+     wlsxNumOfUsersCP      OBJECT-TYPE
+         SYNTAX       Unsigned32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Number of Captive Portal  users.
+            "
+        ::= { wlsxUserStatsGroup 3 }
+
+     wlsxNumOfUsersMAC      OBJECT-TYPE
+         SYNTAX       Unsigned32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Number of MAC users.
+            "
+        ::= { wlsxUserStatsGroup 4 }
+
+     wlsxNumOfUsersStateful8021x      OBJECT-TYPE
+         SYNTAX       Unsigned32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Number of stateful 802.1x users.
+            "
+        ::= { wlsxUserStatsGroup 5 }
+
+
 END

mibs/arubaos/WLSX-VOICE-MIB

@@ -1,9 +1,10 @@
--- ArubaOS 3.2.0.0_16376
+--- ArubaOS 6.5.2.0_59123
 -- vim:set ts=4 sw=4:
 WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
 
    IMPORTS
-       TEXTUAL-CONVENTION,
+       TEXTUAL-CONVENTION FROM SNMPv2-TC 
+       
        MODULE-IDENTITY,
        OBJECT-TYPE,
        snmpModules,
@@ -46,7 +47,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
 			FROM ARUBA-MIB;
 
    wlsxVoiceMIB MODULE-IDENTITY 
-       LAST-UPDATED "0701102156Z"
+       LAST-UPDATED "0804160206Z"
        ORGANIZATION "Aruba Wireless Networks"
        CONTACT-INFO
             "Postal:    1322 Crossman Avenue
@@ -57,7 +58,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
            "This MIB module defines MIB objects which provide
             information about Voice call status and call detail reporting
 		in the Aruba controller."
-       REVISION        "0701102156Z"
+       REVISION        "0804160206Z"
        DESCRIPTION
            "The initial revision."
        ::= { wlsxEnterpriseMibModules 12 }
@@ -68,6 +69,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    wlsxVoiceCallCtrsGroup		OBJECT IDENTIFIER ::= { wlsxVoiceStatsGroup 2 }
    wlsxVoiceClientInfoGroup     OBJECT IDENTIFIER ::= { wlsxVoiceStatsGroup 3 }
    wlsxVoiceAPBssidInfoGroup	OBJECT IDENTIFIER ::= { wlsxVoiceStatsGroup 4 }
+   wlsxVoiceClientLocationInfoGroup     OBJECT IDENTIFIER ::= { wlsxVoiceStatsGroup 5 }
 
    wlsxVoiceCdrTotal  OBJECT-TYPE 
          SYNTAX       Unsigned32
@@ -208,7 +210,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    	voiceCdrTeardownTime OBJECT-TYPE
          SYNTAX       Unsigned32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Voice CDR teardown number
@@ -329,7 +331,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    	voiceCdrMOS OBJECT-TYPE
          SYNTAX       Integer32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Voice CDR MOS
@@ -428,7 +430,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    voiceCallCtrsNotFnd  OBJECT-TYPE 
          SYNTAX       Unsigned32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Total number of not found calls.
@@ -438,7 +440,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    voiceCallCtrsBusy  OBJECT-TYPE 
          SYNTAX       Unsigned32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Total number of busy calls.
@@ -448,7 +450,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    voiceCallCtrsSvc  OBJECT-TYPE 
          SYNTAX       Unsigned32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Total number of service unavailable calls.
@@ -458,7 +460,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    voiceCallCtrsReqTerm  OBJECT-TYPE 
          SYNTAX       Unsigned32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Total number of request terminated calls.
@@ -468,7 +470,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    voiceCallCtrsDecline  OBJECT-TYPE 
          SYNTAX       Unsigned32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Total number of declined calls.
@@ -478,7 +480,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    voiceCallCtrsUnauth  OBJECT-TYPE 
          SYNTAX       Unsigned32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Total number of unauthorized calls.
@@ -488,7 +490,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    voiceCallCtrsMisc  OBJECT-TYPE 
          SYNTAX       Unsigned32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Total number of miscellaneous calls.
@@ -681,6 +683,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
 	voiceAPBssidTotVoiceClients   Unsigned32,
 	voiceAPBssidCallsSCCP			Unsigned32,
 	voiceAPBssidCallsSIP			Unsigned32,
+    voiceAPBssidCallsSIPS           Unsigned32,
 	voiceAPBssidCallsSVP			Unsigned32,
 	voiceAPBssidCallsVocera		Unsigned32,
 	voiceAPBssidCallsNoe		    Unsigned32,
@@ -713,7 +716,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
          STATUS       current
          DESCRIPTION
             "
-			Voice AP IP addresss
+			Voice AP IP address
             "
         ::= { wlsxVoiceAPBssidEntry 3 }
 
@@ -798,7 +801,7 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
    	voiceAPBssidKickedOff OBJECT-TYPE
          SYNTAX       Counter32
          MAX-ACCESS   read-only
-         STATUS       current
+         STATUS       deprecated
          DESCRIPTION
             "
 			Voice AP kicked off
@@ -895,8 +898,136 @@ WLSX-VOICE-MIB DEFINITIONS ::= BEGIN
             "
         ::= { wlsxVoiceAPBssidEntry 20 }
 
+   	voiceAPBssidCallsSIPS OBJECT-TYPE
+         SYNTAX       Unsigned32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Voice AP Total SIPS calls
+            "
+        ::= { wlsxVoiceAPBssidEntry 21 }
+
 --
 -- end VoiceApEntry
 --
 
+--
+-- begin voice client location entry
+--
+
+   wlsxVoiceClientLocationTotal  OBJECT-TYPE 
+         SYNTAX       Unsigned32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Total Number of Active voice clients in the controller.
+            "
+        ::= { wlsxVoiceClientLocationInfoGroup 1 }
+
+   wlsxVoiceClientLocationTable  OBJECT-TYPE
+		SYNTAX       SEQUENCE OF VoiceClientLocationEntry 
+        MAX-ACCESS   not-accessible		
+        STATUS       current 
+        DESCRIPTION 
+	  	"
+			This table lists all voice client Location Info
+		"
+      ::= { wlsxVoiceClientLocationInfoGroup 2 } 
+      
+   wlsxVoiceClientLocationEntry OBJECT-TYPE 
+	  SYNTAX       VoiceClientLocationEntry 
+	  MAX-ACCESS   not-accessible		
+      STATUS       current 
+      DESCRIPTION 
+             ""
+	  INDEX { wlanStaPhyAddress }
+      ::= { wlsxVoiceClientLocationTable 1 } 
+
+
+   VoiceClientLocationEntry ::=
+	SEQUENCE {
+		vcLocationIp          IpAddress,
+		vcLocationMac	      MacAddress,  
+		vcLocationSwitchIp	  IpAddress,
+		vcLocationApName	  DisplayString,
+		vcLocationApMac  	  MacAddress,
+		vcLocationApMode	  Integer32,
+		vcLocationApLoc	      DisplayString
+    }
+
+   	vcLocationIp OBJECT-TYPE
+         SYNTAX       IpAddress
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Voice client IP Address 
+            "
+        ::= { wlsxVoiceClientLocationEntry 1 }
+
+   	vcLocationMac OBJECT-TYPE
+         SYNTAX       MacAddress
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Voice client Mac Address 
+            "
+        ::= { wlsxVoiceClientLocationEntry 2 }
+
+   	vcLocationSwitchIp OBJECT-TYPE
+         SYNTAX       IpAddress
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Voice Client Switch IP Address 
+            "
+        ::= { wlsxVoiceClientLocationEntry 3 }
+
+   	vcLocationApName OBJECT-TYPE
+         SYNTAX       DisplayString
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Voice Client AP Name
+            "
+        ::= { wlsxVoiceClientLocationEntry 4 }
+
+   	vcLocationApMac OBJECT-TYPE
+         SYNTAX       MacAddress 
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Voice client AP Mac Address 
+            "
+        ::= { wlsxVoiceClientLocationEntry 5 }
+
+   	vcLocationApMode OBJECT-TYPE
+         SYNTAX       Integer32
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Voice client AP Mode
+            "
+        ::= { wlsxVoiceClientLocationEntry 6 }
+
+   	vcLocationApLoc OBJECT-TYPE
+         SYNTAX       DisplayString
+         MAX-ACCESS   read-only
+         STATUS       current
+         DESCRIPTION
+            "
+			Voice client Ap Location 
+            "
+        ::= { wlsxVoiceClientLocationEntry 7 }
+--
+-- end voice client location entry 
+--
+        
 END