From patchwork Tue Nov 6 17:33:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 197517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "aserp1040.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 7FBEC2C00AE for ; Wed, 7 Nov 2012 04:33:41 +1100 (EST) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6HXbfD029212 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 17:33:38 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6HXb0J019434 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 17:33:37 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TVn1s-0007JW-V9; Tue, 06 Nov 2012 09:33:36 -0800 Received: from ucsinet22.oracle.com ([156.151.31.94]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TVn1h-0007Il-El for fedfs-utils-devel@oss.oracle.com; Tue, 06 Nov 2012 09:33:25 -0800 Received: from acsinet13.oracle.com (acsinet13.oracle.com [141.146.126.235]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6HXOth010548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 6 Nov 2012 17:33:25 GMT Received: from mail-pb0-f43.google.com ([209.85.160.43]) by acsinet13.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6HWtFt014787 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Tue, 6 Nov 2012 17:33:23 GMT Received: by mail-pb0-f43.google.com with SMTP id jt11so539025pbb.2 for ; Tue, 06 Nov 2012 09:33:23 -0800 (PST) Received: by 10.66.87.167 with SMTP id az7mr4402164pab.69.1352223203679; Tue, 06 Nov 2012 09:33:23 -0800 (PST) Received: from seurat.1015granger.net ([2001:df8:0:64:20c:29ff:fe93:815b]) by mx.google.com with ESMTPS id qd3sm12225832pbc.29.2012.11.06.09.33.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Nov 2012 09:33:22 -0800 (PST) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Tue, 06 Nov 2012 12:33:21 -0500 Message-ID: <20121106173321.26310.76455.stgit@seurat.1015granger.net> In-Reply-To: <20121106172934.26310.10982.stgit@seurat.1015granger.net> References: <20121106172934.26310.10982.stgit@seurat.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Flow-Control-Info: class=Default reputation=ipRepBelow100 ip=209.85.160.43 ct-class=R6 ct-vol1=0 ct-vol2=0 ct-vol3=0 ct-risk=68 ct-spam1=0 ct-spam2=0 ct-bulk=0 rcpts=1 size=16469 X-MM-CT-Classification: not spam X-MM-CT-RefID: str=0001.0A020206.509949E4.0077,ss=1,re=-2.300,fgs=0 Subject: [fedfs-utils] [PATCH 03/11] Update NSDB schema docs X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet21.oracle.com [141.146.126.237] Pull in schema in revision 13 of the NSDB protocol draft. The new schema introduces non-backwards-compatible changes to the FedFS NSDB protocol. These changes will be introduced to fedfs-utils in subsequent commits. Signed-off-by: Chuck Lever --- doc/ldap/fedfs-schema.ldif | 158 ++++++++------------------------------------ doc/ldap/fedfs.schema | 110 +++++-------------------------- 2 files changed, 48 insertions(+), 220 deletions(-) diff --git a/doc/ldap/fedfs-schema.ldif b/doc/ldap/fedfs-schema.ldif index 06a3048..a81b35f 100644 --- a/doc/ldap/fedfs-schema.ldif +++ b/doc/ldap/fedfs-schema.ldif @@ -1,5 +1,5 @@ # -# Copyright (c) 2010 IETF Trust and the persons identified +# Copyright (c) 2010-2012 IETF Trust and the persons identified # as authors of the code. All rights reserved. # # The authors of the code are the authors of @@ -47,7 +47,7 @@ dn: cn=schema # #--------------------------------------------------------------------- # -# objectClasses: ( 1.3.6.1.4.1.31103.1.1001 NAME 'fedfsNsdbContainerInfo' DESC 'Describes NCE location' SUP top AUXILIARY MUST ( fedfsNcePrefix ) MAY ( fedfsAnnotation $ fedfsDescr ) ) +# objectClasses: ( 1.3.6.1.4.1.31103.1.1001 NAME 'fedfsNsdbContainerInfo' DESC 'Describes NCE location' SUP top AUXILIARY MUST ( fedfsNceDN ) MAY ( fedfsAnnotation $ fedfsDescr ) ) # objectClasses: ( 1.3.6.1.4.1.31103.1.1001 @@ -55,13 +55,13 @@ objectClasses: ( DESC 'Describes NCE location' SUP top AUXILIARY - MUST ( fedfsNcePrefix ) + MUST ( fedfsNceDN ) MAY ( fedfsAnnotation $ fedfsDescr ) ) # #--------------------------------------------------------------------- # -# objectClasses: ( 1.3.6.1.4.1.31103.1.1002 NAME 'fedfsFsn' DESC 'Represents a fileset' SUP top STRUCTURAL MUST ( fedfsFsnUuid $ fedfsNsdbName ) MAY ( fedfsNsdbPort $ fedfsAnnotation $ fedfsDescr ) ) +# objectClasses: ( 1.3.6.1.4.1.31103.1.1002 NAME 'fedfsFsn' DESC 'Represents a fileset' SUP top STRUCTURAL MUST ( fedfsFsnUuid $ fedfsFsnTTL ) MAY ( fedfsAnnotation $ fedfsDescr ) ) # objectClasses: ( 1.3.6.1.4.1.31103.1.1002 @@ -69,13 +69,13 @@ objectClasses: ( DESC 'Represents a fileset' SUP top STRUCTURAL - MUST ( fedfsFsnUuid $ fedfsNsdbName ) - MAY ( fedfsNsdbPort $ fedfsAnnotation $ fedfsDescr ) + MUST ( fedfsFsnUuid $ fedfsFsnTTL ) + MAY ( fedfsAnnotation $ fedfsDescr ) ) # #--------------------------------------------------------------------- # -# objectClasses: ( 1.3.6.1.4.1.31103.1.1003 NAME 'fedfsFsl' DESC 'A physical location of a fileset' SUP top ABSTRACT MUST ( fedfsFslUuid $ fedfsFsnUuid $ fedfsNsdbName $ fedfsFslHost $ fedfsFslTTL ) MAY ( fedfsNsdbPort $ fedfsFslPort $ fedfsAnnotation $ fedfsDescr ) ) +# objectClasses: ( 1.3.6.1.4.1.31103.1.1003 NAME 'fedfsFsl' DESC 'A physical location of a fileset' SUP top ABSTRACT MUST ( fedfsFslUuid $ fedfsFsnUuid ) MAY ( fedfsAnnotation $ fedfsDescr ) ) # objectClasses: ( 1.3.6.1.4.1.31103.1.1003 @@ -83,13 +83,13 @@ objectClasses: ( DESC 'A physical location of a fileset' SUP top ABSTRACT - MUST ( fedfsFslUuid $ fedfsFsnUuid $ fedfsNsdbName $ fedfsFslHost $ fedfsFslTTL ) - MAY ( fedfsNsdbPort $ fedfsFslPort $ fedfsAnnotation $ fedfsDescr ) + MUST ( fedfsFslUuid $ fedfsFsnUuid ) + MAY ( fedfsAnnotation $ fedfsDescr ) ) # #--------------------------------------------------------------------- # -# objectClasses: ( 1.3.6.1.4.1.31103.1.1004 NAME 'fedfsNfsFsl' DESC 'An NFS location of a fileset' SUP fedfsFsl STRUCTURAL MUST ( fedfsNfsPath $ fedfsNfsMajorVer $ fedfsNfsMinorVer $ fedfsNfsCurrency $ fedfsNfsGenFlagWritable $ fedfsNfsGenFlagGoing $ fedfsNfsGenFlagSplit $ fedfsNfsTransFlagRdma $ fedfsNfsClassSimul $ fedfsNfsClassHandle $ fedfsNfsClassFileid $ fedfsNfsClassWritever $ fedfsNfsClassChange $ fedfsNfsClassReaddir $ fedfsNfsReadRank $ fedfsNfsReadOrder $ fedfsNfsWriteRank $ fedfsNfsWriteOrder $ fedfsNfsVarSub $ fedfsNfsValidFor ) ) +# objectClasses: ( 1.3.6.1.4.1.31103.1.1004 NAME 'fedfsNfsFsl' DESC 'An NFS location of a fileset' SUP fedfsFsl STRUCTURAL MUST ( fedfsNfsURI $ fedfsNfsCurrency $ fedfsNfsGenFlagWritable $ fedfsNfsGenFlagGoing $ fedfsNfsGenFlagSplit $ fedfsNfsTransFlagRdma $ fedfsNfsClassSimul $ fedfsNfsClassHandle $ fedfsNfsClassFileid $ fedfsNfsClassWritever $ fedfsNfsClassChange $ fedfsNfsClassReaddir $ fedfsNfsReadRank $ fedfsNfsReadOrder $ fedfsNfsWriteRank $ fedfsNfsWriteOrder $ fedfsNfsVarSub $ fedfsNfsValidFor ) ) # objectClasses: ( 1.3.6.1.4.1.31103.1.1004 @@ -97,43 +97,20 @@ objectClasses: ( DESC 'An NFS location of a fileset' SUP fedfsFsl STRUCTURAL - MUST ( fedfsNfsPath $ fedfsNfsMajorVer $ fedfsNfsMinorVer $ fedfsNfsCurrency $ fedfsNfsGenFlagWritable $ fedfsNfsGenFlagGoing $ fedfsNfsGenFlagSplit $ fedfsNfsTransFlagRdma $ fedfsNfsClassSimul $ fedfsNfsClassHandle $ fedfsNfsClassFileid $ fedfsNfsClassWritever $ fedfsNfsClassChange $ fedfsNfsClassReaddir $ fedfsNfsReadRank $ fedfsNfsReadOrder $ fedfsNfsWriteRank $ fedfsNfsWriteOrder $ fedfsNfsVarSub $ fedfsNfsValidFor ) + MUST ( fedfsNfsURI $ fedfsNfsCurrency $ fedfsNfsGenFlagWritable $ fedfsNfsGenFlagGoing $ fedfsNfsGenFlagSplit $ fedfsNfsTransFlagRdma $ fedfsNfsClassSimul $ fedfsNfsClassHandle $ fedfsNfsClassFileid $ fedfsNfsClassWritever $ fedfsNfsClassChange $ fedfsNfsClassReaddir $ fedfsNfsReadRank $ fedfsNfsReadOrder $ fedfsNfsWriteRank $ fedfsNfsWriteOrder $ fedfsNfsVarSub $ fedfsNfsValidFor ) ) # #--------------------------------------------------------------------- # -# attributeTypes: ( 1.3.6.1.4.1.31103.1.1 NAME 'fedfsUuid' DESC 'A UUID used by NSDB' SUP name SINGLE-VALUE ) +# attributeTypes: ( 1.3.6.1.4.1.31103.1.1 NAME 'fedfsUuid' DESC 'A UUID used by NSDB' EQUALITY uuidMatch ORDERING uuidOrderingMatch SYNTAX 1.3.6.1.1.16.1 SINGLE-VALUE ) # attributeTypes: ( 1.3.6.1.4.1.31103.1.1 NAME 'fedfsUuid' DESC 'A UUID used by NSDB' - SUP name - SINGLE-VALUE - ) -# -#--------------------------------------------------------------------- -# -# attributeTypes: ( 1.3.6.1.4.1.31103.1.2 NAME 'fedfsNetAddr' DESC 'The network name of a host or service' SUP name SINGLE-VALUE ) -# -attributeTypes: ( - 1.3.6.1.4.1.31103.1.2 - NAME 'fedfsNetAddr' - DESC 'The network name of a host or service' - SUP name - SINGLE-VALUE - ) -# -#--------------------------------------------------------------------- -# -# attributeTypes: ( 1.3.6.1.4.1.31103.1.3 NAME 'fedfsNetPort' DESC 'A transport port number of a service' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -# -attributeTypes: ( - 1.3.6.1.4.1.31103.1.3 - NAME 'fedfsNetPort' - DESC 'A transport port number of a service' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + EQUALITY uuidMatch + ORDERING uuidOrderingMatch + SYNTAX 1.3.6.1.1.16.1 SINGLE-VALUE ) # @@ -151,36 +128,25 @@ attributeTypes: ( # #--------------------------------------------------------------------- # -# attributeTypes: ( 1.3.6.1.4.1.31103.1.5 NAME 'fedfsNsdbName' DESC 'The NSDB node component of an FSN' SUP name SINGLE-VALUE ) -# -attributeTypes: ( - 1.3.6.1.4.1.31103.1.5 - NAME 'fedfsNsdbName' - DESC 'The NSDB node component of an FSN' - SUP name - SINGLE-VALUE - ) -# -#--------------------------------------------------------------------- -# -# attributeTypes: ( 1.3.6.1.4.1.31103.1.6 NAME 'fedfsNsdbPort' DESC 'The transport port number of an NSDB' SUP fedfsNetPort SINGLE-VALUE ) +# attributeTypes: ( 1.3.6.1.4.1.31103.1.11 NAME 'fedfsFsnTTL' DESC 'Time to live of an FSN tree' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) # attributeTypes: ( - 1.3.6.1.4.1.31103.1.6 - NAME 'fedfsNsdbPort' - DESC 'The transport port number of an NSDB' - SUP fedfsNetPort + 1.3.6.1.4.1.31103.1.11 + NAME 'fedfsFsnTTL' + DESC 'Time to live of an FSN tree' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) # #--------------------------------------------------------------------- # -# attributeTypes: ( 1.3.6.1.4.1.31103.1.7 NAME 'fedfsNcePrefix' DESC 'NCE prefix' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) +# attributeTypes: ( 1.3.6.1.4.1.31103.1.14 NAME 'fedfsNceDN' DESC 'NCE Distinguished Name' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE ) # attributeTypes: ( - 1.3.6.1.4.1.31103.1.7 - NAME 'fedfsNcePrefix' - DESC 'NCE prefix' + 1.3.6.1.4.1.31103.1.14 + NAME 'fedfsNceDN' + DESC 'NCE Distinguished Name' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE @@ -200,43 +166,6 @@ attributeTypes: ( # #--------------------------------------------------------------------- # -# attributeTypes: ( 1.3.6.1.4.1.31103.1.9 NAME 'fedfsFslHost' DESC 'Service location for a fileserver' SUP fedfsNetAddr SINGLE-VALUE ) -# -attributeTypes: ( - 1.3.6.1.4.1.31103.1.9 - NAME 'fedfsFslHost' - DESC 'Service location for a fileserver' - SUP fedfsNetAddr - SINGLE-VALUE - ) -# -#--------------------------------------------------------------------- -# -# attributeTypes: ( 1.3.6.1.4.1.31103.1.10 NAME 'fedfsFslPort' DESC 'The file service transport port number' SUP fedfsNetPort SINGLE-VALUE ) -# -attributeTypes: ( - 1.3.6.1.4.1.31103.1.10 - NAME 'fedfsFslPort' - DESC 'The file service transport port number' - SUP fedfsNetPort - SINGLE-VALUE - ) -# -#--------------------------------------------------------------------- -# -# attributeTypes: ( 1.3.6.1.4.1.31103.1.11 NAME 'fedfsFslTTL' DESC 'Time to live of an FSL' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -# -attributeTypes: ( - 1.3.6.1.4.1.31103.1.11 - NAME 'fedfsFslTTL' - DESC 'Time to live of an FSL' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE - ) -# -#--------------------------------------------------------------------- -# # attributeTypes: ( 1.3.6.1.4.1.31103.1.12 NAME 'fedfsAnnotation' DESC 'Annotation of an object' SUP name ) # attributeTypes: ( @@ -259,40 +188,13 @@ attributeTypes: ( # #--------------------------------------------------------------------- # -# attributeTypes: ( 1.3.6.1.4.1.31103.1.100 NAME 'fedfsNfsPath' DESC 'Server-local path to a fileset' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE ) +# attributeTypes: ( 1.3.6.1.4.1.31103.1.120 NAME 'fedfsNfsURI' DESC 'Location of fileset' SUP labeledURI SINGLE-VALUE ) # attributeTypes: ( - 1.3.6.1.4.1.31103.1.100 - NAME 'fedfsNfsPath' - DESC 'Server-local path to a fileset' - EQUALITY octetStringMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 - SINGLE-VALUE - ) -# -#--------------------------------------------------------------------- -# -# attributeTypes: ( 1.3.6.1.4.1.31103.1.101 NAME 'fedfsNfsMajorVer' DESC 'NFS major version' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -# -attributeTypes: ( - 1.3.6.1.4.1.31103.1.101 - NAME 'fedfsNfsMajorVer' - DESC 'NFS major version' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE - ) -# -#--------------------------------------------------------------------- -# -# attributeTypes: ( 1.3.6.1.4.1.31103.1.102 NAME 'fedfsNfsMinorVer' DESC 'NFS minor version' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) -# -attributeTypes: ( - 1.3.6.1.4.1.31103.1.102 - NAME 'fedfsNfsMinorVer' - DESC 'NFS minor version' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + 1.3.6.1.4.1.31103.1.120 + NAME 'fedfsNfsURI' + DESC 'Location of fileset' + SUP labeledURI SINGLE-VALUE ) # diff --git a/doc/ldap/fedfs.schema b/doc/ldap/fedfs.schema index b67509f..0880ec6 100644 --- a/doc/ldap/fedfs.schema +++ b/doc/ldap/fedfs.schema @@ -1,5 +1,5 @@ # -# Copyright (c) 2010 IETF Trust and the persons identified +# Copyright (c) 2010-2012 IETF Trust and the persons identified # as authors of the code. All rights reserved. # # The authors of the code are the authors of @@ -44,24 +44,9 @@ attributetype ( 1.3.6.1.4.1.31103.1.1 NAME 'fedfsUuid' DESC 'A UUID used by NSDB' - SUP name - SINGLE-VALUE - ) - - -attributetype ( - 1.3.6.1.4.1.31103.1.2 NAME 'fedfsNetAddr' - DESC 'The network name of a host or service' - SUP name - SINGLE-VALUE - ) - - -attributetype ( - 1.3.6.1.4.1.31103.1.3 NAME 'fedfsNetPort' - DESC 'A transport port number of a service' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + EQUALITY uuidMatch + ORDERING uuidOrderingMatch + SYNTAX 1.3.6.1.1.16.1 SINGLE-VALUE ) @@ -75,24 +60,17 @@ attributetype ( attributetype ( - 1.3.6.1.4.1.31103.1.5 NAME 'fedfsNsdbName' - DESC 'The NSDB node component of an FSN' - SUP name - SINGLE-VALUE - ) - - -attributetype ( - 1.3.6.1.4.1.31103.1.6 NAME 'fedfsNsdbPort' - DESC 'The transport port number of an NSDB' - SUP fedfsNetPort + 1.3.6.1.4.1.31103.1.11 NAME 'fedfsFsnTTL' + DESC 'Time to live of an FSN tree' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributetype ( - 1.3.6.1.4.1.31103.1.7 NAME 'fedfsNcePrefix' - DESC 'NCE prefix' + 1.3.6.1.4.1.31103.1.14 NAME 'fedfsNceDN' + DESC 'NCE Distinguished Name' EQUALITY distinguishedNameMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE @@ -108,31 +86,6 @@ attributetype ( attributetype ( - 1.3.6.1.4.1.31103.1.9 NAME 'fedfsFslHost' - DESC 'Service location for a fileserver' - SUP fedfsNetAddr - SINGLE-VALUE - ) - - -attributetype ( - 1.3.6.1.4.1.31103.1.10 NAME 'fedfsFslPort' - DESC 'The file service transport port number' - SUP fedfsNetPort - SINGLE-VALUE - ) - - -attributetype ( - 1.3.6.1.4.1.31103.1.11 NAME 'fedfsFslTTL' - DESC 'Time to live of an FSL' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE - ) - - -attributetype ( 1.3.6.1.4.1.31103.1.12 NAME 'fedfsAnnotation' DESC 'Annotation of an object' SUP name @@ -147,28 +100,9 @@ attributetype ( attributetype ( - 1.3.6.1.4.1.31103.1.100 NAME 'fedfsNfsPath' - DESC 'Server-local path to a fileset' - EQUALITY octetStringMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 - SINGLE-VALUE - ) - - -attributetype ( - 1.3.6.1.4.1.31103.1.101 NAME 'fedfsNfsMajorVer' - DESC 'NFS major version' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 - SINGLE-VALUE - ) - - -attributetype ( - 1.3.6.1.4.1.31103.1.102 NAME 'fedfsNfsMinorVer' - DESC 'NFS minor version' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + 1.3.6.1.4.1.31103.1.120 NAME 'fedfsNfsURI' + DESC 'Location of fileset' + SUP labeledURI SINGLE-VALUE ) @@ -331,7 +265,7 @@ objectclass ( DESC 'Describes NCE location' SUP top AUXILIARY MUST ( - fedfsNcePrefix + fedfsNceDN ) MAY ( fedfsAnnotation @@ -345,11 +279,10 @@ objectclass ( SUP top STRUCTURAL MUST ( fedfsFsnUuid - $ fedfsNsdbName + $ fedfsFsnTTL ) MAY ( - fedfsNsdbPort - $ fedfsAnnotation + fedfsAnnotation $ fedfsDescr )) @@ -361,14 +294,9 @@ objectclass ( MUST ( fedfsFslUuid $ fedfsFsnUuid - $ fedfsNsdbName - $ fedfsFslHost - $ fedfsFslTTL ) MAY ( - fedfsNsdbPort - $ fedfsFslPort - $ fedfsAnnotation + fedfsAnnotation $ fedfsDescr )) @@ -378,9 +306,7 @@ objectclass ( DESC 'An NFS location of a fileset' SUP fedfsFsl STRUCTURAL MUST ( - fedfsNfsPath - $ fedfsNfsMajorVer - $ fedfsNfsMinorVer + fedfsNfsURI $ fedfsNfsCurrency $ fedfsNfsGenFlagWritable $ fedfsNfsGenFlagGoing