greek to me, but looks like sign off and review already happened - so no
comments here :0

On 01/31/2011 08:16 PM, Angus Salkeld wrote:
> From: Lon Hohberger <[email protected]>
> 
> Signed-off-by: Lon Hohberger <[email protected]>
> Reviewed-by: Angus Salkeld <[email protected]>
> ---
>  conf/COROSYNC-MIB.txt |  237 
> +++++++++++++++++++++++++------------------------
>  1 files changed, 119 insertions(+), 118 deletions(-)
> 
> diff --git a/conf/COROSYNC-MIB.txt b/conf/COROSYNC-MIB.txt
> index 5143190..c8a257a 100644
> --- a/conf/COROSYNC-MIB.txt
> +++ b/conf/COROSYNC-MIB.txt
> @@ -6,22 +6,23 @@ COROSYNC-MIB DEFINITIONS ::= BEGIN
>  
>  IMPORTS
>      MODULE-IDENTITY,NOTIFICATION-TYPE,
> -    Integer32,enterprises                       FROM SNMPv2-SMI
> -    TEXTUAL-CONVENTION                          FROM SNMPv2-TC
> -    SnmpAdminString                             FROM SNMP-FRAMEWORK-MIB
> -    netSnmp                                     FROM NET-SNMP-MIB
> -    InetAddressType, InetAddress                FROM INET-ADDRESS-MIB
> +    Integer32,enterprises,OBJECT-TYPE,
> +    Counter64                                   FROM SNMPv2-SMI
> +    MODULE-COMPLIANCE, OBJECT-GROUP,
> +    NOTIFICATION-GROUP                          FROM SNMPv2-CONF
>  ;
>  
>  corosync MODULE-IDENTITY
> -    LAST-UPDATED    "200911061318Z"
> +    LAST-UPDATED    "201101211300Z"
>      ORGANIZATION    "www.corosync.org"
>      CONTACT-INFO    "name:  Yuki Sato
>                       email: [email protected]"
> +    DESCRIPTION     "Add cluster quorum traps, fix smilint errors, and fix 
> notification block ID"
> +    REVISION        "201101211300Z"
>      DESCRIPTION     "MIB objects for the corosync"
> -    REVISION        "200911061318Z"
> -    DESCRIPTION     "First draft"
>      REVISION        "201003251209Z"
> +    DESCRIPTION     "First draft"
> +    REVISION        "200911061318Z"
>      DESCRIPTION
>          "Private Enterprise Number has been assigned."
>          ::= { enterprises 35488 }
> @@ -29,7 +30,9 @@ corosync MODULE-IDENTITY
>  --
>  -- top level structure
>  --
> -corosyncNotice OBJECT IDENTIFIER ::= { corosync 1 }
> +corosyncNotices OBJECT IDENTIFIER ::= { corosync 0 }
> +corosyncObjects OBJECT IDENTIFIER ::= { corosync 1 }
> +corosyncConformance OBJECT IDENTIFIER ::= { corosync 200 }
>  
>  --
>  --  corosync MIB entries
> @@ -38,149 +41,147 @@ corosyncNotice OBJECT IDENTIFIER ::= { corosync 1 }
>  --
>  -- Node Information
>  --
> -corosyncNoticeNodeStatusTable OBJECT-TYPE
> -    SYNTAX      SEQUENCE OF corosyncNoticeNodeEntry
> +corosyncObjectsNodeName OBJECT-TYPE
> +    SYNTAX      OCTET STRING (SIZE(1..64))
>      MAX-ACCESS  accessible-for-notify
>      STATUS      current
> -    DESCRIPTION
> -        "The table contains information about the nodes in the corosync."
> -::= { corosyncNotice 1 }
> +    DESCRIPTION "Hostname of the cluster node."
> +::= { corosyncObjects 1 }
>  
> -corosyncNoticeNodeEntry OBJECT-TYPE
> -    SYNTAX      corosyncNoticeNodeEntry
> -    MAX-ACCESS  accessible-for-notify
> -    STATUS      current
> -    DESCRIPTION
> -        "The entry containing information about the iface."
> -    INDEX   { corosyncNoticeNodeIndex }
> -::= { corosyncNoticeNodeStatusTable 1 }
> -
> -corosyncNoticeNodeEntry ::= SEQUENCE {
> -    corosyncNoticeNodeIndex     Integer32,
> -    corosyncNoticeNodeid        Integer32,
> -    corosyncNoticeNode          OCTET STRING,
> -    corosyncNoticeNodeStatus    INTEGER
> -}
> -
> -corosyncNoticeNodeIndex OBJECT-TYPE
> +corosyncObjectsNodeID OBJECT-TYPE
>      SYNTAX      Integer32
>      MAX-ACCESS  accessible-for-notify
>      STATUS      current
>      DESCRIPTION "The unique integer of the node."
> -::= { corosyncNoticeNodeEntry 1 }
> -
> -corosyncNoticeNodeid OBJECT-TYPE
> -    SYNTAX      Integer32
> -    MAX-ACCESS  accessible-for-notify
> -    STATUS      current
> -    DESCRIPTION "The id of the node."
> -::= { corosyncNoticeNodeEntry 2 }
> +::= { corosyncObjects 2 }
>  
> -corosyncNoticeNode OBJECT-TYPE
> -    SYNTAX      OCTET STRING (SIZE(1..64))
> +corosyncObjectsNodeStatus OBJECT-TYPE
> +    SYNTAX      INTEGER {
> +               unknown (0),
> +               joined  (1),
> +               left    (2)
> +             }
>      MAX-ACCESS  accessible-for-notify
>      STATUS      current
>      DESCRIPTION
> -        "The iface of the node."
> -::= { corosyncNoticeNodeEntry 3 }
> +        "The status of the node."
> +::= { corosyncObjects 3 }
>  
> -corosyncNoticeNodeStatus OBJECT-TYPE
> -    SYNTAX      INTEGER {
> -                unknown (0),
> -                joined  (1),
> -                left    (2)
> -            }
> +corosyncObjectsNodeAddress OBJECT-TYPE
> +    SYNTAX      OCTET STRING
>      MAX-ACCESS  accessible-for-notify
>      STATUS      current
> -    DESCRIPTION
> -        "The status change of the node."
> -::= { corosyncNoticeNodeEntry 4 }
> +    DESCRIPTION "The address of the node."
> +::= { corosyncObjects 4 }
> +
>  
>  --
> --- Iface(s) Information
> +-- Quorum Information
> +--
>  --
> -corosyncNoticeIfaceStatusTable OBJECT-TYPE
> -    SYNTAX      SEQUENCE OF corosyncNoticeIfaceEntry
> -    MAX-ACCESS  accessible-for-notify
> -    STATUS      current
> -    DESCRIPTION
> -        "The table describes the iface(s) that are used by the corosync."
> -::= { corosyncNotice 2 }
>  
> -corosyncNoticeIfaceEntry OBJECT-TYPE
> -    SYNTAX      corosyncNoticeIfaceEntry
> -    MAX-ACCESS  accessible-for-notify
> -    STATUS      current
> +-- not currently used, but here for future use
> +corosyncObjectsRingSeq OBJECT-TYPE
> +    SYNTAX   Counter64
> +    MAX-ACCESS       accessible-for-notify
> +    STATUS   current
>      DESCRIPTION
> -        "The entry containing information about the iface."
> -    INDEX   { corosyncNoticeIfaceIndex }
> -::= { corosyncNoticeIfaceStatusTable 1 }
> +     "Ring ID Sequence number"
> +::= { corosyncObjects 20 }
>  
> -corosyncNoticeIfaceEntry ::= SEQUENCE {
> -    corosyncNoticeIfaceIndex    INTEGER,
> -    corosyncNoticeIface         OCTET STRING,
> -    corosyncNoticeIfaceStatus   OCTET STRING
> -}
> -
> -corosyncNoticeIfaceIndex OBJECT-TYPE
> -    SYNTAX      Integer32
> +corosyncObjectsQuorumStatus OBJECT-TYPE
> +    SYNTAX   OCTET STRING
>      MAX-ACCESS  accessible-for-notify
>      STATUS      current
>      DESCRIPTION
> -        "The unique integer of the iface(s)."
> -::= { corosyncNoticeIfaceEntry 1 }
> +     "Quorum Status"
> +::= { corosyncObjects 21 }
>  
> -corosyncNoticeIface OBJECT-TYPE
> -    SYNTAX      OCTET STRING (SIZE(1..64))
> -    MAX-ACCESS  accessible-for-notify
> -    STATUS      current
> -    DESCRIPTION
> -        "The iface(s) of the change happened node."
> -::= { corosyncNoticeIfaceEntry 2 }
>  
> -corosyncNoticeIfaceStatus OBJECT-TYPE
> -    SYNTAX      INTEGER {
> -                unknown (0),
> -                up      (1),
> -                down    (2),
> -                faulty  (3)
> -            }
> -    MAX-ACCESS accessible-for-notify
> -    STATUS      current
> +--
> +-- Application Information
> +--
> +corosyncObjectsAppName OBJECT-TYPE
> +    SYNTAX   OCTET STRING
> +    MAX-ACCESS       accessible-for-notify
> +    STATUS   current
>      DESCRIPTION
> -        "The status change of the iface."
> -::= { corosyncNoticeIfaceEntry 3 }
> +     "Application name"
> +::= { corosyncObjects 40 }
>  
> ---corosyncNoticeIfaceStatus OBJECT-TYPE
> ---   SYNTAX     OCTET STRING (SIZE(1..1024))
> ---   MAX-ACCESS accessible-for-notify
> ---   STATUS     current
> ---   DESCRIPTION
> ---       "The iface(s) status of the change happened node."
> ---::= { corosyncNoticeIfaceEntry 3 }
> +corosyncObjectsAppStatus OBJECT-TYPE
> +    SYNTAX   OCTET STRING
> +    MAX-ACCESS       accessible-for-notify
> +    STATUS   current
> +    DESCRIPTION
> +     "Application status"
> +::= { corosyncObjects 41 }
>  
>  --
> --- Trap Information
> +-- Notification Information
>  --
> -corosyncNoticeTrap OBJECT IDENTIFIER ::= { corosync 100 }
> -
> -corosyncNoticeNodeTrap NOTIFICATION-TYPE
> -    OBJECTS
> -        { corosyncNoticeNodeid corosyncNoticeNode corosyncNoticeNodeStatus }
> +corosyncNoticesNodeStatus NOTIFICATION-TYPE
> +    OBJECTS  { corosyncObjectsNodeName,
> +               corosyncObjectsNodeID,
> +               corosyncObjectsNodeAddress,
> +               corosyncObjectsNodeStatus }
>      STATUS      current
> -    DESCRIPTION
> -        "The node status change event just happened."
> -::= { corosyncNoticeTrap 1 }
> +    DESCRIPTION "Node status change."
> +::= { corosyncNotices 1 }
>  
> -corosyncNoticeIfaceTrap NOTIFICATION-TYPE
> -    OBJECTS
> -        { corosyncNoticeNodeid corosyncNoticeIface corosyncNoticeIfaceStatus 
> }
> +corosyncNoticesQuorumStatus NOTIFICATION-TYPE
> +    OBJECTS  { corosyncObjectsNodeName,
> +               corosyncObjectsNodeID,
> +               corosyncObjectsQuorumStatus }
>      STATUS  current
> -    DESCRIPTION
> -        "The iface status change event just happened."
> -::= { corosyncNoticeTrap 2 }
> +    DESCRIPTION "Quorum status change."
> +::= { corosyncNotices 2 }
> +
> +corosyncNoticesAppStatus NOTIFICATION-TYPE
> +    OBJECTS  { corosyncObjectsNodeName,
> +               corosyncObjectsNodeID,
> +               corosyncObjectsAppName, 
> +               corosyncObjectsAppStatus }
> +    STATUS  current
> +    DESCRIPTION "Application connection status change."
> +::= { corosyncNotices 3 }
>  
> -END
>  
> +--
> +-- Compliance Information
> +--
> +corosyncCompliances OBJECT IDENTIFIER ::= { corosyncConformance 1 }
> +
> +corosyncConformanceGroups OBJECT IDENTIFIER ::= { corosyncConformance 2 }
>  
> +corosyncCompliance MODULE-COMPLIANCE
> +    STATUS      current
> +    DESCRIPTION "corosync compliance information"
> +    MODULE    -- this module
> +    MANDATORY-GROUPS { corosyncObjectGroup, corosyncNotificationGroup }
> +::= { corosyncCompliances 1 }
> +
> +corosyncObjectGroup OBJECT-GROUP
> +    OBJECTS { corosyncObjectsNodeName,
> +              corosyncObjectsNodeID,
> +              corosyncObjectsNodeStatus,
> +              corosyncObjectsNodeAddress,
> +              corosyncObjectsRingSeq,
> +              corosyncObjectsQuorumStatus,
> +           corosyncObjectsAppName,
> +           corosyncObjectsAppStatus
> +            }
> +    STATUS      current
> +    DESCRIPTION "corosync Object Conformance Group"
> +::= { corosyncConformanceGroups 1 }
> +
> +corosyncNotificationGroup NOTIFICATION-GROUP
> +    NOTIFICATIONS { corosyncNoticesNodeStatus,
> +                    corosyncNoticesQuorumStatus,
> +                 corosyncNoticesAppStatus
> +                  }
> +    STATUS      current
> +    DESCRIPTION "corosync Notification Conformance Group"
> +::= { corosyncConformanceGroups 2 }
>  
> +END

_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais

Reply via email to