Univention Bugzilla – Attachment 8282 Details for
Bug 43103
import_networks does not create missing dhcp subnet object
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Preliminary patch
bug43103.patch (text/plain), 1.87 KB, created by
Sönke Schwardt-Krummrich
on 2016-12-02 12:51:56 CET
(
hide
)
Description:
Preliminary patch
Filename:
MIME Type:
Creator:
Sönke Schwardt-Krummrich
Created:
2016-12-02 12:51:56 CET
Size:
1.87 KB
patch
obsolete
>diff --git a/ucs-school-4.1r2/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import b/ucs-school-4.1r2/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import >index ca7cec7..650675e 100755 >--- a/ucs-school-4.1r2/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import >+++ b/ucs-school-4.1r2/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import >@@ -1764,16 +1764,21 @@ def create_network(schoolNr, network, iprange=None, defaultrouter=None, nameserv > pass > > position.setDn("cn=%s,cn=dhcp,%s" % (schoolNr.lower(), getDN(schoolNr))) >- object = dhcp_service_module.object(co, lo, position=position, superordinate=superordinate) >- object = dhcp_subnet_module.object(co, lo, position=position, superordinate=dhcp_subnet_module) >- object.open() >- object['subnet'] = str(network.network) >- object['subnetmask'] = str(network.netmask) >- object['broadcastaddress'] = str(network.broadcast) >- try: >- create_object(object, ignore_exists=True) >- except: >+ dhcp_service_objects = univention.admin.modules.lookup( >+ dhcp_service_module, co, lo, scope='sub', superordinate=superordinate, >+ base=baseDN, filter=univention.admin.filter.expression('cn', schoolNr.lower())) >+ if not dhcp_service_objects: >+ print 'ERROR: DHCP service object for %r not found' % (schoolNr.lower(),) > success = False >+ else: >+ object = dhcp_subnet_module.object(co, lo, position=position, superordinate=dhcp_service_objects[0]) >+ object.open() >+ object['subnet'] = str(network.network) >+ object['subnetmask'] = str(network.netmask) >+ object['broadcastaddress'] = str(network.broadcast) >+ exists = create_object(object, ignore_exists=True) >+ if exists: >+ print '%r already existed - usually no problem' % (object.dn,) > > position.setDn("cn=networks,%s" % (getDN(schoolNr), )) > object = network_module.object(co, lo, position=position, superordinate=superordinate)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 43103
: 8282