Attachment #5666 for bug #33223




		self.exceptions=[]

		# remove all properties which do not belong to chosen options

		chosen_options = None
		descriptions = None

		try:
			# these might not be set by an inheriting module
			chosen_options = self.options
			descriptions = self.descriptions
		except:
			chosen_options = None
			descriptions = None

		if chosen_options and descriptions:
			for desc in descriptions:

			self.policyObjects[policy_type]=univention.admin.objects.get(policy_module, None, self.lo, policy_position)
			self.policyObjects[policy_type].copyIdentifier(self)
			self._init_ldap_search( self.policyObjects[ policy_type ] )
		else:
			pass

		return self.policyObjects[policy_type]


						modify(rdn, zone)
					except univention.admin.uexceptions.noObject:
						pass

	def __add_dns_reverse_object( self, name, zoneDn, ip ):
		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should create a dns reverse object: zoneDn="%s", name="%s", ip="%s"' % ( zoneDn, name, ip ) )
		if name and zoneDn and ip:

			else:
				# thow exeption, cNAMERecord is single value
				raise univention.admin.uexceptions.dnsAliasAlreadyUsed, _('DNS alias is already in use.')
		pass

	def __remove_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias = None ):
		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'remove a dns alias object: name="%s", dnsForwardZone="%s", dnsAliasZoneContainer="%s", alias="%s"' % ( name, dnsForwardZone, dnsAliasZoneContainer, alias ) )

			self.__update_groups_after_namechange()
			self.__rename_dhcp_object( position = None, old_name = self.__changes[ 'name' ][ 0 ], new_name = self.__changes[ 'name' ][ 1 ] )
			self.__rename_dns_object( position = None, old_name = self.__changes[ 'name' ][ 0 ], new_name = self.__changes[ 'name' ][ 1 ] )
			pass

		if self.ipRequest == 1 and self[ 'ip' ]:
			for ipAddress in self[ 'ip' ]:

							self.__saved_dhcp_entry = network_object['dhcpEntryZone']

					self.old_network=value
				else:
					pass


		elif key == 'ip':
			self.ip_freshly_set = True
- 
--
.../modules/univention/admin/handlers/__init__.py  | 28 +++++++---------------
.../univention/admin/handlers/dhcp/service.py      |  3 +--
.../univention/admin/handlers/dhcp/sharedsubnet.py |  2 +-
.../univention/admin/handlers/dhcp/subnet.py       |  4 ++--
4 files changed, 12 insertions(+), 25 deletions(-)




			for desc in descriptions:
				propoptions = descriptions[desc].options

				if not propoptions:
					# property applies to all options
					continue

				if set(propoptions) & set(chosen_options):
					# this property applies to one of the chosen options,
					# jump to next option
					if i in chosen_options:
						# this property applies to one of the chosen options,
						# jump to next option
						shortcut = True
						continue
				if shortcut:
					continue

				# if we've come here, we found a property that does not apply


	def _ldap_post_modify( self ):

		self.__multiip |= len(self['mac']) > 1 or len(self['ip']) > 1
			self.__multiip = True

		for entry in self.__changes[ 'dhcpEntryZone' ][ 'remove' ]:
			univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'simpleComputer: dhcp check: removed: %s' % entry )

				else:
					raise univention.admin.uexceptions.invalidDNSAliasEntry, _('The DNS alias entry for this host should contain the zone name, the alias zone container LDAP-DN and the alias.')

		self.__multiip = len(self['mac']) > 1 or len(self['ip']) > 1
			self.__multiip = False
		else:
			self.__multiip = True

		ml += super(simpleComputer, self)._ldap_modlist()

		return ml


				if self.hasChanged(key):
					univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'polinfo: key:%s hasChanged' % (key) )
					self.changes=1
			return
			else:
				return

		# this object did not exist before
		if not self.oldinfo:

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-2 / +1 lines)

Lines 123-127 def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0,	Link Here

123

	return res

123

	return res

124

125

def identify(dn, attr):

125

def identify(dn, attr):

126

	return 'dhcpService' in attr.get('objectClass', []) \

126

	return bool(set(('dhcpService', 'univentionDhcpService')) & set(attr.get('objectClass', [])))

127

		or 'univentionDhcpService' in attr.get('objectClass', [])

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-1 / +1 lines)

Lines 171-174 def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0,	Link Here

171

	return res

171

	return res

172

173

def identify(dn, attr):

173

def identify(dn, attr):

174

	return 'univentionDhcpSubnet' in attr.get('objectClass', []) and 'univentionDhcpSharedSubnet' in attr.get('objectClass', [])

174

	return set(('univentionDhcpSubnet', 'univentionDhcpSharedSubnet')) <= set(attr.get('objectClass', []))




	return res

def identify(dn, attr):
	ocs = set(attr.get('objectClass', []))
	return 'univentionDhcpSubnet' in ocs and not 'univentionDhcpSharedSubnet' in ocs
- 
--
.../modules/univention/admin/handlers/__init__.py  | 31 +++++++++++-----------
.../modules/univention/admin/handlers/dhcp/pool.py |  1 -
.../univention/admin/handlers/dhcp/sharedsubnet.py |  2 --
.../univention/admin/handlers/dhcp/subnet.py       |  4 +--
4 files changed, 16 insertions(+), 22 deletions(-)




import copy
import types
import re
import string
import ldap
import ipaddr


		zoneName.reverse( )
		relativeDomainName = relativeDomainName.split( '.' )
		relativeDomainName.reverse( )
		return '.'.join(zoneName + relativeDomainName)

	def __ip_from_ptr_ipv6( self, zoneName, relativeDomainName ):
		fullName = relativeDomainName + '.' + zoneName.replace('.ip6.arpa', '')

							poscomponents = univention.admin.uldap.explodeDn( dn,0 )
							poscomponents.pop( 0 )
							ip = self.__ip_from_ptr( attr[ 'zoneName' ][ 0 ], attr[ 'relativeDomainName' ][ 0 ] )
							entry = [','.join(poscomponents), ip]
							if not entry in self[ 'dnsEntryZoneReverse' ]:
								self[ 'dnsEntryZoneReverse' ].append( entry )
					except univention.admin.uexceptions.insufficientInformation, msg:

							self[ 'dnsAlias' ].append(dnsAlias)
							poscomponents = univention.admin.uldap.explodeDn( dn,0 )
							poscomponents.pop( 0 )
							dnsAliasZoneContainer = ','.join(poscomponents)
							if attr[ 'cNAMERecord' ][0] == self[ 'name' ]:
								dnsForwardZone = attr[ 'zoneName' ][0]
							else:

							poscomponents.pop( 0 )
							if attr.has_key( 'univentionDhcpFixedAddress' ):
								for ip in attr[ 'univentionDhcpFixedAddress' ]:
									entry = [','.join(poscomponents), ip, macAddress]
									if not entry in self[ 'dhcpEntryZone' ]:
										self[ 'dhcpEntryZone' ].append( entry )

							else:
								entry = [','.join(poscomponents), macAddress]
								if not entry in self[ 'dhcpEntryZone' ]:
									self[ 'dhcpEntryZone' ].append( entry )
						univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'open: DHCP; self[ dhcpEntryZone ] = "%s"' % self[ 'dhcpEntryZone' ] )

			results = self.lo.search( base = tmppos.getBase( ), scope = 'domain', attr = [ 'zoneDn' ], filter = '(&(objectClass=dNSZone)(|(pTRRecord=%s)(pTRRecord=%s.*)))' % ( name, name ), unique = 0 )
			for dn, attr in results:
				univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: dn: "%s"' % dn )
				zone = ','.join(ldap.explode_dn(dn)[1:])
				univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: zone: "%s"' % zone )
				rdn = self.calc_dns_reverse_entry_name( ip, zone )
				univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: rdn: "%s"' % rdn )

			else:
				subnet = ldap.explode_dn( zoneDn, 1 )[ 0 ].replace( '.in-addr.arpa', '' ).split( '.' )
				subnet.reverse( )
				subnet = '.'.join(subnet) + '.'
				ipPart = ip.replace( subnet, '' )
				if ipPart == ip:
					raise univention.admin.uexceptions.InvalidDNS_Information, _( 'Reverse zone and IP address are incompatible.' )
				pointer = ipPart.split('.')
				pointer.reverse( )
				ipPart = '.'.join(pointer)
				tmppos = univention.admin.uldap.position( self.position.getDomain( ) )
				# check in which forward zone the ip is set
				hostname_list = []

						# remove the object
						self.lo.delete( dn )
						if not zoneDn:
							zone = ','.join(ldap.explode_dn(dn)[1:])
						else:
							zone = zoneDn


						self.lo.modify(dn, [(attrEdit, attr[attrEdit], new_ip_list, ), ])

						if not zoneDn:
							zone = ','.join(ldap.explode_dn(dn)[1:])
						else:
							zone = zoneDn


						modlist.append( ('aRecord', old_aRecord, new_aRecord, ) )
				self.lo.modify(dn, modlist)
				if not zoneDn:
					zone = ','.join(ldap.explode_dn(dn)[1:])

			if zoneDn:
				zone = zoneDn

					if len (self[ 'mac' ] ) > 0:
						dn = self.__remove_from_dhcp_object(  None, self[ 'name' ], entry,  self[ 'mac' ][ 0 ])
						try:
							dn = ','.join(dn.split(',')[1:])
							self.__modify_dhcp_object( dn, self[ 'name' ], self.__changes[ 'ip' ][ 'add' ][ 0 ],  self[ 'mac' ][ 0 ] )
						except:
							pass


	def __remove_associated_domain( self, entry ):
		dn, ip = self.__split_dns_line( entry )
		domain = ldap.explode_rdn(dn)[0].split('=', 1)[1]
		if self.info.get('domain', None) == domain:
			self.info['domain'] = None

	def __set_associated_domain( self, entry ):
		dn, ip = self.__split_dns_line( entry )
		domain = ldap.explode_rdn(dn)[0].split('=', 1)[1]
		if not self.info.get('domain', None):
			self.info['domain'] = domain


(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-1 lines)

Lines 31-37	Link Here

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import copy

import copy

import string

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-2 lines)

Lines 30-37	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import string

from univention.admin.layout import Tab, Group

from univention.admin.layout import Tab, Group

import univention.admin.filter

import univention.admin.filter

import univention.admin.handlers

import univention.admin.handlers




# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

import string

from univention.admin.layout import Tab, Group
import univention.admin.filter
import univention.admin.handlers

						raise univention.admin.uexceptions.rangeInBroadcastAddress, '%s-%s' % (i[0], i[1])

				if ip_in_network:
					dhcpRange.append(' '.join(i))
				else:
					raise univention.admin.uexceptions.rangeNotInNetwork, '%s-%s' % (i[0], i[1])
			#univention.debug.debug(univention.debug.ADMIN, univention.debug.ERROR, 'old Range: %s' % self.oldinfo['range'])
- 
--
.../modules/univention/admin/handlers/dhcp/__common.py           | 9 +--------
.../modules/univention/admin/handlers/dhcp/pool.py               | 3 ---
.../modules/univention/admin/handlers/dhcp/shared.py             | 7 -------
.../modules/univention/admin/handlers/dhcp/sharedsubnet.py       | 3 ---
.../modules/univention/admin/handlers/dhcp/subnet.py             | 3 ---
5 files changed, 1 insertion(+), 24 deletions(-)




import copy

import univention.admin.localization
from univention.admin.layout import Tab

translation = univention.admin.localization.translation( 'univention.admin.handlers.dhcp' )
_ = translation.translate

		),
}

# def optionMap( value ):
# 	return map( lambda x: ' '.join( x ), value )

# def optionUnmap( value ):
# 	return map( lambda x: x.split( ' ', 1 ), value )

_mappings = (
	# ( 'option', 'dhcpOption', optionMap, optionUnmap ),
	( 'option', 'dhcpOption', None, univention.admin.mapping.ListToString ),
	)


(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-3 lines)

Lines 124-132 property_descriptions={	Link Here

124

),

124

),

125

126

127

options={

128

129

130

layout = [

127

layout = [

131

	Tab(_('General'), _('Basic settings'), layout = [

128

	Tab(_('General'), _('Basic settings'), layout = [

132

		Group( _( 'General' ), layout = [

129

		Group( _( 'General' ), layout = [




			identifies=1
		)
}
options={
}

layout = [
	Tab( _( 'General' ), _( 'Basic settings' ), layout = [


		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

	def open(self):
		univention.admin.handlers.simpleLdap.open(self)

		self.save()

	def _ldap_pre_create(self):
		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())


(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-3 lines)

Lines 91-99 property_descriptions={	Link Here

),

),

options={

layout = [

layout = [

	Tab(_('General'), _('Basic settings'), layout = [

	Tab(_('General'), _('Basic settings'), layout = [

		Group( _( 'General' ), layout = [

		Group( _( 'General' ), layout = [




		),
}

options={
}

layout = [
	Tab( _( 'General' ), _('Basic settings'), layout = [
		Group( _( 'General' ), layout = [
- 
--
.../modules/univention/admin/handlers/dhcp/__common.py           | 9 +++++++++
.../modules/univention/admin/handlers/dhcp/pool.py               | 5 +----
.../modules/univention/admin/handlers/dhcp/sharedsubnet.py       | 5 +----
.../modules/univention/admin/handlers/dhcp/subnet.py             | 6 +-----
4 files changed, 12 insertions(+), 13 deletions(-)

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (+9 lines)

Lines 51-56 _properties = {	Link Here

),

),

def rangeMap(value):

	return map(lambda x: ' '.join(x), value)

def rangeUnmap(value):

	return map(lambda x: x.split(), value)

_mappings = (

_mappings = (

	( 'option', 'dhcpOption', None, univention.admin.mapping.ListToString ),

	( 'option', 'dhcpOption', None, univention.admin.mapping.ListToString ),

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-4 / +1 lines)

Lines 138-148 layout = [	Link Here

138

] )

138

] )

139

140

141

def rangeMap( value ):

142

	return map( lambda x: ' '.join( x ), value )

143

141

144

def rangeUnmap( value ):

142

from .__common import rangeMap, rangeUnmap

145

	return map( lambda x: x.split( ' ' ), value )

146

143

147

mapping=univention.admin.mapping.mapping()

144

mapping=univention.admin.mapping.mapping()

148

mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

145

mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-4 / +1 lines)

Lines 101-111 layout = [	Link Here

101

	] ),

101

	] ),

102

103

104

def rangeMap( value ):

105

	return map( lambda x: ' '.join( x ), value ) or None

106

104

107

def rangeUnmap( value ):

105

from .__common import rangeMap, rangeUnmap

108

	return map( lambda x: x.split( ' ' ), value )

109

106

110

mapping=univention.admin.mapping.mapping()

107

mapping=univention.admin.mapping.mapping()

111

mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)

108

mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)




	] ),
]

from .__common import rangeUnmap
	return map( lambda x: ' '.join( x ), value )

def rangeUnmap( value ):
	return map( lambda x: x.split(), value )

mapping=univention.admin.mapping.mapping()
mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)
- 
--
.../modules/univention/admin/handlers/dhcp/__common.py                | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)






_mappings = (
	('option', 'dhcpOption', None, None),
)

def add_dhcp_options( properties, mapping, layout ):
	global _properties, _mappings
- 
--
.../modules/univention/admin/handlers/dhcp/__common.py                 | 2 --
.../modules/univention/admin/handlers/dhcp/dhcp.py                     | 3 ---
.../modules/univention/admin/handlers/dhcp/host.py                     | 3 ---
.../modules/univention/admin/handlers/dhcp/pool.py                     | 3 ---
.../modules/univention/admin/handlers/dhcp/server.py                   | 3 ---
.../modules/univention/admin/handlers/dhcp/service.py                  | 3 ---
.../modules/univention/admin/handlers/dhcp/shared.py                   | 3 ---
.../modules/univention/admin/handlers/dhcp/sharedsubnet.py             | 3 ---
.../modules/univention/admin/handlers/dhcp/subnet.py                   | 3 ---
9 files changed, 26 deletions(-)

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (-2 lines)

Lines 65-72 _mappings = (	Link Here

def add_dhcp_options( properties, mapping, layout ):

def add_dhcp_options( properties, mapping, layout ):

	global _properties, _mappings

	for name, prop in _properties.items():

	for name, prop in _properties.items():

		properties[ name ] = prop

		properties[ name ] = prop

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/dhcp.py (-3 lines)

Lines 93-101 class object(univention.admin.handlers.simpleLdap):	Link Here

	module=module

	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

		global mapping

		global property_descriptions

		self.mapping=mapping

		self.mapping=mapping

100

		self.descriptions=property_descriptions

		self.descriptions=property_descriptions

101

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-3 lines)

Lines 118-126 class object(univention.admin.handlers.simpleLdap):	Link Here

118

	module=module

118

	module=module

119

120

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

120

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

121

		global mapping

122

		global property_descriptions

123

124

		self.mapping=mapping

121

		self.mapping=mapping

125

		self.descriptions=property_descriptions

122

		self.descriptions=property_descriptions

126

123

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-3 lines)

Lines 150-158 class object(univention.admin.handlers.simpleLdap):	Link Here

150

	module=module

150

	module=module

151

152

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

152

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

153

		global mapping

154

		global property_descriptions

155

156

		self.mapping=mapping

153

		self.mapping=mapping

157

		self.descriptions=property_descriptions

154

		self.descriptions=property_descriptions

158

155

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-3 lines)

Lines 81-89 class object(univention.admin.handlers.simpleLdap):	Link Here

	module=module

	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

		global mapping

		global property_descriptions

		self.superordinate=superordinate

		self.superordinate=superordinate

		self.mapping=mapping

		self.mapping=mapping

		self.descriptions=property_descriptions

		self.descriptions=property_descriptions

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-3 lines)

Lines 79-87 class object(univention.admin.handlers.simpleLdap):	Link Here

	module=module

	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

		global mapping

		global property_descriptions

		self.mapping=mapping

		self.mapping=mapping

		self.descriptions=property_descriptions

		self.descriptions=property_descriptions

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-3 lines)

Lines 76-84 class object(univention.admin.handlers.simpleLdap):	Link Here

	module=module

	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

		global mapping

		global property_descriptions

		self.mapping=mapping

		self.mapping=mapping

		self.descriptions=property_descriptions

		self.descriptions=property_descriptions

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-3 lines)

Lines 118-126 class object(univention.admin.handlers.simpleLdap):	Link Here

118

	module=module

118

	module=module

119

120

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

120

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

121

		global mapping

122

		global property_descriptions

123

124

		self.superordinate=superordinate

121

		self.superordinate=superordinate

125

		self.mapping=mapping

122

		self.mapping=mapping

126

		self.descriptions=property_descriptions

123

		self.descriptions=property_descriptions




	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
		global mapping
		global property_descriptions

		self.superordinate=superordinate
		self.mapping=mapping
		self.descriptions=property_descriptions
- 
properties
--
.../modules/univention/admin/handlers/dhcp/pool.py | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)




property_descriptions={
	'name': univention.admin.property(
			short_description=_('Name'),
			long_description=_('A unique name used to identify this pool, e.g. "known" or "guests"'),
			syntax=univention.admin.syntax.string,
			multivalue=0,
			include_in_default_search=1,

		),
	'failover_peer': univention.admin.property(
			short_description=_('Failover peer'),
			long_description=_('The name of a failover configuration manually configured in /etc/dhcp/local.conf.'),
			syntax=univention.admin.syntax.string,
			multivalue=0,
			options=[],

			identifies=0,
		),
	'known_clients': univention.admin.property(
			short_description=_('Give IP to known clients'),
			long_description=_('Addresses are allocated for client, which have a host entry matching their MAC address.'),
			syntax=univention.admin.syntax.AllowDeny,
			multivalue=0,
			options=[],

			identifies=0
		),
	'unknown_clients': univention.admin.property(
			short_description=_('Give IP to unknown clients'),
			long_description=_('Addresses are allocated for clients, which do not have a host entry mating their MAC address.'),
			syntax=univention.admin.syntax.AllowDeny,
			multivalue=0,
			options=[],

			identifies=0
		),
	'dynamic_bootp_clients': univention.admin.property(
			short_description=_('Give IP to dynamic BOOTP clients'),
			long_description=_(
				'Give addresses to clients using the legacy BOOTP protocol.'
				'Since BOOTP does not support an expiry date or a release mechanism, addresses are allocated indefinitely!'),
			syntax=univention.admin.syntax.AllowDeny,
			multivalue=0,
			options=[],

			identifies=0
		),
	'all_clients': univention.admin.property(
			short_description=_('Give IP from this pool'),
			long_description=_('Give addresses from this pool at all or not.'),
			syntax=univention.admin.syntax.AllowDeny,
			multivalue=0,
			options=[],
- 
--
.../modules/univention/admin/handlers/dhcp/dhcp.py                 | 2 +-
.../modules/univention/admin/handlers/dhcp/host.py                 | 2 +-
.../modules/univention/admin/handlers/dhcp/pool.py                 | 7 +++----
.../modules/univention/admin/handlers/dhcp/server.py               | 2 +-
.../modules/univention/admin/handlers/dhcp/service.py              | 2 +-
.../modules/univention/admin/handlers/dhcp/shared.py               | 2 +-
.../modules/univention/admin/handlers/dhcp/sharedsubnet.py         | 2 +-
.../modules/univention/admin/handlers/dhcp/subnet.py               | 6 +++---
8 files changed, 12 insertions(+), 13 deletions(-)

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/dhcp.py (-1 / +1 lines)

Lines 96-102 class object(univention.admin.handlers.simpleLdap):	Link Here

		self.mapping=mapping

		self.mapping=mapping

		self.descriptions=property_descriptions

		self.descriptions=property_descriptions

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

100

101

102

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):

102

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-1 / +1 lines)

Lines 126-132 class object(univention.admin.handlers.simpleLdap):	Link Here

126

		if not dn and not position:

126

		if not dn and not position:

127

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

127

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

128

129

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

129

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

130

131

	def _ldap_pre_create(self):

131

	def _ldap_pre_create(self):

132

		self.dn='%s=%s,%s' % (mapping.mapName('host'), mapping.mapValue('host', self.info['host']), self.position.getDn())

132

		self.dn='%s=%s,%s' % (mapping.mapName('host'), mapping.mapValue('host', self.info['host']), self.position.getDn())




		if not dn and not position:
			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

	def open(self):
		super(object, self).open()
		univention.admin.handlers.simpleLdap.open(self)

		for i in self.oldattr.get('dhcpPermitList', []):
			pos=i.find(' ')

		]
	
	def _ldap_modlist(self):
		ml = super(object, self)._ldap_modlist()
		if self.hasChanged(['known_clients', 'unknown_clients', 'dynamic_bootp_clients', 'all_clients']):
			old=self.oldattr.get('dhcpPermitList', [])
			new=copy.deepcopy(old)

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-1 / +1 lines)

Lines 90-96 class object(univention.admin.handlers.simpleLdap):	Link Here

		if not dn and not position:

		if not dn and not position:

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

	def _ldap_pre_create(self):

	def _ldap_pre_create(self):

		self.dn='%s=%s,%s' % (mapping.mapName('server'), mapping.mapValue('server', self.info['server']), self.position.getDn())

		self.dn='%s=%s,%s' % (mapping.mapName('server'), mapping.mapValue('server', self.info['server']), self.position.getDn())

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-1 / +1 lines)

Lines 85-91 class object(univention.admin.handlers.simpleLdap):	Link Here

		if not dn and not position:

		if not dn and not position:

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

	def _ldap_pre_create(self):

	def _ldap_pre_create(self):

		self.dn='%s=%s,%s' % (mapping.mapName('service'), mapping.mapValue('service', self.info['service']), self.position.getDn())

		self.dn='%s=%s,%s' % (mapping.mapName('service'), mapping.mapValue('service', self.info['service']), self.position.getDn())

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-1 / +1 lines)

Lines 84-90 class object(univention.admin.handlers.simpleLdap):	Link Here

		if not dn and not position:

		if not dn and not position:

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

	def _ldap_pre_create(self):

	def _ldap_pre_create(self):

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-1 / +1 lines)

Lines 127-133 class object(univention.admin.handlers.simpleLdap):	Link Here

127

		if not dn and not position:

127

		if not dn and not position:

128

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

128

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

129

130

		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )

130

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

131

132

	def _ldap_pre_create(self):

132

	def _ldap_pre_create(self):

133

		self.dn='%s=%s,%s' % (mapping.mapName('subnet'), mapping.mapValue('subnet', self.info['subnet']), self.position.getDn())

133

		self.dn='%s=%s,%s' % (mapping.mapName('subnet'), mapping.mapValue('subnet', self.info['subnet']), self.position.getDn())




		if not dn and not position:
			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)


	def open(self):
		super(object, self).open()
		self.info['range'] = rangeUnmap( self.oldattr.get('dhcpRange', []) )
		self.oldinfo['range'] = rangeUnmap( self.oldattr.get('dhcpRange', []) )



	def _ldap_modlist(self):

		ml = super(object, self)._ldap_modlist()

		if self.hasChanged('range'):
			dhcpRange=[]
- 
super class
--
.../univention/admin/handlers/dhcp/__common.py     | 17 ++++++++++++
.../modules/univention/admin/handlers/dhcp/host.py | 27 +++++++++----------
.../modules/univention/admin/handlers/dhcp/pool.py | 25 ++++++++---------
.../univention/admin/handlers/dhcp/server.py       | 25 ++++++++---------
.../univention/admin/handlers/dhcp/service.py      | 31 ++++++++++------------
.../univention/admin/handlers/dhcp/shared.py       | 27 ++++++++++---------
.../univention/admin/handlers/dhcp/sharedsubnet.py | 27 +++++++++----------
.../univention/admin/handlers/dhcp/subnet.py       | 27 +++++++++----------
8 files changed, 106 insertions(+), 100 deletions(-)





import univention.admin.localization
from univention.admin.layout import Tab
from univention.admin.handlers import simpleLdap

translation = univention.admin.localization.translation( 'univention.admin.handlers.dhcp' )
_ = translation.translate

	# currently not visible
	#layout.append( Tab( _( 'Advanced' ), _( 'Advanced DHCP options' ), layout = [ 'option' ] ) )


class SimpleDhcp(simpleLdap):
	@classmethod
	def lookup(cls, co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
		filter_str = unicode(cls.lookup_filter(filter_s))
		res = [
			cls(co, lo, None, dn=dn, superordinate=superordinate, attributes=attrs)
			for dn, attrs in lo.search(filter_str, base, scope, [], unique, required, timeout, sizelimit)
		]
		return res


class DhcpOptions(SimpleDhcp):
	pass


def add_dhcp_objectclass( self, ml ):
	oldOCs = self.oldattr.get( 'objectClass', [] )
	newOCs = copy.copy( oldOCs )

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-14 / +13 lines)

Lines 114-120 mapping.register('host', 'cn', None, univention.admin.mapping.ListToString)	Link Here

114

mapping.register('hwaddress', 'dhcpHWAddress', mapHWAddress, unmapHWAddress)

114

mapping.register('hwaddress', 'dhcpHWAddress', mapHWAddress, unmapHWAddress)

115

mapping.register('fixedaddress', 'univentionDhcpFixedAddress')

115

mapping.register('fixedaddress', 'univentionDhcpFixedAddress')

116

117

class object(univention.admin.handlers.simpleLdap):

117

from .__common import DhcpOptions

118

119

120

class object(DhcpOptions):

118

	module=module

121

	module=module

119

122

120

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

123

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

Lines 136-156 class object(univention.admin.handlers.simpleLdap):	Link Here

136

			('objectClass', ['top', 'univentionDhcpHost']),

139

			('objectClass', ['top', 'univentionDhcpHost']),

137

140

138

141

139

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):

142

	@staticmethod

140

143

	def lookup_filter(filter_s=None, lo=None):

141

	filter=univention.admin.filter.conjunction('&', [

144

		filter_obj = univention.admin.filter.conjunction('&', [

142

	univention.admin.filter.expression('objectClass', 'univentionDhcpHost')

145

			univention.admin.filter.expression('objectClass', 'univentionDhcpHost')

143

])

146

])

147

		filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)

148

		return filter_obj

144

149

145

	if filter_s:

146

		filter_p=univention.admin.filter.parse(filter_s)

147

		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)

148

		filter.expressions.append(filter_p)

149

150

	res=[]

151

lookup_filter = object.lookup_filter

151

	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):

152

lookup = object.lookup

152

		res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))

153

	return res

154

153

155

def identify(dn, attr):

154

def identify(dn, attr):

156

155




]


from .__common import rangeMap, rangeUnmap, DhcpOptions

mapping=univention.admin.mapping.mapping()
mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)
mapping.register('range', 'dhcpRange', rangeMap, rangeUnmap)
mapping.register('failover_peer', 'univentionDhcpFailoverPeer', None, univention.admin.mapping.ListToString)

class object(DhcpOptions):
	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

			raise univention.admin.uexceptions.bootpXORFailover
		return ml

	@staticmethod
	def lookup_filter(filter_s=None, lo=None):
		filter_obj = univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('objectClass', 'univentionDhcpPool')
		])
		filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
		return filter_obj

	filter=univention.admin.filter.conjunction('&', [
	univention.admin.filter.expression('objectClass', 'univentionDhcpPool')
	])

lookup_filter = object.lookup_filter
lookup = object.lookup
		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
		filter.expressions.append(filter_p)

	res=[]
	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):
		res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))
	return res

def identify(dn, attr):
	return 'univentionDhcpPool' in attr.get('objectClass', [])




		shadow_module, shadow_object=univention.admin.objects.shadow(self.lo, module, object, self.position)
		self.lo.modify(self.dn, [('dhcpServiceDN', oldServiceDN[0], shadow_object.dn)])

def lookup_filter(filter_s=None, lo=None):
	filter_obj=univention.admin.filter.conjunction('&', [
	filter=univention.admin.filter.conjunction('&', [
	univention.admin.filter.expression('objectClass', 'dhcpServer')
	])
	filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
	return filter_obj

	if superordinate:
		filter.expressions.append(univention.admin.filter.expression('dhcpServiceDN', superordinate.dn))

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
	filter_obj = lookup_filter(filter_s)
	if superordinate:
		filter_obj.expressions.append(univention.admin.filter.expression('dhcpServiceDN', superordinate.dn))
	filter_str = unicode(filter_obj)

	res = [
		object(co, lo, None, dn=dn, superordinate=superordinate, attributes=attrs)
		for dn, attrs in lo.search(filter_str, base, scope, [], unique, required, timeout, sizelimit)
	]
	return res

def identify(dn, attr):




mapping=univention.admin.mapping.mapping()
mapping.register('service', 'cn', None, univention.admin.mapping.ListToString)

from .__common import add_dhcp_options, add_dhcp_objectclass, DhcpOptions

add_dhcp_options( property_descriptions, mapping, layout )

class object(DhcpOptions):
	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):


		return add_dhcp_objectclass( self, ml )

	@staticmethod
	def lookup_filter(filter_s=None, lo=None):
		filter_obj = univention.admin.filter.conjunction('&', [
			univention.admin.filter.conjunction('|', [
				univention.admin.filter.expression('objectClass', 'dhcpService'),
				univention.admin.filter.expression('objectClass', 'univentionDhcpService')
			])
		])
		filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
		return filter_obj


lookup_filter = object.lookup_filter
lookup = object.lookup
		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
		filter.expressions.append(filter_p)

	res=[]
	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):
		res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))
	return res

def identify(dn, attr):
	return bool(set(('dhcpService', 'univentionDhcpService')) & set(attr.get('objectClass', [])))

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-13 / +14 lines)

Lines 72-78 layout = [	Link Here

mapping=univention.admin.mapping.mapping()

mapping=univention.admin.mapping.mapping()

mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

class object(univention.admin.handlers.simpleLdap):

from .__common import DhcpOptions

class object(DhcpOptions):

	module=module

	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

Lines 94-114 class object(univention.admin.handlers.simpleLdap):	Link Here

			('objectClass', ['top', 'dhcpSharedNetwork'])

			('objectClass', ['top', 'dhcpSharedNetwork'])

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):

100

	filter=univention.admin.filter.conjunction('&', [

101

	@staticmethod

100

	univention.admin.filter.expression('objectClass', 'dhcpSharedNetwork')

102

	def lookup_filter(filter_s=None, lo=None):

101

])

103

		filter_obj = univention.admin.filter.conjunction('&', [

104

			univention.admin.filter.expression('objectClass', 'dhcpSharedNetwork')

105

])

106

		filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)

107

		return filter_obj

108

102

109

103

	if filter_s:

110

lookup_filter = object.lookup_filter

104

		filter_p=univention.admin.filter.parse(filter_s)

111

lookup = object.lookup

105

		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)

106

		filter.expressions.append(filter_p)

107

112

108

	res=[]

109

	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):

110

		res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))

111

	return res

112

113

def identify(dn, attr):

114

def identify(dn, attr):

114

115




]


from .__common import rangeMap, rangeUnmap, DhcpOptions

mapping=univention.admin.mapping.mapping()
mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)


add_dhcp_options( property_descriptions, mapping, layout )

class object(DhcpOptions):
	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):


		return add_dhcp_objectclass( self, ml )

	@staticmethod
	def lookup_filter(filter_s=None, lo=None):
		filter_obj = univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('objectClass', 'univentionDhcpSubnet'),
			univention.admin.filter.expression('objectClass', 'univentionDhcpSharedSubnet')
		])
		filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
		return filter_obj

	filter=univention.admin.filter.conjunction('&', [
	univention.admin.filter.expression('objectClass', 'univentionDhcpSubnet'),
	univention.admin.filter.expression('objectClass', 'univentionDhcpSharedSubnet')
	])

lookup_filter = object.lookup_filter
lookup = object.lookup
		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
		filter.expressions.append(filter_p)

	res=[]
	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):
		res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))
	return res

def identify(dn, attr):
	return set(('univentionDhcpSubnet', 'univentionDhcpSharedSubnet')) <= set(attr.get('objectClass', []))




	] ),
]

from .__common import rangeUnmap, DhcpOptions

mapping=univention.admin.mapping.mapping()
mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)


add_dhcp_options( property_descriptions, mapping, layout )

class object(DhcpOptions):
	module=module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

			ml.append(('dhcpRange', self.oldattr.get('dhcpRange', []), dhcpRange))
		return add_dhcp_objectclass( self, ml )

	@staticmethod
	def lookup_filter(filter_s=None, lo=None):
		filter_obj = univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('objectClass', 'univentionDhcpSubnet'),
			univention.admin.filter.conjunction('!', [univention.admin.filter.expression('objectClass', 'univentionDhcpSharedSubnet')])
		])
		filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
		return filter_obj

	filter=univention.admin.filter.conjunction('&', [
	univention.admin.filter.expression('objectClass', 'univentionDhcpSubnet'),
	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('objectClass', 'univentionDhcpSharedSubnet')])
	])

lookup_filter = object.lookup_filter
lookup = object.lookup
		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
		filter.expressions.append(filter_p)

	res=[]
	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):
		res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))
	return res

def identify(dn, attr):
	ocs = set(attr.get('objectClass', []))
- 
options
--
.../modules/univention/admin/handlers/dhcp/__common.py         | 10 +++++++---
.../modules/univention/admin/handlers/dhcp/host.py             |  3 ++-
.../modules/univention/admin/handlers/dhcp/pool.py             |  5 ++++-
.../modules/univention/admin/handlers/dhcp/server.py           |  2 +-
.../modules/univention/admin/handlers/dhcp/service.py          |  2 +-
.../modules/univention/admin/handlers/dhcp/shared.py           |  3 ++-
.../modules/univention/admin/handlers/dhcp/sharedsubnet.py     |  7 ++++---
.../modules/univention/admin/handlers/dhcp/subnet.py           |  7 ++++---
8 files changed, 25 insertions(+), 14 deletions(-)

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (-3 / +7 lines)

Lines 30-35	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

import sys

import copy

import copy

import univention.admin.localization

import univention.admin.localization

Lines 65-74 _mappings = (	Link Here

	('option', 'dhcpOption', None, None),

	('option', 'dhcpOption', None, None),

def add_dhcp_options( properties, mapping, layout ):

def add_dhcp_options(module_name):

	for name, prop in _properties.items():

	module = sys.modules[module_name]

		properties[ name ] = prop

	properties = getattr(module, "property_descriptions")

	properties.update(_properties)

	mapping = getattr(module, "mapping")

	for item in _mappings:

	for item in _mappings:

		mapping.register( *item )

		mapping.register( *item )

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-1 / +2 lines)

Lines 114-120 mapping.register('host', 'cn', None, univention.admin.mapping.ListToString)	Link Here

114

mapping.register('hwaddress', 'dhcpHWAddress', mapHWAddress, unmapHWAddress)

114

mapping.register('hwaddress', 'dhcpHWAddress', mapHWAddress, unmapHWAddress)

115

mapping.register('fixedaddress', 'univentionDhcpFixedAddress')

115

mapping.register('fixedaddress', 'univentionDhcpFixedAddress')

116

117

from .__common import DhcpOptions

117

from .__common import add_dhcp_options, DhcpOptions

118

add_dhcp_options(__name__)

118

119

120

class object(DhcpOptions):

121

class object(DhcpOptions):




]


from .__common import rangeMap, rangeUnmap, add_dhcp_options, DhcpOptions

mapping=univention.admin.mapping.mapping()
mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)
mapping.register('range', 'dhcpRange', rangeMap, rangeUnmap)
mapping.register('failover_peer', 'univentionDhcpFailoverPeer', None, univention.admin.mapping.ListToString)

add_dhcp_options(__name__)


class object(DhcpOptions):
	module=module


(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-1 / +1 lines)

Lines 74-81 mapping=univention.admin.mapping.mapping()	Link Here

mapping.register('server', 'cn', None, univention.admin.mapping.ListToString)

mapping.register('server', 'cn', None, univention.admin.mapping.ListToString)

from .__common import add_dhcp_options

from .__common import add_dhcp_options

add_dhcp_options(__name__)

add_dhcp_options( property_descriptions, mapping, layout )

class object(univention.admin.handlers.simpleLdap):

class object(univention.admin.handlers.simpleLdap):

	module=module

	module=module

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-1 / +1 lines)

Lines 72-79 mapping=univention.admin.mapping.mapping()	Link Here

mapping.register('service', 'cn', None, univention.admin.mapping.ListToString)

mapping.register('service', 'cn', None, univention.admin.mapping.ListToString)

from .__common import add_dhcp_options, add_dhcp_objectclass, DhcpOptions

from .__common import add_dhcp_options, add_dhcp_objectclass, DhcpOptions

add_dhcp_options(__name__)

add_dhcp_options( property_descriptions, mapping, layout )

class object(DhcpOptions):

class object(DhcpOptions):

	module=module

	module=module

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-1 / +2 lines)

Lines 72-78 layout = [	Link Here

mapping=univention.admin.mapping.mapping()

mapping=univention.admin.mapping.mapping()

mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

from .__common import DhcpOptions

from .__common import add_dhcp_options, DhcpOptions

add_dhcp_options(__name__)

class object(DhcpOptions):

class object(DhcpOptions):

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-3 / +4 lines)

Lines 102-108 layout = [	Link Here

102

103

104

105

from .__common import rangeMap, rangeUnmap, DhcpOptions

105

from .__common import rangeMap, rangeUnmap, add_dhcp_options, DhcpOptions

106

107

mapping=univention.admin.mapping.mapping()

107

mapping=univention.admin.mapping.mapping()

108

mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)

108

mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)

Lines 110-118 mapping.register('range', 'dhcpRange', rangeMap, rangeUnmap)	Link Here

110

mapping.register('subnetmask', 'dhcpNetMask', None, univention.admin.mapping.ListToString)

110

mapping.register('subnetmask', 'dhcpNetMask', None, univention.admin.mapping.ListToString)

111

mapping.register('broadcastaddress', 'univentionDhcpBroadcastAddress', None, univention.admin.mapping.ListToString)

111

mapping.register('broadcastaddress', 'univentionDhcpBroadcastAddress', None, univention.admin.mapping.ListToString)

112

113

from .__common import add_dhcp_options, add_dhcp_objectclass

113

add_dhcp_options(__name__)

114

115

from .__common import add_dhcp_objectclass

114

116

115

add_dhcp_options( property_descriptions, mapping, layout )

116

117

class object(DhcpOptions):

118

class object(DhcpOptions):

118

	module=module

119

	module=module




	] ),
]

from .__common import rangeUnmap, add_dhcp_options, DhcpOptions

mapping=univention.admin.mapping.mapping()
mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)
mapping.register('subnetmask', 'dhcpNetMask', None, univention.admin.mapping.ListToString)
mapping.register('broadcastaddress', 'univentionDhcpBroadcastAddress', None, univention.admin.mapping.ListToString)

add_dhcp_options(__name__)

from .__common import add_dhcp_objectclass

add_dhcp_options( property_descriptions, mapping, layout )

class object(DhcpOptions):
	module=module
- 
super class
--
.../univention/admin/handlers/dhcp/__common.py     | 71 +++++++++++++++++-----
.../modules/univention/admin/handlers/dhcp/host.py |  1 +
.../modules/univention/admin/handlers/dhcp/pool.py |  1 +
.../univention/admin/handlers/dhcp/service.py      | 10 +--
.../univention/admin/handlers/dhcp/shared.py       |  1 +
.../univention/admin/handlers/dhcp/sharedsubnet.py | 10 +--
.../univention/admin/handlers/dhcp/subnet.py       |  7 +--
7 files changed, 66 insertions(+), 35 deletions(-)




# <http://www.gnu.org/licenses/>.

import sys
import copy

import univention.admin.localization
from univention.admin.layout import Tab
from univention.admin.handlers import simpleLdap

translation = univention.admin.localization.translation( 'univention.admin.handlers.dhcp' )
_ = translation.translate


_options = {
	'options': univention.admin.option(
		short_description=_('Allow custom DHCP options'),
		long_description=_("Allow adding custom DHCP options. Experts only!"),
		default=False,
		editable=True,
		objectClasses=['dhcpOptions'],
	),
}


_properties = {
	'option': univention.admin.property(
		short_description = _( 'DHCP options' ),
		long_description = _( 'Defines DHCP options for the subnet.' ),
		syntax = univention.admin.syntax.string,
		multivalue = True,
		options = ["options"],
		required = 0,
		may_change = True,
		identifies = 0

	('option', 'dhcpOption', None, None),
)


def add_dhcp_options(module_name):
	module = sys.modules[module_name]

	options = getattr(module, "options")
	options.update(_options)

	properties = getattr(module, "property_descriptions")
	properties.update(_properties)


	for item in _mappings:
		mapping.register( *item )

	layout = getattr(module, "layout")
	layout.append(Tab(
		_('DHCP options'),
		_('Custom DHCP options'),
		advanced=True,
		layout=['option']
	))


class SimpleDhcp(simpleLdap):



class DhcpOptions(SimpleDhcp):
	def setup_options(self, options):
		self.options = []
		self._define_options(options)

	def open(self):
		super(DhcpOptions, self).open()
		try:
			ocs = self.oldattr['objectClass']
			if "dhcpOptions" in ocs:
				self.options.append("options")
		except LookupError:
			pass
		self.old_options = list(self.options)

	def _ldap_modlist(self):
		if "options" not in self.options:
			del self.info.get('option', [])[:]

		mod_list = super(DhcpOptions, self)._ldap_modlist()

		old_ocs = self.oldattr.get('objectClass', [])
		if self.info.get('option', []):
			if 'dhcpOptions' not in old_ocs:
				new_ocs = old_ocs + ['dhcpOptions']
				mod_list.append(('objectClass', old_ocs, new_ocs))
		elif "options" not in self.options and 'dhcpOptions' in old_ocs:
			new_ocs = list(old_ocs)
			new_ocs.remove("dhcpOptions")
			mod_list.append(('objectClass', old_ocs, new_ocs))

		return mod_list

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (+1 lines)

Lines 131-136 class object(DhcpOptions):	Link Here

131

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

131

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

132

133

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

133

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

134

		self.setup_options(options)

134

135

	def _ldap_pre_create(self):

136

	def _ldap_pre_create(self):

136

		self.dn='%s=%s,%s' % (mapping.mapName('host'), mapping.mapValue('host', self.info['host']), self.position.getDn())

137

		self.dn='%s=%s,%s' % (mapping.mapName('host'), mapping.mapValue('host', self.info['host']), self.position.getDn())

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (+1 lines)

Lines 164-169 class object(DhcpOptions):	Link Here

164

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

164

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

165

166

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

166

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

167

		self.setup_options(options)

167

168

	def open(self):

169

	def open(self):

169

		super(object, self).open()

170

		super(object, self).open()




mapping=univention.admin.mapping.mapping()
mapping.register('service', 'cn', None, univention.admin.mapping.ListToString)

from .__common import add_dhcp_options, DhcpOptions
add_dhcp_options(__name__)



			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
		self.setup_options(options)

	def _ldap_pre_create(self):
		self.dn='%s=%s,%s' % (mapping.mapName('service'), mapping.mapValue('service', self.info['service']), self.position.getDn())

	def _ldap_addlist(self):
		return [
			('objectClass', ['top', 'univentionDhcpService']),
		]

	def _ldap_modlist(self):
		ml = univention.admin.handlers.simpleLdap._ldap_modlist( self )

		return add_dhcp_objectclass( self, ml )

	@staticmethod
	def lookup_filter(filter_s=None, lo=None):
		filter_obj = univention.admin.filter.conjunction('&', [

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (+1 lines)

Lines 89-94 class object(DhcpOptions):	Link Here

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

		self.setup_options(options)

	def _ldap_pre_create(self):

	def _ldap_pre_create(self):

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

		self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())





add_dhcp_options(__name__)

from .__common import add_dhcp_objectclass


class object(DhcpOptions):
	module=module

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
		self.setup_options(options)

	def _ldap_pre_create(self):
		self.dn='%s=%s,%s' % (mapping.mapName('subnet'), mapping.mapValue('subnet', self.info['subnet']), self.position.getDn())

	def _ldap_addlist(self):
		return [
			('objectClass', ['top', 'univentionDhcpSubnet', 'univentionDhcpSharedSubnet']),
		]

	def _ldap_modlist(self):
		ml = univention.admin.handlers.simpleLdap._ldap_modlist( self )

		return add_dhcp_objectclass( self, ml )

	@staticmethod
	def lookup_filter(filter_s=None, lo=None):
		filter_obj = univention.admin.filter.conjunction('&', [





add_dhcp_options(__name__)

from .__common import add_dhcp_objectclass


class object(DhcpOptions):
	module=module

			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
		self.setup_options(options)

	def open(self):
		super(object, self).open()

			if '' in dhcpRange:
				dhcpRange.remove('')
			ml.append(('dhcpRange', self.oldattr.get('dhcpRange', []), dhcpRange))

		return ml

	@staticmethod
	def lookup_filter(filter_s=None, lo=None):
- 
--
.../modules/univention/admin/handlers/dhcp/pool.py | 58 +++++++++-------------
1 file changed, 24 insertions(+), 34 deletions(-)




class object(DhcpOptions):
	module=module

	permits_udm2dhcp = {
		'known_clients': "known clients",
		'unknown_clients': "unknown clients",
		'dynamic_bootp_clients': "dynamic bootp clients",
		'all_clients': "all clients",
	}
	permits_dhcp2udm = dict((value, key) for (key, value) in permits_udm2dhcp.items())

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
		self.mapping=mapping
		self.descriptions=property_descriptions

		super(object, self).open()

		for i in self.oldattr.get('dhcpPermitList', []):
			permit, name = i.split(' ', 1)
			prop = self.permits_dhcp2udm[name]
			self[prop] = permit
			if name == 'known clients':
				self['known_clients']=permit
			elif name == 'unknown clients':
				self['unknown_clients']=permit
			elif name == 'dynamic bootp clients':
				self['dynamic_bootp_clients']=permit
			elif name == 'all clients':
				self['all_clients']=permit

		self.save()


		return [
			('objectClass', ['top', 'univentionDhcpPool']),
		]

	def _ldap_modlist(self):
		ml = super(object, self)._ldap_modlist()
		if self.hasChanged(self.permits_udm2dhcp.keys()):
			old=self.oldattr.get('dhcpPermitList', [])
			new=copy.deepcopy(old)
			for prop, value in self.permits_udm2dhcp.items():
				try:
					permit = self.oldinfo[prop]
					new.remove("%s %s" % (permit, value))
				except LookupError:
					pass
				try:
					permit = self.info[prop]
					new.append("%s %s" % (permit, value))
				except LookupError:
					pass
			if self.oldinfo.has_key('dynamic_bootp_clients') and self.oldinfo['dynamic_bootp_clients']:
				new.remove(self.oldinfo['dynamic_bootp_clients']+' dynamic bootp clients')
			if self.info.has_key('dynamic_bootp_clients') and self.info['dynamic_bootp_clients']:
				new.append(self.info['dynamic_bootp_clients']+' dynamic bootp clients')
			
			if self.oldinfo.has_key('all_clients') and self.oldinfo['all_clients']:
				new.remove(self.oldinfo['all_clients']+' all clients')
			if self.info.has_key('all_clients') and self.info['all_clients']:
				new.append(self.info['all_clients']+' all clients')
				
			ml.append(('dhcpPermitList', old, new))
		if self.info.get('failover_peer', None) and not self.info.get('dynamic_bootp_clients', None) == 'deny':
			raise univention.admin.uexceptions.bootpXORFailover
- 
--
.../modules/univention/admin/handlers/dhcp/subnet.py              | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)





	def open(self):
		super(object, self).open()
		self.info['range'] = self.oldinfo['range'] = rangeUnmap(self.oldattr.get('dhcpRange', []))
		self.oldinfo['range'] = rangeUnmap( self.oldattr.get('dhcpRange', []) )


	def _ldap_pre_create(self):
		self.dn='%s=%s,%s' % (mapping.mapName('subnet'), mapping.mapValue('subnet', self.info['subnet']), self.position.getDn())

					if i != j and univention.admin.ipaddress.is_range_overlapping(i, j):
						raise univention.admin.uexceptions.rangesOverlapping, '%s-%s; %s-%s' % (i[0], i[1], j[0], j[1])

				ip_in_network = True
				for j in i:
					if not univention.admin.ipaddress.ip_is_in_network(self['subnet'], self['subnetmask'], j):
						ip_in_network = False

					if univention.admin.ipaddress.ip_is_network_address(self['subnet'], self['subnetmask'], j):
						raise univention.admin.uexceptions.rangeInNetworkAddress, '%s-%s' % (i[0], i[1])
- 
--
.../modules/univention/admin/handlers/dhcp/host.py                  | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)




import univention.admin.filter
import univention.admin.handlers
import univention.admin.localization
import univention.debug as ud

translation=univention.admin.localization.translation('univention.admin.handlers.dhcp')
_=translation.translate

]

def unmapHWAddress(old):
	ud.debug(ud.ADMIN, ud.INFO, 'host.py: unmapHWAddress: old: %s' % old)
	if not old:
		return ['', '']
	return old[0].split(' ')

def mapHWAddress(old):
	ud.debug(ud.ADMIN, ud.INFO, 'host.py: mapHWAddress: old: %s' % old)
	if not old[0]:
		return ''
	else:
- 
--
.../modules/univention/admin/handlers/__init__.py  |  47 ++---
.../univention/admin/handlers/dhcp/__common.py     |  18 +-
.../modules/univention/admin/handlers/dhcp/dhcp.py | 114 ++++++------
.../modules/univention/admin/handlers/dhcp/host.py | 122 +++++++------
.../modules/univention/admin/handlers/dhcp/pool.py | 193 +++++++++++----------
.../univention/admin/handlers/dhcp/server.py       |  89 +++++-----
.../univention/admin/handlers/dhcp/service.py      |  68 ++++----
.../univention/admin/handlers/dhcp/shared.py       |  70 ++++----
.../univention/admin/handlers/dhcp/sharedsubnet.py | 126 +++++++-------
.../univention/admin/handlers/dhcp/subnet.py       | 133 +++++++-------
10 files changed, 510 insertions(+), 470 deletions(-)




# FIXME: What is the use of the following line?
# __path__.append("users")


# manages properties
class base(object):
	def __init__(self, co, lo, position, dn='', superordinate = None ):

		return self.descriptions.keys()

	def items(self):

		# this returns emtpy strings resp. empty lists for attributes not set
		r=[]
		for key in self.keys():



class simpleLdap(base):

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
		global s4connector_present
		global s4connector_search

	def description(self):
		if self.dn:
			rdn = self.lo.explodeDn(self.dn)[0]
			return rdn[rdn.find('=') + 1:]
		else:
			return 'none'


				ml.append(('objectClass', self.oldattr.get('objectClass', []), self.oldattr.get('objectClass', [])+['univentionPolicyReference']))
			ml.append(('univentionPolicyReference', self.oldpolicies, self.policies))


		return ml

	def _create(self):

		self.save()
		return self.dn

	#+++# MODIFY #+++#
	def _modify(self, modify_childs=1, ignore_license=0):
		self.exceptions=[]


		# iterate over all properties and call checkLdap() of corresponding syntax
		self._call_checkLdap_on_all_property_syntaxes()

		#+++# MODLIST #+++#
		ml=self._ldap_modlist()
		# custom attributes
		m=univention.admin.modules.get(self.module)

							ml.remove(i)
						ml.extend( addlist )


					else:
						if deleteObjectClass == '1' and not self.info.has_key(pname):
							# value is empty, should delete objectClass and Values

					ml.append( ('objectClass', self.oldattr.get('objectClass'), current_ocs+[prop.objClass]) )

				else:

					if prop.syntax == 'boolean' and self.info.has_key(prop.name) and self.info[prop.name] == '0':
						# syntax is boolean and value == 0 ==> remove
						dellist = []

				object[ 'host' ] = object[ 'host' ].replace( old_name, new_name )
				object.modify( )


	def __remove_from_dhcp_object( self, position = None, name = None, oldname = None, mac = None, ip = None ):
		# if we got the mac addres, then we remove the object
		# if we only got the ip addres, we remove the ip address

		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should remove a dhcp object: position="%s", name="%s", oldname="%s", mac="%s", ip="%s"' % ( position, name, oldname, mac, ip ) )

		dn = None

		tmppos = univention.admin.uldap.position( self.position.getDomain( ) )

					for dn2, attributes2 in self.lo.search(scope='domain', attr=[ 'zoneName' ], filter='(&(relativeDomainName=%s)(objectClass=dNSZone))' %  name, unique=0 ):
						self.lo.modify( dn, [('pTRRecord', '%s.%s.' % (name, attributes2['zoneName'][0]), '')] )

				zone = univention.admin.handlers.dns.reverse_zone.object( self.co, self.lo, self.position, zoneDN)
				zone.open()
				zone.modify()


		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should remove a dns reverse object: dnsEntryZoneReverse="%s", name="%s", ip="%s"' % ( dnsEntryZoneReverse, name, ip ) )
		if dnsEntryZoneReverse:
			rdn = self.calc_dns_reverse_entry_name( ip, dnsEntryZoneReverse )

		for dn, attributes in self.lo.search(base=zoneDN, scope='domain', attr=['pTRRecord'], filter=search_filter):
			self.lo.modify(dn, [('pTRRecord', '', ptrrecord)])



	def __remove_related_ptrrecords(self, zoneDN, ip):
		ptrrecord = '%s.%s.' % (self.info['name'], zoneDN.split('=')[1].split(',')[0])
		ip_split = ip.split('.')

		for dn, attributes in self.lo.search(base=zoneDN, scope='domain', attr=['pTRRecord'], filter=search_filter):
			if ptrrecord in attributes['pTRRecord']:
				self.lo.modify(dn, [('pTRRecord', ptrrecord, '')])
		

	def check_common_name_length(self):
		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'check_common_name_length with self["ip"] = %r and self["dnsEntryZoneForward"] = %r' % (self['ip'], self['dnsEntryZoneForward'], ))

					else:
						self.lo.modify( dn, [ ( 'aRecord', '' ,  ip ) ] )


	def __add_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias ):
		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'add a dns alias object: name="%s", dnsForwardZone="%s", dnsAliasZoneContainer="%s", alias="%s"' % ( name, dnsForwardZone, dnsAliasZoneContainer, alias ) )
		if name and dnsForwardZone and dnsAliasZoneContainer and alias:

					pass

	def _ldap_post_modify( self ):

		self.__multiip |= len(self['mac']) > 1 or len(self['ip']) > 1

		for entry in self.__changes[ 'dhcpEntryZone' ][ 'remove' ]:

			else:
				self.__add_dns_reverse_object( self[ 'name' ], dn, ip )


		for entry in self.__changes[ 'dnsEntryZoneAlias' ][ 'remove' ]:
			dnsForwardZone, dnsAliasZoneContainer, alias = entry
			if not alias:

		if not self.info.get('domain', None):
			self.info['domain'] = domain


	def _ldap_modlist( self ):
		self.__changes =  {	'mac': {'remove': [ ], 'add': [ ]}, 'ip': {'remove': [ ], 'add': [ ]}, 'name': None,
							'dnsEntryZoneForward': { 'remove': [ ], 'add': [ ] },

		newAaaaRecord = []
		if oldAddresses != newAddresses:
			if oldAddresses:
				for address in oldAddresses:
					if ':' in address: # IPv6
						oldAaaaRecord.append(address)
					else:
						oldARecord.append(address)
			if newAddresses:
				for address in newAddresses:
					if ':' in address: # IPv6
						newAaaaRecord.append(ipaddr.IPv6Address(address).exploded)
					else:

						continue
					self.__changes[ 'ip' ][ 'remove' ].append( ipAddress )


		if self.hasChanged( 'name' ):
			ml.append( ( 'sn', self.oldattr.get( 'sn', [ None ] )[ 0 ], self[ 'name' ] ) )
			self.__changes[ 'name' ] = ( self.oldattr.get( 'sn', [ None ] )[ 0 ], self[ 'name' ] )

		if self.hasChanged('ip') or self.hasChanged('mac'):

			if len(self.info.get('ip', [])) == 1 and len(self.info.get('mac', [])) == 1 and len(self.info.get('dhcpEntryZone', [])):
				# In this special case, we assume the mapping between ip/mac address to be
				# unique. The dhcp entry needs to contain the mac address (as sepcified by
				# the ldap search for dhcp entries), the ip address may not correspond to
				# the ip address associated with the computer ldap object, but this would
				# be erroneous anyway. We therefore update the dhcp entry to correspond to
				# the current ip and mac address. (Bug #20315)
				dn, ip, mac = self.__split_dhcp_line( self.info['dhcpEntryZone'][0] )


			subnet=ldap.explode_dn(reverseDN, 1)[0].replace('.in-addr.arpa','').split('.')
			ip=sip.split('.')
			return self.calc_dns_reverse_entry_name_do(4, subnet, ip)

	def calc_dns_reverse_entry_name_do(self, maxLength, zoneNet, ip):
		zoneNet.reverse()
		if not ip[:len(zoneNet)] == zoneNet:

			else:
				self.__modify_dhcp_object( dn, self[ 'name' ], ip, mac )


		for entry in self.__changes[ 'dnsEntryZoneForward' ][ 'remove' ]:
			dn, ip = self.__split_dns_line( entry )
			if not ip and not self.__multiip:

			groupObject = univention.admin.objects.get(univention.admin.modules.get('groups/group'), self.co, self.lo, self.position, group)
			groupObject.fast_member_remove( [ self.dn ], self.oldattr.get('uid',[]), ignore_license=1 )


	def __update_groups_after_namechange(self):
		oldname = self.oldinfo.get('name')
		newname = self.info.get('name')


			self.lo.modify(group, [('uniqueMember', oldUniqueMembers, newUniqueMembers), ('memberUid', oldMemberUids, newMemberUids)])


	def update_groups(self):
		if not self.hasChanged('groups') and \
			   not ('oldPrimaryGroupDn' in self.__dict__ and self.oldPrimaryGroupDn) and \

				groupObject['hosts'].remove(self.dn)
				groupObject.modify(ignore_license=1)


	def primary_group(self):
		if not self.hasChanged('primaryGroup'):
			return

		if raise_after:
			raise raise_after

class simpleLdapSub(simpleLdap):

class simpleLdapSub(simpleLdap):
	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
		base.__init__(self, co, lo, position, dn, superordinate )


		if hasattr(self,"_ldap_post_remove"):
			self._ldap_post_remove()


class simplePolicy(simpleLdap):
	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):

		self.resultmode=0
		self.dn=dn


		self.policy_result()

		if self.polinfo.has_key(key):

			if self.polinfo[key] != newvalue or self.polinfo_more[key]['policy'] == self.cloned or ( self.info.has_key( key ) and self.info[ key ] != newvalue ):
				if self.polinfo_more[key]['fixed'] and self.polinfo_more[key]['policy'] != self.cloned:
					raise univention.admin.uexceptions.policyFixedAttribute, key




from univention.admin.layout import Tab
from univention.admin.handlers import simpleLdap

translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate




_properties = {
	'option': univention.admin.property(
		short_description=_('DHCP options'),
		long_description=_('Defines additional DHCP options.'),
		syntax=univention.admin.syntax.string,
		multivalue=True,
		options=["options"],
		required = 0,
		may_change=True,
		identifies = 0
	),
}




	mapping = getattr(module, "mapping")
	for item in _mappings:
		mapping.register(*item)

	layout = getattr(module, "layout")
	layout.append(Tab(




import univention.admin.handlers.dhcp.subnet


translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate


module = 'dhcp/dhcp'

childs = 0
short_description = _('DHCP')
long_description = ''
operations = ['search']
usewizard = 1
wizardmenustring = _("DHCP")
wizarddescription = _("Add, edit and delete DHCP objects")
wizardoperations = {
	"add": [_("Add"), _("Add DHCP object")],
	"find": [_("Search"), _("Search DHCP object(s)")],
}
wizardpath = "univentionDhcpObject"
wizardsuperordinates = ('None', 'dhcp/service', 'dhcp/shared')
wizardtypesforsuper = {
	'None': ('dhcp/service',),
	'dhcp/service': ('dhcp/host', 'dhcp/server', 'dhcp/shared', 'dhcp/subnet'),
	'dhcp/shared': ('dhcp/sharedsubnet',)
}

childmodules = [
	"dhcp/host",
	"dhcp/pool",
	"dhcp/server",
	"dhcp/service",
	"dhcp/shared",
	"dhcp/sharedsubnet",
	"dhcp/subnet",
]
virtual = 1

options = {
}

property_descriptions = {
	'name': univention.admin.property(
		short_description=_('Name'),
		long_description='',
		syntax=univention.admin.syntax.string,
		multivalue=0,
		include_in_default_search=1,
		options=[],
		required=1,
		may_change=1,
		identifies=1
	)
}

layout = [Tab(_('General'), _('Basic settings'), layout=["name"])]

mapping = univention.admin.mapping.mapping()


class object(univention.admin.handlers.simpleLdap):
	module = module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
		self.mapping = mapping
		self.descriptions = property_descriptions

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)


def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
	ret = []
	if superordinate:
		ret += univention.admin.handlers.dhcp.host.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
		ret += univention.admin.handlers.dhcp.pool.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
		ret += univention.admin.handlers.dhcp.server.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
		ret += univention.admin.handlers.dhcp.shared.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
		ret += univention.admin.handlers.dhcp.sharedsubnet.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
		ret += univention.admin.handlers.dhcp.subnet.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
	else:
		ret += univention.admin.handlers.dhcp.service.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
	return ret


def identify(dn, attr, canonical=0):
	pass






import univention.admin.localization
import univention.debug as ud

translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate

module = 'dhcp/host'
operations = ['add', 'edit', 'remove', 'search']
superordinate = 'dhcp/service'
childs = 0
usewizard = 1
short_description = _('DHCP: Host')
long_description = ''

options = {
}

property_descriptions = {
	'host':  univention.admin.property(
		short_description=_('Hostname'),
		long_description='',
		syntax=univention.admin.syntax.string,
		multivalue=0,
		include_in_default_search=1,
		options=[],
		required=1,
		may_change=1,
		identifies=1
	),
	'hwaddress': univention.admin.property(
		short_description=_('Hardware address'),
		long_description=_(
			'Currently, only the ethernet and token-ring types are recognized.'
			'The hardware-address should be a set of hexadecimal octets (numbers from 0 through ff) separated by colons.'),
		syntax=univention.admin.syntax.DHCP_HardwareAddress,
		multivalue=0,
		options=[],
		required=1,
		may_change=1,
		identifies=0
	),
	'fixedaddress': univention.admin.property(
		short_description=_('Fixed IP addresses'),
		long_description=_(
			'Assign one or more fixed IP addresses.'
			'Each address should be either an IP address or a domain name that resolves to one or more IP addresses'),
		syntax=univention.admin.syntax.string,
		multivalue=1,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
}

layout = [
	Tab(_('General'), _('Basic settings'), layout=[
		Group(_('General'), layout=[
			'host',
			'hwaddress',
			'fixedaddress'
		]),
	])
]


def unmapHWAddress(old):
	ud.debug(ud.ADMIN, ud.INFO, 'host.py: unmapHWAddress: old: %s' % old)
	if not old:
		return ['', '']
	return old[0].split(' ')


def mapHWAddress(old):
	ud.debug(ud.ADMIN, ud.INFO, 'host.py: mapHWAddress: old: %s' % old)
	if not old[0]:
		return ''
	else:
		if len(old) > 1:
			return '%s %s' % (old[0], old[1])
		else:
			return old


mapping = univention.admin.mapping.mapping()
mapping.register('host', 'cn', None, univention.admin.mapping.ListToString)
mapping.register('hwaddress', 'dhcpHWAddress', mapHWAddress, unmapHWAddress)
mapping.register('fixedaddress', 'univentionDhcpFixedAddress')



class object(DhcpOptions):
	module = module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
		self.mapping = mapping
		self.descriptions = property_descriptions

		if not superordinate:
			raise univention.admin.uexceptions.insufficientInformation, 'superordinate object not present'

		self.setup_options(options)

	def _ldap_pre_create(self):
		self.dn = '%s=%s,%s' % (
			mapping.mapName('host'),
			mapping.mapValue('host', self.info['host']),
			self.position.getDn()
		)

	def _ldap_addlist(self):
		return [

lookup_filter = object.lookup_filter
lookup = object.lookup

def identify(dn, attr):

def identify(dn, attr):
	return 'univentionDhcpHost' in attr.get('objectClass', [])




import univention.admin.localization
import univention.admin.uexceptions

translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate

module = 'dhcp/pool'
operations = ['add', 'edit', 'remove', 'search']
superordinate = 'dhcp/subnet'
childs = 0
usewizard = 1
short_description = _('DHCP: Pool')
long_description = ''

options = {
}

property_descriptions = {
	'name': univention.admin.property(
		short_description=_('Name'),
		long_description=_('A unique name used to identify this pool, e.g. "known" or "guests"'),
		syntax=univention.admin.syntax.string,
		multivalue=0,
		include_in_default_search=1,
		options=[],
		required=1,
		may_change=0,
		identifies=1
	),
	'range': univention.admin.property(
		short_description=_('IP range for dynamic assignment'),
		long_description='',
		syntax=univention.admin.syntax.IPv4_AddressRange,
		multivalue=1,
		options=[],
		required=1,
		may_change=1,
		identifies=0
	),
	'failover_peer': univention.admin.property(
		short_description=_('Failover peer'),
		long_description=_('The name of a failover configuration manually configured in /etc/dhcp/local.conf.'),
		syntax=univention.admin.syntax.string,
		multivalue=0,
		options=[],
		required=0,
		may_change=1,
		identifies=0,
	),
	'known_clients': univention.admin.property(
		short_description=_('Give IP to known clients'),
		long_description=_('Addresses are allocated for client, which have a host entry matching their MAC address.'),
		syntax=univention.admin.syntax.AllowDeny,
		multivalue=0,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
	'unknown_clients': univention.admin.property(
		short_description=_('Give IP to unknown clients'),
		long_description=_('Addresses are allocated for clients, which do not have a host entry mating their MAC address.'),
		syntax=univention.admin.syntax.AllowDeny,
		multivalue=0,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
	'dynamic_bootp_clients': univention.admin.property(
		short_description=_('Give IP to dynamic BOOTP clients'),
		long_description=_(
			'Give addresses to clients using the legacy BOOTP protocol.'
			'Since BOOTP does not support an expiry date or a release mechanism, addresses are allocated indefinitely!'),
		syntax=univention.admin.syntax.AllowDeny,
		multivalue=0,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
	'all_clients': univention.admin.property(
		short_description=_('Give IP from this pool'),
		long_description=_('Give addresses from this pool at all or not.'),
		syntax=univention.admin.syntax.AllowDeny,
		multivalue=0,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
}

layout = [
	Tab(_('General'), _('Basic settings'), layout=[
		Group(_('General'), layout=[
			'name',
			'range'
		]),
	]),
	Tab(_('Advanced'), _('Advanced DHCP pool options'), advanced=True, layout=[
		'failover_peer',
		['known_clients', 'unknown_clients'],
		['dynamic_bootp_clients', 'all_clients']
	])
]


from .__common import rangeMap, rangeUnmap, add_dhcp_options, DhcpOptions

mapping = univention.admin.mapping.mapping()
mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)
mapping.register('range', 'dhcpRange', rangeMap, rangeUnmap)
mapping.register('failover_peer', 'univentionDhcpFailoverPeer', None, univention.admin.mapping.ListToString)



class object(DhcpOptions):
	module = module

	permits_udm2dhcp = {
		'known_clients': "known clients",

	}
	permits_dhcp2udm = dict((value, key) for (key, value) in permits_udm2dhcp.items())

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
		self.mapping = mapping
		self.descriptions = property_descriptions

		if not superordinate:
			raise univention.admin.uexceptions.insufficientInformation, 'superordinate object not present'


		self.save()


	def _ldap_pre_create(self):
		self.dn = '%s=%s,%s' % (
			mapping.mapName('name'),
			mapping.mapValue('name', self.info['name']),
			self.position.getDn()
		)

	def _ldap_addlist(self):
		return [

	def _ldap_modlist(self):
		ml = super(object, self)._ldap_modlist()
		if self.hasChanged(self.permits_udm2dhcp.keys()):
			old = self.oldattr.get('dhcpPermitList', [])
			new = copy.deepcopy(old)
			for prop, value in self.permits_udm2dhcp.items():
				try:
					permit = self.oldinfo[prop]

				except LookupError:
					pass
			ml.append(('dhcpPermitList', old, new))

		if self.info.get('failover_peer', None) and not self.info.get('dynamic_bootp_clients', None) == 'deny':
			raise univention.admin.uexceptions.bootpXORFailover

		return ml

	@staticmethod




import univention.admin.handlers
import univention.admin.localization

translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate

module = 'dhcp/server'
operations = ['add', 'edit', 'remove', 'search']
superordinate = 'dhcp/service'
childs = 0
usewizard = 1
short_description = _('DHCP: Server')
long_description = ''

options = {
}

property_descriptions = {
	'server': univention.admin.property(
		short_description=_('Server name'),
		long_description='',
		syntax=univention.admin.syntax.string,
		multivalue=0,
		include_in_default_search=1,
		options=[],
		required=1,
		may_change=1,
		identifies=1
	),
}

layout = [
	Tab(_('General'), _('General settings'), layout=[
		Group(_('General'), layout=[
			'server'
		]),
	])
]

mapping = univention.admin.mapping.mapping()
mapping.register('server', 'cn', None, univention.admin.mapping.ListToString)

from .__common import add_dhcp_options



class object(univention.admin.handlers.simpleLdap):
	module = module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
		self.superordinate = superordinate
		self.mapping = mapping
		self.descriptions = property_descriptions

		if not superordinate:
			raise univention.admin.uexceptions.insufficientInformation, 'superordinate object not present'

		super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)

	def _ldap_pre_create(self):
		self.dn = '%s=%s,%s' % (
			mapping.mapName('server'),
			mapping.mapValue('server', self.info['server']),
			self.position.getDn()
		)

	def _ldap_addlist(self):
		searchBase = self.position.getDomain()
		if self.lo.searchDn(base=searchBase, filter='(&(objectClass=dhcpServer)(cn=%s))' % (self.info['server'])):
			raise univention.admin.uexceptions.dhcpServerAlreadyUsed, self.info['server']


			('objectClass', ['top', 'dhcpServer']),
			('dhcpServiceDN', self.superordinate.dn),
		]

	def _ldap_post_move(self, olddn):
		'''edit dhcpServiceDN'''
		oldServiceDN = self.lo.getAttr(self.dn, 'dhcpServiceDN')
		module = univention.admin.modules.identifyOne(self.position.getDn(), self.lo.get(self.position.getDn()))
		object = univention.admin.objects.get(module, None, self.lo, self.position, dn=self.position.getDn())
		shadow_module, shadow_object = univention.admin.objects.shadow(self.lo, module, object, self.position)
		self.lo.modify(self.dn, [('dhcpServiceDN', oldServiceDN[0], shadow_object.dn)])


def lookup_filter(filter_s=None, lo=None):
	filter_obj = univention.admin.filter.conjunction('&', [
		univention.admin.filter.expression('objectClass', 'dhcpServer')
	])
	filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
	return filter_obj

	]
	return res

def identify(dn, attr):

def identify(dn, attr):
	return 'dhcpServer' in attr.get('objectClass', [])




import univention.admin.handlers
import univention.admin.localization

translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate

module = 'dhcp/service'
operations = ['add', 'edit', 'remove', 'search']
childs = 1
usewizard = 1
short_description = _('DHCP: Service')
long_description = ''

options = {
}

property_descriptions = {
	'service': univention.admin.property(
		short_description=_('Service name'),
		long_description='',
		syntax=univention.admin.syntax.string,
		multivalue=0,
		include_in_default_search=1,
		options=[],
		required=1,
		may_change=0,
		identifies=1
	),
}

layout = [
	Tab(_('General'), _('Basic settings'), layout=[
		Group(_('General'), layout=[
			'service',
		]),
	]),
]

mapping = univention.admin.mapping.mapping()
mapping.register('service', 'cn', None, univention.admin.mapping.ListToString)

from .__common import add_dhcp_options, DhcpOptions



class object(DhcpOptions):
	module = module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
		self.mapping = mapping
		self.descriptions = property_descriptions

		if not dn and not position:
			raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'

		self.setup_options(options)

	def _ldap_pre_create(self):
		self.dn = '%s=%s,%s' % (
			mapping.mapName('service'),
			mapping.mapValue('service', self.info['service']),
			self.position.getDn()
		)

	def _ldap_addlist(self):
		return [




import univention.admin.ipaddress
import univention.admin.localization

translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate

module = 'dhcp/shared'
operations = ['add', 'edit', 'remove', 'search']
superordinate = 'dhcp/service'
childs = 1
short_description = _('DHCP: Shared network')
long_description = ''

options = {
}

property_descriptions = {
	'name': univention.admin.property(
		short_description=_('Shared network name'),
		long_description='',
		syntax=univention.admin.syntax.uid,
		multivalue=0,
		include_in_default_search=1,
		options=[],
		required=1,
		may_change=0,
		identifies=1
	)
}

layout = [
	Tab(_('General'), _('Basic settings'), layout=[
		Group(_('General'), layout=[
			'name'
		]),
	]),
]

mapping = univention.admin.mapping.mapping()
mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

from .__common import add_dhcp_options, DhcpOptions



class object(DhcpOptions):
	module = module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
		self.mapping = mapping
		self.descriptions = property_descriptions

		if not superordinate:
			raise univention.admin.uexceptions.insufficientInformation, 'superordinate object not present'

		self.setup_options(options)

	def _ldap_pre_create(self):
		self.dn = '%s=%s,%s' % (
			mapping.mapName('name'),
			mapping.mapValue('name', self.info['name']),
			self.position.getDn(),
		)

	def _ldap_addlist(self):
		return [



def identify(dn, attr):
	
	return 'dhcpSharedNetwork' in attr.get('objectClass', [])





import univention.admin.ipaddress
import univention.admin.localization

translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate

module = 'dhcp/sharedsubnet'
operations = ['add', 'edit', 'remove', 'search']
superordinate = 'dhcp/shared'
childs = 1
short_description = _('DHCP: Shared subnet')
long_description = ''

options = {
}

property_descriptions = {
	'subnet': univention.admin.property(
		short_description=_('Subnet address'),
		long_description='',
		syntax=univention.admin.syntax.ipv4Address,
		multivalue=0,
		include_in_default_search=1,
		options=[],
		required=1,
		may_change=0,
		identifies=1
	),
	'subnetmask': univention.admin.property(
		short_description=_('Netmask'),
		long_description='',
		syntax=univention.admin.syntax.v4netmask,
		multivalue=0,
		options=[],
		required=1,
		may_change=1,
		identifies=0
	),
	'broadcastaddress': univention.admin.property(
		short_description=_('Broadcast address'),
		long_description='',
		syntax=univention.admin.syntax.ipv4Address,
		multivalue=0,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
	'range': univention.admin.property(
		short_description=_('Dynamic address assignment'),
		long_description=_('Define a pool of addresses available for dynamic address assignment.'),
		syntax=univention.admin.syntax.IPv4_AddressRange,
		multivalue=1,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
}

layout = [
	Tab(_('General'), _('Basic settings'), layout=[
		Group(_('General'), layout=[
			['subnet', 'subnetmask'],
			'broadcastaddress',
			'range'
		]),
	]),
]


from .__common import rangeMap, rangeUnmap, add_dhcp_options, DhcpOptions

mapping = univention.admin.mapping.mapping()
mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)
mapping.register('range', 'dhcpRange', rangeMap, rangeUnmap)
mapping.register('subnetmask', 'dhcpNetMask', None, univention.admin.mapping.ListToString)



class object(DhcpOptions):
	module = module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
		self.superordinate = superordinate
		self.mapping = mapping
		self.descriptions = property_descriptions

		if not superordinate:
			raise univention.admin.uexceptions.insufficientInformation, 'superordinate object not present'

		self.setup_options(options)

	def _ldap_pre_create(self):
		self.dn = '%s=%s,%s' % (
			mapping.mapName('subnet'),
			mapping.mapValue('subnet', self.info['subnet']),
			self.position.getDn()
		)

	def _ldap_addlist(self):
		return [




import univention.admin.ipaddress
import univention.admin.localization

translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
_ = translation.translate

module = 'dhcp/subnet'
operations = ['add', 'edit', 'remove', 'search']
superordinate = 'dhcp/service'
childs = 1
usewizard = 1
short_description = _('DHCP: Subnet')
long_description = ''

options = {
}

property_descriptions = {
	'subnet': univention.admin.property(
		short_description=_('Subnet address'),
		long_description='',
		syntax=univention.admin.syntax.ipv4Address,
		multivalue=0,
		include_in_default_search=1,
		options=[],
		required=1,
		may_change=0,
		identifies=1
	),
	'subnetmask': univention.admin.property(
		short_description=_('Netmask'),
		long_description='',
		syntax=univention.admin.syntax.v4netmask,
		multivalue=0,
		options=[],
		required=1,
		may_change=1,
		identifies=0
	),
	'broadcastaddress': univention.admin.property(
		short_description=_('Broadcast address'),
		long_description='',
		syntax=univention.admin.syntax.ipv4Address,
		multivalue=0,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
	'range': univention.admin.property(
		short_description=_('Dynamic address assignment'),
		long_description=_('Define a pool of addresses available for dynamic address assignment.'),
		syntax=univention.admin.syntax.IPv4_AddressRange,
		multivalue=1,
		options=[],
		required=0,
		may_change=1,
		identifies=0
	),
}

layout = [
	Tab(_('General'), _('Basic settings'), layout=[
		Group(_('General'), layout=[
			['subnet', 'subnetmask'],
			'broadcastaddress',
			'range'
		]),
	]),
]

from .__common import rangeUnmap, add_dhcp_options, DhcpOptions

mapping = univention.admin.mapping.mapping()
mapping.register('subnet', 'cn', None, univention.admin.mapping.ListToString)
mapping.register('subnetmask', 'dhcpNetMask', None, univention.admin.mapping.ListToString)
mapping.register('broadcastaddress', 'univentionDhcpBroadcastAddress', None, univention.admin.mapping.ListToString)



class object(DhcpOptions):
	module = module

	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
		self.superordinate = superordinate
		self.mapping = mapping
		self.descriptions = property_descriptions

		if not superordinate:
			raise univention.admin.uexceptions.insufficientInformation, 'superordinate object not present'

		self.info['range'] = self.oldinfo['range'] = rangeUnmap(self.oldattr.get('dhcpRange', []))

	def _ldap_pre_create(self):
		self.dn = '%s=%s,%s' % (
			mapping.mapName('subnet'),
			mapping.mapValue('subnet', self.info['subnet']),
			self.position.getDn()
		)

	def _ldap_addlist(self):
		return [
			('objectClass', ['top', 'univentionDhcpSubnet']),
		]

	def _ldap_modlist(self):

		ml = super(object, self)._ldap_modlist()

		if self.hasChanged('range'):
			dhcpRange = []
			for i in self['range']:
				for j in self['range']:
					if i != j and univention.admin.ipaddress.is_range_overlapping(i, j):
- 
--
.../univention/admin/handlers/dhcp/__common.py     |  4 +-
.../modules/univention/admin/handlers/dhcp/dhcp.py | 10 ++--
.../modules/univention/admin/handlers/dhcp/host.py | 26 +++++-----
.../modules/univention/admin/handlers/dhcp/pool.py | 58 +++++++++++-----------
.../univention/admin/handlers/dhcp/server.py       | 10 ++--
.../univention/admin/handlers/dhcp/service.py      | 10 ++--
.../univention/admin/handlers/dhcp/shared.py       | 10 ++--
.../univention/admin/handlers/dhcp/sharedsubnet.py | 34 ++++++-------
.../univention/admin/handlers/dhcp/subnet.py       | 34 ++++++-------
9 files changed, 98 insertions(+), 98 deletions(-)

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (-2 / +2 lines)

Lines 57-65 _properties = {	Link Here

		syntax=univention.admin.syntax.string,

		syntax=univention.admin.syntax.string,

		multivalue=True,

		multivalue=True,

		options=["options"],

		options=["options"],

		required = 0,

		required=False,

		may_change=True,

		may_change=True,

		identifies = 0

		identifies=False,

),

),




		short_description=_('Name'),
		long_description='',
		syntax=univention.admin.syntax.string,
		multivalue=False,
		include_in_default_search=True,
		options=[],
		required=True,
		may_change=True,
		identifies=True
	)
}





		short_description=_('Hostname'),
		long_description='',
		syntax=univention.admin.syntax.string,
		multivalue=False,
		include_in_default_search=True,
		options=[],
		required=True,
		may_change=True,
		identifies=True
	),
	'hwaddress': univention.admin.property(
		short_description=_('Hardware address'),

			'Currently, only the ethernet and token-ring types are recognized.'
			'The hardware-address should be a set of hexadecimal octets (numbers from 0 through ff) separated by colons.'),
		syntax=univention.admin.syntax.DHCP_HardwareAddress,
		multivalue=False,
		options=[],
		required=True,
		may_change=True,
		identifies=False
	),
	'fixedaddress': univention.admin.property(
		short_description=_('Fixed IP addresses'),

			'Assign one or more fixed IP addresses.'
			'Each address should be either an IP address or a domain name that resolves to one or more IP addresses'),
		syntax=univention.admin.syntax.string,
		multivalue=True,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
}





		short_description=_('Name'),
		long_description=_('A unique name used to identify this pool, e.g. "known" or "guests"'),
		syntax=univention.admin.syntax.string,
		multivalue=False,
		include_in_default_search=True,
		options=[],
		required=True,
		may_change=False,
		identifies=True
	),
	'range': univention.admin.property(
		short_description=_('IP range for dynamic assignment'),
		long_description='',
		syntax=univention.admin.syntax.IPv4_AddressRange,
		multivalue=True,
		options=[],
		required=True,
		may_change=True,
		identifies=False
	),
	'failover_peer': univention.admin.property(
		short_description=_('Failover peer'),
		long_description=_('The name of a failover configuration manually configured in /etc/dhcp/local.conf.'),
		syntax=univention.admin.syntax.string,
		multivalue=False,
		options=[],
		required=False,
		may_change=True,
		identifies=False,
	),
	'known_clients': univention.admin.property(
		short_description=_('Give IP to known clients'),
		long_description=_('Addresses are allocated for client, which have a host entry matching their MAC address.'),
		syntax=univention.admin.syntax.AllowDeny,
		multivalue=False,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
	'unknown_clients': univention.admin.property(
		short_description=_('Give IP to unknown clients'),
		long_description=_('Addresses are allocated for clients, which do not have a host entry mating their MAC address.'),
		syntax=univention.admin.syntax.AllowDeny,
		multivalue=False,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
	'dynamic_bootp_clients': univention.admin.property(
		short_description=_('Give IP to dynamic BOOTP clients'),

			'Give addresses to clients using the legacy BOOTP protocol.'
			'Since BOOTP does not support an expiry date or a release mechanism, addresses are allocated indefinitely!'),
		syntax=univention.admin.syntax.AllowDeny,
		multivalue=False,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
	'all_clients': univention.admin.property(
		short_description=_('Give IP from this pool'),
		long_description=_('Give addresses from this pool at all or not.'),
		syntax=univention.admin.syntax.AllowDeny,
		multivalue=False,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
}





		short_description=_('Server name'),
		long_description='',
		syntax=univention.admin.syntax.string,
		multivalue=False,
		include_in_default_search=True,
		options=[],
		required=True,
		may_change=True,
		identifies=True
	),
}





		short_description=_('Service name'),
		long_description='',
		syntax=univention.admin.syntax.string,
		multivalue=False,
		include_in_default_search=True,
		options=[],
		required=True,
		may_change=False,
		identifies=True
	),
}





		short_description=_('Shared network name'),
		long_description='',
		syntax=univention.admin.syntax.uid,
		multivalue=False,
		include_in_default_search=True,
		options=[],
		required=True,
		may_change=False,
		identifies=True
	)
}





		short_description=_('Subnet address'),
		long_description='',
		syntax=univention.admin.syntax.ipv4Address,
		multivalue=False,
		include_in_default_search=True,
		options=[],
		required=True,
		may_change=False,
		identifies=True
	),
	'subnetmask': univention.admin.property(
		short_description=_('Netmask'),
		long_description='',
		syntax=univention.admin.syntax.v4netmask,
		multivalue=False,
		options=[],
		required=True,
		may_change=True,
		identifies=False
	),
	'broadcastaddress': univention.admin.property(
		short_description=_('Broadcast address'),
		long_description='',
		syntax=univention.admin.syntax.ipv4Address,
		multivalue=False,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
	'range': univention.admin.property(
		short_description=_('Dynamic address assignment'),
		long_description=_('Define a pool of addresses available for dynamic address assignment.'),
		syntax=univention.admin.syntax.IPv4_AddressRange,
		multivalue=True,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
}





		short_description=_('Subnet address'),
		long_description='',
		syntax=univention.admin.syntax.ipv4Address,
		multivalue=False,
		include_in_default_search=True,
		options=[],
		required=True,
		may_change=False,
		identifies=True
	),
	'subnetmask': univention.admin.property(
		short_description=_('Netmask'),
		long_description='',
		syntax=univention.admin.syntax.v4netmask,
		multivalue=False,
		options=[],
		required=True,
		may_change=True,
		identifies=False
	),
	'broadcastaddress': univention.admin.property(
		short_description=_('Broadcast address'),
		long_description='',
		syntax=univention.admin.syntax.ipv4Address,
		multivalue=False,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
	'range': univention.admin.property(
		short_description=_('Dynamic address assignment'),
		long_description=_('Define a pool of addresses available for dynamic address assignment.'),
		syntax=univention.admin.syntax.IPv4_AddressRange,
		multivalue=True,
		options=[],
		required=False,
		may_change=True,
		identifies=False
	),
}

- 

Return to bug 33223