fix zyxel bullshit (we now have custom mibs, beware) fix DNS-SERVER-MIB and DNS-RESOLVER-MIB (from fenner's site) fix Juniper WX mibs (removed some comments which were breaking the compile)

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

mibs/ZYXEL-IESCOMMON-MIB

@@ -804,11 +804,11 @@ ZYXEL-IESCOMMON-MIB DEFINITIONS ::= BEGIN
 			 the maintenance operation should be performed. The target can
 			 be a chassis, a plug-in module, and a port.
 		 	 The value of the object will be:
-		 	 	(Chassis_id * 10000 + slot_id * 100 + port_id)
+		 	 	(Chassisid * 10000 + slotid * 100 + portid)
 		 	  where
-		 	 	chassis_id: 0~3,
-		 	 	slot_id: 1~16,
-		 	 	port_id: 1~24"
+		 	 	chassisid: 0~3,
+		 	 	slotid: 1~16,
+		 	 	portid: 1~24"
         ::= { iesSysMaintenance 2 }
 
 
@@ -1697,9 +1697,9 @@ ZYXEL-IESCOMMON-MIB DEFINITIONS ::= BEGIN
 
         iesMacFilterStatusEnable    OBJECT-TYPE
         SYNTAX  INTEGER {
-				enable_accept(1),
+				enableaccept(1),
 				disable(2),
-				enable_deny(3)
+				enabledeny(3)
 			}
         MAX-ACCESS	read-write
         STATUS	current
@@ -2079,7 +2079,7 @@ ZYXEL-IESCOMMON-MIB DEFINITIONS ::= BEGIN
 
 	iesSwitchMode OBJECT-TYPE
         SYNTAX INTEGER {
-        			daisy_chain(1),
+        			daisychain(1),
         			standalone(2)
         		}
 	MAX-ACCESS	read-write

mibs/ZYXEL-SAM1216

@@ -2270,7 +2270,7 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
 --      STATUS current
 --      DESCRIPTION
 --	"configured transition L0 to L2 rate.
---	 (<=min_l2rate/2 and >= 16 Kbps, For CTLM solution, 0 for system assign; for BCM solution, default:16.)"
+--	 (<=minl2rate/2 and >= 16 Kbps, For CTLM solution, 0 for system assign; for BCM solution, default:16.)"
 --      ::= { adslLineConfEntry 22 }
 
 -- ADSL Port Batch Set
@@ -2551,7 +2551,7 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
 --      STATUS current
 --      DESCRIPTION
 --	"configured transition L0 to L2 rate.
---	 (<=min_l2rate/2 and >= 16 Kbps, For CTLM solution, 0 for system assign; for BCM solution, default:16.)"
+--	 (<=minl2rate/2 and >= 16 Kbps, For CTLM solution, 0 for system assign; for BCM solution, default:16.)"
 --      ::= { adslPortBatchSet 22 }
 
 -- Line Status
@@ -2800,9 +2800,9 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
 
         shdslLineConfPboMode OBJECT-TYPE
         SYNTAX 	INTEGER {
-			normal_epl(1),
-			forced_epl(2),
-			forced_no_epl(3)
+			normalepl(1),
+			forcedepl(2),
+			forcednoepl(3)
 		}
         MAX-ACCESS read-write
         STATUS current
@@ -2865,9 +2865,9 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
 		BIT  5: set alarm profile
 		BIT  6: set pmms mode to be normal
 		BIT  7: set pmms mode to be forced
-		BIT  8: set pbo mode to be normal_epl
-		BIT  9: set pbo mode to be forced_epl
-		BIT 10: set pbo mode to be forced_no_epl
+		BIT  8: set pbo mode to be normalepl
+		BIT  9: set pbo mode to be forcedepl
+		BIT 10: set pbo mode to be forcednoepl
 		BIT 11: set pbo value"
         ::= { shdslPortBatchSet 2 }
 
@@ -5463,4 +5463,4 @@ ZYXEL-SAM1216 DEFINITIONS ::= BEGIN
                 "This object is used to create a new row or delete an existing row in this table."
          ::= { dsBcastDisableEntry 2 }
 
-END
+END

mibs/jnx-wx.mib.txt

@@ -751,10 +751,6 @@ jnxWxGrpStatsSysExchangeFailTcpAcclFailedPkts OBJECT-TYPE
       "
     ::= { jnxWxGrpStatsSysExchange 6 }
 
----------------------------------
--- Acceleration Statistics Group 
----------------------------------
-
 jnxWxGrpStatsAccl OBJECT-IDENTITY
     STATUS  current
     DESCRIPTION
@@ -872,9 +868,6 @@ jnxWxGrpStatsComp OBJECT-IDENTITY
       "
     ::= { jnxWxGrpStats 3 }
 
--------------------------------------------------------------
--- Compression Statistics for each Application and Remote Wx 
--------------------------------------------------------------
 
 jnxWxGrpStatsCompTable OBJECT-TYPE
     SYNTAX  SEQUENCE OF JnxWxGrpStatsCompEntry
@@ -945,9 +938,6 @@ jnxWxGrpStatsCompCacheMisses OBJECT-TYPE
       "
     ::= { jnxWxGrpStatsCompEntry 4 }
 
------------------------------------------------------------------
--- WAN Performance Statistics for each Application and Remote Wx 
------------------------------------------------------------------
 
 jnxWxGrpStatsWanPerf OBJECT-IDENTITY
     STATUS  current