diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-05-17 17:06:32 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-05-30 20:14:32 +0200 |
| commit | 0c75df4bf3784eae08f41c176bbaab44c6d510a7 (patch) | |
| tree | 2b7c1162a64f95c62e6f8cc642dbb51007cc404c /ipaserver/install/bindinstance.py | |
| parent | da71e7e9de233bc0e40a90adb2db6d0944a1356a (diff) | |
| download | freeipa-0c75df4bf3784eae08f41c176bbaab44c6d510a7.tar.gz freeipa-0c75df4bf3784eae08f41c176bbaab44c6d510a7.tar.xz freeipa-0c75df4bf3784eae08f41c176bbaab44c6d510a7.zip | |
Move check_zone_overlap() from ipapython.ipautil to ipapython.dnsutil
This is preparatory work to avoid (future) cyclic import between
ipapython.dnsutil and ipapython.ipautil.
https://fedorahosted.org/freeipa/ticket/5710
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver/install/bindinstance.py')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 0cc8d2589..0a988562f 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -34,6 +34,7 @@ from ipaserver.install import installutils from ipaserver.install import service from ipaserver.install.cainstance import IPA_CA_RECORD from ipapython import sysrestore, ipautil, ipaldap +from ipapython import dnsutil from ipapython.ipa_log_manager import root_logger from ipapython.dn import DN import ipalib @@ -293,7 +294,7 @@ def read_reverse_zone(default, ip_address, allow_zone_overlap=False): continue if not allow_zone_overlap: try: - ipautil.check_zone_overlap(zone, raise_on_error=False) + dnsutil.check_zone_overlap(zone, raise_on_error=False) except ValueError as e: root_logger.error("Reverse zone %s will not be used: %s" % (zone, e)) @@ -313,7 +314,7 @@ def get_auto_reverse_zones(ip_addresses): continue default_reverse = get_reverse_zone_default(ip) try: - ipautil.check_zone_overlap(default_reverse) + dnsutil.check_zone_overlap(default_reverse) except ValueError: root_logger.info("Reverse zone %s for IP address %s already exists" % (default_reverse, ip)) @@ -460,7 +461,7 @@ def check_reverse_zones(ip_addresses, reverse_zones, options, unattended, # isn't the zone managed by someone else if not options.allow_zone_overlap: try: - ipautil.check_zone_overlap(rz) + dnsutil.check_zone_overlap(rz) except ValueError as e: msg = "Reverse zone %s will not be used: %s" % (rz, e) if unattended: |