Commits

Anonymous committed 24cb9ce Merge

Merge branch 'master' into features/linkd-scalability

Comments (0)

Files changed (5)

features/topology-map/org.opennms.features.topology.app/src/main/resources/OSGI-INF/blueprint/blueprint.xml

         <service-properties>
             <!-- <entry key="operation.menuLocation" value="View"/> -->
             <entry key="operation.contextMenuLocation" value=""/>
-            <entry key="operation.label" value="Add Item To Group"/>
+            <entry key="operation.label" value="Add This Item To a Group"/>
         </service-properties>
         <bean class="org.opennms.features.topology.app.internal.operations.AddVertexToGroupOperation"/>
     </service>
         <service-properties>
             <!-- <entry key="operation.menuLocation" value="View"/> -->
             <entry key="operation.contextMenuLocation" value=""/>
-            <entry key="operation.label" value="Remove Item From Group"/>
+            <entry key="operation.label" value="Remove This Item From a Group"/>
         </service-properties>
         <bean class="org.opennms.features.topology.app.internal.operations.RemoveVertexFromGroupOperation"/>
     </service>

opennms-base-assembly/src/main/filtered/etc/events/Aruba.AP.events.xml

-<events>
 <!-- Start of auto generated data from MIB: WLSR-AP-MIB -->
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1001</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrUnsecureApDetected</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrUnsecureApDetected</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an Unsecure Access Point is detected
-by an Air Monitor located at wlsrLocation on channel 
-wlsrCurrentChannel. The AP is declared unsecure, because we 
-macthed it to the wlsrMatchedMac/wlsrMatchedIp.&lt;/p&gt;&lt;table&gt;
+<events>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1001</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrUnsecureApDetected</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrUnsecureApDetected</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an Unsecure Access Point is detected
+			by an Air Monitor located at wlsrLocation on channel 
+			wlsrCurrentChannel. The AP is declared unsecure, because we 
+			matched it to the wlsrMatchedMac/wlsrMatchedIp.
+
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrRogueInfoURL&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#7]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrUnsecureApDetected trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]% 
-			wlsrMatchedMac=%parm[#5]% 
-			wlsrMatchedIp=%parm[#6]% 
-			wlsrRogueInfoURL=%parm[#7]%&lt;/p&gt;
-		</logmsg>
-	<severity>Major</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1002</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrStaImpersonation</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrStaImpersonation</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM at location wlsrLocation detected
-a Station impersonation.&lt;/p&gt;&lt;table&gt;
+	%parm[#7]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrUnsecureApDetected trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%
+	wlsrMatchedMac=%parm[#5]%
+	wlsrMatchedIp=%parm[#6]%
+	wlsrRogueInfoURL=%parm[#7]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1002</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrStaImpersonation</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrStaImpersonation</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM at location wlsrLocation detected
+			a Station impersonation.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrNodeMac&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrLocation&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrStaImpersonation trap received 
-			wlsrNodeMac=%parm[#1]% 
-			wlsrLocation=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1003</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrReservedChannelViolation</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrReservedChannelViolation</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an Access Point is detected
-by an AP at location wlsrLocation, which
-violates the Reserved Channel configuration.&lt;/p&gt;&lt;table&gt;
+	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrStaImpersonation trap received
+	wlsrNodeMac=%parm[#1]%
+	wlsrLocation=%parm[#2]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1003</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrReservedChannelViolation</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrReservedChannelViolation</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an Access Point is detected
+			by an AP at location wlsrLocation, which
+			violates the Reserved Channel configuration.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrReservedChannelViolation trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1004</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrValidSSIDViolation</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrValidSSIDViolation</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an Access Point voilating Valid SSID is 
-detected by an AP at wlsrLocation.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrReservedChannelViolation trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1004</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrValidSSIDViolation</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrValidSSIDViolation</event-label>
+        <descr>&lt;p&gt;
+		This trap indicates that an Access Point violating Valid SSID is 
+		detected by an AP at wlsrLocation.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrValidSSIDViolation trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1005</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrChannelMisconfiguration</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrChannelMisconfiguration</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an Access Point has a bad channel
-configuration.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrValidSSIDViolation trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1005</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrChannelMisconfiguration</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrChannelMisconfiguration</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an Access Point has a bad channel
+			configuration.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrChannelMisconfiguration trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1006</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrOUIMisconfiguration</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrOUIMisconfiguration</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an Access Point has bad OUI
-configuration.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrChannelMisconfiguration trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1006</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrOUIMisconfiguration</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrOUIMisconfiguration</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an Access Point has bad OUI
+			configuration.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrOUIMisconfiguration trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1007</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrSSIDMisconfiguration</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrSSIDMisconfiguration</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an Access Point has bad SSID
-configuration.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrOUIMisconfiguration trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1007</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrSSIDMisconfiguration</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrSSIDMisconfiguration</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an Access Point has bad SSID
+			configuration.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrSSIDMisconfiguration trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1008</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrShortPreableMisconfiguration</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrShortPreableMisconfiguration</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an Access Point has bad Short preamble
-configuration.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrSSIDMisconfiguration trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1008</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrShortPreableMisconfiguration</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrShortPreableMisconfiguration</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an Access Point has bad Short preamble
+			configuration.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrShortPreableMisconfiguration trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1009</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrWPAMisconfiguration</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrWPAMisconfiguration</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an Access Point has bad WPA
-configuration.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrShortPreableMisconfiguration trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1009</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrWPAMisconfiguration</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrWPAMisconfiguration</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an Access Point has bad WPA
+			configuration.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrWPAMisconfiguration trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1010</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrAdhocNetworkDetected</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrAdhocNetworkDetected</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM has detected an Adhoc
-network.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrWPAMisconfiguration trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1010</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrAdhocNetworkDetected</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrAdhocNetworkDetected</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM has detected an Adhoc
+			network.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrAdhocNetworkDetected trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1011</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrStaPolicyViolation</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrStaPolicyViolation</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that a Valid Station policy is violated.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrAdhocNetworkDetected trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1011</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrStaPolicyViolation</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrStaPolicyViolation</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that a Valid Station policy is violated.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrStaPolicyViolation trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrNodeMac=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1012</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrRepeatWEPIVViolation</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrRepeatWEPIVViolation</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AP/AM detected a Repeat WEP-IV violation.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrStaPolicyViolation trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrNodeMac=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1012</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrRepeatWEPIVViolation</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrRepeatWEPIVViolation</event-label>
+        <descr>&lt;p&gt;
+		This trap indicates that an AP/AM detected a Repeat WEP-IV violation.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrRepeatWEPIVViolation trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1013</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrWeakWEPIVViolation</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrWeakWEPIVViolation</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AP/AM detected a Weak WEP-IV violation.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrRepeatWEPIVViolation trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1013</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrWeakWEPIVViolation</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrWeakWEPIVViolation</event-label>
+        <descr>&lt;p&gt;
+		This trap indicates that an AP/AM detected a Weak WEP-IV violation.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrWeakWEPIVViolation trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1014</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrChannelInterferenceDetected</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrChannelInterferenceDetected</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation has detected a channel interference on
-wlsrCurrentChannel.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrWeakWEPIVViolation trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1014</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrChannelInterferenceDetected</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrChannelInterferenceDetected</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation has detected a channel interference on
+			wlsrCurrentChannel.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrLocation&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrChannelInterferenceDetected trap received 
-			wlsrLocation=%parm[#1]% 
-			wlsrCurrentChannel=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1015</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrAPInterferenceDetected</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrAPInterferenceDetected</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation has detected an AP interference on
-wlsrCurrentChannel.&lt;/p&gt;&lt;table&gt;
+	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrChannelInterferenceDetected trap received
+	wlsrLocation=%parm[#1]%
+	wlsrCurrentChannel=%parm[#2]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1015</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrAPInterferenceDetected</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrAPInterferenceDetected</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation has detected an AP interference on
+			wlsrCurrentChannel.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrAPInterferenceDetected trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1016</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrStaInterferenceDetected</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrStaInterferenceDetected</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation has detected a Station interference on
-wlsrCurrentChannel.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrAPInterferenceDetected trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1016</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrStaInterferenceDetected</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrStaInterferenceDetected</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation has detected a Station interference on
+			wlsrCurrentChannel.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrStaInterferenceDetected trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrNodeMac=%parm[#3]% 
-			wlsrLocation=%parm[#4]% 
-			wlsrCurrentChannel=%parm[#5]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1017</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrFrameRetryRateExceeded</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrFrameRetryRateExceeded</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that an AP wlsrTargetApBSSID has exceeded
-an upper threshold for Frame Retry Rate for AP wlsrTargetApBSSID.&lt;/p&gt;&lt;table&gt;
+	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrStaInterferenceDetected trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrNodeMac=%parm[#3]%
+	wlsrLocation=%parm[#4]%
+	wlsrCurrentChannel=%parm[#5]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1017</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrFrameRetryRateExceeded</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrFrameRetryRateExceeded</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that an AP wlsrTargetApBSSID has exceeded
+			an upper threshold for Frame Retry Rate for AP wlsrTargetApBSSID.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrFrameRetryRateExceeded trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1018</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrFrameReceiveErrorRateExceeded</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrFrameReceiveErrorRateExceeded</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that an AP wlsrTargetApBSSID has exceeded
-an upper threshold for Frame Receive Error Rate for AP 
-wlsrTargetApBSSID.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrFrameRetryRateExceeded trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1018</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrFrameReceiveErrorRateExceeded</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrFrameReceiveErrorRateExceeded</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that an AP wlsrTargetApBSSID has exceeded
+			an upper threshold for Frame Receive Error Rate for AP 
+			wlsrTargetApBSSID.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrLocation&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrFrameReceiveErrorRateExceeded trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrTargetApChannel=%parm[#3]% 
-			wlsrLocation=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1019</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrFrameFragmentationRateExceeded</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrFrameFragmentationRateExceeded</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that an AP wlsrTargetApBSSID has exceeded
-an upper threshold for Frame Fragmentation Rate for AP 
-wlsrTargetApBSSID.&lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrFrameReceiveErrorRateExceeded trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrTargetApChannel=%parm[#3]%
+	wlsrLocation=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1019</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrFrameFragmentationRateExceeded</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrFrameFragmentationRateExceeded</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that an AP wlsrTargetApBSSID has exceeded
+			an upper threshold for Frame Fragmentation Rate for AP 
+			wlsrTargetApBSSID.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrLocation&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrFrameFragmentationRateExceeded trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrTargetApChannel=%parm[#3]% 
-			wlsrLocation=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1020</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrFrameBandWidthRateExceeded</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrFrameBandWidthRateExceeded</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that a station wlsrStaAddress has exceeded
-the allocated Bandwidth rate. &lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrFrameFragmentationRateExceeded trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrTargetApChannel=%parm[#3]%
+	wlsrLocation=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1020</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrFrameBandWidthRateExceeded</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrFrameBandWidthRateExceeded</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that a station wlsrStaAddress has exceeded
+			the allocated Bandwidth rate. 
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrNodeMac&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrFrameBandWidthRateExceeded trap received 
-			wlsrNodeMac=%parm[#1]% 
-			wlsrTargetApBSSID=%parm[#2]% 
-			wlsrTargetApSSID=%parm[#3]% 
-			wlsrLocation=%parm[#4]% 
-			wlsrCurrentChannel=%parm[#5]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1021</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrFrameLowSpeedRateExceeded</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrFrameLowSpeedRateExceeded</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that a station wlsrStaAddress has exceeded
-the Low speed rate. &lt;/p&gt;&lt;table&gt;
+	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrFrameBandWidthRateExceeded trap received
+	wlsrNodeMac=%parm[#1]%
+	wlsrTargetApBSSID=%parm[#2]%
+	wlsrTargetApSSID=%parm[#3]%
+	wlsrLocation=%parm[#4]%
+	wlsrCurrentChannel=%parm[#5]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1021</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrFrameLowSpeedRateExceeded</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrFrameLowSpeedRateExceeded</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that a station wlsrStaAddress has exceeded
+			the Low speed rate. 
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrNodeMac&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrFrameLowSpeedRateExceeded trap received 
-			wlsrNodeMac=%parm[#1]% 
-			wlsrTargetApBSSID=%parm[#2]% 
-			wlsrTargetApSSID=%parm[#3]% 
-			wlsrLocation=%parm[#4]% 
-			wlsrCurrentChannel=%parm[#5]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1022</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrFrameNonUnicastRateExceeded</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrFrameNonUnicastRateExceeded</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that a station wlsrStaAddress has exceeded
-the Non Unicast traffic rate. &lt;/p&gt;&lt;table&gt;
+	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrFrameLowSpeedRateExceeded trap received
+	wlsrNodeMac=%parm[#1]%
+	wlsrTargetApBSSID=%parm[#2]%
+	wlsrTargetApSSID=%parm[#3]%
+	wlsrLocation=%parm[#4]%
+	wlsrCurrentChannel=%parm[#5]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1022</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrFrameNonUnicastRateExceeded</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrFrameNonUnicastRateExceeded</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that a station wlsrStaAddress has exceeded
+			the Non Unicast traffic rate. 
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrNodeMac&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrFrameNonUnicastRateExceeded trap received 
-			wlsrNodeMac=%parm[#1]% 
-			wlsrTargetApBSSID=%parm[#2]% 
-			wlsrTargetApSSID=%parm[#3]% 
-			wlsrLocation=%parm[#4]% 
-			wlsrCurrentChannel=%parm[#5]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1023</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrLoadbalancingEnabled</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrLoadbalancingEnabled</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that an AP with BSSID wlsrTargetApBSSID 
-has enabled Load balancing.&lt;/p&gt;&lt;table&gt;
+	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrFrameNonUnicastRateExceeded trap received
+	wlsrNodeMac=%parm[#1]%
+	wlsrTargetApBSSID=%parm[#2]%
+	wlsrTargetApSSID=%parm[#3]%
+	wlsrLocation=%parm[#4]%
+	wlsrCurrentChannel=%parm[#5]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1023</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrLoadbalancingEnabled</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrLoadbalancingEnabled</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that an AP with BSSID wlsrTargetApBSSID 
+			has enabled Load balancing.
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrTargetApBSSID&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrLoadbalancingEnabled trap received 
-			wlsrTargetApBSSID=%parm[#1]% 
-			wlsrTargetApSSID=%parm[#2]% 
-			wlsrLocation=%parm[#3]% 
-			wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1024</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrChannelFrameRetryRateExceeded</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrChannelFrameRetryRateExceeded</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that it exceeded an upper threshold
-for Frame Retry Rate. &lt;/p&gt;&lt;table&gt;
+	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrLoadbalancingEnabled trap received
+	wlsrTargetApBSSID=%parm[#1]%
+	wlsrTargetApSSID=%parm[#2]%
+	wlsrLocation=%parm[#3]%
+	wlsrCurrentChannel=%parm[#4]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1024</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrChannelFrameRetryRateExceeded</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrChannelFrameRetryRateExceeded</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that it exceeded an upper threshold
+			for Frame Retry Rate. 
+		&lt;/p&gt;&lt;table&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrLocation&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
 	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
 
 	wlsrCurrentChannel&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			wlsrChannelFrameRetryRateExceeded trap received 
-			wlsrLocation=%parm[#1]% 
-			wlsrCurrentChannel=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.14823.2.3.1.1</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>1025</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/aruba/traps/wlsrChannelFrameFragmentationRateExceeded</uei>
-	<event-label>WLSR-AP-MIB defined trap event: wlsrChannelFrameFragmentationRateExceeded</event-label>
-	<descr>
-&lt;p&gt;
-This trap indicates that an AM/AP located at 
-wlsrLocation is reporting that it exceeded an upper threshold
-for Frame Fragmentation Rate. &lt;/p&gt;&lt;table&gt;
+	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</descr>
+        <logmsg dest="logndisplay">&lt;p&gt;
+	wlsrChannelFrameRetryRateExceeded trap received
+	wlsrLocation=%parm[#1]%
+	wlsrCurrentChannel=%parm[#2]%&lt;/p&gt;</logmsg>
+        <severity>Indeterminate</severity>
+    </event>
+    <event>
+        <mask>
+            <maskelement>
+                <mename>id</mename>
+                <mevalue>.1.3.6.1.4.1.14823.2.3.1.1.100</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>generic</mename>
+                <mevalue>6</mevalue>
+            </maskelement>
+            <maskelement>
+                <mename>specific</mename>
+                <mevalue>1025</mevalue>
+            </maskelement>
+        </mask>
+        <uei>uei.opennms.org/vendor/aruba/ap/traps/wlsrChannelFrameFragmentationRateExceeded</uei>
+        <event-label>WLSR-AP-MIB defined trap event: wlsrChannelFrameFragmentationRateExceeded</event-label>
+        <descr>&lt;p&gt;
+			This trap indicates that an AM/AP located at 
+			wlsrLocation is reporting that it exceeded an upper threshold
+			for Frame Fragmentation Rate.