From aa4f6ff989bc3d391344a6f89773c6fecd656db8 Mon Sep 17 00:00:00 2001
From: Josh Baird <joshbaird@gmail.com>
Date: Sun, 31 May 2020 17:19:07 -0400
Subject: [PATCH] Add OS support for Aviat WTM (#11654)

* Add support for Aviat WTM

* Remove sleeps

* Rename MIBs

* Remove old MIBs

* Fix mystery tabs

* 4 spaces, not 2

* Bybebye, whitespace

* Moar whitespace

* Update AviatWtm.php

* Update aviat-wtm.yaml

* Delete aviat-wtm.inc.php

* Update aviat-wtm.snmprec

* Update aviat-wtm.json

* Update AviatWtm.php

* Update aviat-wtm.json

* Update AviatWtm.php

* Update aviat-wtm.json

* Update AviatWtm.php

Co-authored-by: Tony Murray <murraytony@gmail.com>
---
 LibreNMS/OS/AviatWtm.php                      |  215 +++
 html/images/os/aviat.png                      |  Bin 0 -> 3601 bytes
 includes/definitions/aviat-wtm.yaml           |   11 +
 includes/definitions/discovery/aviat-wtm.yaml |   26 +
 mibs/aviat-wtm/AVIAT-ALARM-REPORTING-MIB      |  634 ++++++++
 mibs/aviat-wtm/AVIAT-G826-MIB                 |  838 ++++++++++
 mibs/aviat-wtm/AVIAT-MODEM-MIB                |  621 ++++++++
 mibs/aviat-wtm/AVIAT-RF-MIB                   |  621 ++++++++
 mibs/aviat-wtm/AVIAT-RXPERFORMANCE-EX-MIB     |  435 ++++++
 mibs/aviat-wtm/AVIAT-RXPERFORMANCE-MIB        |  691 +++++++++
 mibs/aviat-wtm/AVIAT-SWMANAGEMENT-MIB         |  328 ++++
 mibs/aviat-wtm/AVIAT-TEXTCONVENTION-MIB       |  208 +++
 mibs/aviat-wtm/STXN-GLOBALREGISTER-MIB        |  315 ++++
 tests/data/aviat-wtm.json                     | 1355 +++++++++++++++++
 tests/snmpsim/aviat-wtm.snmprec               |  155 ++
 15 files changed, 6453 insertions(+)
 create mode 100644 LibreNMS/OS/AviatWtm.php
 create mode 100644 html/images/os/aviat.png
 create mode 100644 includes/definitions/aviat-wtm.yaml
 create mode 100644 includes/definitions/discovery/aviat-wtm.yaml
 create mode 100644 mibs/aviat-wtm/AVIAT-ALARM-REPORTING-MIB
 create mode 100644 mibs/aviat-wtm/AVIAT-G826-MIB
 create mode 100644 mibs/aviat-wtm/AVIAT-MODEM-MIB
 create mode 100644 mibs/aviat-wtm/AVIAT-RF-MIB
 create mode 100644 mibs/aviat-wtm/AVIAT-RXPERFORMANCE-EX-MIB
 create mode 100644 mibs/aviat-wtm/AVIAT-RXPERFORMANCE-MIB
 create mode 100644 mibs/aviat-wtm/AVIAT-SWMANAGEMENT-MIB
 create mode 100644 mibs/aviat-wtm/AVIAT-TEXTCONVENTION-MIB
 create mode 100644 mibs/aviat-wtm/STXN-GLOBALREGISTER-MIB
 create mode 100644 tests/data/aviat-wtm.json
 create mode 100644 tests/snmpsim/aviat-wtm.snmprec

diff --git a/LibreNMS/OS/AviatWtm.php b/LibreNMS/OS/AviatWtm.php
new file mode 100644
index 0000000000..203b6b6e4a
--- /dev/null
+++ b/LibreNMS/OS/AviatWtm.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * AviatWtm.php
+ *
+ * Aviat WTM
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2020 Josh Baird
+ * @author     Josh Baird<joshbaird@gmail.com>
+ */
+
+namespace LibreNMS\OS;
+
+use LibreNMS\Device\WirelessSensor;
+use LibreNMS\Interfaces\Discovery\OSDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessFrequencyDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessRateDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessSnrDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessPowerDiscovery;
+use LibreNMS\Interfaces\Discovery\Sensors\WirelessRssiDiscovery;
+use LibreNMS\OS;
+
+class AviatWtm extends OS implements
+    OSDiscovery,
+    WirelessFrequencyDiscovery,
+    WirelessRateDiscovery,
+    WirelessRssiDiscovery,
+    WirelessSnrDiscovery,
+    WirelessPowerDiscovery
+{
+    public function discoverOS(): void
+    {
+        $device = $this->getDeviceModel();
+
+        $oids = ['entPhysicalModelName.2', 'entPhysicalSerialNum.2', 'entPhysicalSoftwareRev.2'];
+        $data = snmp_get_multi($this->getDevice(), $oids, '-OQUs', 'ENTITY-MIB');
+
+        $device->hardware = $data[2]['entPhysicalModelName'] ?? null;
+        $device->serial = $data[2]['entPhysicalSerialNum'] ?? null;
+        $device->version = $data[2]['entPhysicalSoftwareRev'] ?? null;
+    }
+
+    /**
+     * 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 discoverWirelessFrequency()
+    {
+        $sensors = [];
+        $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB');
+        $frequency = snmpwalk_cache_oid($this->getDevice(), 'aviatRfFreqTx', [], 'AVIAT-RF-MIB:');
+        foreach ($frequency as $index => $data) {
+            $sensors[] = new WirelessSensor(
+                'frequency',
+                $this->getDeviceId(),
+                ".1.3.6.1.4.1.2509.9.5.2.1.1.1.$index",
+                'aviat-wtm-carrier-tx-freq',
+                $index,
+                "TX Frequency ({$name[$index]})",
+                $data['aviatRfFreqTx'],
+                1,
+                1000
+            );
+        }
+
+        return $sensors;
+    }
+
+    /**
+     * Discover wireless tx or rx capacity. This is in bps. Type is rate.
+     * Returns an array of LibreNMS\Device\Sensor objects that have been discovered
+     *
+     * @return array
+     */
+
+    public function discoverWirelessRate()
+    {
+        $sensors = [];
+        $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB');
+
+        $tx = snmpwalk_cache_oid($this->getDevice(), 'aviatModemCurCapacityTx', [], 'AVIAT-MODEM-MIB');
+        foreach ($tx as $index => $data) {
+            $sensors[] = new WirelessSensor(
+                'rate',
+                $this->getDeviceId(),
+                ".1.3.6.1.4.1.2509.9.3.2.1.1.11.$index",
+                'aviat-wtm-carrier-tx-rate',
+                $index,
+                "TX Capacity ({$name[$index]})",
+                $data['aviatModemCurCapacityTx'],
+                1000
+            );
+        }
+
+        $rx = snmpwalk_cache_oid($this->getDevice(), 'aviatModemCurCapacityRx', [], 'AVIAT-MODEM-MIB');
+        foreach ($rx as $index => $data) {
+            $sensors[] = new WirelessSensor(
+                'rate',
+                $this->getDeviceId(),
+                ".1.3.6.1.4.1.2509.9.3.2.1.1.12.$index",
+                'aviat-wtm-carrier-rx-rate',
+                $index,
+                "TX Capacity ({$name[$index]})",
+                $data['aviatModemCurCapacityRx'],
+                1000
+            );
+        }
+
+        return $sensors;
+    }
+
+    /**
+     * Discover wireless tx or rx RSL. This is in dbm. Type is rssi.
+     * Returns an array of LibreNMS\Device\Sensor objects that have been discovered
+     *
+     * @return array
+     */
+    public function discoverWirelessRssi()
+    {
+        $sensors = [];
+        $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB');
+        $rsl = snmpwalk_cache_oid($this->getDevice(), 'aviatRxPerformRslReadingCurrent', [], 'AVIAT-RXPERFORMANCE-MIB');
+
+        foreach ($rsl as $index => $data) {
+            $sensors[] = new WirelessSensor(
+                'rssi',
+                $this->getDeviceId(),
+                ".1.3.6.1.4.1.2509.9.15.2.2.1.4.$index",
+                'aviat-wtm-carrier-rsl',
+                $index,
+                "RSL ({$name[$index]})",
+                $data['aviatRxPerformRslReadingCurrent'],
+                1,
+                10
+            );
+        }
+
+        return $sensors;
+    }
+
+    /**
+     * Discover wireless SNR (CINR). This is in dbm. Type is snr.
+     * Returns an array of LibreNMS\Device\Sensor objects that have been discovered
+     *
+     * @return array
+     */
+    public function discoverWirelessSnr()
+    {
+        $sensors = [];
+        $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB');
+        $snr = snmpwalk_cache_oid($this->getDevice(), 'aviatRxPerformCinrReadingCurrent', [], 'AVIAT-RXPERFORMANCE-EX-MIB');
+
+        foreach ($snr as $index => $data) {
+            $sensors[] = new WirelessSensor(
+                'snr',
+                $this->getDeviceId(),
+                ".1.3.6.1.4.1.2509.9.33.2.2.1.3.$index",
+                'aviat-wtm-carrier-snr',
+                $index,
+                "SNR ({$name[$index]})",
+                $data['aviatRxPerformCinrReadingCurrent'],
+                1,
+                10
+            );
+        }
+
+        return $sensors;
+    }
+
+    /**
+     * Discover wireless TX 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()
+    {
+        $sensors = [];
+        $name = $this->getCacheByIndex('entPhysicalName', 'ENTITY-MIB');
+        $power = snmpwalk_cache_oid($this->getDevice(), 'aviatRxPerformTxpowReadingCurrent', [], 'AVIAT-RXPERFORMANCE-EX-MIB');
+
+        foreach ($power as $index => $data) {
+            $sensors[] = new WirelessSensor(
+                'power',
+                $this->getDeviceId(),
+                ".1.3.6.1.4.1.2509.9.33.2.2.1.7.$index",
+                'aviat-wtm-carrier-txpower',
+                $index,
+                "TX Power ({$name[$index]})",
+                $data['aviatRxPerformTxpowReadingCurrent'],
+                1,
+                10
+            );
+        }
+
+        return $sensors;
+    }
+}
diff --git a/html/images/os/aviat.png b/html/images/os/aviat.png
new file mode 100644
index 0000000000000000000000000000000000000000..4475e58e095dd4cea2518c236e2f51c41b4da28a
GIT binary patch
literal 3601
zcmV+s4({=ZP)<h;3K|Lk000e1NJLTq005Q%002`61^@s6eI)+n0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU<vq?ljRCwC#oqKE?M;*s!FLoY~l0!xO
z(SLdoMImhxUy?RS^QhMa!5@|CGZI2VNIoMWRRWYV;txQIZ1YEvD5`BrOT_DJ2~|`G
z`K(e2@w#;=P2xQ6oHPxjDtD1eS{}j|@^Tz!kKgZZCO0=X`@Fq}?fF@&+1uHjeavUS
z^PAu7uC=eHKQ&4SiIQrYp=lPT!t*_UFo-g8G54`By;eBk{3gk@8{E42o$PAARvq-h
z=)&@<-vD0;G7TrKI0LEioc_oBO20UB?|fVjX+<5*w;NIhlaqzjEm#K2twjN<C|u+?
zOyrw0Pv#*_A!yG&kxs3Ii*f4hEn!U~F^v>^LxjYN1pbO}mRcp%6f?ns6`~hatIS6L
zssvO(;>fX{Jj|zHeth_lvFw!W_@z(a&C(0_#DFCNaA8t9TZD@MR3@BrNWm2>SQ4n<
z;=_fe%V0hNX#zp}&g<O<q~k{p9BXS8JNDOyQJvt%C>}1Bny*@QqD++yW{O&Q0iL_E
zI>B-Qm6)ePp8o7#o<J2F`PTkFPqfns|LNi*coPf(K5+!cgdd?|>A=hC1ZQEAiaME)
zhA2o3Cw`eS3vL32s!GLRKKZ@l2XoIIKd86*M1S|zw(#%Y+BOVFngb-_#ZogzO6pWj
z373j_Ldrp=%p+KJLRFq;z8EQ{pFeRRJ$m9mq!lOm+Y8&{00jay#K19mfM{xpknxiR
zWXe2%6(CflDhp|)JRO$hesFUCaI;SCH*a=DUVC##8jd81epE$?1a)$$Ql<rD%3Ofe
zAgH+YibFq~eLVBh?7oJo*Yx?W1OStPBhgJ6KpbRdjY?^BnSE2pmML=ps|iq*y7G`l
zA<Y~;wJ#p@3H|!q&hXT^=oIW})GVnK@u5=Hkjd6Ds~}TwS%TF>s90VY=951;y>~RI
zllj%$&L~x>SkXeIcy+S(v*iAkX#=7%UZh$B6~8R;vom|rKR>gluAz`$W_QJ)MDV9b
zq*|pk2bGfa28o3_(PmFv$5j571gsW96}p#4a7->edG;}1aJ`(_jp2hSfFoSn;}g`$
z0wA*nGUlwiXfBmAFITJ<L&eIEVp!rAnMb2uP5{;is7SI5g65!7#I;IQ1EfivdQ&;`
z)?i_Uw*gday%Jn6XLq}T3luI6N|dYsBv!Hjo3zJguVl47N9VAFvXWx84ODC$aOz3&
zmFzCtW)XZcs#IQ7$~xr0uVXquCQ~WpXUUqv_JOLLR}M#{p_eCx>!+tFR5g{X5&Ot`
zEr6y)kI`%JR5gVX=e^CKx)<w$yeaX3e|&mx6k}91a1^VXKuZPl*kkk)JXKb%OLF8`
zPnbT$hn0>I@d%_{p^`&gdhV*(P*w5>8SC4T9mM1O(W!kH`^tsN&84&~zRZy17-ahh
zRoytkHr#%=8!ij$W?}owu&zP3DeQjeQdS|wfn{gked7>5W)g#o+Kp+Gp<?rWPj8<~
zy)?To1M5UXva)T!sfNS?Hi;^8uofUqK{|~f9o%xUpwOukEZ)9<`~WCf>CxnV`dCae
zpu)VudkgDRcg#>+ggL~k69Yn~O8y|jN3SP8x%EOyq0&IGcpE>tKMs{J1eFnKFjVAU
zi=AY)5GLC<-l%EjEWvT1WESd#=>()BpMLm!ULn$Cu$a9#yDtHiFhs}x0*C63sgYOz
z{SmTYt|6P(FOUb;Emo<cv!7)RS=Ii_kQwlE@TqO*l&{oku+WZ{o$4gM;SwZNxK8HU
zePr(1M$!Sl*J>uH)=jcLWRj2##Lj*eYwqr?TYz)~{J1fNL>qy{$CsdzMp3<jfa?0)
zHRP4|KT6iXZv<-%EW5vRi9GayTMj)wPmtmJl6}zgRLx$yf<+_ZQ5;ZaO`~6^aM`Q>
zxu5*=_S!12aDEGb^`VZXnx3h>GcMit#OJy)0}6u%1W1D}@JqXAQ2{nXrDf}Z>dN9;
za^?0q=|0{E*i3OinFTH_BkMJR(Ln{(G6D;&f7hu3z|w<o`GE>m=+xEwEX&6xa{f-I
z5H+uc%pv+d@cHOj<xed)u+YA^^K?Ng!9}uOp+cqlhlN@(n_udzi~-gFR6PbLj2{ks
zA$n#)RsAvr3k@m|ds{tPIdbg^Dm<VQHfqJ}#@$d!xhi9Hn!SRR(=h;ELABh$LW3p;
zq3Ur9)&BsNcOBG<*?+M)B%}&1(;6}Zn&?4Q<tqd%G;or^p)U?PL50iCUfbxp-0Mqg
z$f9ZSbSVEgOpz2I?Nimg!oWiN?2hahKxNoLg?Z<%f6!C8SC=}i{j3UPeb8G~1IH^7
zta8w-I6$M^QmEd(xq;j^y&clErH*PptF|ee`0}GC4OP`E7_6ta&*cHCaT!#&?9#0b
zp3A%gP$7(!rmzY!Yyy>EwbH>tdurRcVSp+xLWM&xf4jNCSD81kcPMKDi`w`zkDX9W
z;A#Mi?sP<i>hi*R&&?pSn<cPnnnF-3qJp5S39QdNa()6I<>d#9^9$>Im$wK&-mQ7|
zTpR!Dp5u*DEA~O)h(f51z#`>laDsn)B@c>Kk1dpfrTqJZWTF9woq%Z`rVLDJm~wQA
zDU{j-tcnv~4n5><)dv<fqg==#mDu}6KHx(hh6z7lBEFJ_sx?JwKWVPOYK1+y^+Fz?
zDvcxN>QpP%JLLSV>3|OxVLI%v&gd#(CQNT4-R@=zwU+AQG%D76w>#@DYq2`y5cJCr
zF^N*8B!1Uw@VS!I4PaBE?ZCos!=t|7^Xx&`QZa;~2ICu#zaF&H-YtO&hlmOi09S)z
z+5K)kSckS;#D@aO-*2rCq`Y#^P@8GMp^CsvTc}pI@~+wdEK&|P7`Mz|4r8h8X9fL+
zjqHEu7&M)6(PS#HTGAW>2v=^e4NkF&TF_wi3%{}ayoF*B)jMn-#kv|~dEY*8Ea)(U
zZlP9$`dEgL-zzC&o>YI7#>>a$V#2mlLQj;>v-9z$h~x`Qbjs2ExJ5XHKYsCg3`xq%
zw1Z+9L6rqP!=RyxNFbPY_${m4f`bZrQB1L!w)^eqWOL^kqdmTiP)@{0^B!$ESTDT$
zKwxEoj}<gnF$o}sje@ZXj5@5N*KrIp4X%<14I@PBD5KEPYOwGbtd`U5KFlCfSLSm?
z1Q@b{s>LN80;jNu3_!mzx<Lyy-9(p1gqs7K*&ce%gPdyh3+oyZ*s~pNP<aIsTyq$t
z;~usNGY|=Ialy|Tc7OrPo^UvZUYm}CpKFt~fi5YWgHCS%+-6L;*&>314y*2pf2X-f
ztRw4g))k%Sq>E$72-}FmMrk3x-U=2w8M3Ilt9^zPKY^%);i4IH<K#Q}YLg8<=d1^Z
zzrDi^ZEQ|pI5p?JKAe1~j>EF~ypjUTx*H$y=rlViQeFav?xEwbtiCGPp%`+d7KAuI
z78AB8Cncy>R8Y0CCWRTIw9IZ7YN^0#l7Ho-E_SMu5`3hDi!x>7lc_p@8YN90YEn&M
ztwjR7n`08^*v+Fhy2L*#_=GA=S}=a86e}2Ia)LA~C{Nr*)ntn4_lejkizeEj$0Ux^
z_7nAjNW)BwH|0EnB*wE65`}Uq-);QNE~cbQ%1Jte5ZuJ5R2(ay=F9M~t*qzQ?@(TZ
z)D8!UW#$7=UTjJSeKx7e$7(=t&}%bfI5^@3Nz<n{A<U3%7E}r>c`wch6epYX5jyB?
zV3?sLrogfXAm!sOmnlQ9g9_;u&0--y#fm7fT4S<kyI-|PIruxG-^2ozdYx)10xp6T
zZvcD`s&Iq%FoR#Um=P+Gz2s>KW%E78AxXv7^Wv>R6_5Atuvd7PE}s$L&?WoNTXax(
zi_`L^9kyGwmZ>AmAX-?`)gP6BTy&V6o-T0e`X^lM!|VRzF1DLjIJpPGtEF9lnzN~#
zq>p_JOV%0o302&~O(>g`QLr)s1oaN<#7Omnb5j<6U7C0gWb%qM&#6Sr#&;Sfl`rI2
z!H}l=)?Hk$B&mHc@ZR-P{~5ded^}?r-jq>?j)O8~%9JTnrc9YKWy;#sRIkv7z3}2u
z?7qign)upRp2@>+?9oMFenQA+W<Z`n^Wvm7!p+JN%Pp0G<%)T<EDSHO$8x6G{%M}h
z^)w4~y8@R#%#I7@6Lddg!Z{wM$2tjlo<<?mSfM||i;Y7tNiI~-FUiNjXYtM9F1l=p
zZo^(~AQYG(4oWOP36;#=${rG+n&QAoQds!#1(vl*I96u3OoweS5Iiag5wH*T7Kpcx
zn3PP771n1uyW1@cAEC)IwW9D0QZR~C35JDjaNTYS4m0+44X+x9sp9m}@(2Z>syy5u
z1v4T!J_H|QPy_riQe)qi7-29g#cH07(L4V^i+ogqw8t{1sZ#V(kg^miTs9*p694<M
z3?6_gO%+h~qy|Ej=bKQ@Mre6Cs%i?XCfW$StK$~=Jy2<0{aB_P42DTk`5+pvSPVF3
z2)9gG3Urdazlh~U0Gyg}NrVli57To@z&cR{R+Ef6!vi*}^rPQH9ci~^il3rnpyh=o
zX_7X@NvbGuB7b^yfb-Wxo1^)0)=}V;j+NWR_OHNdyxsd&1NBWt1m~CKM<mWWuS|Ix
z->lU8qo5&R;{t$V6p9FK(gp>8El+(g27g#k9fNBIN9aw!ALk6IJg?u!_bA=i{{<KT
X^kv$2p@5bO00000NkvXXu0mjfx(LRl

literal 0
HcmV?d00001

diff --git a/includes/definitions/aviat-wtm.yaml b/includes/definitions/aviat-wtm.yaml
new file mode 100644
index 0000000000..f3074e08c6
--- /dev/null
+++ b/includes/definitions/aviat-wtm.yaml
@@ -0,0 +1,11 @@
+os: aviat-wtm
+text: 'Aviat WTM'
+type: wireless
+icon: aviat
+over:
+    - { graph: device_bits, text: 'Traffic' }
+    - { graph: device_wireless_rssi, text: 'RSSI' }
+    - { graph: device_wireless_power, text: 'Power' }
+discovery:
+    - sysObjectID:
+        - .1.3.6.1.4.1.2509.11.1.1.8
diff --git a/includes/definitions/discovery/aviat-wtm.yaml b/includes/definitions/discovery/aviat-wtm.yaml
new file mode 100644
index 0000000000..7a2a485a4e
--- /dev/null
+++ b/includes/definitions/discovery/aviat-wtm.yaml
@@ -0,0 +1,26 @@
+mib: AVIAT-MODEM-MIB
+modules:
+  sensors:
+    state:
+      data:
+        -
+          oid: aviatModemCurModulationRx
+          num_oid: '.1.3.6.1.4.1.2509.9.3.2.1.1.13.{{ $index }}'
+          descr: Tx Mod Rate (Carrier1/{{ $index }})
+          index: '{{ $index }}'
+          state_name: aviatModemCurModulationRx
+          states:
+            - { value: 1, generic: 1, graph: 1, descr: 'N/A' }
+            - { value: 2, generic: 0, graph: 1, descr: 'QPSK' }
+            - { value: 3, generic: 0, graph: 1, descr: '16-QAM' }
+            - { value: 4, generic: 0, graph: 1, descr: '32-QAM' }
+            - { value: 5, generic: 0, graph: 1, descr: '64-QAM' }
+            - { value: 6, generic: 0, graph: 1, descr: '128-QAM' }
+            - { value: 7, generic: 0, graph: 1, descr: '256-QAM' }
+            - { value: 8, generic: 0, graph: 1, descr: '512-QAM' }
+            - { value: 9, generic: 0, graph: 1, descr: '1024-QAM' }
+            - { value: 10, generic: 0, graph: 1, descr: '256-QAM-HG' }
+            - { value: 11, generic: 0, graph: 1, descr: '512-QAM-HD' }
+            - { value: 12, generic: 0, graph: 1, descr: '1024-QAM-HD' }
+            - { value: 13, generic: 0, graph: 1, descr: '2048-QAM' }
+            - { value: 14, generic: 0, graph: 1, descr: '4096-QAM' }
diff --git a/mibs/aviat-wtm/AVIAT-ALARM-REPORTING-MIB b/mibs/aviat-wtm/AVIAT-ALARM-REPORTING-MIB
new file mode 100644
index 0000000000..1cc5f18355
--- /dev/null
+++ b/mibs/aviat-wtm/AVIAT-ALARM-REPORTING-MIB
@@ -0,0 +1,634 @@
+-- ****************************************************************************
+-- aviatAlarmReporting.mib: Aviat Networks Alarm Reporting MIB
+--
+-- Copyright © 2016 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+AVIAT-ALARM-REPORTING-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        TEXTUAL-CONVENTION, DisplayString, TruthValue, DateAndTime
+            FROM SNMPv2-TC
+        MODULE-IDENTITY, OBJECT-TYPE, Counter32,
+        NOTIFICATION-TYPE
+            FROM SNMPv2-SMI
+        MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
+            FROM SNMPv2-CONF
+        ItuPerceivedSeverity
+            FROM ITU-ALARM-TC-MIB
+        IANAItuEventType, IANAItuProbableCause
+            FROM IANA-ITU-ALARM-TC-MIB
+        AviatYangIdentityRef
+            FROM AVIAT-TEXTCONVENTION-MIB
+        aviatModules
+            FROM STXN-GLOBALREGISTER-MIB;
+
+    aviatAlarmReportingModule MODULE-IDENTITY
+        LAST-UPDATED    "201605260000Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This MIB module is used to describe the status of alarms
+                 present in Aviat Networks products."
+        REVISION        "201605260000Z"
+        DESCRIPTION
+                "Initial Version."
+            ::= { aviatModules 47 }
+
+
+-- ****************************************************************************
+-- Conformance area, containing groups and compliance specifications
+-- ****************************************************************************
+    aviatAlarmReportingConformance       OBJECT IDENTIFIER ::= { aviatAlarmReportingModule 1 }
+
+    aviatAlarmReportingGroups            OBJECT IDENTIFIER ::= { aviatAlarmReportingConformance 1 }
+
+    aviatAlarmReportingCompliance        OBJECT IDENTIFIER ::= { aviatAlarmReportingConformance 2 }
+
+
+-- ****************************************************************************
+-- Sub-tree for Alarm MIB objects
+-- ****************************************************************************
+    aviatAlarmReportingMIBObjects        OBJECT IDENTIFIER ::= { aviatAlarmReportingModule 2 }
+
+    aviatAlarmReportingNotifications     OBJECT IDENTIFIER ::= { aviatAlarmReportingMIBObjects 7 }
+
+
+-- ****************************************************************************
+-- Sub-tree for Alarm MIB notifications
+-- ****************************************************************************
+    aviatAlarmReportingMIBEvents         OBJECT IDENTIFIER ::= { aviatAlarmReportingModule 0 }
+
+
+-- ****************************************************************************
+-- Textual Conventions
+-- ****************************************************************************
+
+   IetfEntityName ::= TEXTUAL-CONVENTION
+       DISPLAY-HINT "127t"
+       STATUS       current
+       DESCRIPTION
+            "A name uniquely identifying an entity within the system.
+             This corresponds to the physical entity name used by the
+             ietf-entity YANG."
+       SYNTAX       OCTET STRING (SIZE (0..127))
+
+   AviatAlarmInstanceState ::= TEXTUAL-CONVENTION
+       STATUS current
+       DESCRIPTION
+               "The current state of an alarm instance"
+       SYNTAX         INTEGER
+       {
+              cleared (0),
+              raised (1),
+              unstable (2)
+       }
+
+   AviatAlarmReportingMode ::= TEXTUAL-CONVENTION
+       STATUS current
+       DESCRIPTION
+               "Reporting mode for alarm instances on a particular entity."
+       SYNTAX         INTEGER
+       {
+              all (0),
+              nonSummary (1),
+              summaryOnly (2),
+              none (3)
+       }
+
+-- ****************************************************************************
+-- Alarm Supported Types Table
+-- ****************************************************************************
+    aviatAlarmTypeTable   OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatAlarmTypeEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing information for all alarms
+                         types that are supported by the system."
+            ::= { aviatAlarmReportingMIBObjects 1 }
+
+    aviatAlarmTypeEntry   OBJECT-TYPE
+        SYNTAX          AviatAlarmTypeEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the table holding information about a
+                         single supported alarm type."
+        INDEX           { aviatAlarmTypeIndex }
+            ::= { aviatAlarmTypeTable 1 }
+
+    AviatAlarmTypeEntry ::=
+        SEQUENCE {
+            aviatAlarmTypeIndex
+                AviatYangIdentityRef,
+            aviatAlarmTypeSecurityEvent
+                TruthValue,
+            aviatAlarmTypeDescription
+                DisplayString,
+            aviatAlarmTypeEvent
+                IANAItuEventType,
+            aviatAlarmTypeDefaultSeverity
+                ItuPerceivedSeverity
+        }
+
+    aviatAlarmTypeIndex             OBJECT-TYPE
+        SYNTAX          AviatYangIdentityRef
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "The unique Yang Identity representing a particular alarm
+                         type."
+            ::= { aviatAlarmTypeEntry 1 }
+
+    aviatAlarmTypeSecurityEvent     OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates whether or not the system views the alarm
+                         type as being security related."
+            ::= { aviatAlarmTypeEntry 2 }
+
+    aviatAlarmTypeDescription       OBJECT-TYPE
+        SYNTAX          DisplayString ( SIZE ( 0..255 ) )
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This object specifies a human-readable message
+                         describing the alarm type."
+            ::= { aviatAlarmTypeEntry 3 }
+
+    aviatAlarmTypeEvent              OBJECT-TYPE
+        SYNTAX          IANAItuEventType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The type of event associated with the alarm type."
+            ::= { aviatAlarmTypeEntry 4 }
+
+    aviatAlarmTypeDefaultSeverity    OBJECT-TYPE
+        SYNTAX          ItuPerceivedSeverity
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This object specifies the default severity assigned to
+                         the alarm type by the system. By default, any entity that
+                         raises an alarm of this type will have this level of severity
+                         associated with the alarm instance.
+                         The following ITU-t X.733 severities are supported:
+                             critical        (3)
+                             major           (4)
+                             minor           (5)
+                             warning         (6)
+
+                         See http://www.iana.org."
+            ::= { aviatAlarmTypeEntry 5 }
+
+-- ****************************************************************************
+-- Alarm Status Objects
+-- ****************************************************************************
+    aviatAlarmInstanceLastChange  OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The time when any alarm instance in the system last
+                         changed its state."
+            ::= { aviatAlarmReportingMIBObjects 2 }
+
+    aviatAlarmInstanceTable       OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatAlarmInstanceEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing information for all alarm
+                         instances currently registered within the system."
+            ::= { aviatAlarmReportingMIBObjects 3 }
+
+    aviatAlarmInstanceEntry       OBJECT-TYPE
+        SYNTAX          AviatAlarmInstanceEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the table holding information for a
+                         given alarm instance."
+        INDEX           { aviatAlarmInstanceEntity, aviatAlarmTypeIndex}
+            ::= { aviatAlarmInstanceTable 1 }
+
+    AviatAlarmInstanceEntry ::=
+        SEQUENCE {
+            aviatAlarmInstanceEntity
+                IetfEntityName,
+            aviatAlarmInstanceSecurityEvent
+                TruthValue,
+            aviatAlarmInstanceDescription
+                DisplayString,
+            aviatAlarmInstanceType
+                IANAItuEventType,
+            aviatAlarmInstanceCurrentState
+                AviatAlarmInstanceState,
+            aviatAlarmInstanceCurrentSeverity
+                ItuPerceivedSeverity,
+            aviatAlarmInstanceRaisedSeverity
+                ItuPerceivedSeverity,
+            aviatAlarmInstanceLastStatusChange
+                DateAndTime,
+            aviatAlarmInstanceStatusChangeCount
+                Counter32,
+            aviatAlarmInstanceDisabled
+                TruthValue
+        }
+
+    aviatAlarmInstanceEntity    OBJECT-TYPE
+        SYNTAX          IetfEntityName
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "Each alarm instance is associated with a particular
+                         system entity. This object identifies the entity in the
+                         form of a name string. Corresponds to the physical
+                         entity name as per the ietf-entity YANG."
+            ::= { aviatAlarmInstanceEntry 1 }
+
+    aviatAlarmInstanceSecurityEvent     OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates whether or not the system views the alarm
+                         instance as being security related."
+            ::= { aviatAlarmInstanceEntry 2 }
+
+    aviatAlarmInstanceDescription   OBJECT-TYPE
+        SYNTAX          DisplayString ( SIZE ( 0..255 ) )
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This object specifies a human-readable message
+                         describing the alarm instance."
+            ::= { aviatAlarmInstanceEntry 3 }
+
+    aviatAlarmInstanceType          OBJECT-TYPE
+        SYNTAX          IANAItuEventType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The type of event associated with the alarm instance."
+            ::= { aviatAlarmInstanceEntry 4 }
+
+    aviatAlarmInstanceCurrentState     OBJECT-TYPE
+        SYNTAX          AviatAlarmInstanceState
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The current state of the alarm instance.
+                         Supported states are:
+                             cleared  (0)
+                             raised   (1)
+                             unstable (2)"
+            ::= { aviatAlarmInstanceEntry 5 }
+
+    aviatAlarmInstanceCurrentSeverity   OBJECT-TYPE
+        SYNTAX          ItuPerceivedSeverity
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This object shows the current severity level
+                         associated with the alarm instance:
+                             cleared        (1)
+                             indetermined   (2)
+                             critical       (3)
+                             major          (4)
+                             minor          (5)
+                             warning        (6)"
+            ::= { aviatAlarmInstanceEntry 6 }
+
+    aviatAlarmInstanceRaisedSeverity   OBJECT-TYPE
+        SYNTAX          ItuPerceivedSeverity
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The severity to be applied when this alarm instance is
+                         raised for this entity. This is either based upon the
+                         default for the alarm type, or overriden by user
+                         configuration.
+
+                         The following ITU-t X.733 severities are supported:
+                             critical       (3)
+                             major          (4)
+                             minor          (5)
+                             warning        (6)
+
+                         See http://www.iana.org."
+            ::= { aviatAlarmInstanceEntry 7 }
+
+    aviatAlarmInstanceLastStatusChange  OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The time when the status of the alarm instance last
+                         changed."
+            ::= { aviatAlarmInstanceEntry 8 }
+
+    aviatAlarmInstanceStatusChangeCount OBJECT-TYPE
+        SYNTAX          Counter32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The number of times that the entity has raised or
+                         lowered this alarm instance since the system was started."
+            ::= { aviatAlarmInstanceEntry 9 }
+
+    aviatAlarmInstanceDisabled    OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates whether or not an event which causes this
+                         alarm instance to be raised or lowered by this entity,
+                         will be reported.
+
+                         When disabled, status changes for the alarm will still
+                         be shown in aviatAlarmInstanceTable, but the alarm instance
+                         will no longer appear in aviatAlarmRaisedInstanceTable,
+                         a log entry will not be made, and a notification will not
+                         be generated."
+            ::= { aviatAlarmInstanceEntry 10 }
+
+-- ****************************************************************************
+-- Raised Alarms
+-- ****************************************************************************
+
+    aviatAlarmRaisedInstanceLastChange  OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The time of the last update to the raised alarms table."
+            ::= { aviatAlarmReportingMIBObjects 4 }
+
+    aviatAlarmRaisedInstanceTable       OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatAlarmRaisedInstanceEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing information for all alarm
+                         instances that are currently raised or unstable in the
+                         system."
+            ::= { aviatAlarmReportingMIBObjects 5 }
+
+    aviatAlarmRaisedInstanceEntry       OBJECT-TYPE
+        SYNTAX          AviatAlarmRaisedInstanceEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the table holding information for a
+                         given raised or unstable alarm instance."
+        INDEX           { aviatAlarmInstanceEntity, aviatAlarmTypeIndex }
+            ::= { aviatAlarmRaisedInstanceTable 1 }
+
+    AviatAlarmRaisedInstanceEntry ::=
+        SEQUENCE {
+            aviatAlarmRaisedInstanceSecurityEvent
+                TruthValue,
+            aviatAlarmRaisedInstanceDescription
+                DisplayString,
+            aviatAlarmRaisedInstanceSeverity
+                ItuPerceivedSeverity,
+            aviatAlarmRaisedInstanceCause
+                IANAItuProbableCause,
+            aviatAlarmRaisedInstanceTime
+                DateAndTime,
+            aviatAlarmRaisedInstanceIsUnstable
+                TruthValue
+        }
+
+    aviatAlarmRaisedInstanceSecurityEvent     OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates whether or not the system views the alarm
+                         instance as being security related."
+            ::= { aviatAlarmRaisedInstanceEntry 1 }
+
+    aviatAlarmRaisedInstanceDescription OBJECT-TYPE
+        SYNTAX          DisplayString ( SIZE ( 0..255 ) )
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This object specifies a human-readable message
+                         describing the alarm instance."
+            ::= { aviatAlarmRaisedInstanceEntry 2 }
+
+    aviatAlarmRaisedInstanceSeverity    OBJECT-TYPE
+        SYNTAX          ItuPerceivedSeverity
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This object shows the severity level associated with
+                         the alarm instance:
+                             critical       (3)
+                             major          (4)
+                             minor          (5)
+                             warning        (6)"
+            ::= { aviatAlarmRaisedInstanceEntry 3 }
+
+    aviatAlarmRaisedInstanceCause       OBJECT-TYPE
+        SYNTAX          IANAItuProbableCause
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This object shows the probable cause of the alarm
+                         instance being active."
+            ::= { aviatAlarmRaisedInstanceEntry 4 }
+
+    aviatAlarmRaisedInstanceTime        OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The time when the alarm instance was raised."
+            ::= { aviatAlarmRaisedInstanceEntry 5 }
+
+    aviatAlarmRaisedInstanceIsUnstable  OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "An indication of whether the alarm instance is
+                         currently considered unstable, and hence has
+                         further state changes suspended until it is
+                         considered stable again."
+            ::= { aviatAlarmRaisedInstanceEntry 6 }
+
+-- ****************************************************************************
+-- Alarm Entity Status
+-- ****************************************************************************
+
+    aviatAlarmEntityTable       OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatAlarmEntityEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing information for all entities
+                         that have alarm instances registered against them."
+            ::= { aviatAlarmReportingMIBObjects 6 }
+
+    aviatAlarmEntityEntry       OBJECT-TYPE
+        SYNTAX          AviatAlarmEntityEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the table holding information for a
+                         given entity."
+        INDEX           { aviatAlarmInstanceEntity }
+            ::= { aviatAlarmEntityTable 1 }
+
+    AviatAlarmEntityEntry ::=
+        SEQUENCE {
+            aviatAlarmEntityReportingMode
+                AviatAlarmReportingMode
+        }
+
+    aviatAlarmEntityReportingMode     OBJECT-TYPE
+        SYNTAX          AviatAlarmReportingMode
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates the alarm reporting mode configured for this
+                         entity. Supported modes are:
+
+                             all         (0)
+                             nonSummary  (1)
+                             summaryOnly (2)
+                             none        (3)
+
+                         The mode dictates alarm instances of which alarm types
+                         against the entity shall generate a log entry and a
+                         notification upon state change or suppression change."
+            ::= { aviatAlarmEntityEntry 1 }
+
+-- ****************************************************************************
+-- Notification Objects
+-- ****************************************************************************
+    aviatAlarmEntityName        OBJECT-TYPE
+        SYNTAX          IetfEntityName
+        MAX-ACCESS      accessible-for-notify
+        STATUS          current
+        DESCRIPTION     "The name of the entity associated with the alarm
+                         instance. Only used for the generation of
+                         notifications."
+            ::= { aviatAlarmReportingNotifications 1 }
+
+    aviatAlarmTypeID    OBJECT-TYPE
+        SYNTAX          AviatYangIdentityRef
+        MAX-ACCESS      accessible-for-notify
+        STATUS          current
+        DESCRIPTION     "The index of the alarm type associated with
+                         the alarm instance. Only used for the
+                         generation of notifications."
+            ::= { aviatAlarmReportingNotifications 2 }
+
+-- ****************************************************************************
+-- Notification Events
+-- ****************************************************************************
+    aviatAlarmRaisedInstanceNotification    NOTIFICATION-TYPE
+        OBJECTS {
+            aviatAlarmInstanceLastStatusChange,
+            aviatAlarmEntityName,
+            aviatAlarmTypeID,
+            aviatAlarmInstanceCurrentSeverity
+        }
+        STATUS          current
+        DESCRIPTION     "This notification is generated whenever a system alarm
+                         is raised."
+            ::= { aviatAlarmReportingMIBEvents 1 }
+
+    aviatAlarmClearedInstanceNotification   NOTIFICATION-TYPE
+        OBJECTS {
+            aviatAlarmInstanceLastStatusChange,
+            aviatAlarmEntityName,
+            aviatAlarmTypeID
+        }
+        STATUS          current
+        DESCRIPTION     "This notification is generated whenever a system alarm
+                         is cleared."
+            ::= { aviatAlarmReportingMIBEvents 2 }
+
+    aviatAlarmUnstableInstanceNotification NOTIFICATION-TYPE
+        OBJECTS {
+            aviatAlarmInstanceLastStatusChange,
+            aviatAlarmEntityName,
+            aviatAlarmTypeID,
+            aviatAlarmInstanceCurrentSeverity
+        }
+        STATUS          current
+        DESCRIPTION     "This notification is generated whenever a system alarm
+                         is suspended."
+            ::= { aviatAlarmReportingMIBEvents 3 }
+
+    aviatAlarmStabilizedInstanceNotification NOTIFICATION-TYPE
+        OBJECTS {
+            aviatAlarmInstanceLastStatusChange,
+            aviatAlarmEntityName,
+            aviatAlarmTypeID
+        }
+        STATUS          current
+        DESCRIPTION     "This notification is generated whenever a system alarm
+                         suspension is cleared."
+            ::= { aviatAlarmReportingMIBEvents 4 }
+
+
+-- ****************************************************************************
+-- The Object and Event Groups
+-- ****************************************************************************
+    aviatAlarmReportingObjectGroup       OBJECT-GROUP
+        OBJECTS {
+            aviatAlarmTypeSecurityEvent,
+            aviatAlarmTypeDescription,
+            aviatAlarmTypeEvent,
+            aviatAlarmTypeDefaultSeverity,
+            aviatAlarmInstanceLastChange,
+            aviatAlarmInstanceSecurityEvent,
+            aviatAlarmInstanceDescription,
+            aviatAlarmInstanceType,
+            aviatAlarmInstanceCurrentState,
+            aviatAlarmInstanceCurrentSeverity,
+            aviatAlarmInstanceRaisedSeverity,
+            aviatAlarmInstanceLastStatusChange,
+            aviatAlarmInstanceStatusChangeCount,
+            aviatAlarmInstanceDisabled,
+            aviatAlarmRaisedInstanceLastChange,
+            aviatAlarmRaisedInstanceSecurityEvent,
+            aviatAlarmRaisedInstanceDescription,
+            aviatAlarmRaisedInstanceSeverity,
+            aviatAlarmRaisedInstanceCause,
+            aviatAlarmRaisedInstanceTime,
+            aviatAlarmRaisedInstanceIsUnstable,
+            aviatAlarmEntityReportingMode,
+            aviatAlarmEntityName,
+            aviatAlarmTypeID
+        }
+        STATUS          current
+        DESCRIPTION     "These are the objects for alarms in the Alarm MIB."
+            ::= { aviatAlarmReportingGroups 1 }
+
+
+    aviatAlarmReportingNotifyGroup       NOTIFICATION-GROUP
+        NOTIFICATIONS {
+            aviatAlarmRaisedInstanceNotification,
+            aviatAlarmClearedInstanceNotification,
+            aviatAlarmUnstableInstanceNotification,
+            aviatAlarmStabilizedInstanceNotification
+        }
+        STATUS          current
+        DESCRIPTION     "Alarm notifications defined in this MIB."
+            ::= { aviatAlarmReportingGroups 2 }
+
+
+-- ****************************************************************************
+-- The Compliance Specifications
+-- ****************************************************************************
+    aviatAlarmReportingComplV1           MODULE-COMPLIANCE
+        STATUS          current
+        DESCRIPTION     "The implementation requirements for this MIB."
+        MODULE          -- This module
+            MANDATORY-GROUPS    {
+                                    aviatAlarmReportingObjectGroup,
+                                    aviatAlarmReportingNotifyGroup
+                                }
+            ::= { aviatAlarmReportingCompliance 1 }
+
+END
diff --git a/mibs/aviat-wtm/AVIAT-G826-MIB b/mibs/aviat-wtm/AVIAT-G826-MIB
new file mode 100644
index 0000000000..24156468b1
--- /dev/null
+++ b/mibs/aviat-wtm/AVIAT-G826-MIB
@@ -0,0 +1,838 @@
+-- ****************************************************************************
+-- aviatG826.mib: Aviat Networks G.826 MIB
+--
+-- Copyright © 2014 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+AVIAT-G826-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        DateAndTime, TruthValue, TEXTUAL-CONVENTION
+            FROM SNMPv2-TC
+        Gauge32, MODULE-IDENTITY, OBJECT-TYPE
+            FROM SNMPv2-SMI
+        MODULE-COMPLIANCE, OBJECT-GROUP
+            FROM SNMPv2-CONF
+        entPhysicalIndex
+            FROM ENTITY-MIB
+        aviatModules
+            FROM STXN-GLOBALREGISTER-MIB;
+
+    aviatG826Module MODULE-IDENTITY
+        LAST-UPDATED    "201401210157Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This MIB module supports the ITU standard G.826 Error
+                 Performance Measure."
+        REVISION        "201401210157Z"
+        DESCRIPTION
+                "Initial Version."
+            ::= { aviatModules 14 }
+
+
+-- ****************************************************************************
+-- Textual Conventions
+-- ****************************************************************************
+    AviatPackedG826Data ::=     TEXTUAL-CONVENTION
+        DISPLAY-HINT    "55x"
+        STATUS          current
+        DESCRIPTION     "This is the G826 data packed into a single object.
+                         Note that these are fixed size fields. The Date and
+                         Time bytes are padded with trailing zeros. Refer to
+                         the individual object definitions in
+                         aviatPerformanceTable for details on the syntax of
+                         each object.
+
+                             Bytes 1-4:     G826 Errored Blocks
+                             Bytes 5-8:     G826 Errored Seconds
+                             Bytes 9-12:    G826 Errored Seconds Ratio
+                             Bytes 13-16:   G826 Severely Errored Seconds
+                             Bytes 17-20:   G826 Severely Errored Seconds Ratio
+                             Bytes 21-24:   G826 Background Block Errors
+                             Bytes 25-28:   G826 Background Block Errors Ratio
+                             Bytes 29-32:   G826 Available Seconds
+                             Bytes 33-36:   G826 Unavailable Seconds
+                             Bytes 37-47:   Date And Time
+                             "
+        SYNTAX          OCTET STRING ( SIZE ( 0 | 47 ) )
+
+
+-- ****************************************************************************
+-- Conformance area, containing groups and compliance specifications
+-- ****************************************************************************
+    aviatG826Conformance        OBJECT IDENTIFIER ::= { aviatG826Module 1 }
+
+    aviatG826Groups             OBJECT IDENTIFIER ::= { aviatG826Conformance 1 }
+
+    aviatG826Compliance         OBJECT IDENTIFIER ::= { aviatG826Conformance 2 }
+
+
+-- ****************************************************************************
+-- Sub-tree for G.826 MIB objects
+-- ****************************************************************************
+    aviatG826MIBObjects         OBJECT IDENTIFIER ::= { aviatG826Module 2 }
+
+
+-- ****************************************************************************
+-- G.826 Control Table
+-- ****************************************************************************
+    aviatG826ControlTable       OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatG826ControlEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing G.826 control objects for entities
+                         within the system."
+            ::= { aviatG826MIBObjects 1 }
+
+    aviatG826ControlEntry       OBJECT-TYPE
+        SYNTAX          AviatG826ControlEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A row in the aviatG826ControlTable."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatG826ControlTable 1 }
+
+    AviatG826ControlEntry ::=
+        SEQUENCE {
+            aviatG826LastQHourChangeIndex
+                Gauge32,
+            aviatG826LastDayChangeIndex
+                Gauge32,
+            aviatG826Reset
+                INTEGER
+        }
+
+    aviatG826LastQHourChangeIndex   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the index number of the last entry in
+                         aviatG826QHourTable that refers to the given entity.
+                         This index number refers to the aviatG826QHourPeriod
+                         index of the table."
+            ::= { aviatG826ControlEntry 1 }
+
+    aviatG826LastDayChangeIndex OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the index number of the last entry in
+                         aviatG826DayTable that refers to the given entity.
+                         This index number refers to the aviatG826DayPeriod
+                         index of the table."
+            ::= { aviatG826ControlEntry 2 }
+
+    aviatG826Reset              OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    none (1),
+                                    all (2),
+                                    realtime (3),
+                                    quarterhour (4),
+                                    daily (5)
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This object resets G826 statistics for an entity.
+                         Setting all(2) will reset realtime, quarter hourly and
+                         daily statistics. Setting realtime(3), quarterhour(4)
+                         or daily(5) will reset only the selected type of
+                         statistics. If quarter hour or daily statistics are
+                         reset, then all saved statistics data of that type
+                         will be deleted. Resetting also resets the current bin
+                         so statistic will begin on next boundary.
+
+                         Reading this object will return none(1)."
+            ::= { aviatG826ControlEntry 3 }
+
+
+-- ****************************************************************************
+--  G.826 Performance Table
+-- ****************************************************************************
+    aviatG826PerformTable       OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatG826PerformEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the table containing information about the
+                         radio path G.826 performance of each terminal in the
+                         domain. This performance data is updated every 1
+                         second."
+            ::= { aviatG826MIBObjects 2 }
+
+    aviatG826PerformEntry       OBJECT-TYPE
+        SYNTAX          AviatG826PerformEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing the receiver
+                         performance data of an entity in the system."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatG826PerformTable 1 }
+
+    AviatG826PerformEntry ::=
+        SEQUENCE {
+            aviatG826ErroredBlocks
+                Gauge32,
+            aviatG826ErroredSeconds
+                Gauge32,
+            aviatG826ErroredSecondsRatio
+                Gauge32,
+            aviatG826SeverelyErroredSeconds
+                Gauge32,
+            aviatG826SeverelyErroredSecsRatio
+                Gauge32,
+            aviatG826BackgroundBlockErrors
+                Gauge32,
+            aviatG826BackgroundBlockErrorsRatio
+                Gauge32,
+            aviatG826AvailableSeconds
+                Gauge32,
+            aviatG826UnavailableSeconds
+                Gauge32,
+            aviatG826PackedData
+                AviatPackedG826Data
+        }
+
+    aviatG826ErroredBlocks      OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Errored Blocks since the
+                         start of monitoring. This parameter is updated every 1
+                         second.
+
+                         This parameter indicates the number of blocks in which
+                         one or more bits are in error."
+            ::= { aviatG826PerformEntry 3 }
+
+    aviatG826ErroredSeconds     OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Errored Seconds since the
+                         start of monitoring. This parameter is updated every 1
+                         second.
+
+                         This parameter indicates the number of one second
+                         periods with one or more errored blocks."
+            ::= { aviatG826PerformEntry 4 }
+
+    aviatG826ErroredSecondsRatio    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the G.826 Errored Seconds Ratio since the
+                         start of monitoring. This parameter is updated every 1
+                         second.
+
+                         The ratio is calculated by dividing the number of
+                         errored seconds by the available time. The ratio is
+                         then multiplied by 1E+7 to preserve 7 decimal places
+                         of the ratio while it is represented as an integer. If
+                         the available time is 0, then this object will also be
+                         0."
+            ::= { aviatG826PerformEntry 5 }
+
+    aviatG826SeverelyErroredSeconds OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Severely Errored Seconds
+                         since the start of monitoring. This parameter is
+                         updated every 1 second.
+
+                         This parameter indicates the number of one second
+                         periods that contain 30%, or more, errored blocks or
+                         at least one defect."
+            ::= { aviatG826PerformEntry 6 }
+
+    aviatG826SeverelyErroredSecsRatio   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the G.826 Severely Errored Seconds Ratio since
+                         the start of monitoring. This parameter is updated
+                         every 1 second.
+
+                         The ratio is calculated by dividing the number of
+                         severely errored seconds by the available time. The
+                         ratio is then multiplied by 1E+7 to preserve 7 decimal
+                         places of the ratio while it is represented as an
+                         integer. If the available time is 0, then this object
+                         will also be 0."
+            ::= { aviatG826PerformEntry 7 }
+
+    aviatG826BackgroundBlockErrors  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Background Block Errors
+                         since the start of monitoring. This parameter is
+                         updated every 1 second."
+            ::= { aviatG826PerformEntry 8 }
+
+    aviatG826BackgroundBlockErrorsRatio OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the Background Block Errors Ratio since the
+                         start of monitoring. This parameter is updated every 1
+                         second.
+
+                         The ratio is calculated by dividing the number of
+                         Background Block Errors by the total number of blocks
+                         (excluding blocks transmitted during severely errored
+                         seconds). The ratio is then multiplied by 1E+14 to
+                         preserve 14 decimal places of the ratio while it is
+                         represented as an integer. If the total number of
+                         blocks is 0, then this object will also be 0."
+            ::= { aviatG826PerformEntry 9 }
+
+    aviatG826AvailableSeconds   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of Available Seconds since the
+                         start of monitoring. This parameter is updated every 1
+                         second.
+
+                         This parameter indicates the time in seconds that the
+                         link is available.
+
+                         Note that available time ends at the start of a block
+                         of ten consecutive Severely Errored Seconds and
+                         recommences at the start of a block of ten seconds
+                         each of which is not severely errored."
+            ::= { aviatG826PerformEntry 10 }
+
+    aviatG826UnavailableSeconds OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of Unavailable Seconds since the
+                         start of monitoring. This parameter is updated every 1
+                         second.
+
+                         Note that unavailable time commences at the start of a
+                         block of ten consecutive Severely Errored Seconds and
+                         ends at the start of a block of ten seconds each of
+                         which is not severely errored."
+            ::= { aviatG826PerformEntry 11 }
+
+    aviatG826PackedData         OBJECT-TYPE
+        SYNTAX          AviatPackedG826Data
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is all of the Performance data for this table,
+                         updated every 1 second, packed into a single object.
+
+                         This object is provided to guarantee a 'snapshot'
+                         collection of the performance measures in an entity.
+                         Slowly stepping through the aviatG826PerformTable may
+                         result in changing information being read."
+            ::= { aviatG826PerformEntry 12 }
+
+
+-- ****************************************************************************
+--  G.826 Quarter Hourly Table
+-- ****************************************************************************
+    aviatG826QuarterHourTable   OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatG826QuarterHourEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the table containing information about the
+                         radio path G.826 performance of each terminal in the
+                         domain. This performance data is recorded for 15
+                         minute periods."
+            ::= { aviatG826MIBObjects 3 }
+
+    aviatG826QuarterHourEntry   OBJECT-TYPE
+        SYNTAX          AviatG826QuarterHourEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing the G.826
+                         performance data of a particular entity within the
+                         agent during a 15 minute period. This is required to
+                         maintain a unique index even when the table wraps."
+        INDEX           { entPhysicalIndex, aviatG826QHourIndex,
+                          aviatG826QHourPeriod }
+            ::= { aviatG826QuarterHourTable 1 }
+
+    AviatG826QuarterHourEntry ::=
+        SEQUENCE {
+            aviatG826QHourIndex
+                Gauge32,
+            aviatG826QHourPeriod
+                Gauge32,
+            aviatG826QHourDateAndTime
+                DateAndTime,
+            aviatG826QHourErroredBlocks
+                Gauge32,
+            aviatG826QHourErroredSeconds
+                Gauge32,
+            aviatG826QHourErroredSecondsRatio
+                Gauge32,
+            aviatG826QHourSeverelyErroredSeconds
+                Gauge32,
+            aviatG826QHourSeverelyErroredSecsRatio
+                Gauge32,
+            aviatG826QHourBackgroundBlockErrors
+                Gauge32,
+            aviatG826QHourBackgroundBlockErrorsRatio
+                Gauge32,
+            aviatG826QHourAvailableSeconds
+                Gauge32,
+            aviatG826QHourUnavailableSeconds
+                Gauge32,
+            aviatG826QHourInvalidEntry
+                TruthValue
+        }
+
+    aviatG826QHourIndex         OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the row number referencing to the quarter
+                         hourly G.826 performance data of a particular entity
+                         in the system."
+            ::= { aviatG826QuarterHourEntry 1 }
+
+    aviatG826QHourPeriod        OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the unique row number for the 15 minute period
+                         during which this block of performance data was
+                         collected."
+            ::= { aviatG826QuarterHourEntry 2 }
+
+    aviatG826QHourDateAndTime   OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the date and time at the start of the current
+                         15 minute period during which this block of
+                         performance data was collected."
+            ::= { aviatG826QuarterHourEntry 3 }
+
+    aviatG826QHourErroredBlocks OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Errored Blocks for the
+                         current 15 minute period of monitoring.
+
+                         This parameter indicates the number of blocks in which
+                         one or more bits are in error."
+            ::= { aviatG826QuarterHourEntry 4 }
+
+    aviatG826QHourErroredSeconds    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Errored Seconds for the
+                         current 15 minute period of monitoring.
+
+                         This parameter indicates the number of one second
+                         periods with one or more errored blocks."
+            ::= { aviatG826QuarterHourEntry 5 }
+
+    aviatG826QHourErroredSecondsRatio   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the G.826 Errored Seconds Ratio for the
+                         current 15 minute period of monitoring.
+
+                         The ratio is calculated by dividing the number of
+                         errored seconds by the available time. The ratio is
+                         then multiplied by 1E+7 to preserve 7 decimal places
+                         of the ratio while it is represented as an integer. If
+                         the available time is 0, then this object will also be
+                         0."
+            ::= { aviatG826QuarterHourEntry 6 }
+
+    aviatG826QHourSeverelyErroredSeconds    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Severely Errored Seconds
+                         for the current 15 minute period of monitoring.
+
+                         This parameter indicates the number of one second
+                         periods that contain 30%, or more, errored blocks or
+                         at least one defect."
+            ::= { aviatG826QuarterHourEntry 7 }
+
+    aviatG826QHourSeverelyErroredSecsRatio  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the G.826 Severely Errored Seconds Ratio for
+                         the current 15 minute period of monitoring.
+
+                         The ratio is calculated by dividing the number of
+                         severely errored seconds by the available time. The
+                         ratio is then multiplied by 1E+7 to preserve 7 decimal
+                         places of the ratio while it represented as an
+                         integer. If the available time is 0, then this object
+                         will also be 0."
+            ::= { aviatG826QuarterHourEntry 8 }
+
+    aviatG826QHourBackgroundBlockErrors OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Background Block Errors
+                         for the current 15 minute period of monitoring."
+            ::= { aviatG826QuarterHourEntry 9 }
+
+    aviatG826QHourBackgroundBlockErrorsRatio    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the Background Block Errors Ratio for the
+                         current 15 minute period of monitoring.
+
+                         The ratio is calculated by dividing the number of
+                         Background Block Errors by the total number of blocks
+                         (excluding blocks transmitted during severely errored
+                         seconds). The ratio is then multiplied by 1E+7 to
+                         preserve 7 decimal places of the ratio while it is
+                         represented as an integer. If the total number of
+                         blocks is 0, then this object will also be 0."
+            ::= { aviatG826QuarterHourEntry 10 }
+
+    aviatG826QHourAvailableSeconds  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of Available Seconds for the
+                         current 15 minute period of monitoring.
+
+                         This parameter indicates the time in seconds that the
+                         link is available.
+
+                         Note that available time ends at the start of a block
+                         of ten consecutive Severely Errored Seconds and
+                         recommences at the start of a block of ten seconds
+                         each of which is not severely errored."
+            ::= { aviatG826QuarterHourEntry 11 }
+
+    aviatG826QHourUnavailableSeconds    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of Unavailable Seconds for the
+                         current 15 minute period of monitoring.
+
+                         Note that unavailable time commences at the start of a
+                         block of ten consecutive Severely Errored Seconds and
+                         ends at the start of a block of ten seconds each of
+                         which is not severely errored."
+            ::= { aviatG826QuarterHourEntry 12 }
+
+    aviatG826QHourInvalidEntry  OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This indicates the validity of the performance data in
+                         this row of the table. It is set to TRUE when the data
+                         becomes invalid due to the interval not being within
+                         ten seconds of its nominal length otherwise it is set
+                         to FALSE.
+
+                         This could be a result of a time-of-day change."
+            ::= { aviatG826QuarterHourEntry 14 }
+
+
+-- ****************************************************************************
+--  G.826 Daily Table
+-- ****************************************************************************
+    aviatG826DayTable           OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatG826DayEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing a collection of information
+                         about the radio path performance of each terminal in
+                         the domain. Performance data in this table is recorded
+                         for 1 day periods."
+            ::= { aviatG826MIBObjects 4 }
+
+    aviatG826DayEntry           OBJECT-TYPE
+        SYNTAX          AviatG826DayEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing performance
+                         data of a particular entity within the agent during a
+                         24 hour period."
+        INDEX           { entPhysicalIndex, aviatG826DayIndex,
+                          aviatG826DayPeriod }
+            ::= { aviatG826DayTable 1 }
+
+    AviatG826DayEntry ::=
+        SEQUENCE {
+            aviatG826DayIndex
+                Gauge32,
+            aviatG826DayPeriod
+                Gauge32,
+            aviatG826DayDateAndTime
+                DateAndTime,
+            aviatG826DayErroredBlocks
+                Gauge32,
+            aviatG826DayErroredSeconds
+                Gauge32,
+            aviatG826DayErroredSecondsRatio
+                Gauge32,
+            aviatG826DaySeverelyErroredSeconds
+                Gauge32,
+            aviatG826DaySeverelyErroredSecsRatio
+                Gauge32,
+            aviatG826DayBackgroundBlockErrors
+                Gauge32,
+            aviatG826DayBackgroundBlockErrorsRatio
+                Gauge32,
+            aviatG826DayAvailableSeconds
+                Gauge32,
+            aviatG826DayUnavailableSeconds
+                Gauge32,
+            aviatG826DayInvalidEntry
+                TruthValue
+        }
+
+    aviatG826DayIndex           OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the row number referencing to the daily G.826
+                         performance data of a particular entity in the system."
+            ::= { aviatG826DayEntry 1 }
+
+    aviatG826DayPeriod          OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the unique row number of the 1 day period
+                         during which this block of performance data was
+                         collected."
+            ::= { aviatG826DayEntry 2 }
+
+    aviatG826DayDateAndTime     OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the date and time at the start of the current
+                         day period during which this block of performance data
+                         was collected."
+            ::= { aviatG826DayEntry 3 }
+
+    aviatG826DayErroredBlocks   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Errored Blocks for the
+                         current 24 hour period of monitoring.
+
+                         This parameter indicates the number of blocks in which
+                         one or more bits are in error."
+            ::= { aviatG826DayEntry 4 }
+
+    aviatG826DayErroredSeconds  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Errored Seconds for the
+                         current 24 hour period of monitoring.
+
+                         This parameter indicates the number of one second
+                         periods with one or more errored blocks."
+            ::= { aviatG826DayEntry 5 }
+
+    aviatG826DayErroredSecondsRatio OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the G.826 Errored Seconds Ratio for the
+                         current 24 hour period of monitoring.
+
+                         The ratio is calculated by dividing the number of
+                         errored seconds by the available time. The ratio is
+                         then multiplied by 1E+7 to preserve 7 decimal places
+                         of the ratio while it is represented as an integer. If
+                         the available time is 0, then this object will also be
+                         0."
+            ::= { aviatG826DayEntry 6 }
+
+    aviatG826DaySeverelyErroredSeconds  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Severely Errored Seconds
+                         for the current 24 hour period of monitoring.
+
+                         This parameter indicates the number of one second
+                         periods that contain 30%, or more, errored blocks or
+                         at least one defect."
+            ::= { aviatG826DayEntry 7 }
+
+    aviatG826DaySeverelyErroredSecsRatio    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the G.826 Severely Errored Seconds Ratio for
+                         the current 24 hour period of monitoring.
+
+                         The ratio is calculated by dividing the number of
+                         severely errored seconds by the available time. The
+                         ratio is then multiplied by 1E+7 to preserve 7 decimal
+                         places of the ratio while it represented as an
+                         integer. If the available time is 0, then this object
+                         will also be 0."
+            ::= { aviatG826DayEntry 8 }
+
+    aviatG826DayBackgroundBlockErrors   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of G.826 Background Block Errors
+                         for the current 24 hour period of monitoring."
+            ::= { aviatG826DayEntry 9 }
+
+    aviatG826DayBackgroundBlockErrorsRatio  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the Background Block Errors Ratio for the
+                         current 24 hour period of monitoring.
+
+                         The ratio is calculated by dividing the number of
+                         Background Block Errors by the total number of blocks
+                         (excluding blocks transmitted during severely errored
+                         seconds). The ratio is then multiplied by 1E+14 to
+                         preserve 14 decimal places of the ratio while it is
+                         represented as an integer. If the total number of
+                         blocks is 0, then this object will also be 0."
+            ::= { aviatG826DayEntry 10 }
+
+    aviatG826DayAvailableSeconds    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of Available Seconds for the
+                         current 24 hour period of monitoring.
+
+                         This parameter indicates the time in seconds that the
+                         link is available.
+
+                         Note that available time ends at the start of a block
+                         of ten consecutive Severely Errored Seconds and
+                         recommences at the start of a block of ten seconds
+                         each of which is not severely errored."
+            ::= { aviatG826DayEntry 11 }
+
+    aviatG826DayUnavailableSeconds  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of Unavailable Seconds for the
+                         current 24 hour period of monitoring.
+
+                         Note that unavailable time commences at the start of a
+                         block of ten consecutive Severely Errored Seconds and
+                         ends at the start of a block of ten seconds each of
+                         which is not severely errored."
+            ::= { aviatG826DayEntry 12 }
+
+    aviatG826DayInvalidEntry    OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This indicates the validity of the performance data in
+                         this row of the table. It is set to TRUE when the data
+                         becomes invalid due to the interval not being within
+                         ten seconds of its nominal length otherwise it is set
+                         to FALSE.
+
+                         This could be a result of a time-of-day change."
+            ::= { aviatG826DayEntry 13 }
+
+
+-- ****************************************************************************
+-- The Object and Event Groups
+-- ****************************************************************************
+    aviatG826ObjectGroup        OBJECT-GROUP
+        OBJECTS {
+            aviatG826LastQHourChangeIndex,
+            aviatG826LastDayChangeIndex,
+            aviatG826Reset,
+            aviatG826ErroredBlocks,
+            aviatG826ErroredSeconds,
+            aviatG826ErroredSecondsRatio,
+            aviatG826SeverelyErroredSeconds,
+            aviatG826SeverelyErroredSecsRatio,
+            aviatG826BackgroundBlockErrors,
+            aviatG826BackgroundBlockErrorsRatio,
+            aviatG826AvailableSeconds,
+            aviatG826UnavailableSeconds,
+            aviatG826PackedData,
+            aviatG826QHourDateAndTime,
+            aviatG826QHourErroredBlocks,
+            aviatG826QHourErroredSeconds,
+            aviatG826QHourErroredSecondsRatio,
+            aviatG826QHourSeverelyErroredSeconds,
+            aviatG826QHourSeverelyErroredSecsRatio,
+            aviatG826QHourBackgroundBlockErrors,
+            aviatG826QHourBackgroundBlockErrorsRatio,
+            aviatG826QHourAvailableSeconds,
+            aviatG826QHourUnavailableSeconds,
+            aviatG826QHourInvalidEntry,
+            aviatG826DayDateAndTime,
+            aviatG826DayErroredBlocks,
+            aviatG826DayErroredSeconds,
+            aviatG826DayErroredSecondsRatio,
+            aviatG826DaySeverelyErroredSeconds,
+            aviatG826DaySeverelyErroredSecsRatio,
+            aviatG826DayBackgroundBlockErrors,
+            aviatG826DayBackgroundBlockErrorsRatio,
+            aviatG826DayAvailableSeconds,
+            aviatG826DayUnavailableSeconds,
+            aviatG826DayInvalidEntry
+        }
+        STATUS          current
+        DESCRIPTION     "These are objects in the G826 MIB."
+            ::= { aviatG826Groups 1 }
+
+
+-- ****************************************************************************
+-- The Compliance Specifications
+-- ****************************************************************************
+    aviatG826ComplV1            MODULE-COMPLIANCE
+        STATUS          current
+        DESCRIPTION     "The implementation requirements for this MIB."
+        MODULE          -- This module
+            MANDATORY-GROUPS    {
+                                    aviatG826ObjectGroup
+                                }
+            ::= { aviatG826Compliance 1 }
+
+END
diff --git a/mibs/aviat-wtm/AVIAT-MODEM-MIB b/mibs/aviat-wtm/AVIAT-MODEM-MIB
new file mode 100644
index 0000000000..244ab866dc
--- /dev/null
+++ b/mibs/aviat-wtm/AVIAT-MODEM-MIB
@@ -0,0 +1,621 @@
+-- ****************************************************************************
+-- aviatModem.mib: Aviat Networks Modem Configuration MIB
+--
+-- Copyright © 2014-2015,2017 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+AVIAT-MODEM-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        MODULE-IDENTITY, OBJECT-TYPE, Gauge32, Integer32, Counter32
+            FROM SNMPv2-SMI
+        TEXTUAL-CONVENTION, TruthValue
+            FROM SNMPv2-TC
+        OBJECT-GROUP, MODULE-COMPLIANCE
+            FROM SNMPv2-CONF
+        entPhysicalIndex
+            FROM ENTITY-MIB
+        AviatModulationType
+            FROM AVIAT-TEXTCONVENTION-MIB
+        aviatModules
+            FROM STXN-GLOBALREGISTER-MIB;
+
+    aviatModemModule MODULE-IDENTITY
+        LAST-UPDATED    "201703280119Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This MIB module defines the Modem configuration objects for
+                 Aviat Networks radios."
+        REVISION        "201809201130Z"
+        DESCRIPTION
+                "Added aviatModemStatusOper"
+        REVISION        "201703280119Z"
+        DESCRIPTION
+                "Added aviatModemModulationStatsTable, aviatModemCurCapacityTx/Rx
+                 and aviatModemCurModulationTx/Rx.
+                 Fixed descriptions of module and previous revision."
+        REVISION        "201504281530Z"
+        DESCRIPTION
+                "Add MLHC support"
+        REVISION        "201409191505Z"
+        DESCRIPTION
+                "L1LA-Lite support added."
+        REVISION        "201402032220Z"
+        DESCRIPTION
+                "Added aviatModemStatusMaxCapacity to show the maximum possible
+                 capacity of the radio link."
+        REVISION        "201401210157Z"
+        DESCRIPTION
+                "Initial Version."
+            ::= { aviatModules 3 }
+
+
+-- ****************************************************************************
+-- Conformance area, containing groups and compliance specifications
+-- ****************************************************************************
+    aviatModemConformance       OBJECT IDENTIFIER ::= { aviatModemModule 1 }
+
+    aviatModemGroups            OBJECT IDENTIFIER ::= { aviatModemConformance 1 }
+
+    aviatModemCompliance        OBJECT IDENTIFIER ::= { aviatModemConformance 2 }
+
+
+-- ****************************************************************************
+-- Sub-tree for Modem MIB objects
+-- ****************************************************************************
+    aviatModemMIBObjects        OBJECT IDENTIFIER ::= { aviatModemModule 2 }
+
+
+-- ****************************************************************************
+-- Textual Conventions
+-- ****************************************************************************
+    AviatModemCapacityType ::=  TEXTUAL-CONVENTION
+        DISPLAY-HINT    "d"
+        STATUS          current
+        DESCRIPTION
+            "Represents the capacity of a modem in one direction.
+             This value is reported in kilobits per second, rounded to the
+             nearest multiple of 1 kbps. Therefore, if the value of this object
+             is equal to `n' then the capacity is somewhere in the range of
+             `n*1000 - 500` to `n*1000 + 499` bits per second.
+             If the capacity is greater than 4,294,967,295,499 bits per second
+             then the value of this object shall be 4,294,967,295."
+        SYNTAX          Gauge32
+
+
+-- ****************************************************************************
+-- Modem Table
+-- ****************************************************************************
+    aviatModemTable             OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatModemEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing the modem configuration objects for
+                         a particular entity of the system."
+            ::= { aviatModemMIBObjects 1 }
+
+    aviatModemEntry             OBJECT-TYPE
+        SYNTAX          AviatModemEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the modem table."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatModemTable 1 }
+
+    AviatModemEntry ::=
+        SEQUENCE {
+            aviatModemBandwidth
+                Gauge32,
+            aviatModemModulationType
+                INTEGER,
+            aviatModemModulationBase
+                AviatModulationType,
+            aviatModemModulationMax
+                AviatModulationType,
+            aviatModemLicensedModulationMask
+                AviatModulationType,
+            aviatModemRegulatoryStandard
+                INTEGER,
+            aviatModemProfileVersion
+                Integer32,
+            aviatModemCapacity
+                Integer32,
+            aviatModemL1laLiteEnabled
+                INTEGER,
+            aviatModemMLHCEnabled
+                INTEGER,
+            aviatModemCurCapacityTx
+                AviatModemCapacityType,
+            aviatModemCurCapacityRx
+                AviatModemCapacityType,
+            aviatModemCurModulationTx
+                AviatModulationType,
+            aviatModemCurModulationRx
+                AviatModulationType
+        }
+
+    aviatModemBandwidth         OBJECT-TYPE
+        SYNTAX          Gauge32
+        UNITS           "kHz"
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "The modem channel bandwidth currently in use, in
+                         kilohertz."
+            ::= { aviatModemEntry 1 }
+
+    aviatModemModulationType    OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    fixed (0),
+                                    acm256 (1),
+                                    acm1024 (2)
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This allocates an ACM license for this radio link
+                         allowing modulation up to and including this
+                         modulation."
+        DEFVAL          { 0 }
+            ::= { aviatModemEntry 2 }
+
+    aviatModemModulationBase    OBJECT-TYPE
+        SYNTAX          AviatModulationType
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the base modulation to use for modem.
+                         Together with aviatModemModulationMax this is used to
+                         define the range of modulations that can be active for
+                         ACM. The modem will configure the ACM operation to
+                         include the minimum and maximum modulations and an
+                         appropriate set of intermediate modulations between
+                         the minimum and maximum.
+
+                         Some combinations of min and max modulations may not
+                         be supported in which case an INCONSISTENT_VALUE error
+                         will be reported."
+            ::= { aviatModemEntry 3 }
+
+    aviatModemModulationMax     OBJECT-TYPE
+        SYNTAX          AviatModulationType
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the maximum modulation to use for ACM.
+                         See the aviatModemModulationBase description for
+                         details.
+
+                         Setting Max without setting Acm mode to the
+                         appropriate ACM mode will cause this command to fail
+                         (i.e. 1024qam requires acm1024)."
+            ::= { aviatModemEntry 4 }
+
+    aviatModemLicensedModulationMask    OBJECT-TYPE
+        SYNTAX          AviatModulationType
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "When configured for adaptive modulation, this
+                         specifies the licensed RF mask. Tx power output will
+                         be controlled to maintain compliance with the
+                         operator's licensed RF mask according to the active
+                         modulation."
+            ::= { aviatModemEntry 5 }
+
+    aviatModemRegulatoryStandard    OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    none (1),
+                                    ansi (2),
+                                    etsi (3)
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the regulatory standard to use."
+            ::= { aviatModemEntry 6 }
+
+    aviatModemProfileVersion    OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This sets the profile version to use. If a new profile
+                         comes out with the same characteristics to a previous
+                         one but not over air compatible, the new one will have
+                         a different version."
+        DEFVAL          { 1 }
+            ::= { aviatModemEntry 7 }
+
+    aviatModemCapacity          OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the capacity to license for this
+                         interface. Set to 0 to unlicense."
+        DEFVAL          { 0 }
+            ::= { aviatModemEntry 8 }
+
+    aviatModemL1laLiteEnabled   OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    disabled (0),
+                                    enabled (1)
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "Enabled L1laLite for this interface and it's partner"
+        DEFVAL          { 0 }
+            ::= { aviatModemEntry 9 }
+
+	aviatModemMLHCEnabled   OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    disabled (0), -- Disable header compression
+                                    enabled(1)   -- Enable MLHC
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "Enable multilayer header compression for this radio interface."
+        DEFVAL          { 0 }
+            ::= { aviatModemEntry 10 }
+
+    aviatModemCurCapacityTx     OBJECT-TYPE
+        SYNTAX          AviatModemCapacityType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Current capacity in the transmit direction."
+            ::= { aviatModemEntry 11 }
+
+    aviatModemCurCapacityRx     OBJECT-TYPE
+        SYNTAX          AviatModemCapacityType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Current capacity in the receive direction."
+            ::= { aviatModemEntry 12 }
+
+    aviatModemCurModulationTx   OBJECT-TYPE
+        SYNTAX          AviatModulationType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Current modulation used to transmit."
+            ::= { aviatModemEntry 13 }
+
+    aviatModemCurModulationRx   OBJECT-TYPE
+        SYNTAX          AviatModulationType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Current modulation used to receive."
+            ::= { aviatModemEntry 14 }
+
+-- ****************************************************************************
+-- Modem Modulation Table
+-- ****************************************************************************
+    aviatModemModulationTable   OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatModemModulationEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing the list of modem
+                         modulations configured for use with adaptive
+                         modulation. This list is based on the settings of
+                         aviatModemModulationBase and aviatModemModulationMax,
+                         and a set of automatically selected intermediate
+                         modulations.
+
+                         If configured for static modulation, this list will
+                         contain only one entry, the configured static
+                         modulation."
+            ::= { aviatModemMIBObjects 2 }
+
+    aviatModemModulationEntry   OBJECT-TYPE
+        SYNTAX          AviatModemModulationEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A single modulation entry for an entity."
+        INDEX           { entPhysicalIndex, aviatModemModulationIndex }
+            ::= { aviatModemModulationTable 1 }
+
+    AviatModemModulationEntry ::=
+        SEQUENCE {
+            aviatModemModulationIndex
+                Gauge32,
+            aviatModemModulation
+                AviatModulationType
+        }
+
+    aviatModemModulationIndex   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "An index representing a particular modulation entry
+                         for an entity."
+            ::= { aviatModemModulationEntry 1 }
+
+    aviatModemModulation        OBJECT-TYPE
+        SYNTAX          AviatModulationType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "A configured modem modulation of the system."
+            ::= { aviatModemModulationEntry 2 }
+
+
+-- ****************************************************************************
+-- Modem Xpic Table
+-- ****************************************************************************
+    aviatModemXpicTable         OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatModemXpicEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing configuration objects for the cross
+                         polarisation interference cancellation (XPIC)
+                         functionality for a particular entity of the system."
+            ::= { aviatModemMIBObjects 3 }
+
+    aviatModemXpicEntry         OBJECT-TYPE
+        SYNTAX          AviatModemXpicEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the modem XPIC table."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatModemXpicTable 1 }
+
+    AviatModemXpicEntry ::=
+        SEQUENCE {
+            aviatModemXpicEnable
+                TruthValue
+        }
+
+    aviatModemXpicEnable        OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies whether the cross polarisation
+                         interference cancellation (XPIC) function is enabled."
+        DEFVAL          { false }
+            ::= { aviatModemXpicEntry 1 }
+
+
+-- ****************************************************************************
+-- Modem Status Table
+-- ****************************************************************************
+    aviatModemStatusTable       OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatModemStatusEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing read only information about the
+                         modem."
+            ::= { aviatModemMIBObjects 4 }
+
+    aviatModemStatusEntry       OBJECT-TYPE
+        SYNTAX          AviatModemStatusEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the modem status table."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatModemStatusTable 1 }
+
+    AviatModemStatusEntry ::=
+        SEQUENCE {
+            aviatModemStatusMaxCapacity
+                Integer32,
+            aviatModemStatusOper
+                INTEGER
+        }
+
+    aviatModemStatusMaxCapacity OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the maximum radio link capacity."
+        DEFVAL          { 0 }
+            ::= { aviatModemStatusEntry 1 }
+
+    aviatModemStatusOper OBJECT-TYPE
+        SYNTAX  INTEGER {
+                up(1),        -- ready to pass packets
+                down(2),
+                testing(3),   -- in some test mode
+                unknown(4),   -- status can not be determined
+                              -- for some reason.
+                dormant(5),
+                notPresent(6),    -- some component is missing
+                lowerLayerDown(7) -- down due to state of
+                                  -- lower-layer interface(s)
+            }
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Operational status of radio link.
+                        Based off ifOperStatus"
+            ::= { aviatModemStatusEntry 2 }
+
+-- ****************************************************************************
+-- Modulation Time Table
+-- ****************************************************************************
+    aviatModemModulationStatsTable      OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatModemModulationStatsEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing information about the
+                         amount of time the radio spends at each modulation
+                         level. Counters are cumulative. No means to reset
+                         counters is provided within this MIB module.
+
+                         If the radio has never used a particular modulation
+                         since statistics were reset, then a row for that
+                         modulation may or may not be present in this table."
+
+            ::= { aviatModemMIBObjects 5 }
+
+    aviatModemModulationStatsEntry      OBJECT-TYPE
+        SYNTAX          AviatModemModulationStatsEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing modulation
+                         time counters for a particular entity at a particular
+                         modulation level."
+        INDEX           { entPhysicalIndex, aviatModemModStatsModulation }
+            ::= { aviatModemModulationStatsTable 1 }
+
+    AviatModemModulationStatsEntry ::=
+        SEQUENCE {
+            aviatModemModStatsModulation
+                AviatModulationType,
+            aviatModemModStatsTxSecs
+                Counter32,
+            aviatModemModStatsTxPct
+                Gauge32,
+            aviatModemModStatsRxSecs
+                Counter32,
+            aviatModemModStatsRxPct
+                Gauge32
+        }
+
+    aviatModemModStatsModulation      OBJECT-TYPE
+        SYNTAX          AviatModulationType
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the modulation type to which the data in this
+                         is row refers."
+            ::= { aviatModemModulationStatsEntry 1 }
+
+    aviatModemModStatsTxSecs     OBJECT-TYPE
+        SYNTAX          Counter32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of seconds in which the radio was
+                         using the specified modulation to transmit."
+            ::= { aviatModemModulationStatsEntry 2 }
+
+    aviatModemModStatsTxPct    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the fraction of the total time in which the
+                         radio was receiving, where the radio was receiving in
+                         the specified modulation, multiplied by 1000000
+                         (10^7) and rounded in an unspecified manner."
+            ::= { aviatModemModulationStatsEntry 4 }
+
+    aviatModemModStatsRxSecs OBJECT-TYPE
+        SYNTAX          Counter32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of seconds in which the radio was
+                         using the specified modulation to receive."
+            ::= { aviatModemModulationStatsEntry 5 }
+
+    aviatModemModStatsRxPct  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the fraction of the total time in which the
+                         radio was transmitting, where the radio was
+                         transmitting at the specified modulation, multiplied
+                         by 1000000 (10^7) and rounded in an unspecified
+                         manner."
+            ::= { aviatModemModulationStatsEntry 6 }
+
+-- ****************************************************************************
+-- The Object and Event Groups
+-- ****************************************************************************
+    aviatModemObjectGroup       OBJECT-GROUP
+        OBJECTS {
+            aviatModemBandwidth,
+            aviatModemModulationType,
+            aviatModemModulationBase,
+            aviatModemModulationMax,
+            aviatModemLicensedModulationMask,
+            aviatModemRegulatoryStandard,
+            aviatModemProfileVersion,
+            aviatModemCapacity,
+            aviatModemL1laLiteEnabled,
+            aviatModemModulation,
+            aviatModemStatusMaxCapacity,
+            aviatModemMLHCEnabled
+        }
+        STATUS          current
+        DESCRIPTION     "These are objects in the Aviat Modem management MIB."
+            ::= { aviatModemGroups 1 }
+
+    aviatModemXpicGroup          OBJECT-GROUP
+        OBJECTS {
+            aviatModemXpicEnable
+        }
+        STATUS          current
+        DESCRIPTION     "These are objects for configuring the cross polar
+                         interference cancellation (XPIC) functionality."
+            ::= { aviatModemGroups 2 }
+
+    aviatModemModulationStatsGroup   OBJECT-GROUP
+        OBJECTS {
+            aviatModemModStatsTxSecs,
+            aviatModemModStatsTxPct,
+            aviatModemModStatsRxSecs,
+            aviatModemModStatsRxPct
+        }
+        STATUS          current
+        DESCRIPTION     "These are the objects in the modulation stats table
+                         introduced for WTM4000. They are not supported on
+                         all modems."
+            ::= { aviatModemGroups 3 }
+
+    aviatModemModulationCurrentGroup OBJECT-GROUP
+        OBJECTS {
+            aviatModemCurCapacityTx,
+            aviatModemCurCapacityRx,
+            aviatModemCurModulationTx,
+            aviatModemCurModulationRx
+        }
+        STATUS          current
+        DESCRIPTION     "These are the new 'current modulation' objects
+                         introduced for WTM4000. They are not supported on
+                         all modems."
+            ::= { aviatModemGroups 4 }
+
+    aviatModemStatusGroup OBJECT-GROUP
+        OBJECTS {
+            aviatModemStatusOper
+        }
+        STATUS          current
+        DESCRIPTION     "These are the new 'status' objects
+                         introduced for WTM4000. They are not supported on
+                         all modems."
+            ::= { aviatModemGroups 5 }
+
+
+-- ****************************************************************************
+-- The Compliance Specifications
+-- ****************************************************************************
+    aviatModemComplV1           MODULE-COMPLIANCE
+        STATUS          current
+        DESCRIPTION     "The implementation requirements for this MIB."
+        MODULE          -- This module
+            MANDATORY-GROUPS    {
+                                    aviatModemObjectGroup
+                                }
+            GROUP               aviatModemXpicGroup
+                DESCRIPTION     "This group is mandatory for all modems that
+                                 support cross polar interference cancellation
+                                 (XPIC)."
+            GROUP               aviatModemModulationStatsGroup
+                DESCRIPTION     "This group is not supported on all modems."
+            GROUP               aviatModemModulationCurrentGroup
+                DESCRIPTION     "This group is not supported on all modems."
+            GROUP               aviatModemStatusGroup
+                DESCRIPTION     "This group is not supported on all modems."
+            ::= { aviatModemCompliance 1 }
+
+END
diff --git a/mibs/aviat-wtm/AVIAT-RF-MIB b/mibs/aviat-wtm/AVIAT-RF-MIB
new file mode 100644
index 0000000000..0f1dc89804
--- /dev/null
+++ b/mibs/aviat-wtm/AVIAT-RF-MIB
@@ -0,0 +1,621 @@
+-- ****************************************************************************
+-- aviatRf.mib: Aviat Networks RF Configuration Settings MIB
+--
+-- Copyright © 2014 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+AVIAT-RF-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        MODULE-IDENTITY, OBJECT-TYPE, Gauge32, Integer32
+            FROM SNMPv2-SMI
+        TruthValue
+            FROM SNMPv2-TC
+        MODULE-COMPLIANCE, OBJECT-GROUP
+            FROM SNMPv2-CONF
+        AviatPowerLevel, AviatDecibel, AviatModulationType, AviatRfuSideBandType
+            FROM AVIAT-TEXTCONVENTION-MIB
+        entPhysicalIndex
+            FROM ENTITY-MIB
+        aviatModules
+            FROM STXN-GLOBALREGISTER-MIB;
+
+    aviatRfModule MODULE-IDENTITY
+        LAST-UPDATED    "201511051430Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This MIB module supports the RF Fault Management functions of
+                 the radio."
+        REVISION        "201511051430Z"
+        DESCRIPTION
+                "Added Tx power limit capability."
+        REVISION        "201507290845Z"
+        DESCRIPTION
+                "Added side band and Tx Rx spacing capability indications."
+        REVISION        "201502100948Z"
+        DESCRIPTION
+                "Added external RF switch indication."
+        REVISION        "201501270246Z"
+        DESCRIPTION
+                "Added 5.8GHz/ L6GHz selection support."
+        REVISION        "201411070247Z"
+        DESCRIPTION
+                "Added Semiconductor Technology."
+        REVISION        "201401210157Z"
+        DESCRIPTION
+                "Initial Version."
+            ::= { aviatModules 5 }
+
+
+-- ****************************************************************************
+-- Conformance area, containing groups and compliance specifications
+-- ****************************************************************************
+    aviatRfConformance          OBJECT IDENTIFIER ::= { aviatRfModule 1 }
+
+    aviatRfGroups               OBJECT IDENTIFIER ::= { aviatRfConformance 1 }
+
+    aviatRfCompliance           OBJECT IDENTIFIER ::= { aviatRfConformance 2 }
+
+
+-- ****************************************************************************
+-- Sub-tree for RF MIB objects
+-- ****************************************************************************
+    aviatRfMIBObjects           OBJECT IDENTIFIER ::= { aviatRfModule 2 }
+
+-- ****************************************************************************
+-- RF Config Types Table
+-- ****************************************************************************
+    aviatRfConfigTable          OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRfConfigEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing the RF configuration objects for a
+                         particular entity of the system."
+            ::= { aviatRfMIBObjects 1 }
+
+    aviatRfConfigEntry          OBJECT-TYPE
+        SYNTAX          AviatRfConfigEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the RF configuration table."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatRfConfigTable 1 }
+
+    AviatRfConfigEntry ::=
+        SEQUENCE {
+            aviatRfFreqTx
+                Integer32,
+            aviatRfFreqRx
+                Integer32,
+            aviatRfPowerSet
+                AviatPowerLevel,
+            aviatRfTxMute
+                TruthValue,
+            aviatRfHighGain
+                TruthValue,
+            aviatRfBandSelection
+                INTEGER
+        }
+
+    aviatRfFreqTx               OBJECT-TYPE
+        SYNTAX          Integer32 ( 0..2147483647 )
+        UNITS           "kHz"
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the transmit frequency of the unit."
+            ::= { aviatRfConfigEntry 1 }
+
+    aviatRfFreqRx               OBJECT-TYPE
+        SYNTAX          Integer32 ( 0..2147483647 )
+        UNITS           "kHz"
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the receive frequency of the unit."
+            ::= { aviatRfConfigEntry 2 }
+
+    aviatRfPowerSet             OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        UNITS           "0.1 dBm"
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the desired output power for the
+                         transmitter of the unit."
+            ::= { aviatRfConfigEntry 3 }
+
+    aviatRfTxMute               OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the status of the factory mute of the
+                         unit. If set to TRUE, the transmitter output will be
+                         muted. It should be set to FALSE otherwise.
+
+                         This setting is 'ORed' with other conditions
+                         (including diagnostic functions and configuration
+                         validation) to control the transmitter output status."
+        DEFVAL          { true }
+            ::= { aviatRfConfigEntry 4 }
+
+    aviatRfHighGain             OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies whether to assign a high power license
+                         to this RF interface. If set to TRUE a license has
+                         been assigned, FALSE otherwise."
+        DEFVAL          { false }
+            ::= { aviatRfConfigEntry 5 }
+
+    aviatRfBandSelection        OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    upper5g8   (1),
+                                    lower6g    (2)
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This is used to select a sub-band within the frequency
+                         range of the attached RFU. It is intended to limit the
+                         frequencies available for configuration of the RFU."
+            ::= { aviatRfConfigEntry 6 }
+
+
+-- ****************************************************************************
+-- RF ATPC MIB Types Table
+-- ****************************************************************************
+    aviatRfATPCTable            OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRfATPCEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing the RF ATPC configuration objects
+                         for a particular entity of the system."
+            ::= { aviatRfMIBObjects 2 }
+
+    aviatRfATPCEntry            OBJECT-TYPE
+        SYNTAX          AviatRfATPCEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the RF ATPC table."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatRfATPCTable 1 }
+
+    AviatRfATPCEntry ::=
+        SEQUENCE {
+            aviatRfATPCEnabled
+                TruthValue,
+            aviatRfATPCTargetFadeMargin
+                AviatDecibel,
+            aviatRfATPCMaximumPower
+                AviatPowerLevel,
+            aviatRfATPCMinimumPower
+                AviatPowerLevel,
+            aviatRfATPCFCCCompliant
+                TruthValue
+        }
+
+    aviatRfATPCEnabled          OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This is the control to enable or disable the Automatic
+                         Transmit Power Control (ATPC) function on the unit."
+            ::= { aviatRfATPCEntry 1 }
+
+    aviatRfATPCTargetFadeMargin OBJECT-TYPE
+        SYNTAX          AviatDecibel
+        UNITS           "0.1 dB"
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the desired nominal fade margin that
+                         the Automatic Transmit Power Control function should
+                         attempt to maintain."
+        DEFVAL          { 100 }
+            ::= { aviatRfATPCEntry 2 }
+
+    aviatRfATPCMaximumPower     OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        UNITS           "0.1 dBm"
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the maximum power level that the
+                         Automatic Transmit Power Control function may set."
+        DEFVAL          { 200 }
+            ::= { aviatRfATPCEntry 3 }
+
+    aviatRfATPCMinimumPower     OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        UNITS           "0.1 dBm"
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the minimum power level that the
+                         Automatic Transmit Power Control function may set."
+        DEFVAL          { 0 }
+            ::= { aviatRfATPCEntry 4 }
+
+    aviatRfATPCFCCCompliant     OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This is the control to enable or disable the Federal
+                         Communications Commission (FCC) compliant Automatic
+                         Transmit Power Control function."
+        DEFVAL          { false }
+            ::= { aviatRfATPCEntry 5 }
+
+
+-- ****************************************************************************
+-- RFU CAPABILITIES MIB Types Table
+-- ****************************************************************************
+    aviatRfuCapabilityTable     OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRfuCapabilityEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing the capabilities of an attached
+                         RFU."
+            ::= { aviatRfMIBObjects 3 }
+
+    aviatRfuCapabilityEntry     OBJECT-TYPE
+        SYNTAX          AviatRfuCapabilityEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the RFU capabilities table."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatRfuCapabilityTable 1 }
+
+    AviatRfuCapabilityEntry ::=
+        SEQUENCE {
+            aviatRfuTxFreqMax
+                Integer32,
+            aviatRfuTxFreqMin
+                Integer32,
+            aviatRfuRxFreqMax
+                Integer32,
+            aviatRfuRxFreqMin
+                Integer32,
+            aviatRfuFreqStepMin
+                Integer32,
+            aviatRfuBandwidthMax
+                Integer32,
+            aviatRfuTxRxSpacingMax
+                Integer32,
+            aviatRfuTxRxSpacingMin
+                Integer32,
+            aviatRfuTxPowerMax
+                Integer32,
+            aviatRfuTxPowerMin
+                Integer32,
+            aviatRfuPowerStep
+                Integer32,
+            aviatRfuNoiseFigure
+                Integer32,
+            aviatRfuModulationMax
+                AviatModulationType,
+            aviatRfuTxRxSpacingPreset
+                TruthValue,
+            aviatRfuTxSideBand
+                AviatRfuSideBandType,
+            aviatRfuTxPowerLimit
+                Integer32
+        }
+
+    aviatRfuTxFreqMax           OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU maximum transmit frequency capability."
+            ::= { aviatRfuCapabilityEntry 1 }
+
+    aviatRfuTxFreqMin           OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU minimum Tx frequency capability."
+            ::= { aviatRfuCapabilityEntry 2 }
+
+    aviatRfuRxFreqMax           OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU maximum Rx frequency capability."
+            ::= { aviatRfuCapabilityEntry 3 }
+
+    aviatRfuRxFreqMin           OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU minimum Rx frequency capability."
+            ::= { aviatRfuCapabilityEntry 4 }
+
+    aviatRfuFreqStepMin         OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU minimum frequency step size capability."
+            ::= { aviatRfuCapabilityEntry 5 }
+
+    aviatRfuBandwidthMax        OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU maximum bandwidth capability."
+            ::= { aviatRfuCapabilityEntry 6 }
+
+    aviatRfuTxRxSpacingMax      OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU maximum Tx Rx spacing capability."
+            ::= { aviatRfuCapabilityEntry 7 }
+
+    aviatRfuTxRxSpacingMin      OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU minimum Tx Rx spacing capability."
+            ::= { aviatRfuCapabilityEntry 8 }
+
+    aviatRfuTxPowerMax          OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU maximum Tx power capability."
+            ::= { aviatRfuCapabilityEntry 9 }
+
+    aviatRfuTxPowerMin          OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU minimum Tx power capability."
+            ::= { aviatRfuCapabilityEntry 10 }
+
+    aviatRfuPowerStep           OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU power step capability."
+            ::= { aviatRfuCapabilityEntry 11 }
+
+    aviatRfuNoiseFigure         OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The RFU noise figure capability."
+            ::= { aviatRfuCapabilityEntry 12 }
+
+    aviatRfuModulationMax       OBJECT-TYPE
+        SYNTAX          AviatModulationType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This RFU maximum modulation capability."
+            ::= { aviatRfuCapabilityEntry 13 }
+
+    aviatRfuTxRxSpacingPreset   OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates if the valid RFU Tx Rx spacing range is limited
+                         to the preset values provided by aviatRfuTxSpacingTable."
+            ::= { aviatRfuCapabilityEntry 14 }
+
+    aviatRfuTxSideBand          OBJECT-TYPE
+        SYNTAX          AviatRfuSideBandType
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates the RFU side band."
+            ::= { aviatRfuCapabilityEntry 15 }
+
+    aviatRfuTxPowerLimit        OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "RFU maximum Tx power limit for any modulation."
+            ::= { aviatRfuCapabilityEntry 16 }
+
+-- ****************************************************************************
+-- RFU CAPABILITIES MIB Spacing Table
+-- ****************************************************************************
+    aviatRfuTxSpacingTable      OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRfuTxSpacingEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing the allowed spacings for an
+                         attached RFU."
+            ::= { aviatRfMIBObjects 4 }
+
+    aviatRfuTxSpacingEntry      OBJECT-TYPE
+        SYNTAX          AviatRfuTxSpacingEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the RFU Tx spacing table."
+        INDEX           { entPhysicalIndex, aviatRfuTxSpacingIndex }
+            ::= { aviatRfuTxSpacingTable 1 }
+
+    AviatRfuTxSpacingEntry ::=
+        SEQUENCE {
+            aviatRfuTxSpacingIndex
+                Gauge32,
+            aviatRfuTxSpacingFreq
+                Integer32
+        }
+
+    aviatRfuTxSpacingIndex      OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "An index representing a TxRx Spacing entry for an
+                         entity."
+            ::= { aviatRfuTxSpacingEntry 1 }
+
+    aviatRfuTxSpacingFreq       OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "A TxRx spacing entry valid for the system."
+            ::= { aviatRfuTxSpacingEntry 2 }
+
+
+-- ****************************************************************************
+-- RFU Details MIB Types Table
+-- ****************************************************************************
+    aviatRfuDetailsTable        OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRfuDetailsEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing the details of an attached RFU."
+            ::= { aviatRfMIBObjects 5 }
+
+    aviatRfuDetailsEntry        OBJECT-TYPE
+        SYNTAX          AviatRfuDetailsEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a row in the RFU details table."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatRfuDetailsTable 1 }
+
+    AviatRfuDetailsEntry ::=
+        SEQUENCE {
+            aviatRfuType
+                Integer32,
+            aviatRfuFreqBand
+                Integer32,
+            aviatRfuPowerAmp
+                Integer32,
+            aviatRfuSemiconductorTech
+                INTEGER,
+            aviatRfuUnlicensed5G8Cap
+                TruthValue,
+            aviatRfuExternalCoaxPresent
+                TruthValue
+        }
+
+    aviatRfuType                OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The type indentification of the attached RFU."
+            ::= { aviatRfuDetailsEntry 1 }
+
+    aviatRfuFreqBand            OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The frequency band indication of the attached RFU."
+            ::= { aviatRfuDetailsEntry 2 }
+
+    aviatRfuPowerAmp            OBJECT-TYPE
+        SYNTAX          Integer32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The power amplifier type of the attached RFU."
+            ::= { aviatRfuDetailsEntry 3 }
+
+    aviatRfuSemiconductorTech   OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    gaas (0),
+                                    gan  (1)
+                                 }
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The semiconductor technology used in the power
+                         amplifier of the attached RFU. This is used to
+                         determine whether IDQ optimization is necessary
+                         for GaN type devices."
+            ::= { aviatRfuDetailsEntry 4 }
+
+    aviatRfuUnlicensed5G8Cap    OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates that a 5.8GHz capable RFU is attached. This
+                         unit can operate across frequency ranges which are
+                         unlicensed in some markets."
+            ::= { aviatRfuDetailsEntry 5 }
+
+    aviatRfuExternalCoaxPresent OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "Indicates if an external RF switch is present."
+            ::= { aviatRfuDetailsEntry 6 }
+
+
+-- ****************************************************************************
+-- The Object and Event Groups
+-- ****************************************************************************
+    aviatRfObjectGroup          OBJECT-GROUP
+        OBJECTS {
+            aviatRfFreqTx,
+            aviatRfFreqRx,
+            aviatRfPowerSet,
+            aviatRfTxMute,
+            aviatRfHighGain,
+            aviatRfBandSelection,
+            aviatRfATPCEnabled,
+            aviatRfATPCTargetFadeMargin,
+            aviatRfATPCMaximumPower,
+            aviatRfATPCMinimumPower,
+            aviatRfATPCFCCCompliant,
+            aviatRfuTxFreqMax,
+            aviatRfuTxFreqMin,
+            aviatRfuRxFreqMax,
+            aviatRfuRxFreqMin,
+            aviatRfuFreqStepMin,
+            aviatRfuBandwidthMax,
+            aviatRfuTxRxSpacingMax,
+            aviatRfuTxRxSpacingMin,
+            aviatRfuTxPowerMax,
+            aviatRfuTxPowerMin,
+            aviatRfuPowerStep,
+            aviatRfuNoiseFigure,
+            aviatRfuModulationMax,
+            aviatRfuTxRxSpacingPreset,
+            aviatRfuTxSideBand,
+            aviatRfuTxPowerLimit,
+            aviatRfuTxSpacingFreq,
+            aviatRfuType,
+            aviatRfuFreqBand,
+            aviatRfuPowerAmp,
+            aviatRfuSemiconductorTech,
+            aviatRfuUnlicensed5G8Cap,
+            aviatRfuExternalCoaxPresent
+        }
+        STATUS          current
+        DESCRIPTION     "These objects specify the RF capabilities and settings
+                         of the unit."
+            ::= { aviatRfGroups 1 }
+
+
+-- ****************************************************************************
+-- The Compliance Specifications
+-- ****************************************************************************
+    aviatRfComplV1              MODULE-COMPLIANCE
+        STATUS          current
+        DESCRIPTION     "The implementation requirements for this MIB."
+        MODULE          -- This module
+            MANDATORY-GROUPS    {
+                                    aviatRfObjectGroup
+                                }
+            ::= { aviatRfCompliance 1 }
+
+END
diff --git a/mibs/aviat-wtm/AVIAT-RXPERFORMANCE-EX-MIB b/mibs/aviat-wtm/AVIAT-RXPERFORMANCE-EX-MIB
new file mode 100644
index 0000000000..ba821445e6
--- /dev/null
+++ b/mibs/aviat-wtm/AVIAT-RXPERFORMANCE-EX-MIB
@@ -0,0 +1,435 @@
+-- ****************************************************************************
+-- aviatRxPerformanceEx.mib: Aviat Networks RX Performance Extension MIB
+--
+-- Copyright © 2014 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+AVIAT-RXPERFORMANCE-EX-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        MODULE-IDENTITY, OBJECT-TYPE
+            FROM SNMPv2-SMI
+        MODULE-COMPLIANCE, OBJECT-GROUP
+            FROM SNMPv2-CONF
+        AviatPowerLevel
+            FROM AVIAT-TEXTCONVENTION-MIB
+        entPhysicalIndex
+            FROM ENTITY-MIB
+        aviatRxPerformQHourIndex, aviatRxPerformQHourPeriod,
+        aviatRxPerformDayIndex, aviatRxPerformDayPeriod
+            FROM AVIAT-RXPERFORMANCE-MIB
+        aviatModules
+            FROM STXN-GLOBALREGISTER-MIB;
+
+    aviatRxPerformanceExModule MODULE-IDENTITY
+        LAST-UPDATED    "201401210157Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This MIB module extends existing performance monitoring of the
+                 receiver on the radio for some parameters."
+        REVISION        "201401210157Z"
+        DESCRIPTION
+                "Initial Version."
+        ::= { aviatModules 33 }
+
+
+-- ****************************************************************************
+-- Conformance area, containing groups and compliance specifications
+-- ****************************************************************************
+    aviatRxPerformanceExConf      OBJECT IDENTIFIER ::= { aviatRxPerformanceExModule 1 }
+
+    aviatRxPerformanceExGroups    OBJECT IDENTIFIER ::= { aviatRxPerformanceExConf 1 }
+
+    aviatRxPerformanceExCompl     OBJECT IDENTIFIER ::= { aviatRxPerformanceExConf 2 }
+
+
+-- ****************************************************************************
+-- Sub-tree for RX Performance MIB objects
+-- ****************************************************************************
+    aviatRxPerformanceExMIBObjs   OBJECT IDENTIFIER ::= { aviatRxPerformanceExModule 2 }
+
+
+-- ****************************************************************************
+-- Receiver Performance Table Extension
+-- ****************************************************************************
+    aviatRxPerformExTable       OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRxPerformExEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the table containing extended information
+                         about the radio receive path performance of each
+                         terminal in the domain. This performance data is
+                         updated every 1 second."
+            ::= { aviatRxPerformanceExMIBObjs 2 }
+
+    aviatRxPerformExEntry       OBJECT-TYPE
+        SYNTAX          AviatRxPerformExEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing the receiver
+                         performance data of an entity in the system."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatRxPerformExTable 1 }
+
+    AviatRxPerformExEntry ::=
+        SEQUENCE {
+            aviatRxPerformCinrReadingMean
+                AviatPowerLevel,
+            aviatRxPerformCinrReadingCurrent
+                AviatPowerLevel,
+            aviatRxPerformCinrReadingMax
+                AviatPowerLevel,
+            aviatRxPerformCinrReadingMin
+                AviatPowerLevel,
+            aviatRxPerformTxpowReadingMean
+                AviatPowerLevel,
+            aviatRxPerformTxpowReadingCurrent
+                AviatPowerLevel,
+            aviatRxPerformTxpowReadingMax
+                AviatPowerLevel,
+            aviatRxPerformTxpowReadingMin
+                AviatPowerLevel
+        }
+
+    aviatRxPerformCinrReadingMean   OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Carrier to
+                         Interference + Noise ratio of the radio over the
+                         period since the start of monitoring."
+            ::= { aviatRxPerformExEntry 2 }
+
+    aviatRxPerformCinrReadingCurrent    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the current reading of the Carrier to
+                         Interference + Noise ratio of the radio."
+            ::= { aviatRxPerformExEntry 3 }
+
+    aviatRxPerformCinrReadingMax    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Carrier to
+                         Interference + Noise ratio of the radio since the
+                         start of monitoring."
+            ::= { aviatRxPerformExEntry 4 }
+
+    aviatRxPerformCinrReadingMin    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Carrier to
+                         Interference + Noise ratio of the radio since the
+                         start of monitoring."
+            ::= { aviatRxPerformExEntry 5 }
+
+    aviatRxPerformTxpowReadingMean  OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Carrier to
+                         Interference + Noise ratio of the radio over the
+                         period since the start of monitoring."
+            ::= { aviatRxPerformExEntry 6 }
+
+    aviatRxPerformTxpowReadingCurrent   OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the current reading of the Carrier to
+                         Interference + Noise ratio of the radio."
+            ::= { aviatRxPerformExEntry 7 }
+
+    aviatRxPerformTxpowReadingMax   OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Carrier to
+                         Interference + Noise ratio of the radio since the
+                         start of monitoring."
+            ::= { aviatRxPerformExEntry 8 }
+
+    aviatRxPerformTxpowReadingMin   OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Carrier to
+                         Interference + Noise ratio of the radio since the
+                         start of monitoring."
+            ::= { aviatRxPerformExEntry 9 }
+
+
+-- ****************************************************************************
+-- Receiver Performance Quarter Hourly Table Extension
+-- ****************************************************************************
+    aviatRxPerformQuarterHourExTable    OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRxPerformQuarterHourExEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the table containing extended information
+                         about the radio receive path performance of each
+                         terminal in the domain.
+
+                         The performance data recording is started at the next
+                         15 minute boundry in the hour of the time when
+                         monitoring was initiated eg: 12:00, 12:15, 12:30 or
+                         12:45.
+
+                         This performance data is recorded for 15 minute
+                         periods and the object is updated at the end of the
+                         period."
+            ::= { aviatRxPerformanceExMIBObjs 3 }
+
+    aviatRxPerformQuarterHourExEntry    OBJECT-TYPE
+        SYNTAX          AviatRxPerformQuarterHourExEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing the receiver
+                         performance data of an entity in the system for a 15
+                         minute period."
+        INDEX           { entPhysicalIndex, aviatRxPerformQHourIndex,
+                          aviatRxPerformQHourPeriod }
+            ::= { aviatRxPerformQuarterHourExTable 1 }
+
+    AviatRxPerformQuarterHourExEntry ::=
+        SEQUENCE {
+            aviatRxPerformQHourCinrReadingMean
+                AviatPowerLevel,
+            aviatRxPerformQHourCinrReadingMax
+                AviatPowerLevel,
+            aviatRxPerformQHourCinrReadingMin
+                AviatPowerLevel,
+            aviatRxPerformQHourTxpowReadingMean
+                AviatPowerLevel,
+            aviatRxPerformQHourTxpowReadingMax
+                AviatPowerLevel,
+            aviatRxPerformQHourTxpowReadingMin
+                AviatPowerLevel
+        }
+
+    aviatRxPerformQHourCinrReadingMean  OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Carrier to
+                         Interference + Noise ratio of the radio for the 15
+                         minute period during which this block of performance
+                         data was collected."
+            ::= { aviatRxPerformQuarterHourExEntry 4 }
+
+    aviatRxPerformQHourCinrReadingMax   OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Carrier to
+                         Interference + Noise ratio of the radio for the 15
+                         minute period during which this block of performance
+                         data was collected."
+            ::= { aviatRxPerformQuarterHourExEntry 5 }
+
+    aviatRxPerformQHourCinrReadingMin   OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Carrier to
+                         Interference + Noise ratio of the radio for the 15
+                         minute period during which this block of performance
+                         data was collected."
+            ::= { aviatRxPerformQuarterHourExEntry 6 }
+
+    aviatRxPerformQHourTxpowReadingMean OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean value of the Transmit power of the
+                         radio for the 15 minute period during which this block
+                         of performance data was collected."
+            ::= { aviatRxPerformQuarterHourExEntry 7 }
+
+    aviatRxPerformQHourTxpowReadingMax  OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded value of the Transmit
+                         power of the radio for the 15 minute period during
+                         which this block of performance data was collected."
+            ::= { aviatRxPerformQuarterHourExEntry 8 }
+
+    aviatRxPerformQHourTxpowReadingMin  OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded value of the Transmit
+                         power of the radio for the 15 minute period during
+                         which this block of performance data was collected."
+            ::= { aviatRxPerformQuarterHourExEntry 9 }
+
+
+-- ****************************************************************************
+-- Rx Performance Daily Table
+-- ****************************************************************************
+    aviatRxPerformDayExTable    OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRxPerformDayExEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing a collection of information
+                         about the radio receive path performance of each
+                         terminal in the domain. Performance data in this table
+                         is recorded for 1 day periods."
+            ::= { aviatRxPerformanceExMIBObjs 4 }
+
+    aviatRxPerformDayExEntry    OBJECT-TYPE
+        SYNTAX          AviatRxPerformDayExEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing performance
+                         data of a particular entity within the agent during a
+                         1 day period."
+        INDEX           { entPhysicalIndex, aviatRxPerformDayIndex,
+                          aviatRxPerformDayPeriod }
+            ::= { aviatRxPerformDayExTable 1 }
+
+    AviatRxPerformDayExEntry ::=
+        SEQUENCE {
+            aviatRxPerformDayCinrReadingMean
+                AviatPowerLevel,
+            aviatRxPerformDayCinrReadingMax
+                AviatPowerLevel,
+            aviatRxPerformDayCinrReadingMin
+                AviatPowerLevel,
+            aviatRxPerformDayTxpowReadingMean
+                AviatPowerLevel,
+            aviatRxPerformDayTxpowReadingMax
+                AviatPowerLevel,
+            aviatRxPerformDayTxpowReadingMin
+                AviatPowerLevel
+        }
+
+    aviatRxPerformDayCinrReadingMean    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Carrier to
+                         Interference + Noise ratio of the radio for the 1 day
+                         period during which this block of performance data was
+                         collected."
+            ::= { aviatRxPerformDayExEntry 4 }
+
+    aviatRxPerformDayCinrReadingMax OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Carrier to
+                         Interference + Noise ratio of the radio for the 1 day
+                         period during which this block of performance data was
+                         collected."
+            ::= { aviatRxPerformDayExEntry 5 }
+
+    aviatRxPerformDayCinrReadingMin OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Carrier to
+                         Interference + Noise ratio of the radio for the 1 day
+                         period during which this block of performance data was
+                         collected."
+            ::= { aviatRxPerformDayExEntry 6 }
+
+    aviatRxPerformDayTxpowReadingMean   OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Transmit Power of the
+                         radio for the 1 day period during which this block of
+                         performance data was collected."
+            ::= { aviatRxPerformDayExEntry 7 }
+
+    aviatRxPerformDayTxpowReadingMax    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the transmit
+                         Power of the radio for the 1 day period during which
+                         this block of performance data was collected."
+            ::= { aviatRxPerformDayExEntry 8 }
+
+    aviatRxPerformDayTxpowReadingMin    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Transmit
+                         Power of the radio for the 1 day period during which
+                         this block of performance data was collected."
+            ::= { aviatRxPerformDayExEntry 9 }
+
+
+-- ****************************************************************************
+-- The Object and Event Groups
+-- ****************************************************************************
+    aviatRxPerformExObjectGroup OBJECT-GROUP
+        OBJECTS {
+            aviatRxPerformCinrReadingMean,
+            aviatRxPerformCinrReadingCurrent,
+            aviatRxPerformCinrReadingMax,
+            aviatRxPerformCinrReadingMin,
+            aviatRxPerformTxpowReadingMean,
+            aviatRxPerformTxpowReadingCurrent,
+            aviatRxPerformTxpowReadingMax,
+            aviatRxPerformTxpowReadingMin,
+            aviatRxPerformQHourCinrReadingMean,
+            aviatRxPerformQHourCinrReadingMax,
+            aviatRxPerformQHourCinrReadingMin,
+            aviatRxPerformQHourTxpowReadingMean,
+            aviatRxPerformQHourTxpowReadingMax,
+            aviatRxPerformQHourTxpowReadingMin,
+            aviatRxPerformDayCinrReadingMean,
+            aviatRxPerformDayCinrReadingMax,
+            aviatRxPerformDayCinrReadingMin,
+            aviatRxPerformDayTxpowReadingMean,
+            aviatRxPerformDayTxpowReadingMax,
+            aviatRxPerformDayTxpowReadingMin
+        }
+        STATUS          current
+        DESCRIPTION     "These are the objects in the Receiver Performance
+                         Extended MIB."
+            ::= { aviatRxPerformanceExGroups 1 }
+
+
+-- ****************************************************************************
+-- The Compliance Specifications
+-- ****************************************************************************
+    aviatRxPerformanceExComplV1 MODULE-COMPLIANCE
+        STATUS          current
+        DESCRIPTION     "The implementation requirements for this MIB."
+        MODULE          -- This module
+            MANDATORY-GROUPS    {
+                                    aviatRxPerformExObjectGroup
+                                }
+            ::= { aviatRxPerformanceExCompl 1 }
+
+END
diff --git a/mibs/aviat-wtm/AVIAT-RXPERFORMANCE-MIB b/mibs/aviat-wtm/AVIAT-RXPERFORMANCE-MIB
new file mode 100644
index 0000000000..96598e2dbf
--- /dev/null
+++ b/mibs/aviat-wtm/AVIAT-RXPERFORMANCE-MIB
@@ -0,0 +1,691 @@
+-- ****************************************************************************
+-- aviatRxPerformance.mib: Aviat Networks RX Performance MIB
+--
+-- Copyright © 2014 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+AVIAT-RXPERFORMANCE-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        MODULE-IDENTITY, OBJECT-TYPE, Counter64, Gauge32
+            FROM SNMPv2-SMI
+        MODULE-COMPLIANCE, OBJECT-GROUP
+            FROM SNMPv2-CONF
+        TruthValue, DateAndTime, TEXTUAL-CONVENTION
+            FROM SNMPv2-TC
+        AviatPowerLevel
+            FROM AVIAT-TEXTCONVENTION-MIB
+        entPhysicalIndex
+            FROM ENTITY-MIB
+        aviatModules
+            FROM STXN-GLOBALREGISTER-MIB;
+
+    aviatRxPerformanceModule MODULE-IDENTITY
+        LAST-UPDATED    "201401210157Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This MIB module supports performance monitoring of the
+                 receiver on the radio."
+        REVISION        "201401210157Z"
+        DESCRIPTION
+                "Initial Version."
+        ::= { aviatModules 15 }
+
+
+-- ****************************************************************************
+-- Textual Conventions
+-- ****************************************************************************
+    AviatPackedRxPerformData ::=    TEXTUAL-CONVENTION
+        DISPLAY-HINT    "63x"
+        STATUS          current
+        DESCRIPTION     "This is the Rx Performance data packed into a single
+                         object. Note that these are fixed size fields. The
+                         Date and Time is padded with trailing zeros. Refer to
+                         the individual object definitions in the Rx
+                         Performance Table for details on the syntax of each
+                         object.
+
+                             Bytes 1-4:     Rx Performance Mean Receive Signal
+                                            Level Reading. Note that this is
+                                            the mean reading over a performance
+                                            period.
+                             Bytes 5-8:     Rx Performance Receive Signal Level
+                                            Reading.
+                             Bytes 9-12:    Rx Performance Maximum Receive
+                                            Signal Level Reading.
+                             Bytes 13-16:   Rx Performance Minimum Receive
+                                            Signal Level Reading.
+                             Bytes 17-24:   Rx Performance Mean Bit Error Ratio
+                                            Reading.
+                             Bytes 25-32:   Rx Performance Current Bit Error
+                                            Ratio Reading.
+                             Bytes 33-40:   Rx Performance Maximum Bit Error
+                                            Ratio Reading.
+                             Bytes 41-48:   Rx Performance Minimum Bit Error
+                                            Ratio Reading.
+                             Bytes 49-52:   Rx Performance Frame Loss Seconds.
+                             Bytes 53-63:   Date And Time."
+      SYNTAX            OCTET STRING ( SIZE ( 0 | 63 ) )
+
+
+-- ****************************************************************************
+-- Conformance area, containing groups and compliance specifications
+-- ****************************************************************************
+    aviatRxPerformanceConf      OBJECT IDENTIFIER ::= { aviatRxPerformanceModule 1 }
+
+    aviatRxPerformanceGroups    OBJECT IDENTIFIER ::= { aviatRxPerformanceConf 1 }
+
+    aviatRxPerformanceCompl     OBJECT IDENTIFIER ::= { aviatRxPerformanceConf 2 }
+
+
+-- ****************************************************************************
+-- Sub-tree for RX Performance MIB objects
+-- ****************************************************************************
+    aviatRxPerformanceMIBObjs   OBJECT IDENTIFIER ::= { aviatRxPerformanceModule 2 }
+
+
+-- ****************************************************************************
+-- Rx Perform Control Table
+-- ****************************************************************************
+    aviatRxPerformControlTable  OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRxPerformControlEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A table containing the indexes and reset values for a
+                         particular entity of the system."
+            ::= { aviatRxPerformanceMIBObjs 1 }
+
+    aviatRxPerformControlEntry  OBJECT-TYPE
+        SYNTAX          AviatRxPerformControlEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "A row in the aviatRxPerformControlTable."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatRxPerformControlTable 1 }
+
+    AviatRxPerformControlEntry ::=
+        SEQUENCE {
+            aviatRxPerformReset
+                INTEGER,
+            aviatRxPerformLastQHourChangeIndex
+                Gauge32,
+            aviatRxPerformLastDayChangeIndex
+                Gauge32
+        }
+
+    aviatRxPerformReset         OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    none (1),
+                                    all (2),
+                                    realtime (3),
+                                    quarterhour (4),
+                                    daily (5)
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This object resets Rx Performance statistics. Setting
+                         all(2) will reset realtime, quarter hourly and daily
+                         statistics. Setting realtime(3), quarterhour(4) or
+                         daily(5) will reset only the selected type of
+                         statistics. If quarter hour or daily statistics are
+                         reset, then all saved statistics data of that type
+                         will be deleted including the current bin.
+
+                         Reading this object will return none(1)."
+            ::= { aviatRxPerformControlEntry 1 }
+
+    aviatRxPerformLastQHourChangeIndex  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the index number of the last entry in the
+                         aviatRxPerformQHourTable. This index number refers to
+                         the aviatRxPerformQHourPeriod index of the table."
+            ::= { aviatRxPerformControlEntry 2 }
+
+    aviatRxPerformLastDayChangeIndex    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the index number of the last entry in the
+                         aviatRxPerformDayTable. This index number refers to
+                         the aviatRxPerformDayPeriod index of the table."
+            ::= { aviatRxPerformControlEntry 3 }
+
+
+-- ****************************************************************************
+-- Receiver Performance Table
+-- ****************************************************************************
+    aviatRxPerformTable         OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRxPerformEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the table containing information about the
+                         radio receive path performance of each terminal in the
+                         domain. This performance data is updated every 1
+                         second."
+            ::= { aviatRxPerformanceMIBObjs 2 }
+
+    aviatRxPerformEntry         OBJECT-TYPE
+        SYNTAX          AviatRxPerformEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing the receiver
+                         performance data of an entity in the system."
+        INDEX           { entPhysicalIndex }
+            ::= { aviatRxPerformTable 1 }
+
+    AviatRxPerformEntry ::=
+        SEQUENCE {
+            aviatRxPerformRslReadingMean
+                AviatPowerLevel,
+            aviatRxPerformRslReadingCurrent
+                AviatPowerLevel,
+            aviatRxPerformRslReadingMax
+                AviatPowerLevel,
+            aviatRxPerformRslReadingMin
+                AviatPowerLevel,
+            aviatRxPerformBerReadingMean
+                Counter64,
+            aviatRxPerformBerReadingCurrent
+                Counter64,
+            aviatRxPerformBerReadingMax
+                Counter64,
+            aviatRxPerformBerReadingMin
+                Counter64,
+            aviatRxPerformFrameLossSeconds
+                Gauge32,
+            aviatRxPerformPackedData
+                AviatPackedRxPerformData
+        }
+
+    aviatRxPerformRslReadingMean    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Receive Signal Level
+                         of the radio over the period since the start of
+                         monitoring."
+            ::= { aviatRxPerformEntry 3 }
+
+    aviatRxPerformRslReadingCurrent OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the current reading of the Receive Signal
+                         Level of the radio."
+            ::= { aviatRxPerformEntry 4 }
+
+    aviatRxPerformRslReadingMax OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Receive
+                         Signal Level of the radio since the start of
+                         monitoring."
+            ::= { aviatRxPerformEntry 5 }
+
+    aviatRxPerformRslReadingMin OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Receive
+                         Signal Level of the radio since the start of
+                         monitoring."
+            ::= { aviatRxPerformEntry 6 }
+
+    aviatRxPerformBerReadingMean    OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Bit Error Ratio of the
+                         radio."
+            ::= { aviatRxPerformEntry 7 }
+
+    aviatRxPerformBerReadingCurrent OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the current reading of the Bit Error Ratio of
+                         the radio."
+            ::= { aviatRxPerformEntry 8 }
+
+    aviatRxPerformBerReadingMax OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Bit Error
+                         Ratio of the radio since the start of monitoring."
+            ::= { aviatRxPerformEntry 9 }
+
+    aviatRxPerformBerReadingMin OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Bit Error
+                         Ratio of the radio since the start of monitoring."
+            ::= { aviatRxPerformEntry 10 }
+
+    aviatRxPerformFrameLossSeconds  OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of seconds that had one or more
+                         instances of lost frames since the start of
+                         monitoring."
+            ::= { aviatRxPerformEntry 11 }
+
+    aviatRxPerformPackedData    OBJECT-TYPE
+        SYNTAX          AviatPackedRxPerformData
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is all of the Performance data for this table,
+                         updated every 1 second, packed into a single object.
+
+                         This object is provided to guarantee a 'snapshot'
+                         collection of the performance measures in an entity.
+                         Slowly stepping through the aviatRxPerformTable may
+                         result in changing information being read."
+            ::= { aviatRxPerformEntry 12 }
+
+
+-- ****************************************************************************
+-- Receiver Performance Quarter Hourly Table
+-- ****************************************************************************
+    aviatRxPerformQuarterHourTable  OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRxPerformQuarterHourEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the table containing information about the
+                         radio receive path performance of each terminal in the
+                         domain.
+
+                         The performance data recording is started at the next
+                         15 minute boundry in the hour of the time when
+                         monitoring was initiated eg: 12:00, 12:15, 12:30 or
+                         12:45.
+
+                         This performance data is recorded for 15 minute
+                         periods and the object is updated at the end of the
+                         period."
+            ::= { aviatRxPerformanceMIBObjs 3 }
+
+    aviatRxPerformQuarterHourEntry  OBJECT-TYPE
+        SYNTAX          AviatRxPerformQuarterHourEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing the receiver
+                         performance data of an entity in the system for a 15
+                         minute period."
+        INDEX           { entPhysicalIndex, aviatRxPerformQHourIndex,
+                          aviatRxPerformQHourPeriod }
+            ::= { aviatRxPerformQuarterHourTable 1 }
+
+    AviatRxPerformQuarterHourEntry ::=
+        SEQUENCE {
+            aviatRxPerformQHourIndex
+                Gauge32,
+            aviatRxPerformQHourPeriod
+                Gauge32,
+            aviatRxPerformQHourDateAndTime
+                DateAndTime,
+            aviatRxPerformQHourRslReadingMean
+                AviatPowerLevel,
+            aviatRxPerformQHourRslReadingMax
+                AviatPowerLevel,
+            aviatRxPerformQHourRslReadingMin
+                AviatPowerLevel,
+            aviatRxPerformQHourBerReadingMean
+                Counter64,
+            aviatRxPerformQHourBerReadingMax
+                Counter64,
+            aviatRxPerformQHourBerReadingMin
+                Counter64,
+            aviatRxPerformQHourFrameLossSeconds
+                Gauge32,
+            aviatRxPerformQHourInvalidEntry
+                TruthValue
+        }
+
+    aviatRxPerformQHourIndex    OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the row number referring to the receiver
+                         performance data of a particular entity in the system.
+                         The performance data in this table is updated every 15
+                         minutes."
+            ::= { aviatRxPerformQuarterHourEntry 1 }
+
+    aviatRxPerformQHourPeriod   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the unique row number referencing the 15
+                         minute period during which this block of performance
+                         data was collected. This provides a unique index even
+                         if the table wraps back around."
+            ::= { aviatRxPerformQuarterHourEntry 2 }
+
+    aviatRxPerformQHourDateAndTime  OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the date and time at the start of the 15
+                         minute period during which this block of performance
+                         data was collected."
+            ::= { aviatRxPerformQuarterHourEntry 4 }
+
+    aviatRxPerformQHourRslReadingMean   OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Receive Signal Level
+                         of the radio for the 15 minute period during which
+                         this block of performance data was collected."
+            ::= { aviatRxPerformQuarterHourEntry 5 }
+
+    aviatRxPerformQHourRslReadingMax    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Receive
+                         Signal Level of the radio for the 15 minute period
+                         during which this block of performance data was
+                         collected."
+            ::= { aviatRxPerformQuarterHourEntry 6 }
+
+    aviatRxPerformQHourRslReadingMin    OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Receive
+                         Signal Level of the radio for the 15 minute period
+                         during which this block of performance data was
+                         collected."
+            ::= { aviatRxPerformQuarterHourEntry 7 }
+
+    aviatRxPerformQHourBerReadingMean   OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Bit Error Ratio of the
+                         radio for the 15 minute period during which this block
+                         of performance data was collected."
+            ::= { aviatRxPerformQuarterHourEntry 8 }
+
+    aviatRxPerformQHourBerReadingMax    OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Bit Error
+                         Ratio of the radio for the 15 minute period during
+                         which this block of performance data was collected."
+            ::= { aviatRxPerformQuarterHourEntry 9 }
+
+    aviatRxPerformQHourBerReadingMin    OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Bit Error
+                         Ratio of the radio for the 15 minute period during
+                         which this block of performance data was collected."
+            ::= { aviatRxPerformQuarterHourEntry 10 }
+
+    aviatRxPerformQHourFrameLossSeconds OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of seconds that had one or more
+                         instances of lost frames for the 15 minute period
+                         during which this block of performance data was
+                         collected."
+            ::= { aviatRxPerformQuarterHourEntry 11 }
+
+    aviatRxPerformQHourInvalidEntry OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This indicates the validity of the performance data in
+                         this row of the table. It is set to TRUE when the data
+                         becomes invalid due to the interval not being within
+                         ten seconds of its nominal length. Otherwise it is set
+                         to FALSE.
+
+                         This could be a result of a time-of-day change."
+            ::= { aviatRxPerformQuarterHourEntry 12 }
+
+
+-- ****************************************************************************
+-- Rx Performance Daily Table
+-- ****************************************************************************
+    aviatRxPerformDayTable      OBJECT-TYPE
+        SYNTAX          SEQUENCE OF AviatRxPerformDayEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is a table containing a collection of information
+                         about the radio receive path performance of each
+                         terminal in the domain. Performance data in this table
+                         is recorded for 1 day periods."
+            ::= { aviatRxPerformanceMIBObjs 4 }
+
+    aviatRxPerformDayEntry      OBJECT-TYPE
+        SYNTAX          AviatRxPerformDayEntry
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is an entry in the table containing performance
+                         data of a particular entity within the agent during a
+                         1 day period."
+        INDEX           { entPhysicalIndex, aviatRxPerformDayIndex,
+                          aviatRxPerformDayPeriod }
+            ::= { aviatRxPerformDayTable 1 }
+
+    AviatRxPerformDayEntry ::=
+        SEQUENCE {
+            aviatRxPerformDayIndex
+                Gauge32,
+            aviatRxPerformDayPeriod
+                Gauge32,
+            aviatRxPerformDayDateAndTime
+                DateAndTime,
+            aviatRxPerformDayRslReadingMean
+                AviatPowerLevel,
+            aviatRxPerformDayRslReadingMax
+                AviatPowerLevel,
+            aviatRxPerformDayRslReadingMin
+                AviatPowerLevel,
+            aviatRxPerformDayBerReadingMean
+                Counter64,
+            aviatRxPerformDayBerReadingMax
+                Counter64,
+            aviatRxPerformDayBerReadingMin
+                Counter64,
+            aviatRxPerformDayFrameLossSeconds
+                Gauge32,
+            aviatRxPerformDayInvalidEntry
+                TruthValue
+        }
+
+    aviatRxPerformDayIndex      OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the row number referring to the receiver
+                         performance data of a particular entity in the system.
+                         The performance data in this table is updated every 1
+                         day period."
+            ::= { aviatRxPerformDayEntry 1 }
+
+    aviatRxPerformDayPeriod     OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      not-accessible
+        STATUS          current
+        DESCRIPTION     "This is the unique row number referencing the 1 day
+                         period during which this block of performance data was
+                         collected."
+            ::= { aviatRxPerformDayEntry 2 }
+
+    aviatRxPerformDayDateAndTime    OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the date and time at the start of the Day
+                         period during which this block of performance data was
+                         collected."
+            ::= { aviatRxPerformDayEntry 4 }
+
+    aviatRxPerformDayRslReadingMean OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Receive Signal Level
+                         of the radio for the 1 day period during which this
+                         block of performance data was collected."
+            ::= { aviatRxPerformDayEntry 5 }
+
+    aviatRxPerformDayRslReadingMax  OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Receive
+                         Signal Level of the radio for the 1 day period during
+                         which this block of performance data was collected."
+            ::= { aviatRxPerformDayEntry 6 }
+
+    aviatRxPerformDayRslReadingMin  OBJECT-TYPE
+        SYNTAX          AviatPowerLevel
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Receive
+                         Signal Level of the radio for the 1 day period during
+                         which this block of performance data was collected."
+            ::= { aviatRxPerformDayEntry 7 }
+
+    aviatRxPerformDayBerReadingMean OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the mean reading of the Bit Error Ratio of the
+                         radio for the 1 day period during which this block of
+                         performance data was collected."
+            ::= { aviatRxPerformDayEntry 8 }
+
+    aviatRxPerformDayBerReadingMax  OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the highest recorded reading of the Bit Error
+                         Ratio of the radio for the 1 Day period during which
+                         this block of performance data was collected."
+            ::= { aviatRxPerformDayEntry 9 }
+
+    aviatRxPerformDayBerReadingMin  OBJECT-TYPE
+        SYNTAX          Counter64
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the lowest recorded reading of the Bit Error
+                         Ratio of the radio for the 1 Day period during which
+                         this block of performance data was collected."
+            ::= { aviatRxPerformDayEntry 10 }
+
+    aviatRxPerformDayFrameLossSeconds   OBJECT-TYPE
+        SYNTAX          Gauge32
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This is the number of seconds that had one or more
+                         instances of lost frames for the 1 day period during
+                         which this block of performance data was collected."
+            ::= { aviatRxPerformDayEntry 11 }
+
+    aviatRxPerformDayInvalidEntry   OBJECT-TYPE
+        SYNTAX          TruthValue
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "This indicates the validity of the performance data in
+                         this row of the table. It is set to TRUE when the data
+                         becomes invalid due to the interval not being within
+                         ten seconds of its nominal length. Otherwise it is set
+                         to FALSE.
+
+                         This could be a result of a time-of-day change."
+            ::= { aviatRxPerformDayEntry 12 }
+
+
+-- ****************************************************************************
+-- The Object and Event Groups
+-- ****************************************************************************
+    aviatRxPerformObjectGroup   OBJECT-GROUP
+        OBJECTS {
+            aviatRxPerformReset,
+            aviatRxPerformLastQHourChangeIndex,
+            aviatRxPerformLastDayChangeIndex,
+            aviatRxPerformRslReadingMean,
+            aviatRxPerformRslReadingCurrent,
+            aviatRxPerformRslReadingMax,
+            aviatRxPerformRslReadingMin,
+            aviatRxPerformBerReadingMean,
+            aviatRxPerformBerReadingCurrent,
+            aviatRxPerformBerReadingMax,
+            aviatRxPerformBerReadingMin,
+            aviatRxPerformFrameLossSeconds,
+            aviatRxPerformPackedData,
+            aviatRxPerformQHourDateAndTime,
+            aviatRxPerformQHourRslReadingMean,
+            aviatRxPerformQHourRslReadingMax,
+            aviatRxPerformQHourRslReadingMin,
+            aviatRxPerformQHourBerReadingMean,
+            aviatRxPerformQHourBerReadingMax,
+            aviatRxPerformQHourBerReadingMin,
+            aviatRxPerformQHourFrameLossSeconds,
+            aviatRxPerformQHourInvalidEntry,
+            aviatRxPerformDayDateAndTime,
+            aviatRxPerformDayRslReadingMean,
+            aviatRxPerformDayRslReadingMax,
+            aviatRxPerformDayRslReadingMin,
+            aviatRxPerformDayBerReadingMean,
+            aviatRxPerformDayBerReadingMax,
+            aviatRxPerformDayBerReadingMin,
+            aviatRxPerformDayFrameLossSeconds,
+            aviatRxPerformDayInvalidEntry
+        }
+        STATUS          current
+        DESCRIPTION     "These are the objects in the Receiver Performance
+                         MIB."
+            ::= { aviatRxPerformanceGroups 1 }
+
+
+-- ****************************************************************************
+-- The Compliance Specifications
+-- ****************************************************************************
+    aviatRxPerformanceComplV1   MODULE-COMPLIANCE
+        STATUS          current
+        DESCRIPTION     "The implementation requirements for this MIB."
+        MODULE          -- This module
+        MANDATORY-GROUPS    {
+                                aviatRxPerformObjectGroup
+                            }
+            ::= { aviatRxPerformanceCompl 1 }
+
+END
diff --git a/mibs/aviat-wtm/AVIAT-SWMANAGEMENT-MIB b/mibs/aviat-wtm/AVIAT-SWMANAGEMENT-MIB
new file mode 100644
index 0000000000..24369c4c4c
--- /dev/null
+++ b/mibs/aviat-wtm/AVIAT-SWMANAGEMENT-MIB
@@ -0,0 +1,328 @@
+-- ****************************************************************************
+-- aviatSwManagement.mib: Aviat Networks Software Management MIB
+--
+-- Copyright © 2014 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+AVIAT-SWMANAGEMENT-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        DisplayString, DateAndTime
+            FROM SNMPv2-TC
+        Integer32, MODULE-IDENTITY, OBJECT-TYPE
+            FROM SNMPv2-SMI
+        MODULE-COMPLIANCE, OBJECT-GROUP
+            FROM SNMPv2-CONF
+        aviatModules
+            FROM STXN-GLOBALREGISTER-MIB;
+
+    aviatSwManagementModule MODULE-IDENTITY
+        LAST-UPDATED    "201401210157Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This MIB defines the interface for software loading, soft
+                 reset and software details retrieval."
+        REVISION        "201401210157Z"
+        DESCRIPTION
+                "Initial Version."
+            ::= { aviatModules 11 }
+
+
+-- ****************************************************************************
+-- Conformance area, containing groups and compliance specifications
+-- ****************************************************************************
+    aviatSwManagementConf       OBJECT IDENTIFIER ::= { aviatSwManagementModule 1 }
+
+    aviatSwManagementGroups     OBJECT IDENTIFIER ::= { aviatSwManagementConf 1 }
+
+    aviatSwManagementCompliance OBJECT IDENTIFIER ::= { aviatSwManagementConf 2 }
+
+
+-- ****************************************************************************
+-- Sub-tree for Software Management MIB objects
+-- ****************************************************************************
+    aviatSwManagementMIBObjects OBJECT IDENTIFIER ::= { aviatSwManagementModule 2 }
+
+    aviatSwResetObjects         OBJECT IDENTIFIER ::= { aviatSwManagementMIBObjects 1 }
+
+    aviatSwLoadObjects          OBJECT IDENTIFIER ::= { aviatSwManagementMIBObjects 2 }
+
+    aviatSwDetailsObjects       OBJECT IDENTIFIER ::= { aviatSwManagementMIBObjects 3 }
+
+
+-- ****************************************************************************
+-- Software Reset MIB objects
+-- ****************************************************************************
+    aviatSmSoftReset            OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    resetNone (0),
+                                    resetSoft (1),
+                                    resetHard (2)
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This is the control to perform a software reset on the
+                         product.
+
+                         When set to resetSoft(1) a soft reset will be
+                         performed. When set to resetHard(2) a full system
+                         reset will be performed, with all reinitialisation
+                         carried out. Setting to resetNone(0) has no effect."
+            ::= { aviatSwResetObjects 1 }
+
+
+-- ****************************************************************************
+-- Software Loading MIB objects
+-- ****************************************************************************
+    aviatSmLoadControl          OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    abort (0),
+                                    load (1),
+                                    activate (2),
+                                    loadAndActivate (3),
+                                    rollback (4),
+                                    forceLoad (5)
+                                }
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "The software loading process may be controlled using
+                         this object.
+
+                         Setting the value load(1) will begin transfer of the
+                         specified file from the external URI to the unit. If
+                         the file is a manifest, this will initiate transfer of
+                         all referenced files. When this procedure has
+                         completed, aviatSmLoadStatus will indicate loadOk(6)
+                         for success, or loadError(10) for failure.
+
+                         An unresolvable incompatibility error is indicated by
+                         compatibilityError(13) and should be followed by an
+                         abort(0).
+
+                         A successful software (loadOk) load may be activated
+                         by setting the value to activate(2). If the
+                         delayed/timed activation objects are disabled this
+                         will have an immediate effect, otherwise the
+                         activation will take place as scheduled. A successful
+                         activation will result in an aviatSmLoadStatus value
+                         of activateOk(7). An error will be indicated by the
+                         value activateError(11).
+
+                         If the value is idle(7) and no software load process
+                         has been initiated since the last successful
+                         activation, the inactive software can be re-activated
+                         by setting the value to rollback(4). Success is
+                         indicated in aviatSmLoadStatus by rollbackOk(8) and
+                         failure by rollbackError(12).
+
+                         Setting the value to loadAndActivate(3) will begin
+                         software transfer. A successful transfer will be
+                         followed by software activation which is controlled by
+                         the delayed/timed activation objects. Success will be
+                         indicated in aviatSmLoadStatus by activateOk(7). A
+                         pending scheduled activation is indicated by
+                         waitingToActivate(13)."
+            ::= { aviatSwLoadObjects 1 }
+
+    aviatSmLoadStatus           OBJECT-TYPE
+        SYNTAX          INTEGER {
+                                    abort (0),
+                                    load (1),
+                                    commit (2),
+                                    activate (3),
+                                    rollback (4),
+                                    idle (5),
+                                    loadOk (6),
+                                    activateOk (7),
+                                    rollbackOk (8),
+                                    compatibilityError (9),
+                                    loadError (10),
+                                    activateError (11),
+                                    rollbackError (12),
+                                    waitingToActivate (13),
+                                    sameVersion (14)
+                                }
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The software loading process may be monitored using
+                         this object. See the aviatSmLoadControl object
+                         description for more details."
+            ::= { aviatSwLoadObjects 2 }
+
+    aviatSmLoadRollbackDuration OBJECT-TYPE
+        SYNTAX          Integer32 ( 0..2147483647 )
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the duration, in seconds, from which
+                         the 'sw load rollback timer' will count down when it
+                         is started."
+            ::= { aviatSwLoadObjects 3 }
+
+    aviatSmLoadRollbackTimer    OBJECT-TYPE
+        SYNTAX          Integer32 ( -1..2147483647 )
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This is the control and counter of the 'sw load
+                         rollback timer'. When set to -1, the timer is stopped
+                         and disabled. When set to 0, the timer assumes an
+                         'instant timeout'. Otherwise, this object will
+                         indicate the time left on the timer.
+
+                         The timer is automatically started whenever the
+                         software starts up following a software load
+                         activation.
+
+                         When this timer reaches zero, the 'sw load manager' of
+                         the system will roll back the software to its previous
+                         version."
+            ::= { aviatSwLoadObjects 4 }
+
+    aviatSmLoadActivateWaitDuration OBJECT-TYPE
+        SYNTAX          Integer32 ( 0..2147483647 )
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This specifies the duration, in seconds, from which
+                         the 'sw load activate wait timer' will count down when
+                         it is started."
+            ::= { aviatSwLoadObjects 5 }
+
+    aviatSmLoadActivateWaitTimer    OBJECT-TYPE
+        SYNTAX          Integer32 ( -1..2147483647 )
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This is the control and counter of the 'sw load
+                         activate wait timer'. When set to -1, the timer is
+                         stopped and disabled. When set to 0, the timer assumes
+                         an 'instant timeout'. Otherwise, this object will
+                         indicate the time left on the timer.
+
+                         This timer is loaded with the lesser of
+                         aviatSmLoadActivateWaitDuration (if non-zero), or the
+                         time in seconds until aviatSmLoadActivateTime occurs
+                         (if set) when the activate(2) state is entered.
+
+                         When this timer reaches zero, the 'sw load manager' of
+                         the system will activate the loaded software."
+            ::= { aviatSwLoadObjects 6 }
+
+    aviatSmLoadActivateTime     OBJECT-TYPE
+        SYNTAX          DateAndTime
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "This determines the date and time at which to activate
+                         the loaded software.
+
+                         The 'sw load manager' of the system shall activate the
+                         loaded software when the current system time reaches
+                         or is past this setting."
+            ::= { aviatSwLoadObjects 7 }
+
+    aviatSmLoadUri              OBJECT-TYPE
+        SYNTAX          DisplayString ( SIZE ( 0..1024 ) )
+        MAX-ACCESS      read-write
+        STATUS          current
+        DESCRIPTION     "The URI of the manifest for software loading."
+            ::= { aviatSwLoadObjects 8 }
+
+    aviatSmLoadProgress         OBJECT-TYPE
+        SYNTAX          Integer32 ( 0..100 )
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The percentage progress of the current sofware load.
+                         It is only meaningful during load and commit, and will
+                         return zero otherwise."
+            ::= { aviatSwLoadObjects 9 }
+
+
+-- ****************************************************************************
+-- Software Details MIB objects
+-- ****************************************************************************
+    aviatSmDetailsVersion       OBJECT-TYPE
+        SYNTAX          DisplayString ( SIZE ( 0..32 ) )
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The software version of currently running software."
+            ::= { aviatSwDetailsObjects 1 }
+
+    aviatSmDetailsInactiveVersion   OBJECT-TYPE
+        SYNTAX          DisplayString ( SIZE ( 0..32 ) )
+        MAX-ACCESS      read-only
+        STATUS          current
+        DESCRIPTION     "The software version of the inactive software."
+            ::= { aviatSwDetailsObjects 2 }
+
+
+-- ****************************************************************************
+-- The Object and Event Groups
+-- ****************************************************************************
+    aviatSwResetGroup           OBJECT-GROUP
+        OBJECTS {
+            aviatSmSoftReset
+        }
+        STATUS          current
+        DESCRIPTION     "These are the software reset objects."
+            ::= { aviatSwManagementGroups 1 }
+
+    aviatSwLoadGroup            OBJECT-GROUP
+        OBJECTS {
+            aviatSmLoadControl,
+            aviatSmLoadStatus,
+            aviatSmLoadRollbackDuration,
+            aviatSmLoadRollbackTimer,
+            aviatSmLoadActivateWaitDuration,
+            aviatSmLoadActivateWaitTimer,
+            aviatSmLoadActivateTime,
+            aviatSmLoadUri,
+            aviatSmLoadProgress
+        }
+        STATUS          current
+        DESCRIPTION     "These are the objects for software loading."
+            ::= { aviatSwManagementGroups 2 }
+
+    aviatSwDetailsGroup         OBJECT-GROUP
+        OBJECTS {
+            aviatSmDetailsVersion,
+            aviatSmDetailsInactiveVersion
+        }
+        STATUS          current
+        DESCRIPTION     "These are the software details objects."
+            ::= { aviatSwManagementGroups 3 }
+
+
+-- ****************************************************************************
+-- The Compliance Specifications
+-- ****************************************************************************
+    aviatSwManagementComplV1    MODULE-COMPLIANCE
+        STATUS          current
+        DESCRIPTION     "The implementation requirements for this MIB."
+        MODULE          -- This module
+            MANDATORY-GROUPS    {
+                                    aviatSwResetGroup,
+                                    aviatSwLoadGroup,
+                                    aviatSwDetailsGroup
+                                }
+            ::= { aviatSwManagementCompliance 1 }
+
+END
diff --git a/mibs/aviat-wtm/AVIAT-TEXTCONVENTION-MIB b/mibs/aviat-wtm/AVIAT-TEXTCONVENTION-MIB
new file mode 100644
index 0000000000..56c7d0d543
--- /dev/null
+++ b/mibs/aviat-wtm/AVIAT-TEXTCONVENTION-MIB
@@ -0,0 +1,208 @@
+-- ****************************************************************************
+-- aviatTextConvention.mib: Aviat Networks Common Textual Conventions
+--
+-- Copyright © 2014 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+AVIAT-TEXTCONVENTION-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        MODULE-IDENTITY, Integer32, Unsigned32
+            FROM SNMPv2-SMI
+        TEXTUAL-CONVENTION
+            FROM SNMPv2-TC
+        aviatModules
+            FROM STXN-GLOBALREGISTER-MIB;
+
+    aviatTextConventionModule MODULE-IDENTITY
+        LAST-UPDATED    "201703282339Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This module defines the textual conventions used throughout
+                 the DMC Aviat Enterprise MIB. The definitions in this module
+                 are for general purpose use. Textual conventions that are for
+                 specific MIB functionality are defined in the respective MIB
+                 modules."
+        REVISION        "201703282339Z"
+        DESCRIPTION
+                "Added modulation2048qam and modulation4096qam modulations
+                 for WTM4000."
+        REVISION        "201507290845Z"
+        DESCRIPTION
+                "Added RFU side band type textual convention."
+        REVISION        "201501050910Z"
+        DESCRIPTION
+                "Added monitoredHotStandby protection type textual convention."
+        REVISION        "201408262329Z"
+        DESCRIPTION
+                "Added the textual convention AviatL1LinkAggregationType to
+                 discern whether a layer 1 link aggregation group uses the
+                 Aviat L1LA mode or PLA mode."
+        REVISION        "201401210157Z"
+        DESCRIPTION
+                "Initial Version."
+            ::= { aviatModules 1 }
+
+
+-- ****************************************************************************
+-- Textual Conventions
+-- ****************************************************************************
+    AviatFunctionTimer ::=      TEXTUAL-CONVENTION
+        DISPLAY-HINT    "d"
+        STATUS          current
+        DESCRIPTION     "This specifies the status of the Function Related
+                         Timer described as follows:
+
+                              0               The function is off
+                             -1               The function is permanently on
+                                              (until it is manually switched
+                                              off or the unit is powered off)
+                             positive value   The number of seconds until the
+                                              function is automatically
+                                              switched Off"
+        SYNTAX          Integer32 ( -1..2147483647 )
+
+    AviatModulationType ::=     TEXTUAL-CONVENTION
+        STATUS          current
+        DESCRIPTION     "These are the types of modulation techniques."
+        SYNTAX          INTEGER {
+                                    modulationNone (1),
+                                    modulationQpsk (2),
+                                    modulation16qam (3),
+                                    modulation32qam (4),
+                                    modulation64qam (5),
+                                    modulation128qam (6),
+                                    modulation256qam (7),
+                                    modulation512qam (8),
+                                    modulation1024qam (9),
+                                    modulation256qamHG (10),
+                                    modulation512qamHG (11),
+                                    modulation1024qamHG (12),
+                                    modulation2048qam (13),
+                                    modulation4096qam (14)
+                                }
+
+    AviatPowerLevel ::=         TEXTUAL-CONVENTION
+        DISPLAY-HINT    "d-1"
+        STATUS          current
+        DESCRIPTION     "The power in 0.1dBm steps."
+        SYNTAX          Integer32
+
+    AviatDecibel ::=            TEXTUAL-CONVENTION
+        DISPLAY-HINT    "d-1"
+        STATUS          current
+        DESCRIPTION     "Ratio in 0.1dB steps."
+        SYNTAX          Integer32
+
+    AviatProtectionType ::=     TEXTUAL-CONVENTION
+        STATUS          current
+        DESCRIPTION     "The protection modes for a protected pair."
+        SYNTAX          INTEGER {
+                                    nonProtected (1),
+                                    hotStandby (2),
+                                    spaceDiversity (3),
+                                    frequencyDiversity (4),
+                                    monitoredHotStandby (5)
+                                }
+
+    AviatPluginModuleType ::=   TEXTUAL-CONVENTION
+        STATUS          current
+        DESCRIPTION     "These are the types of plugin modules."
+        SYNTAX          INTEGER {
+                                    pluginModuleNone (1),
+                                    pluginModuleUnsupported (2),
+                                    pluginModulePOEx2 (41),
+                                    pluginModulePWR (61),
+                                    pluginModulePWRAUX (62),
+                                    pluginModuleRACx1 (81),
+                                    pluginModuleRACx2 (82)
+                                }
+
+    AviatLoggingProtocolType ::=    TEXTUAL-CONVENTION
+        STATUS          current
+        DESCRIPTION     "These are the types of network protocols for remote
+                         logging."
+        SYNTAX          INTEGER {
+                                    protocolUdp (1),
+                                    protocolTcp (2),
+                                    protocolTls (3)
+                                }
+
+    AviatTimeOfDay ::=          TEXTUAL-CONVENTION
+        DISPLAY-HINT    "1d:1d:1d.1d"
+        STATUS          current
+        DESCRIPTION     "A time in any given day. This is in localtime.
+
+                         field  octets  contents                  range
+                         =====  ======  ========                  =====
+                           1       1    hour                      0..23
+                           2       2    minutes                   0..59
+                           3       3    seconds                   0..60
+                                        (use 60 for leap-second)
+                           4       4    deci-seconds              0..9"
+         SYNTAX          OCTET STRING (SIZE (4))
+
+    AviatEnabledStatus ::=      TEXTUAL-CONVENTION
+        STATUS          current
+        DESCRIPTION     "A simple status value for generic use."
+        SYNTAX          INTEGER {
+                                    enabled (1),
+                                    disabled (2)
+                                }
+
+    AviatTableIndexInteger ::=  TEXTUAL-CONVENTION
+        DISPLAY-HINT    "d"
+        STATUS          current
+        DESCRIPTION     "An integer which may be used as a table index. If 0
+                         then it is invalid."
+        SYNTAX          Unsigned32 ( 0..65535 )
+
+    AviatL1LinkAggregationType ::=  TEXTUAL-CONVENTION
+        STATUS          current
+        DESCRIPTION     "The aggregation type for a L1 link aggregation group."
+        SYNTAX          INTEGER {
+                                    l1la (1),
+                                    pla (2)
+                                }
+
+    AviatRfuSideBandType ::=  TEXTUAL-CONVENTION
+        STATUS          current
+        DESCRIPTION     "The side band type for an RFU."
+        SYNTAX          INTEGER {
+                                    highBand (1),
+                                    lowBand (2),
+                                    fullBand (3)
+                                }
+
+    AviatYangIdentityRef ::= TEXTUAL-CONVENTION
+        DISPLAY-HINT "255t"
+        STATUS       current
+        DESCRIPTION
+            "A reference to a Yang identity, consisting of the namespace and identity id.
+             These are represented as a string delimited with a colon, 
+             i.e. namespace:identity"
+        SYNTAX       OCTET STRING (SIZE (0..255))
+
+END
diff --git a/mibs/aviat-wtm/STXN-GLOBALREGISTER-MIB b/mibs/aviat-wtm/STXN-GLOBALREGISTER-MIB
new file mode 100644
index 0000000000..21ad1971d6
--- /dev/null
+++ b/mibs/aviat-wtm/STXN-GLOBALREGISTER-MIB
@@ -0,0 +1,315 @@
+-- ****************************************************************************
+-- STXN-GLOBALREGISTER.mib: Aviat Networks MIB Registration MIB
+--
+-- Copyright © 2014 Aviat U.S, Inc. All rights reserved.
+-- Certain information and content may be provided by third parties to AVIAT,
+-- and in each case, such copyrighted work remains the property of that third
+-- party creator/licensor.
+-- All rights not expressly granted herein are reserved. Except as otherwise
+-- required by applicable law, any reproduction, distribution, modification,
+-- retransmission, or publication of any copyrighted material is strictly
+-- prohibited without the express written consent of the copyright owner.
+-- "AVIAT", "AVIAT NETWORKS" and the AVIAT logo are trademarks of Aviat
+-- Networks, Inc. All other trademarks or brand names may be trademarks or
+-- registered trademarks of AVIAT's affiliated companies in the United States
+-- and/or other countries.
+--
+-- ****************************************************************************
+
+STXN-GLOBALREGISTER-MIB DEFINITIONS ::= BEGIN
+    IMPORTS
+        MODULE-IDENTITY, OBJECT-IDENTITY, enterprises
+            FROM SNMPv2-SMI;
+
+    stxnGlobalRegModule MODULE-IDENTITY
+        LAST-UPDATED    "201401210358Z"
+        ORGANIZATION    "Aviat Networks"
+        CONTACT-INFO    "Aviat Networks
+                         Customer Service
+
+                         Postal: 5200 Great America Parkway
+                                 Santa Clara
+                                 California 95054
+                                 United States of America
+
+                         Tel: 408 567 7000
+
+                         E-mail: mibsupport@aviatnet.com"
+        DESCRIPTION
+                "This module defines the OID infrastructure under the DMC
+                 Enterprise MIB Branch."
+        REVISION        "201401210358Z"
+        DESCRIPTION
+                "Added sub-module branches for Aviat products."
+        REVISION        "201111280007Z"
+        DESCRIPTION
+                "Added the registration for stxnProductOIDs branch."
+        REVISION        "201103140119Z"
+        DESCRIPTION
+                "Added the registration for aviatModules, aviatEvents and
+                 aviatProducts branches.  Refer to MDR #320."
+        REVISION        "200907230415Z"
+        DESCRIPTION
+                "Added the registration for stxnEfficientSiteControllerUnit
+                 branch.  Refer to MDR #288."
+        REVISION        "200904162358Z"
+        DESCRIPTION
+                "Added the registration for EfficientSite products and new
+                 product event branches.  Refer to MDR #273."
+        REVISION        "200402200055Z"
+        DESCRIPTION
+                "Added the registration for ProVision products and new
+                 product event branches."
+        REVISION        "200301290331Z"
+        DESCRIPTION
+                "Added the registration for UNITY products branch."
+        REVISION        "200211282358Z"
+        DESCRIPTION
+                "Added the registration for AOU and CTU product branches."
+        REVISION        "200210081935Z"
+        DESCRIPTION
+                "Added the registration for AOU and CTU events."
+        REVISION        "200209032315Z"
+        DESCRIPTION
+                "As part of the clean up exercise for the STXN Generic
+                 MIB modules that have not been 'released', the stxnGeneric
+                 branch has been re-registered under a different number.
+                 It used to be dmc 3 and now it is dmc 8."
+        REVISION        "200111150110Z"
+        DESCRIPTION
+                "Added registration for event OIDs."
+        REVISION        "200103142041Z"
+        DESCRIPTION
+                "Updated following the Common MIB Review held in Wellington."
+        REVISION        "200102132021Z"
+        DESCRIPTION
+                "Initial version."
+            ::= { stxnModules 1 }
+
+
+-- ****************************************************************************
+-- The root of the OID infrastructure for DMC Stratex Networks
+-- ****************************************************************************
+    dmc                         OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "The root of the OID sub-tree assigned to DMC Stratex
+                         Networks by the Internet Assigned Numbers Authority
+                         (IANA)."
+            ::= { enterprises 2509 }
+
+
+-- ****************************************************************************
+-- Pre-DMC Stratex Networks registrations for Digital Microwave Corporation.
+-- ****************************************************************************
+    dmcNet                      OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "dmcNet branch."
+            ::= { dmc 1 }
+
+    proxyAgent                  OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "proxyAgent branch."
+            ::= { dmcNet 1 }
+
+    nonsnmpRadio                OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "nonsnmpRadio branch."
+            ::= { dmcNet 2 }
+
+    snmpRadio                   OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "snmpRadio branch."
+            ::= { dmcNet 3 }
+
+    dmcEvents                   OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "dmcEvents branch."
+            ::= { dmcNet 4 }
+
+    dmcSecurity                 OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "dmcSecurity branch."
+            ::= { dmcNet 5 }
+
+    sp2Radio                    OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "sp2Radio branch for the Spectrum II product."
+            ::= { snmpRadio 1 }
+
+    altium                      OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "altium branch for the Altium product."
+            ::= { snmpRadio 2 }
+
+    dmcModules                  OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "dmcModules branch."
+            ::= { dmc 2 }
+
+
+-- ****************************************************************************
+-- DMC Stratex Networks registrations for STXN MIB modules.
+-- ****************************************************************************
+    stxnEngineering             OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         Engineering purposes within Harris Stratex Networks."
+            ::= { dmc 4 }
+
+    stxnProducts                OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         specific products of Harris Stratex Networks."
+            ::= { dmc 5 }
+
+    stxnLMCDR                   OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         the Low / Medium Capacity Data Radio of Harris Stratex
+                         Networks."
+            ::= { stxnProducts 1 }
+
+    stxnAOU                     OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         the Eclipse All Outdoor Unit (AOU) product of Harris
+                         Stratex Networks."
+            ::= { stxnProducts 2 }
+
+    stxnCTU                     OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         the Eclipse Intelligent Node Unit (INU) product of
+                         Harris Stratex Networks.
+
+                         Note that the INU was previously known as CTU."
+            ::= { stxnProducts 3 }
+
+    stxnUNITY                   OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         the Eclipse products of Harris Stratex Networks.
+
+                         Note that Eclipse was previously referred to as Unity."
+            ::= { stxnProducts 4 }
+
+    stxnProVision               OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         the ProVision product of Harris Stratex Networks."
+            ::= { stxnProducts 5 }
+
+    stxnEfficientSite           OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         the Efficient Site products of Harris Stratex
+                         Networks."
+            ::= { stxnProducts 6 }
+
+    stxnEfficientSiteControllerUnit OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the MIB modules developed for
+                         the Efficient Site Controller Unit - partnership
+                         product with Asentria.
+
+                         Note that the MIB definitions below this node are
+                         managed and controlled by Asentria."
+            ::= { stxnEfficientSite 1 }
+
+    stxnProductOIDs             OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds the object identifiers that are
+                         assigned to Eclipse products."
+            ::= { stxnProducts 10 }
+
+    stxnModules                 OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all MIB modules that are
+                         registered for STXN under the DMC tree."
+            ::= { dmc 6 }
+
+    stxnEvents                  OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all Event Definitions registered
+                         for STXN under the DMC tree."
+            ::= { dmc 7 }
+
+    stxnGeneric                 OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all the reusable generic MIB
+                         modules for the Harris Stratex Networks product range."
+            ::= { dmc 8 }
+
+    aviatModules                OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all MIB modules that are
+                         registered for Aviat under the DMC tree."
+            ::= { dmc 9 }
+
+    aviatAfModules              OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds a group of MIBs that are common to
+                         a specific functional area for Aviat products."
+            ::= { aviatModules 1000 }
+
+    aviatAaModules              OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds a group of MIBs that are common to
+                         a specific functional area for Aviat products."
+            ::= { aviatModules 1001 }
+
+    aviatAlModules              OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds a group of MIBs that are common to
+                         a specific functional area for Aviat products."
+            ::= { aviatModules 1002 }
+
+    aviatAmModules              OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds a group of MIBs that are common to
+                         a specific functional area for Aviat products."
+            ::= { aviatModules 1003 }
+
+    aviatEvents                 OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree holds all Event Definitions registered
+                         for Aviat under the DMC tree."
+            ::= { dmc 10 }
+
+    aviatProducts               OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "This sub-tree contains objects to describe Aviat
+                         Networks products."
+            ::= { dmc 11 }
+
+
+-- ****************************************************************************
+-- Harris Stratex Networks registrations for Product EVENTS.
+-- ****************************************************************************
+    stxnOvationEvents           OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "Event Definition."
+            ::= { stxnEvents 1 }
+
+    stxnUnityAOUEvents          OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "Event Definition."
+            ::= { stxnEvents 2 }
+
+    stxnUnityCTUEvents          OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "Event Definition."
+            ::= { stxnEvents 3 }
+
+    stxnUnityIDUEvents          OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "Event Definition."
+            ::= { stxnEvents 4 }
+
+    stxnEfficientSiteEvents     OBJECT-IDENTITY
+        STATUS          current
+        DESCRIPTION     "Event Definition."
+            ::= { stxnEvents 5 }
+
+
+END
diff --git a/tests/data/aviat-wtm.json b/tests/data/aviat-wtm.json
new file mode 100644
index 0000000000..a19fdcf5e4
--- /dev/null
+++ b/tests/data/aviat-wtm.json
@@ -0,0 +1,1355 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.2509.11.1.1.8",
+                    "sysDescr": null,
+                    "sysContact": null,
+                    "version": "2.7.0.11.4349-WTM4100",
+                    "hardware": "W42-11H2-WPX",
+                    "features": null,
+                    "os": "aviat-wtm",
+                    "type": "wireless",
+                    "serial": "AAA9999A999",
+                    "icon": "aviat.png",
+                    "location": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    },
+    "ports": {
+        "discovery": {
+            "ports": [
+                {
+                    "port_descr_type": null,
+                    "port_descr_descr": null,
+                    "port_descr_circuit": null,
+                    "port_descr_speed": null,
+                    "port_descr_notes": null,
+                    "ifDescr": "Primary",
+                    "ifName": "Radio1",
+                    "portName": null,
+                    "ifIndex": 1537,
+                    "ifSpeed": null,
+                    "ifSpeed_prev": null,
+                    "ifConnectorPresent": null,
+                    "ifPromiscuousMode": null,
+                    "ifHighSpeed": null,
+                    "ifHighSpeed_prev": null,
+                    "ifOperStatus": "up",
+                    "ifOperStatus_prev": null,
+                    "ifAdminStatus": null,
+                    "ifAdminStatus_prev": null,
+                    "ifDuplex": null,
+                    "ifMtu": null,
+                    "ifType": "radioMAC",
+                    "ifAlias": "Primary",
+                    "ifPhysAddress": null,
+                    "ifHardType": null,
+                    "ifLastChange": 0,
+                    "ifVlan": "",
+                    "ifTrunk": null,
+                    "counter_in": null,
+                    "counter_out": null,
+                    "ignore": 0,
+                    "disabled": 0,
+                    "detailed": 0,
+                    "deleted": 0,
+                    "pagpOperationMode": null,
+                    "pagpPortState": null,
+                    "pagpPartnerDeviceId": null,
+                    "pagpPartnerLearnMethod": null,
+                    "pagpPartnerIfIndex": null,
+                    "pagpPartnerGroupIfIndex": null,
+                    "pagpPartnerDeviceName": null,
+                    "pagpEthcOperationMode": null,
+                    "pagpDeviceId": null,
+                    "pagpGroupIfIndex": null,
+                    "ifInUcastPkts": null,
+                    "ifInUcastPkts_prev": null,
+                    "ifInUcastPkts_delta": null,
+                    "ifInUcastPkts_rate": null,
+                    "ifOutUcastPkts": null,
+                    "ifOutUcastPkts_prev": null,
+                    "ifOutUcastPkts_delta": null,
+                    "ifOutUcastPkts_rate": null,
+                    "ifInErrors": null,
+                    "ifInErrors_prev": null,
+                    "ifInErrors_delta": null,
+                    "ifInErrors_rate": null,
+                    "ifOutErrors": null,
+                    "ifOutErrors_prev": null,
+                    "ifOutErrors_delta": null,
+                    "ifOutErrors_rate": null,
+                    "ifInOctets": null,
+                    "ifInOctets_prev": null,
+                    "ifInOctets_delta": null,
+                    "ifInOctets_rate": null,
+                    "ifOutOctets": null,
+                    "ifOutOctets_prev": null,
+                    "ifOutOctets_delta": null,
+                    "ifOutOctets_rate": null,
+                    "poll_prev": null,
+                    "ifInNUcastPkts": null,
+                    "ifInNUcastPkts_prev": null,
+                    "ifInNUcastPkts_delta": null,
+                    "ifInNUcastPkts_rate": null,
+                    "ifOutNUcastPkts": null,
+                    "ifOutNUcastPkts_prev": null,
+                    "ifOutNUcastPkts_delta": null,
+                    "ifOutNUcastPkts_rate": null,
+                    "ifInDiscards": null,
+                    "ifInDiscards_prev": null,
+                    "ifInDiscards_delta": null,
+                    "ifInDiscards_rate": null,
+                    "ifOutDiscards": null,
+                    "ifOutDiscards_prev": null,
+                    "ifOutDiscards_delta": null,
+                    "ifOutDiscards_rate": null,
+                    "ifInUnknownProtos": null,
+                    "ifInUnknownProtos_prev": null,
+                    "ifInUnknownProtos_delta": null,
+                    "ifInUnknownProtos_rate": null,
+                    "ifInBroadcastPkts": null,
+                    "ifInBroadcastPkts_prev": null,
+                    "ifInBroadcastPkts_delta": null,
+                    "ifInBroadcastPkts_rate": null,
+                    "ifOutBroadcastPkts": null,
+                    "ifOutBroadcastPkts_prev": null,
+                    "ifOutBroadcastPkts_delta": null,
+                    "ifOutBroadcastPkts_rate": null,
+                    "ifInMulticastPkts": null,
+                    "ifInMulticastPkts_prev": null,
+                    "ifInMulticastPkts_delta": null,
+                    "ifInMulticastPkts_rate": null,
+                    "ifOutMulticastPkts": null,
+                    "ifOutMulticastPkts_prev": null,
+                    "ifOutMulticastPkts_delta": null,
+                    "ifOutMulticastPkts_rate": null
+                }
+            ]
+        },
+        "poller": {
+            "ports": [
+                {
+                    "port_descr_type": null,
+                    "port_descr_descr": null,
+                    "port_descr_circuit": null,
+                    "port_descr_speed": null,
+                    "port_descr_notes": null,
+                    "ifDescr": "Primary",
+                    "ifName": "Radio1",
+                    "portName": null,
+                    "ifIndex": 1537,
+                    "ifSpeed": null,
+                    "ifSpeed_prev": 0,
+                    "ifConnectorPresent": null,
+                    "ifPromiscuousMode": null,
+                    "ifHighSpeed": null,
+                    "ifHighSpeed_prev": null,
+                    "ifOperStatus": "up",
+                    "ifOperStatus_prev": "up",
+                    "ifAdminStatus": null,
+                    "ifAdminStatus_prev": null,
+                    "ifDuplex": null,
+                    "ifMtu": null,
+                    "ifType": "radioMAC",
+                    "ifAlias": "Primary",
+                    "ifPhysAddress": null,
+                    "ifHardType": null,
+                    "ifLastChange": 0,
+                    "ifVlan": "",
+                    "ifTrunk": null,
+                    "counter_in": null,
+                    "counter_out": null,
+                    "ignore": 0,
+                    "disabled": 0,
+                    "detailed": 0,
+                    "deleted": 0,
+                    "pagpOperationMode": null,
+                    "pagpPortState": null,
+                    "pagpPartnerDeviceId": null,
+                    "pagpPartnerLearnMethod": null,
+                    "pagpPartnerIfIndex": null,
+                    "pagpPartnerGroupIfIndex": null,
+                    "pagpPartnerDeviceName": null,
+                    "pagpEthcOperationMode": null,
+                    "pagpDeviceId": null,
+                    "pagpGroupIfIndex": null,
+                    "ifInUcastPkts": 0,
+                    "ifInUcastPkts_prev": 0,
+                    "ifInUcastPkts_delta": null,
+                    "ifInUcastPkts_rate": null,
+                    "ifOutUcastPkts": 0,
+                    "ifOutUcastPkts_prev": 0,
+                    "ifOutUcastPkts_delta": null,
+                    "ifOutUcastPkts_rate": null,
+                    "ifInErrors": 0,
+                    "ifInErrors_prev": 0,
+                    "ifInErrors_delta": null,
+                    "ifInErrors_rate": null,
+                    "ifOutErrors": 0,
+                    "ifOutErrors_prev": 0,
+                    "ifOutErrors_delta": null,
+                    "ifOutErrors_rate": null,
+                    "ifInOctets": 0,
+                    "ifInOctets_prev": 0,
+                    "ifInOctets_delta": null,
+                    "ifInOctets_rate": null,
+                    "ifOutOctets": 0,
+                    "ifOutOctets_prev": 0,
+                    "ifOutOctets_delta": null,
+                    "ifOutOctets_rate": null,
+                    "poll_prev": null,
+                    "ifInNUcastPkts": 0,
+                    "ifInNUcastPkts_prev": 0,
+                    "ifInNUcastPkts_delta": null,
+                    "ifInNUcastPkts_rate": null,
+                    "ifOutNUcastPkts": 0,
+                    "ifOutNUcastPkts_prev": 0,
+                    "ifOutNUcastPkts_delta": null,
+                    "ifOutNUcastPkts_rate": null,
+                    "ifInDiscards": 0,
+                    "ifInDiscards_prev": 0,
+                    "ifInDiscards_delta": null,
+                    "ifInDiscards_rate": null,
+                    "ifOutDiscards": 0,
+                    "ifOutDiscards_prev": 0,
+                    "ifOutDiscards_delta": null,
+                    "ifOutDiscards_rate": null,
+                    "ifInUnknownProtos": 0,
+                    "ifInUnknownProtos_prev": 0,
+                    "ifInUnknownProtos_delta": null,
+                    "ifInUnknownProtos_rate": null,
+                    "ifInBroadcastPkts": 0,
+                    "ifInBroadcastPkts_prev": 0,
+                    "ifInBroadcastPkts_delta": null,
+                    "ifInBroadcastPkts_rate": null,
+                    "ifOutBroadcastPkts": 0,
+                    "ifOutBroadcastPkts_prev": 0,
+                    "ifOutBroadcastPkts_delta": null,
+                    "ifOutBroadcastPkts_rate": null,
+                    "ifInMulticastPkts": 0,
+                    "ifInMulticastPkts_prev": 0,
+                    "ifInMulticastPkts_delta": null,
+                    "ifInMulticastPkts_rate": null,
+                    "ifOutMulticastPkts": 0,
+                    "ifOutMulticastPkts_prev": 0,
+                    "ifOutMulticastPkts_delta": null,
+                    "ifOutMulticastPkts_rate": null
+                }
+            ]
+        }
+    },
+    "sensors": {
+        "discovery": {
+            "sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.2509.9.3.2.1.1.13.59",
+                    "sensor_index": "59",
+                    "sensor_type": "aviatModemCurModulationRx",
+                    "sensor_descr": "Tx Mod Rate (Carrier1/59)",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 14,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "aviatModemCurModulationRx"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.2509.9.3.2.1.1.13.60",
+                    "sensor_index": "60",
+                    "sensor_type": "aviatModemCurModulationRx",
+                    "sensor_descr": "Tx Mod Rate (Carrier1/60)",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 14,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "aviatModemCurModulationRx"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.5",
+                    "sensor_index": "5",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/1",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 42.562,
+                    "sensor_limit": 62.562,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 32.562,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.6",
+                    "sensor_index": "6",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/2",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 40.375,
+                    "sensor_limit": 60.375,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 30.375,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "6",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.7",
+                    "sensor_index": "7",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/3",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 52,
+                    "sensor_limit": 72,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 42,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "7",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.8",
+                    "sensor_index": "8",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/4",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 51.187,
+                    "sensor_limit": 71.187,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 41.187,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "8",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.9",
+                    "sensor_index": "9",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/5",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 48.724,
+                    "sensor_limit": 68.724,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 38.724,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "9",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.3",
+                    "sensor_index": "3",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Voltage1/1",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 47.058,
+                    "sensor_limit": 54.1167,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 39.9993,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "3",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                }
+            ],
+            "state_indexes": [
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "N/A",
+                    "state_draw_graph": 1,
+                    "state_value": 1,
+                    "state_generic_value": 1
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "QPSK",
+                    "state_draw_graph": 1,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "16-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "32-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "64-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "128-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "256-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "512-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "1024-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 9,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "256-QAM-HG",
+                    "state_draw_graph": 1,
+                    "state_value": 10,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "512-QAM-HD",
+                    "state_draw_graph": 1,
+                    "state_value": 11,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "1024-QAM-HD",
+                    "state_draw_graph": 1,
+                    "state_value": 12,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "2048-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 13,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "4096-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 14,
+                    "state_generic_value": 0
+                }
+            ]
+        },
+        "poller": {
+            "sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.2509.9.3.2.1.1.13.59",
+                    "sensor_index": "59",
+                    "sensor_type": "aviatModemCurModulationRx",
+                    "sensor_descr": "Tx Mod Rate (Carrier1/59)",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 14,
+                    "user_func": null,
+                    "state_name": "aviatModemCurModulationRx"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.2509.9.3.2.1.1.13.60",
+                    "sensor_index": "60",
+                    "sensor_type": "aviatModemCurModulationRx",
+                    "sensor_descr": "Tx Mod Rate (Carrier1/60)",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 14,
+                    "user_func": null,
+                    "state_name": "aviatModemCurModulationRx"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.5",
+                    "sensor_index": "5",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/1",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 42.562,
+                    "sensor_limit": 62.562,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 32.562,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.6",
+                    "sensor_index": "6",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/2",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 40.375,
+                    "sensor_limit": 60.375,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 30.375,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "6",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.7",
+                    "sensor_index": "7",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/3",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 52,
+                    "sensor_limit": 72,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 42,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "7",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.8",
+                    "sensor_index": "8",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/4",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 51.187,
+                    "sensor_limit": 71.187,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 41.187,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "8",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.9",
+                    "sensor_index": "9",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "InternalTemp1/5",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 48.724,
+                    "sensor_limit": 68.724,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 38.724,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "9",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.3",
+                    "sensor_index": "3",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Voltage1/1",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 47.058,
+                    "sensor_limit": 54.1167,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 39.9993,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "3",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                }
+            ],
+            "state_indexes": [
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "N/A",
+                    "state_draw_graph": 1,
+                    "state_value": 1,
+                    "state_generic_value": 1
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "QPSK",
+                    "state_draw_graph": 1,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "16-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "32-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "64-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "128-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "256-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "512-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "1024-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 9,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "256-QAM-HG",
+                    "state_draw_graph": 1,
+                    "state_value": 10,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "512-QAM-HD",
+                    "state_draw_graph": 1,
+                    "state_value": 11,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "1024-QAM-HD",
+                    "state_draw_graph": 1,
+                    "state_value": 12,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "2048-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 13,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "aviatModemCurModulationRx",
+                    "state_descr": "4096-QAM",
+                    "state_draw_graph": 1,
+                    "state_value": 14,
+                    "state_generic_value": 0
+                }
+            ]
+        }
+    },
+    "wireless": {
+        "discovery": {
+            "wireless_sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rate",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-tx-rate",
+                    "sensor_descr": "TX Capacity (Carrier1/1)",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1000,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 730947,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.3.2.1.1.11.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rate",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-tx-rate",
+                    "sensor_descr": "TX Capacity (Carrier1/2)",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1000,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 730947,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.3.2.1.1.11.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rate",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-rx-rate",
+                    "sensor_descr": "TX Capacity (Carrier1/1)",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1000,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 730947,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.3.2.1.1.12.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rate",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-rx-rate",
+                    "sensor_descr": "TX Capacity (Carrier1/2)",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1000,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 730947,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.3.2.1.1.12.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "snr",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-snr",
+                    "sensor_descr": "SNR (Carrier1/1)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 45,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.33.2.2.1.3.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "snr",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-snr",
+                    "sensor_descr": "SNR (Carrier1/2)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 45,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.33.2.2.1.3.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rssi",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-rsl",
+                    "sensor_descr": "RSL (Carrier1/1)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": -36.7,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.15.2.2.1.4.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rssi",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-rsl",
+                    "sensor_descr": "RSL (Carrier1/2)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": -37,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.15.2.2.1.4.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-txpower",
+                    "sensor_descr": "TX Power (Carrier1/1)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 22.4,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.33.2.2.1.7.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-txpower",
+                    "sensor_descr": "TX Power (Carrier1/2)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 22.5,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.33.2.2.1.7.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "frequency",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-tx-freq",
+                    "sensor_descr": "TX Frequency (Carrier1/1)",
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 11565000,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.5.2.1.1.1.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "frequency",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-tx-freq",
+                    "sensor_descr": "TX Frequency (Carrier1/2)",
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 11565000,
+                    "sensor_prev": null,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.5.2.1.1.1.60\"]"
+                }
+            ]
+        },
+        "poller": {
+            "wireless_sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rate",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-tx-rate",
+                    "sensor_descr": "TX Capacity (Carrier1/1)",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1000,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 730947000,
+                    "sensor_prev": 730947,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.3.2.1.1.11.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rate",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-tx-rate",
+                    "sensor_descr": "TX Capacity (Carrier1/2)",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1000,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 730947000,
+                    "sensor_prev": 730947,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.3.2.1.1.11.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rate",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-rx-rate",
+                    "sensor_descr": "TX Capacity (Carrier1/1)",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1000,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 730947000,
+                    "sensor_prev": 730947,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.3.2.1.1.12.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rate",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-rx-rate",
+                    "sensor_descr": "TX Capacity (Carrier1/2)",
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1000,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 730947000,
+                    "sensor_prev": 730947,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.3.2.1.1.12.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "snr",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-snr",
+                    "sensor_descr": "SNR (Carrier1/1)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 45,
+                    "sensor_prev": 45,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.33.2.2.1.3.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "snr",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-snr",
+                    "sensor_descr": "SNR (Carrier1/2)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 45,
+                    "sensor_prev": 45,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.33.2.2.1.3.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rssi",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-rsl",
+                    "sensor_descr": "RSL (Carrier1/1)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": -36.7,
+                    "sensor_prev": -36.7,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.15.2.2.1.4.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "rssi",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-rsl",
+                    "sensor_descr": "RSL (Carrier1/2)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": -37,
+                    "sensor_prev": -37,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.15.2.2.1.4.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-txpower",
+                    "sensor_descr": "TX Power (Carrier1/1)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 22.4,
+                    "sensor_prev": 22.4,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.33.2.2.1.7.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-txpower",
+                    "sensor_descr": "TX Power (Carrier1/2)",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 22.5,
+                    "sensor_prev": 22.5,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.33.2.2.1.7.60\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "frequency",
+                    "sensor_index": "59",
+                    "sensor_type": "aviat-wtm-carrier-tx-freq",
+                    "sensor_descr": "TX Frequency (Carrier1/1)",
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 11565,
+                    "sensor_prev": 11565000,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.5.2.1.1.1.59\"]"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "frequency",
+                    "sensor_index": "60",
+                    "sensor_type": "aviat-wtm-carrier-tx-freq",
+                    "sensor_descr": "TX Frequency (Carrier1/2)",
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_aggregator": "sum",
+                    "sensor_current": 11565,
+                    "sensor_prev": 11565000,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_oids": "[\".1.3.6.1.4.1.2509.9.5.2.1.1.1.60\"]"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/snmpsim/aviat-wtm.snmprec b/tests/snmpsim/aviat-wtm.snmprec
new file mode 100644
index 0000000000..a329fdd1a1
--- /dev/null
+++ b/tests/snmpsim/aviat-wtm.snmprec
@@ -0,0 +1,155 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2509.11.1.1.8
+1.3.6.1.2.1.1.3.0|67|452510468
+1.3.6.1.2.1.2.2.1.2.1025|4|
+1.3.6.1.2.1.2.2.1.2.1026|4|
+1.3.6.1.2.1.2.2.1.2.1537|4|Primary
+1.3.6.1.2.1.2.2.1.2.2049|4|
+1.3.6.1.2.1.2.2.1.2.2050|4|
+1.3.6.1.2.1.2.2.1.2.65537|4|
+1.3.6.1.2.1.2.2.1.3.1025|2|6
+1.3.6.1.2.1.2.2.1.3.1026|2|6
+1.3.6.1.2.1.2.2.1.3.1537|2|188
+1.3.6.1.2.1.2.2.1.3.2049|2|6
+1.3.6.1.2.1.2.2.1.3.2050|2|6
+1.3.6.1.2.1.2.2.1.3.65537|2|135
+1.3.6.1.2.1.2.2.1.8.1025|2|1
+1.3.6.1.2.1.2.2.1.8.1026|2|2
+1.3.6.1.2.1.2.2.1.8.1537|2|1
+1.3.6.1.2.1.2.2.1.8.2049|2|6
+1.3.6.1.2.1.2.2.1.8.2050|2|6
+1.3.6.1.2.1.2.2.1.8.65537|2|1
+1.3.6.1.2.1.31.1.1.1.1.1025|4|GigabitEthernet1/1
+1.3.6.1.2.1.31.1.1.1.1.1026|4|GigabitEthernet1/2
+1.3.6.1.2.1.31.1.1.1.1.1537|4|Radio1
+1.3.6.1.2.1.31.1.1.1.1.2049|4|TenGigE1/1
+1.3.6.1.2.1.31.1.1.1.1.2050|4|TenGigE1/2
+1.3.6.1.2.1.31.1.1.1.1.65537|4|Vlan1
+1.3.6.1.2.1.31.1.1.1.18.1025|4|
+1.3.6.1.2.1.31.1.1.1.18.1026|4|
+1.3.6.1.2.1.31.1.1.1.18.1537|4|
+1.3.6.1.2.1.31.1.1.1.18.2049|4|
+1.3.6.1.2.1.31.1.1.1.18.2050|4|
+1.3.6.1.2.1.31.1.1.1.18.65537|4|
+1.3.6.1.2.1.47.1.1.1.1.2.1|4|System Root
+1.3.6.1.2.1.47.1.1.1.1.2.2|4|WTM4000 Terminal
+1.3.6.1.2.1.47.1.1.1.1.2.3|4|Input voltage sensor
+1.3.6.1.2.1.47.1.1.1.1.2.4|4|Input current sensor
+1.3.6.1.2.1.47.1.1.1.1.2.5|4|PCB temperature (near switch)
+1.3.6.1.2.1.47.1.1.1.1.2.6|4|PCB temperature (near modem)
+1.3.6.1.2.1.47.1.1.1.1.2.7|4|PCB temperature (near power supply)
+1.3.6.1.2.1.47.1.1.1.1.2.8|4|DC/DC converter temperature
+1.3.6.1.2.1.47.1.1.1.1.2.9|4|FPGA junction temperature
+1.3.6.1.2.1.47.1.1.1.1.2.10|4|GigabitEthernetPort 1
+1.3.6.1.2.1.47.1.1.1.1.2.11|4|GigabitEthernetPort 2
+1.3.6.1.2.1.47.1.1.1.1.2.12|4|SFP+ Slot 1
+1.3.6.1.2.1.47.1.1.1.1.2.13|4|SFP+ Slot 2
+1.3.6.1.2.1.47.1.1.1.1.2.14|4|Central Processing Unit
+1.3.6.1.2.1.47.1.1.1.1.2.15|4|Current CPU usage
+1.3.6.1.2.1.47.1.1.1.1.2.16|4|15-minute average CPU usage
+1.3.6.1.2.1.47.1.1.1.1.2.17|4|Boot NVRAM
+1.3.6.1.2.1.47.1.1.1.1.2.18|4|ECC corrections
+1.3.6.1.2.1.47.1.1.1.1.2.19|4|ECC failures
+1.3.6.1.2.1.47.1.1.1.1.2.20|4|Bad block count
+1.3.6.1.2.1.47.1.1.1.1.2.21|4|Primary NVRAM
+1.3.6.1.2.1.47.1.1.1.1.2.22|4|ECC corrections
+1.3.6.1.2.1.47.1.1.1.1.2.23|4|ECC failures
+1.3.6.1.2.1.47.1.1.1.1.2.24|4|Bad block count
+1.3.6.1.2.1.47.1.1.1.1.2.25|4|Maximum erase count
+1.3.6.1.2.1.47.1.1.1.1.2.26|4|Used space
+1.3.6.1.2.1.47.1.1.1.1.2.27|4|Used RAM
+1.3.6.1.2.1.47.1.1.1.1.2.28|4|Time in service
+1.3.6.1.2.1.47.1.1.1.1.2.35|4|PA Temperature
+1.3.6.1.2.1.47.1.1.1.1.2.36|4|PA Temperature
+1.3.6.1.2.1.47.1.1.1.1.2.37|4|Transmission time
+1.3.6.1.2.1.47.1.1.1.1.2.38|4|Transmission time
+1.3.6.1.2.1.47.1.1.1.1.2.57|4|WTM4000 Radio Module
+1.3.6.1.2.1.47.1.1.1.1.2.58|4|WTM4000 Radio Module
+1.3.6.1.2.1.47.1.1.1.1.2.59|4|Radio Carrier
+1.3.6.1.2.1.47.1.1.1.1.2.60|4|Radio Carrier
+1.3.6.1.2.1.47.1.1.1.1.2.61|4|WTM4000 Radio Interface
+1.3.6.1.2.1.47.1.1.1.1.7.1|4|Root
+1.3.6.1.2.1.47.1.1.1.1.7.2|4|Terminal1
+1.3.6.1.2.1.47.1.1.1.1.7.3|4|VoltageSensor1/1
+1.3.6.1.2.1.47.1.1.1.1.7.4|4|CurrentSensor1/1
+1.3.6.1.2.1.47.1.1.1.1.7.5|4|InternalTemp1/1
+1.3.6.1.2.1.47.1.1.1.1.7.6|4|InternalTemp1/2
+1.3.6.1.2.1.47.1.1.1.1.7.7|4|InternalTemp1/3
+1.3.6.1.2.1.47.1.1.1.1.7.8|4|InternalTemp1/4
+1.3.6.1.2.1.47.1.1.1.1.7.9|4|InternalTemp1/5
+1.3.6.1.2.1.47.1.1.1.1.7.10|4|GigabitEthernet1/1
+1.3.6.1.2.1.47.1.1.1.1.7.11|4|GigabitEthernet1/2
+1.3.6.1.2.1.47.1.1.1.1.7.12|4|SFP+Slot1/1
+1.3.6.1.2.1.47.1.1.1.1.7.13|4|SFP+Slot1/2
+1.3.6.1.2.1.47.1.1.1.1.7.14|4|CPU1/1
+1.3.6.1.2.1.47.1.1.1.1.7.15|4|CPUUsage1/1
+1.3.6.1.2.1.47.1.1.1.1.7.16|4|CPUUsageAvg1/1
+1.3.6.1.2.1.47.1.1.1.1.7.17|4|NVRAM1/1
+1.3.6.1.2.1.47.1.1.1.1.7.18|4|NVRAMECCCorrections1/1
+1.3.6.1.2.1.47.1.1.1.1.7.19|4|NVRAMECCErrors1/1
+1.3.6.1.2.1.47.1.1.1.1.7.20|4|NVRAMBadBlocks1/1
+1.3.6.1.2.1.47.1.1.1.1.7.21|4|NVRAM1/2
+1.3.6.1.2.1.47.1.1.1.1.7.22|4|NVRAMECCCorrections1/2
+1.3.6.1.2.1.47.1.1.1.1.7.23|4|NVRAMECCErrors1/2
+1.3.6.1.2.1.47.1.1.1.1.7.24|4|NVRAMBadBlocks1/2
+1.3.6.1.2.1.47.1.1.1.1.7.25|4|NVRAMMaxEraseCount1/2
+1.3.6.1.2.1.47.1.1.1.1.7.26|4|NVRAMUsage1/2
+1.3.6.1.2.1.47.1.1.1.1.7.27|4|RAMUsage1/1
+1.3.6.1.2.1.47.1.1.1.1.7.28|4|TimeInService1/1
+1.3.6.1.2.1.47.1.1.1.1.7.35|4|Temperature1/1
+1.3.6.1.2.1.47.1.1.1.1.7.36|4|Temperature1/2
+1.3.6.1.2.1.47.1.1.1.1.7.37|4|TransmissionTime1/1
+1.3.6.1.2.1.47.1.1.1.1.7.38|4|TransmissionTime1/2
+1.3.6.1.2.1.47.1.1.1.1.7.57|4|RFModule1/1
+1.3.6.1.2.1.47.1.1.1.1.7.58|4|RFModule1/2
+1.3.6.1.2.1.47.1.1.1.1.7.59|4|Carrier1/1
+1.3.6.1.2.1.47.1.1.1.1.7.60|4|Carrier1/2
+1.3.6.1.2.1.47.1.1.1.1.7.61|4|Radio1
+1.3.6.1.2.1.47.1.1.1.1.10.2|4|2.7.0.11.4349-WTM4100
+1.3.6.1.2.1.47.1.1.1.1.11.2|4|AAA9999A999
+1.3.6.1.2.1.47.1.1.1.1.13.2|4|W42-11H2-WPX
+1.3.6.1.2.1.99.1.1.1.1.3|2|4
+1.3.6.1.2.1.99.1.1.1.1.5|2|8
+1.3.6.1.2.1.99.1.1.1.1.6|2|8
+1.3.6.1.2.1.99.1.1.1.1.7|2|8
+1.3.6.1.2.1.99.1.1.1.1.8|2|8
+1.3.6.1.2.1.99.1.1.1.1.9|2|8
+1.3.6.1.2.1.99.1.1.1.1.35|2|1
+1.3.6.1.2.1.99.1.1.1.1.36|2|1
+1.3.6.1.2.1.99.1.1.1.2.3|2|9
+1.3.6.1.2.1.99.1.1.1.2.5|2|9
+1.3.6.1.2.1.99.1.1.1.2.6|2|9
+1.3.6.1.2.1.99.1.1.1.2.7|2|9
+1.3.6.1.2.1.99.1.1.1.2.8|2|9
+1.3.6.1.2.1.99.1.1.1.2.9|2|9
+1.3.6.1.2.1.99.1.1.1.2.35|2|9
+1.3.6.1.2.1.99.1.1.1.2.36|2|9
+1.3.6.1.2.1.99.1.1.1.3.3|2|3
+1.3.6.1.2.1.99.1.1.1.3.5|2|3
+1.3.6.1.2.1.99.1.1.1.3.6|2|3
+1.3.6.1.2.1.99.1.1.1.3.7|2|3
+1.3.6.1.2.1.99.1.1.1.3.8|2|3
+1.3.6.1.2.1.99.1.1.1.3.9|2|3
+1.3.6.1.2.1.99.1.1.1.3.35|2|3
+1.3.6.1.2.1.99.1.1.1.3.36|2|3
+1.3.6.1.2.1.99.1.1.1.4.3|2|47058
+1.3.6.1.2.1.99.1.1.1.4.5|2|42562
+1.3.6.1.2.1.99.1.1.1.4.6|2|40375
+1.3.6.1.2.1.99.1.1.1.4.7|2|52000
+1.3.6.1.2.1.99.1.1.1.4.8|2|51187
+1.3.6.1.2.1.99.1.1.1.4.9|2|48724
+1.3.6.1.2.1.99.1.1.1.4.35|2|40000
+1.3.6.1.2.1.99.1.1.1.4.36|2|41000
+1.3.6.1.4.1.2509.9.3.2.1.1.11.59|66|730947
+1.3.6.1.4.1.2509.9.3.2.1.1.11.60|66|730947
+1.3.6.1.4.1.2509.9.3.2.1.1.12.59|66|730947
+1.3.6.1.4.1.2509.9.3.2.1.1.12.60|66|730947
+1.3.6.1.4.1.2509.9.3.2.1.1.14.60|2|14
+1.3.6.1.4.1.2509.9.3.2.1.1.14.59|2|14
+1.3.6.1.4.1.2509.9.5.2.1.1.1.59|2|11565000
+1.3.6.1.4.1.2509.9.5.2.1.1.1.60|2|11565000
+1.3.6.1.4.1.2509.9.15.2.2.1.4.59|2|-367
+1.3.6.1.4.1.2509.9.15.2.2.1.4.60|2|-370
+1.3.6.1.4.1.2509.9.33.2.2.1.3.59|2|450
+1.3.6.1.4.1.2509.9.33.2.2.1.3.60|2|450
+1.3.6.1.4.1.2509.9.33.2.2.1.7.59|2|224
+1.3.6.1.4.1.2509.9.33.2.2.1.7.60|2|225