Author: akarasulu
Date: Tue Dec 28 11:48:22 2004
New Revision: 123540
URL: http://svn.apache.org/viewcvs?view=rev&rev=123540
Log:
Changes ....
o added schema generation for dhcp and dnszone schemas
o edited dhcp schema due to inconsistancies with specs
- description term (DESC) was not right after NAME
- LDAP schema extensions (X-) not supported but these were NDS extensions
so we removed them
Modified:
incubator/directory/eve/trunk/core/project.properties
incubator/directory/eve/trunk/core/src/schema/dhcp.schema
Modified: incubator/directory/eve/trunk/core/project.properties
Url:
http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/core/project.properties?view=diff&rev=123540&p1=incubator/directory/eve/trunk/core/project.properties&r1=123539&p2=incubator/directory/eve/trunk/core/project.properties&r2=123540
==============================================================================
--- incubator/directory/eve/trunk/core/project.properties (original)
+++ incubator/directory/eve/trunk/core/project.properties Tue Dec 28
11:48:22 2004
@@ -15,7 +15,7 @@
# schema class generation
# =======================
-maven.eve.schemas=autofs,core,cosine,corba,eve,inetorgperson,java,krb5kdc,nis,system,scheduleworld
+maven.eve.schemas=autofs,core,cosine,corba,eve,inetorgperson,java,krb5kdc,nis,system,scheduleworld,dnszone,dhcp
maven.eve.schema.deps.autofs=system,core,cosine
maven.eve.schema.deps.corba=system,core
@@ -28,5 +28,7 @@
maven.eve.schema.deps.nis=system,core,cosine
maven.eve.schema.deps.system=
maven.eve.schema.deps.scheduleworld=system,core,cosine,inetorgperson
+maven.eve.schema.deps.dnszone=system,core
+maven.eve.schema.deps.dhcp=system,core
maven.license.licenseFile=${basedir}/../../../LICENSE.txt
Modified: incubator/directory/eve/trunk/core/src/schema/dhcp.schema
Url:
http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/core/src/schema/dhcp.schema?view=diff&rev=123540&p1=incubator/directory/eve/trunk/core/src/schema/dhcp.schema&r1=123539&p2=incubator/directory/eve/trunk/core/src/schema/dhcp.schema&r2=123540
==============================================================================
--- incubator/directory/eve/trunk/core/src/schema/dhcp.schema (original)
+++ incubator/directory/eve/trunk/core/src/schema/dhcp.schema Tue Dec 28
11:48:22 2004
@@ -1,85 +1,85 @@
attributetype ( 2.16.840.1.113719.1.203.4.1
NAME 'dhcpPrimaryDN'
- EQUALITY distinguishedNameMatch
DESC 'The DN of the dhcpServer which is the primary server for the
configuration.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.2
NAME 'dhcpSecondaryDN'
- EQUALITY distinguishedNameMatch
DESC 'The DN of dhcpServer(s) which provide backup service for the
configuration.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.3
NAME 'dhcpStatements'
- EQUALITY caseIgnoreIA5Match
DESC 'Flexible storage for specific data depending on what object this
exists in. Like conditional statements, server parameters, etc. This allows the
standard to evolve without needing to adjust the schema.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
attributetype ( 2.16.840.1.113719.1.203.4.4
NAME 'dhcpRange'
- EQUALITY caseIgnoreIA5Match
DESC 'The starting & ending IP Addresses in the range (inclusive),
separated by a hyphen; if the range only contains one address, then just the
address can be specified with no hyphen. Each range is defined as a separate
value.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
attributetype ( 2.16.840.1.113719.1.203.4.5
NAME 'dhcpPermitList'
- EQUALITY caseIgnoreIA5Match
DESC 'This attribute contains the permit lists associated with a pool.
Each permit list is defined as a separate value.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
attributetype ( 2.16.840.1.113719.1.203.4.6
NAME 'dhcpNetMask'
- EQUALITY integerMatch
DESC 'The subnet mask length for the subnet. The mask can be easily
computed from this length.'
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.7
NAME 'dhcpOption'
- EQUALITY caseIgnoreIA5Match
DESC 'Encoded option values to be sent to clients. Each value
represents a single option and contains (OptionTag, Length, OptionValue)
encoded in the format used by DHCP.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
attributetype ( 2.16.840.1.113719.1.203.4.8
NAME 'dhcpClassData'
- EQUALITY caseIgnoreIA5Match
DESC 'Encoded text string or list of bytes expressed in hexadecimal,
separated by colons. Clients match subclasses based on matching the class data
with the results of match or spawn with statements in the class name
declarations.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.9
NAME 'dhcpOptionsDN'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name(s) of the dhcpOption objects containing
the configuration options provided by the server.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.10
NAME 'dhcpHostDN'
- EQUALITY distinguishedNameMatch
DESC 'the distinguished name(s) of the dhcpHost objects.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.11
NAME 'dhcpPoolDN'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name(s) of pools.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.12
NAME 'dhcpGroupDN'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name(s) of the groups.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.13
NAME 'dhcpSubnetDN'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name(s) of the subnets.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.14
NAME 'dhcpLeaseDN'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name of a client address.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE)
attributetype ( 2.16.840.1.113719.1.203.4.15 NAME 'dhcpLeasesDN'
@@ -89,26 +89,26 @@
attributetype ( 2.16.840.1.113719.1.203.4.16
NAME 'dhcpClassesDN'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name(s) of a class(es) in a subclass.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.17
NAME 'dhcpSubclassesDN'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name(s) of subclass(es).'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.18
NAME 'dhcpSharedNetworkDN'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name(s) of sharedNetworks.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.19
NAME 'dhcpServiceDN'
- EQUALITY distinguishedNameMatch
DESC 'The DN of dhcpService object(s)which contain the configuration
information. Each dhcpServer object has this attribute identifying the DHCP
configuration(s) that the server is associated with.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
attributetype ( 2.16.840.1.113719.1.203.4.20
@@ -118,116 +118,116 @@
attributetype ( 2.16.840.1.113719.1.203.4.21
NAME 'dhcpImplementation'
- EQUALITY caseIgnoreIA5Match
DESC 'Description of the DHCP Server implementation e.g. DHCP Servers
vendor.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.22
NAME 'dhcpAddressState'
- EQUALITY caseIgnoreIA5Match
DESC 'This stores information about the current binding-status of an
address. For dynamic addresses managed by DHCP, the values should be
restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET",
"ABANDONED", "BACKUP". For other addresses, it SHOULD be one of the following:
"UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for
a specific client), "RESERVED-ACTIVE" (same as reserved, but address is
currently in use), "ASSIGNED" (assigned manually or by some other mechanism),
"UNASSIGNED", "NOTASSIGNABLE".'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.23
NAME 'dhcpExpirationTime'
- EQUALITY integerMatch
DESC 'This is the time the current lease for an address expires.'
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.24
NAME 'dhcpStartTimeOfState'
- EQUALITY integerMatch
DESC 'This is the time of the last state change for a leased address.'
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.25
NAME 'dhcpLastTransactionTime'
- EQUALITY integerMatch
DESC 'This is the last time a valid DHCP packet was received from the
client.'
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.26
NAME 'dhcpBootpFlag'
- EQUALITY integerMatch
DESC 'This indicates whether the address was assigned via BOOTP.'
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.27
NAME 'dhcpDomainName'
- EQUALITY caseIgnoreIA5Match
DESC 'This is the name of the domain sent to the client by the server.
It is essentially the same as the value for DHCP option 15 sent to the client,
and represents only the domain - not the full FQDN. To obtain the full FQDN
assigned to the client you must prepend the "dhcpAssignedHostName" to this
value with a ".".'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.28
NAME 'dhcpDnsStatus'
- EQUALITY integerMatch
DESC 'This indicates the status of updating DNS resource records on
behalf of the client by the DHCP server for this address. The value is a
16-bit bitmask.'
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.29
NAME 'dhcpRequestedHostName'
- EQUALITY caseIgnoreIA5Match
DESC 'This is the hostname that was requested by the client.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.30
NAME 'dhcpAssignedHostName'
- EQUALITY caseIgnoreIA5Match
DESC 'This is the actual hostname that was assigned to a client. It may
not be the name that was requested by the client. The fully qualified domain
name can be determined by appending the value of "dhcpDomainName" (with a dot
separator) to this name.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.31
NAME 'dhcpReservedForClient'
- EQUALITY distinguishedNameMatch
DESC 'The distinguished name of a "dhcpClient" that an address is
reserved for. This may not be the same as the "dhcpAssignedToClient" attribute
if the address is being reassigned but the current lease has not yet expired.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.32
NAME 'dhcpAssignedToClient'
- EQUALITY distinguishedNameMatch
DESC 'This is the distinguished name of a "dhcpClient" that an address
is currently assigned to. This attribute is only present in the class when the
address is leased.'
+ EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.33
NAME 'dhcpRelayAgentInfo'
- EQUALITY caseIgnoreIA5Match
DESC 'If the client request was received via a relay agent, this
contains information about the relay agent that was available from the DHCP
request. This is a hex-encoded option value.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.34
NAME 'dhcpHWAddress'
- EQUALITY caseIgnoreIA5Match
DESC 'The clients hardware address that requested this IP address.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.35
NAME 'dhcpHashBucketAssignment'
- EQUALITY caseIgnoreIA5Match
DESC 'HashBucketAssignment bit map for the DHCP Server, as defined in
DHC Load Balancing Algorithm [RFC 3074].'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.36
NAME 'dhcpDelayedServiceParameter'
- EQUALITY integerMatch
DESC 'Delay in seconds corresponding to Delayed Service Parameter
configuration, as defined in DHC Load Balancing Algorithm [RFC 3074]. '
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.37
NAME 'dhcpMaxClientLeadTime'
- EQUALITY integerMatch
DESC 'Maximum Client Lead Time configuration in seconds, as defined in
DHCP Failover Protocol [FAILOVR]'
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.38
NAME 'dhcpFailOverEndpointState'
- EQUALITY integerMatch
DESC 'Server (Failover Endpoint) state, as defined in DHCP Failover
Protocol [FAILOVR]'
+ EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
attributetype ( 2.16.840.1.113719.1.203.4.39
NAME 'dhcpErrorLog'
- EQUALITY caseIgnoreIA5Match
DESC 'Generic error log attribute that allows logging error conditions
within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.'
+ EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
# Classes
@@ -247,7 +247,7 @@
SUP top
MUST cn
MAY ( dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpStatements)
- X-NDS_CONTAINMENT ('dhcpService' ) )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.3
NAME 'dhcpSubnet'
@@ -256,7 +256,7 @@
MUST ( cn $ dhcpNetMask )
MAY ( dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $
dhcpClassesDN $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpStatements)
- X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork') )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.4
NAME 'dhcpPool'
@@ -265,7 +265,7 @@
MUST ( cn $ dhcpRange )
MAY (dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $
dhcpStatements)
- X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.5
NAME 'dhcpGroup'
@@ -273,7 +273,7 @@
SUP top
MUST cn
MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements )
- X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpService' ) )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.6
NAME 'dhcpHost'
@@ -281,7 +281,7 @@
SUP top
MUST cn
MAY (dhcpLeaseDN $ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements)
- X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' 'dhcpGroup') )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.7
NAME 'dhcpClass'
@@ -289,7 +289,7 @@
SUP top
MUST cn
MAY (dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements)
- X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' ) )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.8
NAME 'dhcpSubClass'
@@ -297,7 +297,7 @@
SUP top
MUST cn
MAY (dhcpClassData $ dhcpOptionsDN $ dhcpStatements)
- X-NDS_CONTAINMENT 'dhcpClass' )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.9
NAME 'dhcpOptions'
@@ -306,8 +306,7 @@
AUXILIARY
MUST cn
MAY ( dhcpOption )
- X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet'
- 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.10
NAME 'dhcpLeases'
@@ -319,7 +318,7 @@
dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $
dhcpReservedForClient $ dhcpAssignedToClient $
dhcpRelayAgentInfo $ dhcpHWAddress )
- X-NDS_CONTAINMENT ( 'dhcpService' 'dhcpSubnet' 'dhcpPool') )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.11
NAME 'dhcpLog'
@@ -331,8 +330,7 @@
dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $
dhcpReservedForClient $ dhcpAssignedToClient $
dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog)
- X-NDS_CONTAINMENT ('dhcpLeases' 'dhcpPool' 'dhcpSubnet'
- 'dhcpSharedNetwork' 'dhcpService' ) )
+ )
objectclass ( 2.16.840.1.113719.1.203.6.12
NAME 'dhcpServer'
@@ -340,5 +338,5 @@
SUP top
MUST (cn $ dhcpServiceDN)
MAY (dhcpVersion $ dhcpImplementation $ dhcpHashBucketAssignment $
dhcpDelayedServiceParameter $ dhcpMaxClientLeadTime $ dhcpFailOverEndpointState
$ dhcpStatements)
- X-NDS_CONTAINMENT ('o' 'ou' 'dc') )
+ )
