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:

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-2 / +1 lines)
123	return res	123	return res
124		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', [])

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-1 / +1 lines)
171	return res	171	return res
172		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


Lines 31-37 Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-1 lines)
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
33	import copy	33	import copy
34	import string
35		34
36	from univention.admin.layout import Tab, Group	35	from univention.admin.layout import Tab, Group
37	import univention.admin.filter	36	import univention.admin.filter

Lines 30-37 Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-2 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
33	import string
34
35	from univention.admin.layout import Tab, Group	33	from univention.admin.layout import Tab, Group
36	import univention.admin.filter	34	import univention.admin.filter
37	import univention.admin.handlers	35	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 ),
	)


Lines 124-132 property_descriptions={ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-3 lines)
124	),	124	),
125	}	125	}
126		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())


Lines 91-99 property_descriptions={ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-3 lines)
91	),	91	),
92	}	92	}
93		93
94	options={
95	}
96
97	layout = [	94	layout = [
98	Tab(_('General'), _('Basic settings'), layout = [	95	Tab(_('General'), _('Basic settings'), layout = [
99	Group( _( 'General' ), layout = [	96	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(-)

Lines 51-56 _properties = { Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (+9 lines)
51	),	51	),
52	}	52	}
53		53
		54
		55	def rangeMap(value):
		56	return map(lambda x: ' '.join(x), value)
		57
		58
		59	def rangeUnmap(value):
		60	return map(lambda x: x.split(), value)
		61
		62
54	_mappings = (	63	_mappings = (
55	( 'option', 'dhcpOption', None, univention.admin.mapping.ListToString ),	64	( 'option', 'dhcpOption', None, univention.admin.mapping.ListToString ),
56	)	65	)

Lines 138-148 layout = [ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-4 / +1 lines)
138	] )	138	] )
139	]	139	]
140		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)

Lines 101-111 layout = [ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-4 / +1 lines)
101	] ),	101	] ),
102	]	102	]
103		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(-)

Lines 65-72 _mappings = ( Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (-2 lines)
65	)	65	)
66		66
67	def add_dhcp_options( properties, mapping, layout ):	67	def add_dhcp_options( properties, mapping, layout ):
68	global _properties, _mappings
69
70	for name, prop in _properties.items():	68	for name, prop in _properties.items():
71	properties[ name ] = prop	69	properties[ name ] = prop
72		70

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/dhcp.py (-3 lines)
93	module=module	93	module=module
94		94
95	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	95	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
96	global mapping
97	global property_descriptions
98
99	self.mapping=mapping	96	self.mapping=mapping
100	self.descriptions=property_descriptions	97	self.descriptions=property_descriptions
101		98

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-3 lines)
118	module=module	118	module=module
119		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

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-3 lines)
150	module=module	150	module=module
151		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

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-3 lines)
81	module=module	81	module=module
82		82
83	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	83	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
84	global mapping
85	global property_descriptions
86
87	self.superordinate=superordinate	84	self.superordinate=superordinate
88	self.mapping=mapping	85	self.mapping=mapping
89	self.descriptions=property_descriptions	86	self.descriptions=property_descriptions

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-3 lines)
79	module=module	79	module=module
80		80
81	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	81	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
82	global mapping
83	global property_descriptions
84
85	self.mapping=mapping	82	self.mapping=mapping
86	self.descriptions=property_descriptions	83	self.descriptions=property_descriptions
87		84

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-3 lines)
76	module=module	76	module=module
77		77
78	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	78	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
79	global mapping
80	global property_descriptions
81
82	self.mapping=mapping	79	self.mapping=mapping
83	self.descriptions=property_descriptions	80	self.descriptions=property_descriptions
84		81

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-3 lines)
118	module=module	118	module=module
119		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(-)

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/dhcp.py (-1 / +1 lines)
96	self.mapping=mapping	96	self.mapping=mapping
97	self.descriptions=property_descriptions	97	self.descriptions=property_descriptions
98		98
99	univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )	99	super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
100		100
101		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):

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-1 / +1 lines)
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		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		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)

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-1 / +1 lines)
90	if not dn and not position:	90	if not dn and not position:
91	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'	91	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'
92		92
93	univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )	93	super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
94		94
95	def _ldap_pre_create(self):	95	def _ldap_pre_create(self):
96	self.dn='%s=%s,%s' % (mapping.mapName('server'), mapping.mapValue('server', self.info['server']), self.position.getDn())	96	self.dn='%s=%s,%s' % (mapping.mapName('server'), mapping.mapValue('server', self.info['server']), self.position.getDn())

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-1 / +1 lines)
85	if not dn and not position:	85	if not dn and not position:
86	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'	86	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'
87		87
88	univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )	88	super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
89		89
90	def _ldap_pre_create(self):	90	def _ldap_pre_create(self):
91	self.dn='%s=%s,%s' % (mapping.mapName('service'), mapping.mapValue('service', self.info['service']), self.position.getDn())	91	self.dn='%s=%s,%s' % (mapping.mapName('service'), mapping.mapValue('service', self.info['service']), self.position.getDn())

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-1 / +1 lines)
84	if not dn and not position:	84	if not dn and not position:
85	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'	85	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'
86		86
87	univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )	87	super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
88		88
89	def _ldap_pre_create(self):	89	def _ldap_pre_create(self):
90	self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())	90	self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-1 / +1 lines)
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		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		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 )

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-14 / +13 lines)
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		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
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', [])))

Lines 72-78 layout = [ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-13 / +14 lines)
72	mapping=univention.admin.mapping.mapping()	72	mapping=univention.admin.mapping.mapping()
73	mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)	73	mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)
74		74
75	class object(univention.admin.handlers.simpleLdap):	75	from .__common import DhcpOptions
		76
		77
		78	class object(DhcpOptions):
76	module=module	79	module=module
77		80
78	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	81	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
Lines 94-114 class object(univention.admin.handlers.simpleLdap): Link Here
94	('objectClass', ['top', 'dhcpSharedNetwork'])	97	('objectClass', ['top', 'dhcpSharedNetwork'])
95	]	98	]
96		99
97	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
98		100
99	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
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(-)

Lines 30-35 Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (-3 / +7 lines)
30	# /usr/share/common-licenses/AGPL-3; if not, see	30	# /usr/share/common-licenses/AGPL-3; if not, see
31	# <http://www.gnu.org/licenses/>.	31	# <http://www.gnu.org/licenses/>.
32		32
		33	import sys
33	import copy	34	import copy
34		35
35	import univention.admin.localization	36	import univention.admin.localization
Lines 65-74 _mappings = ( Link Here
65	('option', 'dhcpOption', None, None),	66	('option', 'dhcpOption', None, None),
66	)	67	)
67		68
68	def add_dhcp_options( properties, mapping, layout ):	69	def add_dhcp_options(module_name):
69	for name, prop in _properties.items():	70	module = sys.modules[module_name]
70	properties[ name ] = prop
71		71
		72	properties = getattr(module, "property_descriptions")
		73	properties.update(_properties)
		74
		75	mapping = getattr(module, "mapping")
72	for item in _mappings:	76	for item in _mappings:
73	mapping.register( *item )	77	mapping.register( *item )
74		78

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-1 / +2 lines)
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		116
117	from .__common import DhcpOptions	117	from .__common import add_dhcp_options, DhcpOptions
		118	add_dhcp_options(__name__)
118		119
119		120
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


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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-1 / +1 lines)
74	mapping.register('server', 'cn', None, univention.admin.mapping.ListToString)	74	mapping.register('server', 'cn', None, univention.admin.mapping.ListToString)
75		75
76	from .__common import add_dhcp_options	76	from .__common import add_dhcp_options
		77	add_dhcp_options(__name__)
77		78
78	add_dhcp_options( property_descriptions, mapping, layout )
79		79
80	class object(univention.admin.handlers.simpleLdap):	80	class object(univention.admin.handlers.simpleLdap):
81	module=module	81	module=module

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-1 / +1 lines)
72	mapping.register('service', 'cn', None, univention.admin.mapping.ListToString)	72	mapping.register('service', 'cn', None, univention.admin.mapping.ListToString)
73		73
74	from .__common import add_dhcp_options, add_dhcp_objectclass, DhcpOptions	74	from .__common import add_dhcp_options, add_dhcp_objectclass, DhcpOptions
		75	add_dhcp_options(__name__)
75		76
76	add_dhcp_options( property_descriptions, mapping, layout )
77		77
78	class object(DhcpOptions):	78	class object(DhcpOptions):
79	module=module	79	module=module

Lines 72-78 layout = [ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-1 / +2 lines)
72	mapping=univention.admin.mapping.mapping()	72	mapping=univention.admin.mapping.mapping()
73	mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)	73	mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)
74		74
75	from .__common import DhcpOptions	75	from .__common import add_dhcp_options, DhcpOptions
		76	add_dhcp_options(__name__)
76		77
77		78
78	class object(DhcpOptions):	79	class object(DhcpOptions):

Lines 102-108 layout = [ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-3 / +4 lines)
102	]	102	]
103		103
104		104
105	from .__common import rangeMap, rangeUnmap, DhcpOptions	105	from .__common import rangeMap, rangeUnmap, add_dhcp_options, DhcpOptions
106		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		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
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

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (+1 lines)
131	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'	131	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'
132		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
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())

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (+1 lines)
164	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'	164	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'
165		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
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('&', [

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (+1 lines)
89	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'	89	raise univention.admin.uexceptions.insufficientInformation, 'neither dn nor position present'
90		90
91	super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)	91	super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
		92	self.setup_options(options)
92		93
93	def _ldap_pre_create(self):	94	def _ldap_pre_create(self):
94	self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())	95	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(-)

Lines 57-65 _properties = { Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (-2 / +2 lines)
57	syntax=univention.admin.syntax.string,	57	syntax=univention.admin.syntax.string,
58	multivalue=True,	58	multivalue=True,
59	options=["options"],	59	options=["options"],
60	required = 0,	60	required=False,
61	may_change=True,	61	may_change=True,
62	identifies = 0	62	identifies=False,
63	),	63	),
64	}	64	}
65		65




		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

Lines 546-561 class simpleLdap(base): Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py (-15 / +3 lines)
546	self.exceptions=[]	546	self.exceptions=[]
547		547
548	# remove all properties which do not belong to chosen options	548	# remove all properties which do not belong to chosen options
549
550	chosen_options = None
551	descriptions = None
552
553	try:	549	try:
554	# these might not be set by an inheriting module	550	# these might not be set by an inheriting module
555	chosen_options = self.options	551	chosen_options = self.options
556	descriptions = self.descriptions	552	descriptions = self.descriptions
557	except:	553	except:
558	pass	554	chosen_options = None
		555	descriptions = None
559		556
560	if chosen_options and descriptions:	557	if chosen_options and descriptions:
561	for desc in descriptions:	558	for desc in descriptions:
Lines 1009-1016 class simpleLdap(base): Link Here
1009	self.policyObjects[policy_type]=univention.admin.objects.get(policy_module, None, self.lo, policy_position)	1006	self.policyObjects[policy_type]=univention.admin.objects.get(policy_module, None, self.lo, policy_position)
1010	self.policyObjects[policy_type].copyIdentifier(self)	1007	self.policyObjects[policy_type].copyIdentifier(self)
1011	self._init_ldap_search( self.policyObjects[ policy_type ] )	1008	self._init_ldap_search( self.policyObjects[ policy_type ] )
1012	else:
1013	pass
1014		1009
1015	return self.policyObjects[policy_type]	1010	return self.policyObjects[policy_type]
1016		1011
Lines 1519-1525 class simpleComputer( simpleLdap ): Link Here
1519	modify(rdn, zone)	1514	modify(rdn, zone)
1520	except univention.admin.uexceptions.noObject:	1515	except univention.admin.uexceptions.noObject:
1521	pass	1516	pass
1522	pass	1517
1523	def __add_dns_reverse_object( self, name, zoneDn, ip ):	1518	def __add_dns_reverse_object( self, name, zoneDn, ip ):
1524	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 ) )	1519	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 ) )
1525	if name and zoneDn and ip:	1520	if name and zoneDn and ip:
Lines 1798-1804 class simpleComputer( simpleLdap ): Link Here
1798	else:	1793	else:
1799	# thow exeption, cNAMERecord is single value	1794	# thow exeption, cNAMERecord is single value
1800	raise univention.admin.uexceptions.dnsAliasAlreadyUsed, _('DNS alias is already in use.')	1795	raise univention.admin.uexceptions.dnsAliasAlreadyUsed, _('DNS alias is already in use.')
1801	pass
1802		1796
1803	def __remove_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias = None ):	1797	def __remove_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias = None ):
1804	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 ) )	1798	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 ) )
Lines 1963-1969 class simpleComputer( simpleLdap ): Link Here
1963	self.__update_groups_after_namechange()	1957	self.__update_groups_after_namechange()
1964	self.__rename_dhcp_object( position = None, old_name = self.__changes[ 'name' ][ 0 ], new_name = self.__changes[ 'name' ][ 1 ] )	1958	self.__rename_dhcp_object( position = None, old_name = self.__changes[ 'name' ][ 0 ], new_name = self.__changes[ 'name' ][ 1 ] )
1965	self.__rename_dns_object( position = None, old_name = self.__changes[ 'name' ][ 0 ], new_name = self.__changes[ 'name' ][ 1 ] )	1959	self.__rename_dns_object( position = None, old_name = self.__changes[ 'name' ][ 0 ], new_name = self.__changes[ 'name' ][ 1 ] )
1966	pass
1967		1960
1968	if self.ipRequest == 1 and self[ 'ip' ]:	1961	if self.ipRequest == 1 and self[ 'ip' ]:
1969	for ipAddress in self[ 'ip' ]:	1962	for ipAddress in self[ 'ip' ]:
Lines 2545-2553 class simpleComputer( simpleLdap ): Link Here
2545	self.__saved_dhcp_entry = network_object['dhcpEntryZone']	2538	self.__saved_dhcp_entry = network_object['dhcpEntryZone']
2546		2539
2547	self.old_network=value	2540	self.old_network=value
2548	else:
2549	pass
2550
2551		2541
2552	elif key == 'ip':	2542	elif key == 'ip':
2553	self.ip_freshly_set = True	2543	self.ip_freshly_set = True
2554	-
2555	--
2556	.../modules/univention/admin/handlers/__init__.py \| 28 +++++++---------------	2544	.../modules/univention/admin/handlers/__init__.py \| 28 +++++++---------------
2557	.../univention/admin/handlers/dhcp/service.py \| 3 +--	2545	.../univention/admin/handlers/dhcp/service.py \| 3 +--
2558	.../univention/admin/handlers/dhcp/sharedsubnet.py \| 2 +-	2546	.../univention/admin/handlers/dhcp/sharedsubnet.py \| 2 +-
2559	.../univention/admin/handlers/dhcp/subnet.py \| 4 ++--	2547	.../univention/admin/handlers/dhcp/subnet.py \| 4 ++--
2560	4 files changed, 12 insertions(+), 25 deletions(-)	2548	4 files changed, 12 insertions(+), 25 deletions(-)

Lines 558-576 class simpleLdap(base): Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py (-20 / +8 lines)
558	for desc in descriptions:	558	for desc in descriptions:
559	propoptions = descriptions[desc].options	559	propoptions = descriptions[desc].options
560		560
561	if (propoptions==[]):	561	if not propoptions:
562	# property applies to all options	562	# property applies to all options
563	continue	563	continue
564		564
565	shortcut = False	565	if set(propoptions) & set(chosen_options):
566		566	# this property applies to one of the chosen options,
567	for i in propoptions:	567	# jump to next option
568	if i in chosen_options:
569	# this property applies to one of the chosen options,
570	# jump to next option
571	shortcut = True
572	continue
573	if shortcut:
574	continue	568	continue
575		569
576	# if we've come here, we found a property that does not apply	570	# if we've come here, we found a property that does not apply
Lines 1840-1847 class simpleComputer( simpleLdap ): Link Here
1840		1834
1841	def _ldap_post_modify( self ):	1835	def _ldap_post_modify( self ):
1842		1836
1843	if len ( self[ 'mac' ] ) > 1 or len( self[ 'ip' ] ) > 1:	1837	self.__multiip \|= len(self['mac']) > 1 or len(self['ip']) > 1
1844	self.__multiip = True
1845		1838
1846	for entry in self.__changes[ 'dhcpEntryZone' ][ 'remove' ]:	1839	for entry in self.__changes[ 'dhcpEntryZone' ][ 'remove' ]:
1847	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'simpleComputer: dhcp check: removed: %s' % entry )	1840	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'simpleComputer: dhcp check: removed: %s' % entry )
Lines 2164-2175 class simpleComputer( simpleLdap ): Link Here
2164	else:	2157	else:
2165	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.')	2158	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.')
2166		2159
2167	if len ( self[ 'mac' ] ) < 2 and len( self[ 'ip' ] ) < 2:	2160	self.__multiip = len(self['mac']) > 1 or len(self['ip']) > 1
2168	self.__multiip = False
2169	else:
2170	self.__multiip = True
2171		2161
2172	ml = ml + super( simpleComputer, self )._ldap_modlist( )	2162	ml += super(simpleComputer, self)._ldap_modlist()
2173		2163
2174	return ml	2164	return ml
2175		2165
Lines 2785-2793 class simplePolicy(simpleLdap): Link Here
2785	if self.hasChanged(key):	2775	if self.hasChanged(key):
2786	univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'polinfo: key:%s hasChanged' % (key) )	2776	univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'polinfo: key:%s hasChanged' % (key) )
2787	self.changes=1	2777	self.changes=1
2788	return	2778	return
2789	else:
2790	return
2791		2779
2792	# this object did not exist before	2780	# this object did not exist before
2793	if not self.oldinfo:	2781	if not self.oldinfo:

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

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/subnet.py (-4 / +2 lines)
205	return res	205	return res
206		206
207	def identify(dn, attr):	207	def identify(dn, attr):
208		208	ocs = set(attr.get('objectClass', []))
209	return 'univentionDhcpSubnet' in attr.get('objectClass', []) and not 'univentionDhcpSharedSubnet' in attr.get('objectClass', [])	209	return 'univentionDhcpSubnet' in ocs and not 'univentionDhcpSharedSubnet' in ocs
210	-
211	--
212	.../modules/univention/admin/handlers/__init__.py \| 31 +++++++++++-----------	210	.../modules/univention/admin/handlers/__init__.py \| 31 +++++++++++-----------
213	.../modules/univention/admin/handlers/dhcp/pool.py \| 1 -	211	.../modules/univention/admin/handlers/dhcp/pool.py \| 1 -
214	.../univention/admin/handlers/dhcp/sharedsubnet.py \| 2 --	212	.../univention/admin/handlers/dhcp/sharedsubnet.py \| 2 --
215	.../univention/admin/handlers/dhcp/subnet.py \| 4 +--	213	.../univention/admin/handlers/dhcp/subnet.py \| 4 +--
216	4 files changed, 16 insertions(+), 22 deletions(-)	214	4 files changed, 16 insertions(+), 22 deletions(-)

Lines 33-39 Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py (-16 / +15 lines)
33	import copy	33	import copy
34	import types	34	import types
35	import re	35	import re
36	import string
37	import ldap	36	import ldap
38	import ipaddr	37	import ipaddr
39		38
Lines 1111-1117 class simpleComputer( simpleLdap ): Link Here
1111	zoneName.reverse( )	1110	zoneName.reverse( )
1112	relativeDomainName = relativeDomainName.split( '.' )	1111	relativeDomainName = relativeDomainName.split( '.' )
1113	relativeDomainName.reverse( )	1112	relativeDomainName.reverse( )
1114	return '%s.%s' % ( string.join( zoneName, '.' ) , string.join( relativeDomainName, '.' ) )	1113	return '.'.join(zoneName + relativeDomainName)
1115		1114
1116	def __ip_from_ptr_ipv6( self, zoneName, relativeDomainName ):	1115	def __ip_from_ptr_ipv6( self, zoneName, relativeDomainName ):
1117	fullName = relativeDomainName + '.' + zoneName.replace('.ip6.arpa', '')	1116	fullName = relativeDomainName + '.' + zoneName.replace('.ip6.arpa', '')
Lines 1200-1206 class simpleComputer( simpleLdap ): Link Here
1200	poscomponents = univention.admin.uldap.explodeDn( dn,0 )	1199	poscomponents = univention.admin.uldap.explodeDn( dn,0 )
1201	poscomponents.pop( 0 )	1200	poscomponents.pop( 0 )
1202	ip = self.__ip_from_ptr( attr[ 'zoneName' ][ 0 ], attr[ 'relativeDomainName' ][ 0 ] )	1201	ip = self.__ip_from_ptr( attr[ 'zoneName' ][ 0 ], attr[ 'relativeDomainName' ][ 0 ] )
1203	entry = [ string.join( poscomponents, ',' ), ip ]	1202	entry = [','.join(poscomponents), ip]
1204	if not entry in self[ 'dnsEntryZoneReverse' ]:	1203	if not entry in self[ 'dnsEntryZoneReverse' ]:
1205	self[ 'dnsEntryZoneReverse' ].append( entry )	1204	self[ 'dnsEntryZoneReverse' ].append( entry )
1206	except univention.admin.uexceptions.insufficientInformation, msg:	1205	except univention.admin.uexceptions.insufficientInformation, msg:
Lines 1218-1224 class simpleComputer( simpleLdap ): Link Here
1218	self[ 'dnsAlias' ].append(dnsAlias)	1217	self[ 'dnsAlias' ].append(dnsAlias)
1219	poscomponents = univention.admin.uldap.explodeDn( dn,0 )	1218	poscomponents = univention.admin.uldap.explodeDn( dn,0 )
1220	poscomponents.pop( 0 )	1219	poscomponents.pop( 0 )
1221	dnsAliasZoneContainer = string.join( poscomponents,',' )	1220	dnsAliasZoneContainer = ','.join(poscomponents)
1222	if attr[ 'cNAMERecord' ][0] == self[ 'name' ]:	1221	if attr[ 'cNAMERecord' ][0] == self[ 'name' ]:
1223	dnsForwardZone = attr[ 'zoneName' ][0]	1222	dnsForwardZone = attr[ 'zoneName' ][0]
1224	else:	1223	else:
Lines 1250-1261 class simpleComputer( simpleLdap ): Link Here
1250	poscomponents.pop( 0 )	1249	poscomponents.pop( 0 )
1251	if attr.has_key( 'univentionDhcpFixedAddress' ):	1250	if attr.has_key( 'univentionDhcpFixedAddress' ):
1252	for ip in attr[ 'univentionDhcpFixedAddress' ]:	1251	for ip in attr[ 'univentionDhcpFixedAddress' ]:
1253	entry = [ string.join( poscomponents,',' ), ip, macAddress ]	1252	entry = [','.join(poscomponents), ip, macAddress]
1254	if not entry in self[ 'dhcpEntryZone' ]:	1253	if not entry in self[ 'dhcpEntryZone' ]:
1255	self[ 'dhcpEntryZone' ].append( entry )	1254	self[ 'dhcpEntryZone' ].append( entry )
1256		1255
1257	else:	1256	else:
1258	entry = [ string.join( poscomponents,',' ), macAddress ]	1257	entry = [','.join(poscomponents), macAddress]
1259	if not entry in self[ 'dhcpEntryZone' ]:	1258	if not entry in self[ 'dhcpEntryZone' ]:
1260	self[ 'dhcpEntryZone' ].append( entry )	1259	self[ 'dhcpEntryZone' ].append( entry )
1261	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'open: DHCP; self[ dhcpEntryZone ] = "%s"' % self[ 'dhcpEntryZone' ] )	1260	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'open: DHCP; self[ dhcpEntryZone ] = "%s"' % self[ 'dhcpEntryZone' ] )
Lines 1499-1505 class simpleComputer( simpleLdap ): Link Here
1499	results = self.lo.search( base = tmppos.getBase( ), scope = 'domain', attr = [ 'zoneDn' ], filter = '(&(objectClass=dNSZone)(\|(pTRRecord=%s)(pTRRecord=%s.*)))' % ( name, name ), unique = 0 )	1498	results = self.lo.search( base = tmppos.getBase( ), scope = 'domain', attr = [ 'zoneDn' ], filter = '(&(objectClass=dNSZone)(\|(pTRRecord=%s)(pTRRecord=%s.*)))' % ( name, name ), unique = 0 )
1500	for dn, attr in results:	1499	for dn, attr in results:
1501	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: dn: "%s"' % dn )	1500	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: dn: "%s"' % dn )
1502	zone = string.join( ldap.explode_dn( dn )[ 1: ], ',' )	1501	zone = ','.join(ldap.explode_dn(dn)[1:])
1503	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: zone: "%s"' % zone )	1502	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: zone: "%s"' % zone )
1504	rdn = self.calc_dns_reverse_entry_name( ip, zone )	1503	rdn = self.calc_dns_reverse_entry_name( ip, zone )
1505	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: rdn: "%s"' % rdn )	1504	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'DEBUG: rdn: "%s"' % rdn )
Lines 1539-1551 class simpleComputer( simpleLdap ): Link Here
1539	else:	1538	else:
1540	subnet = ldap.explode_dn( zoneDn, 1 )[ 0 ].replace( '.in-addr.arpa', '' ).split( '.' )	1539	subnet = ldap.explode_dn( zoneDn, 1 )[ 0 ].replace( '.in-addr.arpa', '' ).split( '.' )
1541	subnet.reverse( )	1540	subnet.reverse( )
1542	subnet = string.join( subnet, '.' ) + '.'	1541	subnet = '.'.join(subnet) + '.'
1543	ipPart = ip.replace( subnet, '' )	1542	ipPart = ip.replace( subnet, '' )
1544	if ipPart == ip:	1543	if ipPart == ip:
1545	raise univention.admin.uexceptions.InvalidDNS_Information, _( 'Reverse zone and IP address are incompatible.' )	1544	raise univention.admin.uexceptions.InvalidDNS_Information, _( 'Reverse zone and IP address are incompatible.' )
1546	pointer = string.split( ipPart, '.' )	1545	pointer = ipPart.split('.')
1547	pointer.reverse( )	1546	pointer.reverse( )
1548	ipPart = string.join( pointer, '.' )	1547	ipPart = '.'.join(pointer)
1549	tmppos = univention.admin.uldap.position( self.position.getDomain( ) )	1548	tmppos = univention.admin.uldap.position( self.position.getDomain( ) )
1550	# check in which forward zone the ip is set	1549	# check in which forward zone the ip is set
1551	hostname_list = []	1550	hostname_list = []
Lines 1601-1607 class simpleComputer( simpleLdap ): Link Here
1601	# remove the object	1600	# remove the object
1602	self.lo.delete( dn )	1601	self.lo.delete( dn )
1603	if not zoneDn:	1602	if not zoneDn:
1604	zone = string.join( ldap.explode_dn( dn )[ 1: ], ',' )	1603	zone = ','.join(ldap.explode_dn(dn)[1:])
1605	else:	1604	else:
1606	zone = zoneDn	1605	zone = zoneDn
1607		1606
Lines 1616-1622 class simpleComputer( simpleLdap ): Link Here
1616	self.lo.modify(dn, [(attrEdit, attr[attrEdit], new_ip_list, ), ])	1615	self.lo.modify(dn, [(attrEdit, attr[attrEdit], new_ip_list, ), ])
1617		1616
1618	if not zoneDn:	1617	if not zoneDn:
1619	zone = string.join( ldap.explode_dn( dn )[ 1: ], ',' )	1618	zone = ','.join(ldap.explode_dn(dn)[1:])
1620	else:	1619	else:
1621	zone = zoneDn	1620	zone = zoneDn
1622		1621
Lines 1696-1702 class simpleComputer( simpleLdap ): Link Here
1696	modlist.append( ('aRecord', old_aRecord, new_aRecord, ) )	1695	modlist.append( ('aRecord', old_aRecord, new_aRecord, ) )
1697	self.lo.modify(dn, modlist)	1696	self.lo.modify(dn, modlist)
1698	if not zoneDn:	1697	if not zoneDn:
1699	zone = string.join( ldap.explode_dn( dn )[ 1: ], ',' )	1698	zone = ','.join(ldap.explode_dn(dn)[1:])
1700		1699
1701	if zoneDn:	1700	if zoneDn:
1702	zone = zoneDn	1701	zone = zoneDn
Lines 1919-1925 class simpleComputer( simpleLdap ): Link Here
1919	if len (self[ 'mac' ] ) > 0:	1918	if len (self[ 'mac' ] ) > 0:
1920	dn = self.__remove_from_dhcp_object( None, self[ 'name' ], entry, self[ 'mac' ][ 0 ])	1919	dn = self.__remove_from_dhcp_object( None, self[ 'name' ], entry, self[ 'mac' ][ 0 ])
1921	try:	1920	try:
1922	dn = string.join(dn.split(',')[1:],',')	1921	dn = ','.join(dn.split(',')[1:])
1923	self.__modify_dhcp_object( dn, self[ 'name' ], self.__changes[ 'ip' ][ 'add' ][ 0 ], self[ 'mac' ][ 0 ] )	1922	self.__modify_dhcp_object( dn, self[ 'name' ], self.__changes[ 'ip' ][ 'add' ][ 0 ], self[ 'mac' ][ 0 ] )
1924	except:	1923	except:
1925	pass	1924	pass
Lines 1967-1979 class simpleComputer( simpleLdap ): Link Here
1967		1966
1968	def __remove_associated_domain( self, entry ):	1967	def __remove_associated_domain( self, entry ):
1969	dn, ip = self.__split_dns_line( entry )	1968	dn, ip = self.__split_dns_line( entry )
1970	domain = string.join(ldap.explode_rdn(dn)[0].split('=')[1:], '=')	1969	domain = ldap.explode_rdn(dn)[0].split('=', 1)[1]
1971	if self.info.get('domain', None) == domain:	1970	if self.info.get('domain', None) == domain:
1972	self.info['domain'] = None	1971	self.info['domain'] = None
1973		1972
1974	def __set_associated_domain( self, entry ):	1973	def __set_associated_domain( self, entry ):
1975	dn, ip = self.__split_dns_line( entry )	1974	dn, ip = self.__split_dns_line( entry )
1976	domain = string.join(ldap.explode_rdn(dn)[0].split('=')[1:], '=')	1975	domain = ldap.explode_rdn(dn)[0].split('=', 1)[1]
1977	if not self.info.get('domain', None):	1976	if not self.info.get('domain', None):
1978	self.info['domain'] = domain	1977	self.info['domain'] = domain
1979		1978

Lines 60-67 property_descriptions={ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-7 lines)
60	identifies=1	60	identifies=1
61	)	61	)
62	}	62	}
63	options={
64	}
65		63
66	layout = [	64	layout = [
67	Tab( _( 'General' ), _( 'Basic settings' ), layout = [	65	Tab( _( 'General' ), _( 'Basic settings' ), layout = [
Lines 91-101 class object(univention.admin.handlers.simpleLdap): Link Here
91		89
92	univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )	90	univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate, attributes = attributes )
93		91
94	def open(self):
95	univention.admin.handlers.simpleLdap.open(self)
96
97	self.save()
98
99	def _ldap_pre_create(self):	92	def _ldap_pre_create(self):
100	self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())	93	self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())
101		94

Lines 53-59 options={ Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/pool.py (-12 / +12 lines)
53	property_descriptions={	53	property_descriptions={
54	'name': univention.admin.property(	54	'name': univention.admin.property(
55	short_description=_('Name'),	55	short_description=_('Name'),
56	long_description='',	56	long_description=_('A unique name used to identify this pool, e.g. "known" or "guests"'),
57	syntax=univention.admin.syntax.string,	57	syntax=univention.admin.syntax.string,
58	multivalue=0,	58	multivalue=0,
59	include_in_default_search=1,	59	include_in_default_search=1,
Lines 74-80 property_descriptions={ Link Here
74	),	74	),
75	'failover_peer': univention.admin.property(	75	'failover_peer': univention.admin.property(
76	short_description=_('Failover peer'),	76	short_description=_('Failover peer'),
77	long_description='',	77	long_description=_('The name of a failover configuration manually configured in /etc/dhcp/local.conf.'),
78	syntax=univention.admin.syntax.string,	78	syntax=univention.admin.syntax.string,
79	multivalue=0,	79	multivalue=0,
80	options=[],	80	options=[],
Lines 83-90 property_descriptions={ Link Here
83	identifies=0,	83	identifies=0,
84	),	84	),
85	'known_clients': univention.admin.property(	85	'known_clients': univention.admin.property(
86	short_description=_('Allow known clients'),	86	short_description=_('Give IP to known clients'),
87	long_description='',	87	long_description=_('Addresses are allocated for client, which have a host entry matching their MAC address.'),
88	syntax=univention.admin.syntax.AllowDeny,	88	syntax=univention.admin.syntax.AllowDeny,
89	multivalue=0,	89	multivalue=0,
90	options=[],	90	options=[],
Lines 93-100 property_descriptions={ Link Here
93	identifies=0	93	identifies=0
94	),	94	),
95	'unknown_clients': univention.admin.property(	95	'unknown_clients': univention.admin.property(
96	short_description=_('Allow unknown clients'),	96	short_description=_('Give IP to unknown clients'),
97	long_description='',	97	long_description=_('Addresses are allocated for clients, which do not have a host entry mating their MAC address.'),
98	syntax=univention.admin.syntax.AllowDeny,	98	syntax=univention.admin.syntax.AllowDeny,
99	multivalue=0,	99	multivalue=0,
100	options=[],	100	options=[],
Lines 103-110 property_descriptions={ Link Here
103	identifies=0	103	identifies=0
104	),	104	),
105	'dynamic_bootp_clients': univention.admin.property(	105	'dynamic_bootp_clients': univention.admin.property(
106	short_description=_('Allow dynamic BOOTP clients'),	106	short_description=_('Give IP to dynamic BOOTP clients'),
107	long_description='',	107	long_description=_(
		108	'Give addresses to clients using the legacy BOOTP protocol.'
		109	'Since BOOTP does not support an expiry date or a release mechanism, addresses are allocated indefinitely!'),
108	syntax=univention.admin.syntax.AllowDeny,	110	syntax=univention.admin.syntax.AllowDeny,
109	multivalue=0,	111	multivalue=0,
110	options=[],	112	options=[],
Lines 113-120 property_descriptions={ Link Here
113	identifies=0	115	identifies=0
114	),	116	),
115	'all_clients': univention.admin.property(	117	'all_clients': univention.admin.property(
116	short_description=_('All clients'),	118	short_description=_('Give IP from this pool'),
117	long_description='',	119	long_description=_('Give addresses from this pool at all or not.'),
118	syntax=univention.admin.syntax.AllowDeny,	120	syntax=univention.admin.syntax.AllowDeny,
119	multivalue=0,	121	multivalue=0,
120	options=[],	122	options=[],
121	-
122	--
123	.../modules/univention/admin/handlers/dhcp/dhcp.py \| 2 +-	123	.../modules/univention/admin/handlers/dhcp/dhcp.py \| 2 +-
124	.../modules/univention/admin/handlers/dhcp/host.py \| 2 +-	124	.../modules/univention/admin/handlers/dhcp/host.py \| 2 +-
125	.../modules/univention/admin/handlers/dhcp/pool.py \| 7 +++----	125	.../modules/univention/admin/handlers/dhcp/pool.py \| 7 +++----
126	.../modules/univention/admin/handlers/dhcp/server.py \| 2 +-	126	.../modules/univention/admin/handlers/dhcp/server.py \| 2 +-
127	.../modules/univention/admin/handlers/dhcp/service.py \| 2 +-	127	.../modules/univention/admin/handlers/dhcp/service.py \| 2 +-
128	.../modules/univention/admin/handlers/dhcp/shared.py \| 2 +-	128	.../modules/univention/admin/handlers/dhcp/shared.py \| 2 +-
129	.../modules/univention/admin/handlers/dhcp/sharedsubnet.py \| 2 +-	129	.../modules/univention/admin/handlers/dhcp/sharedsubnet.py \| 2 +-
130	.../modules/univention/admin/handlers/dhcp/subnet.py \| 6 +++---	130	.../modules/univention/admin/handlers/dhcp/subnet.py \| 6 +++---
131	8 files changed, 12 insertions(+), 13 deletions(-)	131	8 files changed, 12 insertions(+), 13 deletions(-)

Lines 112-134 class object(univention.admin.handlers.simpleLdap): Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-12 / +13 lines)
112	shadow_module, shadow_object=univention.admin.objects.shadow(self.lo, module, object, self.position)	112	shadow_module, shadow_object=univention.admin.objects.shadow(self.lo, module, object, self.position)
113	self.lo.modify(self.dn, [('dhcpServiceDN', oldServiceDN[0], shadow_object.dn)])	113	self.lo.modify(self.dn, [('dhcpServiceDN', oldServiceDN[0], shadow_object.dn)])
114		114
115	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):	115	def lookup_filter(filter_s=None, lo=None):
116		116	filter_obj=univention.admin.filter.conjunction('&', [
117	filter=univention.admin.filter.conjunction('&', [
118	univention.admin.filter.expression('objectClass', 'dhcpServer')	117	univention.admin.filter.expression('objectClass', 'dhcpServer')
119	])	118	])
		119	filter_obj.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
		120	return filter_obj
120		121
121	if superordinate:
122	filter.expressions.append(univention.admin.filter.expression('dhcpServiceDN', superordinate.dn))
123		122
124	if filter_s:	123	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
125	filter_p=univention.admin.filter.parse(filter_s)	124	filter_obj = lookup_filter(filter_s)
126	univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)	125	if superordinate:
127	filter.expressions.append(filter_p)	126	filter_obj.expressions.append(univention.admin.filter.expression('dhcpServiceDN', superordinate.dn))
		127	filter_str = unicode(filter_obj)
128		128
129	res=[]	129	res = [
130	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):	130	object(co, lo, None, dn=dn, superordinate=superordinate, attributes=attrs)
131	res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))	131	for dn, attrs in lo.search(filter_str, base, scope, [], unique, required, timeout, sizelimit)
		132	]
132	return res	133	return res
133		134
134	def identify(dn, attr):	135	def identify(dn, attr):

Lines 63-68 s4connector_search = False Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py (-33 / +14 lines)
63	# FIXME: What is the use of the following line?	63	# FIXME: What is the use of the following line?
64	# __path__.append("users")	64	# __path__.append("users")
65		65
		66
66	# manages properties	67	# manages properties
67	class base(object):	68	class base(object):
68	def __init__(self, co, lo, position, dn='', superordinate = None ):	69	def __init__(self, co, lo, position, dn='', superordinate = None ):
Lines 298-304 class base(object): Link Here
298	return self.descriptions.keys()	299	return self.descriptions.keys()
299		300
300	def items(self):	301	def items(self):
301
302	# this returns emtpy strings resp. empty lists for attributes not set	302	# this returns emtpy strings resp. empty lists for attributes not set
303	r=[]	303	r=[]
304	for key in self.keys():	304	for key in self.keys():
Lines 455-461 class base(object): Link Here
455		455
456		456
457	class simpleLdap(base):	457	class simpleLdap(base):
458
459	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	458	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
460	global s4connector_present	459	global s4connector_present
461	global s4connector_search	460	global s4connector_search
Lines 527-533 class simpleLdap(base): Link Here
527	def description(self):	526	def description(self):
528	if self.dn:	527	if self.dn:
529	rdn = self.lo.explodeDn(self.dn)[0]	528	rdn = self.lo.explodeDn(self.dn)[0]
530	return rdn[rdn.find('=')+1:]	529	return rdn[rdn.find('=') + 1:]
531	else:	530	else:
532	return 'none'	531	return 'none'
533		532
Lines 584-590 class simpleLdap(base): Link Here
584	ml.append(('objectClass', self.oldattr.get('objectClass', []), self.oldattr.get('objectClass', [])+['univentionPolicyReference']))	583	ml.append(('objectClass', self.oldattr.get('objectClass', []), self.oldattr.get('objectClass', [])+['univentionPolicyReference']))
585	ml.append(('univentionPolicyReference', self.oldpolicies, self.policies))	584	ml.append(('univentionPolicyReference', self.oldpolicies, self.policies))
586		585
587
588	return ml	586	return ml
589		587
590	def _create(self):	588	def _create(self):
Lines 709-715 class simpleLdap(base): Link Here
709	self.save()	707	self.save()
710	return self.dn	708	return self.dn
711		709
712	#+++# MODIFY #+++#	710	#+++# MODIFY #+++#
713	def _modify(self, modify_childs=1, ignore_license=0):	711	def _modify(self, modify_childs=1, ignore_license=0):
714	self.exceptions=[]	712	self.exceptions=[]
715		713
Lines 734-740 class simpleLdap(base): Link Here
734	# iterate over all properties and call checkLdap() of corresponding syntax	732	# iterate over all properties and call checkLdap() of corresponding syntax
735	self._call_checkLdap_on_all_property_syntaxes()	733	self._call_checkLdap_on_all_property_syntaxes()
736		734
737	#+++# MODLIST #+++#	735	#+++# MODLIST #+++#
738	ml=self._ldap_modlist()	736	ml=self._ldap_modlist()
739	# custom attributes	737	# custom attributes
740	m=univention.admin.modules.get(self.module)	738	m=univention.admin.modules.get(self.module)
Lines 771-777 class simpleLdap(base): Link Here
771	ml.remove(i)	769	ml.remove(i)
772	ml.extend( addlist )	770	ml.extend( addlist )
773		771
774
775	else:	772	else:
776	if deleteObjectClass == '1' and not self.info.has_key(pname):	773	if deleteObjectClass == '1' and not self.info.has_key(pname):
777	# value is empty, should delete objectClass and Values	774	# value is empty, should delete objectClass and Values
Lines 819-825 class simpleLdap(base): Link Here
819	ml.append( ('objectClass', self.oldattr.get('objectClass'), current_ocs+[prop.objClass]) )	816	ml.append( ('objectClass', self.oldattr.get('objectClass'), current_ocs+[prop.objClass]) )
820		817
821	else:	818	else:
822
823	if prop.syntax == 'boolean' and self.info.has_key(prop.name) and self.info[prop.name] == '0':	819	if prop.syntax == 'boolean' and self.info.has_key(prop.name) and self.info[prop.name] == '0':
824	# syntax is boolean and value == 0 ==> remove	820	# syntax is boolean and value == 0 ==> remove
825	dellist = []	821	dellist = []
Lines 1396-1408 class simpleComputer( simpleLdap ): Link Here
1396	object[ 'host' ] = object[ 'host' ].replace( old_name, new_name )	1392	object[ 'host' ] = object[ 'host' ].replace( old_name, new_name )
1397	object.modify( )	1393	object.modify( )
1398		1394
1399
1400	def __remove_from_dhcp_object( self, position = None, name = None, oldname = None, mac = None, ip = None ):	1395	def __remove_from_dhcp_object( self, position = None, name = None, oldname = None, mac = None, ip = None ):
1401	# if we got the mac addres, then we remove the object	1396	# if we got the mac addres, then we remove the object
1402	# if we only got the ip addres, we remove the ip address	1397	# if we only got the ip addres, we remove the ip address
1403		1398
1404	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 ) )	1399	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 ) )
1405		1400
1406	dn = None	1401	dn = None
1407		1402
1408	tmppos = univention.admin.uldap.position( self.position.getDomain( ) )	1403	tmppos = univention.admin.uldap.position( self.position.getDomain( ) )
Lines 1482-1492 class simpleComputer( simpleLdap ): Link Here
1482	for dn2, attributes2 in self.lo.search(scope='domain', attr=[ 'zoneName' ], filter='(&(relativeDomainName=%s)(objectClass=dNSZone))' % name, unique=0 ):	1477	for dn2, attributes2 in self.lo.search(scope='domain', attr=[ 'zoneName' ], filter='(&(relativeDomainName=%s)(objectClass=dNSZone))' % name, unique=0 ):
1483	self.lo.modify( dn, [('pTRRecord', '%s.%s.' % (name, attributes2['zoneName'][0]), '')] )	1478	self.lo.modify( dn, [('pTRRecord', '%s.%s.' % (name, attributes2['zoneName'][0]), '')] )
1484		1479
1485	zone = univention.admin.handlers.dns.reverse_zone.object( self.co, self.lo, self.position, zoneDN)	1480	zone = univention.admin.handlers.dns.reverse_zone.object( self.co, self.lo, self.position, zoneDN)
1486	zone.open()	1481	zone.open()
1487	zone.modify()	1482	zone.modify()
1488		1483
1489
1490	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 ) )	1484	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 ) )
1491	if dnsEntryZoneReverse:	1485	if dnsEntryZoneReverse:
1492	rdn = self.calc_dns_reverse_entry_name( ip, dnsEntryZoneReverse )	1486	rdn = self.calc_dns_reverse_entry_name( ip, dnsEntryZoneReverse )
Lines 1632-1639 class simpleComputer( simpleLdap ): Link Here
1632	for dn, attributes in self.lo.search(base=zoneDN, scope='domain', attr=['pTRRecord'], filter=search_filter):	1626	for dn, attributes in self.lo.search(base=zoneDN, scope='domain', attr=['pTRRecord'], filter=search_filter):
1633	self.lo.modify(dn, [('pTRRecord', '', ptrrecord)])	1627	self.lo.modify(dn, [('pTRRecord', '', ptrrecord)])
1634		1628
1635
1636
1637	def __remove_related_ptrrecords(self, zoneDN, ip):	1629	def __remove_related_ptrrecords(self, zoneDN, ip):
1638	ptrrecord = '%s.%s.' % (self.info['name'], zoneDN.split('=')[1].split(',')[0])	1630	ptrrecord = '%s.%s.' % (self.info['name'], zoneDN.split('=')[1].split(',')[0])
1639	ip_split = ip.split('.')	1631	ip_split = ip.split('.')
Lines 1643-1649 class simpleComputer( simpleLdap ): Link Here
1643	for dn, attributes in self.lo.search(base=zoneDN, scope='domain', attr=['pTRRecord'], filter=search_filter):	1635	for dn, attributes in self.lo.search(base=zoneDN, scope='domain', attr=['pTRRecord'], filter=search_filter):
1644	if ptrrecord in attributes['pTRRecord']:	1636	if ptrrecord in attributes['pTRRecord']:
1645	self.lo.modify(dn, [('pTRRecord', ptrrecord, '')])	1637	self.lo.modify(dn, [('pTRRecord', ptrrecord, '')])
1646
1647		1638
1648	def check_common_name_length(self):	1639	def check_common_name_length(self):
1649	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'], ))	1640	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'], ))
Lines 1767-1773 class simpleComputer( simpleLdap ): Link Here
1767	else:	1758	else:
1768	self.lo.modify( dn, [ ( 'aRecord', '' , ip ) ] )	1759	self.lo.modify( dn, [ ( 'aRecord', '' , ip ) ] )
1769		1760
1770
1771	def __add_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias ):	1761	def __add_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias ):
1772	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 ) )	1762	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 ) )
1773	if name and dnsForwardZone and dnsAliasZoneContainer and alias:	1763	if name and dnsForwardZone and dnsAliasZoneContainer and alias:
Lines 1832-1838 class simpleComputer( simpleLdap ): Link Here
1832	pass	1822	pass
1833		1823
1834	def _ldap_post_modify( self ):	1824	def _ldap_post_modify( self ):
1835
1836	self.__multiip \|= len(self['mac']) > 1 or len(self['ip']) > 1	1825	self.__multiip \|= len(self['mac']) > 1 or len(self['ip']) > 1
1837		1826
1838	for entry in self.__changes[ 'dhcpEntryZone' ][ 'remove' ]:	1827	for entry in self.__changes[ 'dhcpEntryZone' ][ 'remove' ]:
Lines 1886-1892 class simpleComputer( simpleLdap ): Link Here
1886	else:	1875	else:
1887	self.__add_dns_reverse_object( self[ 'name' ], dn, ip )	1876	self.__add_dns_reverse_object( self[ 'name' ], dn, ip )
1888		1877
1889
1890	for entry in self.__changes[ 'dnsEntryZoneAlias' ][ 'remove' ]:	1878	for entry in self.__changes[ 'dnsEntryZoneAlias' ][ 'remove' ]:
1891	dnsForwardZone, dnsAliasZoneContainer, alias = entry	1879	dnsForwardZone, dnsAliasZoneContainer, alias = entry
1892	if not alias:	1880	if not alias:
Lines 1976-1982 class simpleComputer( simpleLdap ): Link Here
1976	if not self.info.get('domain', None):	1964	if not self.info.get('domain', None):
1977	self.info['domain'] = domain	1965	self.info['domain'] = domain
1978		1966
1979
1980	def _ldap_modlist( self ):	1967	def _ldap_modlist( self ):
1981	self.__changes = { 'mac': {'remove': [ ], 'add': [ ]}, 'ip': {'remove': [ ], 'add': [ ]}, 'name': None,	1968	self.__changes = { 'mac': {'remove': [ ], 'add': [ ]}, 'ip': {'remove': [ ], 'add': [ ]}, 'name': None,
1982	'dnsEntryZoneForward': { 'remove': [ ], 'add': [ ] },	1969	'dnsEntryZoneForward': { 'remove': [ ], 'add': [ ] },
Lines 2014-2026 class simpleComputer( simpleLdap ): Link Here
2014	newAaaaRecord = []	2001	newAaaaRecord = []
2015	if oldAddresses != newAddresses:	2002	if oldAddresses != newAddresses:
2016	if oldAddresses:	2003	if oldAddresses:
2017	for address in oldAddresses:	2004	for address in oldAddresses:
2018	if ':' in address: # IPv6	2005	if ':' in address: # IPv6
2019	oldAaaaRecord.append(address)	2006	oldAaaaRecord.append(address)
2020	else:	2007	else:
2021	oldARecord.append(address)	2008	oldARecord.append(address)
2022	if newAddresses:	2009	if newAddresses:
2023	for address in newAddresses:	2010	for address in newAddresses:
2024	if ':' in address: # IPv6	2011	if ':' in address: # IPv6
2025	newAaaaRecord.append(ipaddr.IPv6Address(address).exploded)	2012	newAaaaRecord.append(ipaddr.IPv6Address(address).exploded)
2026	else:	2013	else:
Lines 2060-2078 class simpleComputer( simpleLdap ): Link Here
2060	continue	2047	continue
2061	self.__changes[ 'ip' ][ 'remove' ].append( ipAddress )	2048	self.__changes[ 'ip' ][ 'remove' ].append( ipAddress )
2062		2049
2063
2064	if self.hasChanged( 'name' ):	2050	if self.hasChanged( 'name' ):
2065	ml.append( ( 'sn', self.oldattr.get( 'sn', [ None ] )[ 0 ], self[ 'name' ] ) )	2051	ml.append( ( 'sn', self.oldattr.get( 'sn', [ None ] )[ 0 ], self[ 'name' ] ) )
2066	self.__changes[ 'name' ] = ( self.oldattr.get( 'sn', [ None ] )[ 0 ], self[ 'name' ] )	2052	self.__changes[ 'name' ] = ( self.oldattr.get( 'sn', [ None ] )[ 0 ], self[ 'name' ] )
2067		2053
2068	if self.hasChanged('ip') or self.hasChanged('mac'):	2054	if self.hasChanged('ip') or self.hasChanged('mac'):
2069
2070	if len(self.info.get('ip', [])) == 1 and len(self.info.get('mac', [])) == 1 and len(self.info.get('dhcpEntryZone', [])):	2055	if len(self.info.get('ip', [])) == 1 and len(self.info.get('mac', [])) == 1 and len(self.info.get('dhcpEntryZone', [])):
2071	# In this special case, we assume the mapping between ip/mac address to be	2056	# In this special case, we assume the mapping between ip/mac address to be
2072	# unique. The dhcp entry needs to contain the mac address (as sepcified by	2057	# unique. The dhcp entry needs to contain the mac address (as sepcified by
2073	# the ldap search for dhcp entries), the ip address may not correspond to	2058	# the ldap search for dhcp entries), the ip address may not correspond to
2074	# the ip address associated with the computer ldap object, but this would	2059	# the ip address associated with the computer ldap object, but this would
2075	# be erroneous anyway. We therefore update the dhcp entry to correspond to	2060	# be erroneous anyway. We therefore update the dhcp entry to correspond to
2076	# the current ip and mac address. (Bug #20315)	2061	# the current ip and mac address. (Bug #20315)
2077	dn, ip, mac = self.__split_dhcp_line( self.info['dhcpEntryZone'][0] )	2062	dn, ip, mac = self.__split_dhcp_line( self.info['dhcpEntryZone'][0] )
2078		2063
Lines 2173-2178 class simpleComputer( simpleLdap ): Link Here
2173	subnet=ldap.explode_dn(reverseDN, 1)[0].replace('.in-addr.arpa','').split('.')	2158	subnet=ldap.explode_dn(reverseDN, 1)[0].replace('.in-addr.arpa','').split('.')
2174	ip=sip.split('.')	2159	ip=sip.split('.')
2175	return self.calc_dns_reverse_entry_name_do(4, subnet, ip)	2160	return self.calc_dns_reverse_entry_name_do(4, subnet, ip)
		2161
2176	def calc_dns_reverse_entry_name_do(self, maxLength, zoneNet, ip):	2162	def calc_dns_reverse_entry_name_do(self, maxLength, zoneNet, ip):
2177	zoneNet.reverse()	2163	zoneNet.reverse()
2178	if not ip[:len(zoneNet)] == zoneNet:	2164	if not ip[:len(zoneNet)] == zoneNet:
Lines 2204-2210 class simpleComputer( simpleLdap ): Link Here
2204	else:	2190	else:
2205	self.__modify_dhcp_object( dn, self[ 'name' ], ip, mac )	2191	self.__modify_dhcp_object( dn, self[ 'name' ], ip, mac )
2206		2192
2207
2208	for entry in self.__changes[ 'dnsEntryZoneForward' ][ 'remove' ]:	2193	for entry in self.__changes[ 'dnsEntryZoneForward' ][ 'remove' ]:
2209	dn, ip = self.__split_dns_line( entry )	2194	dn, ip = self.__split_dns_line( entry )
2210	if not ip and not self.__multiip:	2195	if not ip and not self.__multiip:
Lines 2296-2302 class simpleComputer( simpleLdap ): Link Here
2296	groupObject = univention.admin.objects.get(univention.admin.modules.get('groups/group'), self.co, self.lo, self.position, group)	2281	groupObject = univention.admin.objects.get(univention.admin.modules.get('groups/group'), self.co, self.lo, self.position, group)
2297	groupObject.fast_member_remove( [ self.dn ], self.oldattr.get('uid',[]), ignore_license=1 )	2282	groupObject.fast_member_remove( [ self.dn ], self.oldattr.get('uid',[]), ignore_license=1 )
2298		2283
2299
2300	def __update_groups_after_namechange(self):	2284	def __update_groups_after_namechange(self):
2301	oldname = self.oldinfo.get('name')	2285	oldname = self.oldinfo.get('name')
2302	newname = self.info.get('name')	2286	newname = self.info.get('name')
Lines 2338-2344 class simpleComputer( simpleLdap ): Link Here
2338		2322
2339	self.lo.modify(group, [('uniqueMember', oldUniqueMembers, newUniqueMembers), ('memberUid', oldMemberUids, newMemberUids)])	2323	self.lo.modify(group, [('uniqueMember', oldUniqueMembers, newUniqueMembers), ('memberUid', oldMemberUids, newMemberUids)])
2340		2324
2341
2342	def update_groups(self):	2325	def update_groups(self):
2343	if not self.hasChanged('groups') and \	2326	if not self.hasChanged('groups') and \
2344	not ('oldPrimaryGroupDn' in self.__dict__ and self.oldPrimaryGroupDn) and \	2327	not ('oldPrimaryGroupDn' in self.__dict__ and self.oldPrimaryGroupDn) and \
Lines 2382-2388 class simpleComputer( simpleLdap ): Link Here
2382	groupObject['hosts'].remove(self.dn)	2365	groupObject['hosts'].remove(self.dn)
2383	groupObject.modify(ignore_license=1)	2366	groupObject.modify(ignore_license=1)
2384		2367
2385
2386	def primary_group(self):	2368	def primary_group(self):
2387	if not self.hasChanged('primaryGroup'):	2369	if not self.hasChanged('primaryGroup'):
2388	return	2370	return
Lines 2560-2567 class simpleComputer( simpleLdap ): Link Here
2560	if raise_after:	2542	if raise_after:
2561	raise raise_after	2543	raise raise_after
2562		2544
2563	class simpleLdapSub(simpleLdap):
2564		2545
		2546	class simpleLdapSub(simpleLdap):
2565	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	2547	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
2566	base.__init__(self, co, lo, position, dn, superordinate )	2548	base.__init__(self, co, lo, position, dn, superordinate )
2567		2549
Lines 2580-2588 class simpleLdapSub(simpleLdap): Link Here
2580	if hasattr(self,"_ldap_post_remove"):	2562	if hasattr(self,"_ldap_post_remove"):
2581	self._ldap_post_remove()	2563	self._ldap_post_remove()
2582		2564
		2565
2583	class simplePolicy(simpleLdap):	2566	class simplePolicy(simpleLdap):
2584	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	2567	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):
2585
2586	self.resultmode=0	2568	self.resultmode=0
2587	self.dn=dn	2569	self.dn=dn
2588		2570
Lines 2765-2771 class simplePolicy(simpleLdap): Link Here
2765	self.policy_result()	2747	self.policy_result()
2766		2748
2767	if self.polinfo.has_key(key):	2749	if self.polinfo.has_key(key):
2768
2769	if self.polinfo[key] != newvalue or self.polinfo_more[key]['policy'] == self.cloned or ( self.info.has_key( key ) and self.info[ key ] != newvalue ):	2750	if self.polinfo[key] != newvalue or self.polinfo_more[key]['policy'] == self.cloned or ( self.info.has_key( key ) and self.info[ key ] != newvalue ):
2770	if self.polinfo_more[key]['fixed'] and self.polinfo_more[key]['policy'] != self.cloned:	2751	if self.polinfo_more[key]['fixed'] and self.polinfo_more[key]['policy'] != self.cloned:
2771	raise univention.admin.uexceptions.policyFixedAttribute, key	2752	raise univention.admin.uexceptions.policyFixedAttribute, key

Lines 35-41 import univention.admin.localization Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/__common.py (-9 / +9 lines)
35	from univention.admin.layout import Tab	35	from univention.admin.layout import Tab
36	from univention.admin.handlers import simpleLdap	36	from univention.admin.handlers import simpleLdap
37		37
38	translation = univention.admin.localization.translation( 'univention.admin.handlers.dhcp' )	38	translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
39	_ = translation.translate	39	_ = translation.translate
40		40
41		41
Lines 52-66 _options = { Link Here
52		52
53	_properties = {	53	_properties = {
54	'option': univention.admin.property(	54	'option': univention.admin.property(
55	short_description = _( 'DHCP options' ),	55	short_description=_('DHCP options'),
56	long_description = _( 'Defines DHCP options for the subnet.' ),	56	long_description=_('Defines additional DHCP options.'),
57	syntax = univention.admin.syntax.string,	57	syntax=univention.admin.syntax.string,
58	multivalue = True,	58	multivalue=True,
59	options = ["options"],	59	options=["options"],
60	required = 0,	60	required = 0,
61	may_change = True,	61	may_change=True,
62	identifies = 0	62	identifies = 0
63	),	63	),
64	}	64	}
65		65
66		66
Lines 88-94 def add_dhcp_options(module_name): Link Here
88		88
89	mapping = getattr(module, "mapping")	89	mapping = getattr(module, "mapping")
90	for item in _mappings:	90	for item in _mappings:
91	mapping.register( *item )	91	mapping.register(*item)
92		92
93	layout = getattr(module, "layout")	93	layout = getattr(module, "layout")
94	layout.append(Tab(	94	layout.append(Tab(

Lines 44-118 import univention.admin.handlers.dhcp.sharedsubnet Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/dhcp.py (-51 / +63 lines)
44	import univention.admin.handlers.dhcp.subnet	44	import univention.admin.handlers.dhcp.subnet
45		45
46		46
47	translation=univention.admin.localization.translation('univention.admin.handlers.dhcp')	47	translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
48	_=translation.translate	48	_ = translation.translate
49		49
50		50
51	module='dhcp/dhcp'	51	module = 'dhcp/dhcp'
52		52
53	childs=0	53	childs = 0
54	short_description=_('DHCP')	54	short_description = _('DHCP')
55	long_description=''	55	long_description = ''
56	operations=['search']	56	operations = ['search']
57	usewizard=1	57	usewizard = 1
58	wizardmenustring=_("DHCP")	58	wizardmenustring = _("DHCP")
59	wizarddescription=_("Add, edit and delete DHCP objects")	59	wizarddescription = _("Add, edit and delete DHCP objects")
60	wizardoperations={"add":[_("Add"), _("Add DHCP object")],"find":[_("Search"), _("Search DHCP object(s)")]}	60	wizardoperations = {
61	wizardpath="univentionDhcpObject"	61	"add": [_("Add"), _("Add DHCP object")],
62	wizardsuperordinates = ( 'None', 'dhcp/service', 'dhcp/shared' )	62	"find": [_("Search"), _("Search DHCP object(s)")],
		63	}
		64	wizardpath = "univentionDhcpObject"
		65	wizardsuperordinates = ('None', 'dhcp/service', 'dhcp/shared')
63	wizardtypesforsuper = {	66	wizardtypesforsuper = {
64	'None' : ( 'dhcp/service', ),	67	'None': ('dhcp/service',),
65	'dhcp/service' : ( 'dhcp/host', 'dhcp/server', 'dhcp/shared', 'dhcp/subnet' ),	68	'dhcp/service': ('dhcp/host', 'dhcp/server', 'dhcp/shared', 'dhcp/subnet'),
66	'dhcp/shared' : ( 'dhcp/sharedsubnet', )	69	'dhcp/shared': ('dhcp/sharedsubnet',)
67	}	70	}
68		71
69	childmodules=["dhcp/host","dhcp/pool","dhcp/server","dhcp/service","dhcp/shared","dhcp/sharedsubnet","dhcp/subnet"]	72	childmodules = [
70	virtual=1	73	"dhcp/host",
71	options={	74	"dhcp/pool",
		75	"dhcp/server",
		76	"dhcp/service",
		77	"dhcp/shared",
		78	"dhcp/sharedsubnet",
		79	"dhcp/subnet",
		80	]
		81	virtual = 1
		82
		83	options = {
72	}	84	}
73	property_descriptions={	85
		86	property_descriptions = {
74	'name': univention.admin.property(	87	'name': univention.admin.property(
75	short_description=_('Name'),	88	short_description=_('Name'),
76	long_description='',	89	long_description='',
77	syntax=univention.admin.syntax.string,	90	syntax=univention.admin.syntax.string,
78	multivalue=0,	91	multivalue=0,
79	include_in_default_search=1,	92	include_in_default_search=1,
80	options=[],	93	options=[],
81	required=1,	94	required=1,
82	may_change=1,	95	may_change=1,
83	identifies=1	96	identifies=1
84	)	97	)
85	}	98	}
86		99
87	layout = [ Tab( _( 'General' ), _( 'Basic settings' ), layout = [ "name" ] ) ]	100	layout = [Tab(_('General'), _('Basic settings'), layout=["name"])]
88		101
89	mapping=univention.admin.mapping.mapping()	102	mapping = univention.admin.mapping.mapping()
90		103
91		104
92	class object(univention.admin.handlers.simpleLdap):	105	class object(univention.admin.handlers.simpleLdap):
93	module=module	106	module = module
94		107
95	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	108	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
96	self.mapping=mapping	109	self.mapping = mapping
97	self.descriptions=property_descriptions	110	self.descriptions = property_descriptions
98		111
99	super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)	112	super(object, self).__init__(co, lo, position, dn, superordinate, attributes=attributes)
100		113
101		114
102	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):	115	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
103	ret=[]	116	ret = []
104	if superordinate:	117	if superordinate:
105	ret+= univention.admin.handlers.dhcp.host.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)	118	ret += univention.admin.handlers.dhcp.host.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
106	ret+= univention.admin.handlers.dhcp.pool.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)	119	ret += univention.admin.handlers.dhcp.pool.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
107	ret+=univention.admin.handlers.dhcp.server.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)	120	ret += univention.admin.handlers.dhcp.server.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
108	ret+= univention.admin.handlers.dhcp.shared.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)	121	ret += univention.admin.handlers.dhcp.shared.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
109	ret+= univention.admin.handlers.dhcp.sharedsubnet.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)	122	ret += univention.admin.handlers.dhcp.sharedsubnet.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
110	ret+= univention.admin.handlers.dhcp.subnet.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)	123	ret += univention.admin.handlers.dhcp.subnet.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
111	else:	124	else:
112	ret+= univention.admin.handlers.dhcp.service.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)	125	ret += univention.admin.handlers.dhcp.service.lookup(co, lo, filter_s, base, superordinate, scope, unique, required, timeout, sizelimit)
113	return ret	126	return ret
114		127
		128
115	def identify(dn, attr, canonical=0):	129	def identify(dn, attr, canonical=0):
116	pass	130	pass
117
118

Lines 36-75 import univention.admin.handlers Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/shared.py (-33 / +37 lines)
36	import univention.admin.ipaddress	36	import univention.admin.ipaddress
37	import univention.admin.localization	37	import univention.admin.localization
38		38
39	translation=univention.admin.localization.translation('univention.admin.handlers.dhcp')	39	translation = univention.admin.localization.translation('univention.admin.handlers.dhcp')
40	_=translation.translate	40	_ = translation.translate
41		41
42	module='dhcp/shared'	42	module = 'dhcp/shared'
43	operations=['add','edit','remove','search']	43	operations = ['add', 'edit', 'remove', 'search']
44	superordinate='dhcp/service'	44	superordinate = 'dhcp/service'
45	childs=1	45	childs = 1
46	short_description=_('DHCP: Shared network')	46	short_description = _('DHCP: Shared network')
47	long_description=''	47	long_description = ''
48	options={	48
		49	options = {
49	}	50	}
50	property_descriptions={	51
		52	property_descriptions = {
51	'name': univention.admin.property(	53	'name': univention.admin.property(
52	short_description=_('Shared network name'),	54	short_description=_('Shared network name'),
53	long_description='',	55	long_description='',
54	syntax=univention.admin.syntax.uid,	56	syntax=univention.admin.syntax.uid,
55	multivalue=0,	57	multivalue=0,
56	include_in_default_search=1,	58	include_in_default_search=1,
57	options=[],	59	options=[],
58	required=1,	60	required=1,
59	may_change=0,	61	may_change=0,
60	identifies=1	62	identifies=1
61	)	63	)
62	}	64	}
63		65
64	layout = [	66	layout = [
65	Tab( _( 'General' ), _( 'Basic settings' ), layout = [	67	Tab(_('General'), _('Basic settings'), layout=[
66	Group( _( 'General' ), layout = [	68	Group(_('General'), layout=[
67	'name'	69	'name'
68	] ),	70	]),
69	] ),	71	]),
70	]	72	]
71		73
72	mapping=univention.admin.mapping.mapping()	74	mapping = univention.admin.mapping.mapping()
73	mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)	75	mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)
74		76
75	from .__common import add_dhcp_options, DhcpOptions	77	from .__common import add_dhcp_options, DhcpOptions
Lines 77-87 add_dhcp_options(__name__) Link Here
77		79
78		80
79	class object(DhcpOptions):	81	class object(DhcpOptions):
80	module=module	82	module = module
81		83
82	def __init__(self, co, lo, position, dn='', superordinate=None, attributes = [] ):	84	def __init__(self, co, lo, position, dn='', superordinate=None, attributes=[]):
83	self.mapping=mapping	85	self.mapping = mapping
84	self.descriptions=property_descriptions	86	self.descriptions = property_descriptions
85		87
86	if not superordinate:	88	if not superordinate:
87	raise univention.admin.uexceptions.insufficientInformation, 'superordinate object not present'	89	raise univention.admin.uexceptions.insufficientInformation, 'superordinate object not present'
Lines 92-98 class object(DhcpOptions): Link Here
92	self.setup_options(options)	94	self.setup_options(options)
93		95
94	def _ldap_pre_create(self):	96	def _ldap_pre_create(self):
95	self.dn='%s=%s,%s' % (mapping.mapName('name'), mapping.mapValue('name', self.info['name']), self.position.getDn())	97	self.dn = '%s=%s,%s' % (
		98	mapping.mapName('name'),
		99	mapping.mapValue('name', self.info['name']),
		100	self.position.getDn(),
		101	)
96		102
97	def _ldap_addlist(self):	103	def _ldap_addlist(self):
98	return [	104	return [
Lines 114-119 lookup = object.lookup Link Here
114		120
115		121
116	def identify(dn, attr):	122	def identify(dn, attr):
117
118	return 'dhcpSharedNetwork' in attr.get('objectClass', [])	123	return 'dhcpSharedNetwork' in attr.get('objectClass', [])
119

Lines 55-66 property_descriptions = { Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/host.py (-13 / +13 lines)
55	short_description=_('Hostname'),	55	short_description=_('Hostname'),
56	long_description='',	56	long_description='',
57	syntax=univention.admin.syntax.string,	57	syntax=univention.admin.syntax.string,
58	multivalue=0,	58	multivalue=False,
59	include_in_default_search=1,	59	include_in_default_search=True,
60	options=[],	60	options=[],
61	required=1,	61	required=True,
62	may_change=1,	62	may_change=True,
63	identifies=1	63	identifies=True
64	),	64	),
65	'hwaddress': univention.admin.property(	65	'hwaddress': univention.admin.property(
66	short_description=_('Hardware address'),	66	short_description=_('Hardware address'),
Lines 68-78 property_descriptions = { Link Here
68	'Currently, only the ethernet and token-ring types are recognized.'	68	'Currently, only the ethernet and token-ring types are recognized.'
69	'The hardware-address should be a set of hexadecimal octets (numbers from 0 through ff) separated by colons.'),	69	'The hardware-address should be a set of hexadecimal octets (numbers from 0 through ff) separated by colons.'),
70	syntax=univention.admin.syntax.DHCP_HardwareAddress,	70	syntax=univention.admin.syntax.DHCP_HardwareAddress,
71	multivalue=0,	71	multivalue=False,
72	options=[],	72	options=[],
73	required=1,	73	required=True,
74	may_change=1,	74	may_change=True,
75	identifies=0	75	identifies=False
76	),	76	),
77	'fixedaddress': univention.admin.property(	77	'fixedaddress': univention.admin.property(
78	short_description=_('Fixed IP addresses'),	78	short_description=_('Fixed IP addresses'),
Lines 80-90 property_descriptions = { Link Here
80	'Assign one or more fixed IP addresses.'	80	'Assign one or more fixed IP addresses.'
81	'Each address should be either an IP address or a domain name that resolves to one or more IP addresses'),	81	'Each address should be either an IP address or a domain name that resolves to one or more IP addresses'),
82	syntax=univention.admin.syntax.string,	82	syntax=univention.admin.syntax.string,
83	multivalue=1,	83	multivalue=True,
84	options=[],	84	options=[],
85	required=0,	85	required=False,
86	may_change=1,	86	may_change=True,
87	identifies=0	87	identifies=False
88	),	88	),
89	}	89	}
90		90

Lines 54-65 property_descriptions = { Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/server.py (-5 / +5 lines)
54	short_description=_('Server name'),	54	short_description=_('Server name'),
55	long_description='',	55	long_description='',
56	syntax=univention.admin.syntax.string,	56	syntax=univention.admin.syntax.string,
57	multivalue=0,	57	multivalue=False,
58	include_in_default_search=1,	58	include_in_default_search=True,
59	options=[],	59	options=[],
60	required=1,	60	required=True,
61	may_change=1,	61	may_change=True,
62	identifies=1	62	identifies=True
63	),	63	),
64	}	64	}
65		65

Lines 53-64 property_descriptions = { Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/service.py (-5 / +5 lines)
53	short_description=_('Service name'),	53	short_description=_('Service name'),
54	long_description='',	54	long_description='',
55	syntax=univention.admin.syntax.string,	55	syntax=univention.admin.syntax.string,
56	multivalue=0,	56	multivalue=False,
57	include_in_default_search=1,	57	include_in_default_search=True,
58	options=[],	58	options=[],
59	required=1,	59	required=True,
60	may_change=0,	60	may_change=False,
61	identifies=1	61	identifies=True
62	),	62	),
63	}	63	}
64		64

Lines 54-95 property_descriptions = { Link Here

(-)a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dhcp/sharedsubnet.py (-17 / +17 lines)
54	short_description=_('Subnet address'),	54	short_description=_('Subnet address'),
55	long_description='',	55	long_description='',
56	syntax=univention.admin.syntax.ipv4Address,	56	syntax=univention.admin.syntax.ipv4Address,
57	multivalue=0,	57	multivalue=False,
58	include_in_default_search=1,	58	include_in_default_search=True,
59	options=[],	59	options=[],
60	required=1,	60	required=True,
61	may_change=0,	61	may_change=False,
62	identifies=1	62	identifies=True
63	),	63	),
64	'subnetmask': univention.admin.property(	64	'subnetmask': univention.admin.property(
65	short_description=_('Netmask'),	65	short_description=_('Netmask'),
66	long_description='',	66	long_description='',
67	syntax=univention.admin.syntax.v4netmask,	67	syntax=univention.admin.syntax.v4netmask,
68	multivalue=0,	68	multivalue=False,
69	options=[],	69	options=[],
70	required=1,	70	required=True,
71	may_change=1,	71	may_change=True,
72	identifies=0	72	identifies=False
73	),	73	),
74	'broadcastaddress': univention.admin.property(	74	'broadcastaddress': univention.admin.property(
75	short_description=_('Broadcast address'),	75	short_description=_('Broadcast address'),
76	long_description='',	76	long_description='',
77	syntax=univention.admin.syntax.ipv4Address,	77	syntax=univention.admin.syntax.ipv4Address,
78	multivalue=0,	78	multivalue=False,
79	options=[],	79	options=[],
80	required=0,	80	required=False,
81	may_change=1,	81	may_change=True,
82	identifies=0	82	identifies=False
83	),	83	),
84	'range': univention.admin.property(	84	'range': univention.admin.property(
85	short_description=_('Dynamic address assignment'),	85	short_description=_('Dynamic address assignment'),
86	long_description=_('Define a pool of addresses available for dynamic address assignment.'),	86	long_description=_('Define a pool of addresses available for dynamic address assignment.'),
87	syntax=univention.admin.syntax.IPv4_AddressRange,	87	syntax=univention.admin.syntax.IPv4_AddressRange,
88	multivalue=1,	88	multivalue=True,
89	options=[],	89	options=[],
90	required=0,	90	required=False,
91	may_change=1,	91	may_change=True,
92	identifies=0	92	identifies=False
93	),	93	),
94	}	94	}
95		95