Diff of /cisco/CISCO-ENTITY-FRU-CONTROL-MIB.my [e395ef] .. [e995bb] Maximize Restore

  Switch to side-by-side view

--- a/cisco/CISCO-ENTITY-FRU-CONTROL-MIB.my
+++ b/cisco/CISCO-ENTITY-FRU-CONTROL-MIB.my
@@ -43,7 +43,7 @@
 
 
 ciscoEntityFRUControlMIB MODULE-IDENTITY
-    LAST-UPDATED    "201103180000Z"
+    LAST-UPDATED    "201112220000Z"
     ORGANIZATION    "Cisco Systems, Inc."
     CONTACT-INFO
             "Postal: Cisco Systems, Inc.
@@ -63,6 +63,10 @@
 
         FRUs include assemblies such as power supplies, fans, 
         processor modules, interface modules, etc."
+    REVISION        "201112220000Z"
+    DESCRIPTION
+        "Added new enumeration value mdr(24) to
+        ModuleOperType Textual Convention."
     REVISION        "201103180000Z"
     DESCRIPTION
         "Added FRUCoolingUnit Textual Convention.
@@ -463,7 +467,8 @@
                               This state can be cleared by plugging
                               in the appropriate module.
 
-        mismatchConfig(10)     Module is not compatible with the current
+        mismatchConfig(10)     Module is not compatible with the
+        current
                               configuration. Module was correctly
                               provisioned earlier, however the module
                               was replaced by an incompatible module.
@@ -471,7 +476,8 @@
                               the configuration, or replacing with the
                               appropriate module.
 
-        diagFailed(11)         Module diagnostic test failed due to some
+        diagFailed(11)         Module diagnostic test failed due to
+        some
                               hardware failure.
 
         dormant(12)            Module is waiting for an external or
@@ -523,7 +529,10 @@
         upgrading(22)         Module is upgrading.
 
         okButAuthFailed(23)   Module is operational but did not pass 
-                              hardware integrity verification."
+                              hardware integrity verification.
+
+        mdr(24)               Module is undergoing a Minimum 
+                              Disruptive Restart (MDR) upgrade."
     SYNTAX          INTEGER  {
                         unknown(1),
                         ok(2),
@@ -547,7 +556,8 @@
                         okButPowerOverCritical(20),
                         syncInProgress(21),
                         upgrading(22),
-                        okButAuthFailed(23)
+                        okButAuthFailed(23),
+                        mdr(24)
                     }
 
 ModuleResetReasonType ::= TEXTUAL-CONVENTION
@@ -660,13 +670,12 @@
     DESCRIPTION
         "The unit for the cooling capacity and requirement.
 
-          cfm(1)    Cubic feet per minute
-          watts(2)  Watts"
+        cfm(1)    Cubic feet per minute
+        watts(2)  Watts"
     SYNTAX          INTEGER  {
                         cfm(1),
                         watts(2)
-    }
-
+                    }
 -- MIB variables
 
 cefcFRUPower  OBJECT IDENTIFIER
@@ -883,11 +892,11 @@
         "Current supplied by the FRU (positive values)
         or current required to operate the FRU (negative values)." 
     ::= { cefcFRUPowerStatusEntry 3 }
- 
+
 cefcFRUPowerCapability OBJECT-TYPE
     SYNTAX          BITS {
-        realTimeCurrent(0)
-    }
+                        realTimeCurrent(0)
+                    }
     MAX-ACCESS      read-only
     STATUS          current
     DESCRIPTION
@@ -895,7 +904,7 @@
         of the FRU.
 
         realTimeCurrent(0) -
-            cefcFRURealTimeCurrent is supported by the FRU."
+            cefcFRURealTimeCurrent is supported by the FRU." 
     ::= { cefcFRUPowerStatusEntry 4 }
 
 cefcFRURealTimeCurrent OBJECT-TYPE
@@ -905,8 +914,10 @@
     DESCRIPTION
         "This object indicates the realtime value of current supplied
         by the FRU (positive values) or the realtime value of current
-        drawn by the FRU (negative values)."
+        drawn by the FRU (negative values)." 
     ::= { cefcFRUPowerStatusEntry 5 }
+ 
+
 
 -- cefcMaxDefaultInLinePower
 
@@ -929,7 +940,6 @@
         the actual maximum default inline power."
     DEFVAL          { 12500 } 
     ::= { cefcFRUPower 3 }
-
 -- cefcFRUPowerSupplyValueTable
 
 cefcFRUPowerSupplyValueTable OBJECT-TYPE
@@ -1237,6 +1247,8 @@
         determined by the value of the object 
         cefcIntelliModuleIPAddrType." 
     ::= { cefcIntelliModuleEntry 2 }
+ 
+
 
 cefcModuleLocalSwitchingTable OBJECT-TYPE
     SYNTAX          SEQUENCE OF CefcModuleLocalSwitchingEntry 
@@ -1292,6 +1304,7 @@
         disabled(2) - local switching is disabled." 
     ::= { cefcModuleLocalSwitchingEntry 1 }
  
+
 -- cefcFanTrayStatusTable
 
 cefcFanTrayStatusTable OBJECT-TYPE
@@ -1349,6 +1362,7 @@
         warning(4) - partial failure, needs replacement 
                      as soon as possible." 
     ::= { cefcFanTrayStatusEntry 1 }
+ 
 
 -- cefcPhysicalTable
 
@@ -1591,19 +1605,21 @@
     DESCRIPTION
         "The maximum cooling capacity that could be provided
         for any slot in this chassis.
-        
+
         The default unit of the cooling capacity is 'cfm', if
-        cefcChassisPerSlotCoolingUnit is not supported."
+        cefcChassisPerSlotCoolingUnit is not supported." 
     ::= { cefcChassisCoolingEntry 1 }
- 
+
 cefcChassisPerSlotCoolingUnit OBJECT-TYPE
     SYNTAX          FRUCoolingUnit
     MAX-ACCESS      read-only
     STATUS          current
     DESCRIPTION
         "The unit of the maximum cooling capacity for any slot
-        in this chassis."
+        in this chassis." 
     ::= { cefcChassisCoolingEntry 2 }
+ 
+
 
 cefcFanCoolingTable OBJECT-TYPE
     SYNTAX          SEQUENCE OF CefcFanCoolingEntry 
@@ -1647,7 +1663,7 @@
         "The cooling capacity that is provided by this fan.
 
         The default unit of the fan cooling capacity is 'cfm',
-        if cefcFanCoolingCapacityUnit is not supported."
+        if cefcFanCoolingCapacityUnit is not supported." 
     ::= { cefcFanCoolingEntry 1 }
 
 cefcFanCoolingCapacityUnit OBJECT-TYPE
@@ -1655,8 +1671,10 @@
     MAX-ACCESS      read-only
     STATUS          current
     DESCRIPTION
-        "The unit of the fan cooling capacity."
+        "The unit of the fan cooling capacity." 
     ::= { cefcFanCoolingEntry 2 }
+ 
+
 
 cefcModuleCoolingTable OBJECT-TYPE
     SYNTAX          SEQUENCE OF CefcModuleCoolingEntry 
@@ -1699,17 +1717,18 @@
         cards.
 
         The default unit of the module cooling requirement is
-        'cfm', if cefcModuleCoolingUnit is not supported."
+        'cfm', if cefcModuleCoolingUnit is not supported." 
     ::= { cefcModuleCoolingEntry 1 }
- 
+
 cefcModuleCoolingUnit OBJECT-TYPE
     SYNTAX          FRUCoolingUnit
     MAX-ACCESS      read-only
     STATUS          current
     DESCRIPTION
         "The unit of the cooling requirement of the module and its
-        daughter cards."
+        daughter cards." 
     ::= { cefcModuleCoolingEntry 2 }
+ 
 
 
 cefcFanCoolingCapTable OBJECT-TYPE
@@ -1781,7 +1800,7 @@
         when the fan is operating in this mode.
 
         The default unit of the cooling capacity is 'cfm',
-        if cefcFanCoolingCapCapacityUnit is not supported."
+        if cefcFanCoolingCapCapacityUnit is not supported." 
     ::= { cefcFanCoolingCapEntry 3 }
 
 cefcFanCoolingCapCurrent OBJECT-TYPE
@@ -1799,8 +1818,9 @@
     STATUS          current
     DESCRIPTION
         "The unit of the fan cooling capacity when operating
-        in this mode."
+        in this mode." 
     ::= { cefcFanCoolingCapEntry 5 }
+ 
 
 -- Connector rating management
 
@@ -1888,6 +1908,7 @@
         "The combined power consumption to operate the module
         and its submodule(s) and inline-power device(s)." 
     ::= { cefcModulePowerConsumptionEntry 1 }
+ 
 
 
 -- notifications
@@ -1920,7 +1941,6 @@
         will prevent this notification to generated."
     DEFVAL          { false } 
     ::= { cefcMIBNotificationEnables 2 }
-
 cefcMIBNotifications  OBJECT IDENTIFIER
     ::= { cefcFRUMIBNotificationPrefix 0 }
 
@@ -2014,7 +2034,6 @@
         of the power supply's cefcPSOutputModeInOperation 
         has transitioned from 'false' to 'true'."
    ::= { cefcMIBNotifications 7 }
-
 -- conformance information
 
 cefcMIBCompliances  OBJECT IDENTIFIER
@@ -3065,9 +3084,7 @@
     ::= { cefcMIBGroups 23 }
 
 cefcMIBModuleLocalSwitchingGroup OBJECT-GROUP
-    OBJECTS         {
-                        cefcModuleLocalSwitchingMode
-                    }
+    OBJECTS         { cefcModuleLocalSwitchingMode }
     STATUS          current
     DESCRIPTION
         "The collection of objects which show information of the
@@ -3075,9 +3092,7 @@
     ::= { cefcMIBGroups 24 }
 
 cefcFRUPowerRealTimeStatusGroup OBJECT-GROUP
-    OBJECTS         {
-                        cefcFRURealTimeCurrent
-                    }
+    OBJECTS         { cefcFRURealTimeCurrent }
     STATUS          current
     DESCRIPTION
         "The collection of objects provide the power-related
@@ -3085,9 +3100,7 @@
     ::= { cefcMIBGroups 25 }
 
 cefcFRUPowerCapabilityGroup OBJECT-GROUP
-    OBJECTS         {
-                        cefcFRUPowerCapability
-                    }
+    OBJECTS         { cefcFRUPowerCapability }
     STATUS          current
     DESCRIPTION
         "The collection of objects provide the power-related
@@ -3128,9 +3141,7 @@
     ::= { cefcMIBGroups 29 }
 
 cefcFanCoolingGroup OBJECT-GROUP
-    OBJECTS         {
-                        cefcFanCoolingCapacity
-                    }
+    OBJECTS         { cefcFanCoolingCapacity }
     STATUS          current
     DESCRIPTION
         "The collection of objects provide the cooling
@@ -3143,3 +3154,4 @@
 
 
 
+