|
Lines 183-189
class object(univention.admin.handlers.simpleLdap):
|
Link Here
|
|---|
|
|---|
| 183 |
module = module |
183 |
module = module |
| 184 |
|
184 |
|
| 185 |
def stepIp(self): |
185 |
def stepIp(self): |
| 186 |
network = ipaddr.IPNetwork(self['network'] + '/' + self['netmask']) |
186 |
try: |
|
|
187 |
network = ipaddr.IPNetwork(self['network'] + '/' + self['netmask']) |
| 188 |
except ValueError as exc: |
| 189 |
raise univention.admin.uexceptions.valueError(str(exc)) |
| 187 |
if self['nextIp']: |
190 |
if self['nextIp']: |
| 188 |
# nextIP is already set: |
191 |
# nextIP is already set: |
| 189 |
# - check range for actual ip |
192 |
# - check range for actual ip |
|
Lines 258-265
def _ldap_modlist(self):
|
Link Here
|
|---|
|
|---|
| 258 |
next_ip_changed = False |
261 |
next_ip_changed = False |
| 259 |
|
262 |
|
| 260 |
if self.hasChanged('ipRange'): |
263 |
if self.hasChanged('ipRange'): |
| 261 |
network = ipaddr.IPNetwork(self['network'] + '/' + self['netmask']) |
264 |
try: |
| 262 |
currentIp = ipaddr.IPAddress(self['nextIp']) |
265 |
network = ipaddr.IPNetwork(self['network'] + '/' + self['netmask']) |
|
|
266 |
ipaddr.IPAddress(self['nextIp']) |
| 267 |
except ValueError as exc: |
| 268 |
raise univention.admin.uexceptions.valueError(str(exc)) |
| 263 |
if self['ipRange']: |
269 |
if self['ipRange']: |
| 264 |
self.sort_ipranges() |
270 |
self.sort_ipranges() |
| 265 |
self['nextIp'] = self['ipRange'][0][0] |
271 |
self['nextIp'] = self['ipRange'][0][0] |