|
Lines 432-448
def __get_zone_dn(s4connector, zone_name):
|
Link Here
|
|---|
|
|---|
| 432 |
return unicode(ldap.dn.dn2str([zone_rdn] + ldap.dn.str2dn(unicode_to_utf8(default_dn))), 'utf8') |
432 |
return unicode(ldap.dn.dn2str([zone_rdn] + ldap.dn.str2dn(unicode_to_utf8(default_dn))), 'utf8') |
| 433 |
|
433 |
|
| 434 |
|
434 |
|
| 435 |
def __append_dot(str): |
435 |
def __append_dot(string): |
| 436 |
if str[-1] != '.': |
436 |
if string and not string.endswith('.') and ':' not in string and '.' in string: |
| 437 |
str += '.' |
437 |
string += '.' |
| 438 |
return str |
438 |
return string |
| 439 |
|
439 |
|
| 440 |
|
440 |
|
| 441 |
def __remove_dot(str): |
441 |
def __remove_dot(string): |
| 442 |
if str[-1] == '.': |
442 |
if string.endswith('.'): |
| 443 |
return str[:-1] |
443 |
return string[:-1] |
| 444 |
else: |
444 |
return string |
| 445 |
return str |
|
|
| 446 |
|
445 |
|
| 447 |
|
446 |
|
| 448 |
def __split_s4_dnsNode_dn(dn): |
447 |
def __split_s4_dnsNode_dn(dn): |
|
Lines 1430-1438
def ucs_zone_create(s4connector, object, dns_type):
|
Link Here
|
|---|
|
|---|
| 1430 |
msdcs_soa = __unpack_soaRecord(msdcs_soa_obj) |
1429 |
msdcs_soa = __unpack_soaRecord(msdcs_soa_obj) |
| 1431 |
soa['serial'] = str(max(int(soa['serial']), int(msdcs_soa['serial']))) |
1430 |
soa['serial'] = str(max(int(soa['serial']), int(msdcs_soa['serial']))) |
| 1432 |
|
1431 |
|
| 1433 |
mname = soa['mname'] |
1432 |
mname = __append_dot(soa['mname']) |
| 1434 |
if mname and not mname.endswith("."): |
|
|
| 1435 |
mname = "%s." % mname |
| 1436 |
|
1433 |
|
| 1437 |
ns_lower = [x.lower() for x in ns] |
1434 |
ns_lower = [x.lower() for x in ns] |
| 1438 |
mname_lower = mname.lower() |
1435 |
mname_lower = mname.lower() |