From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 12 Jan 2018 14:48:21 +0000 (+0100)
Subject: Retrieving complete data about zone to migrate
X-Git-Tag: 0.1.2~41
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=8c818685d6997ed35da4426c0a63c03afba8c5c9;p=pixelpark%2Fadmin-tools.git

Retrieving complete data about zone to migrate
---

diff --git a/pp_lib/pdns_migrate_ns.py b/pp_lib/pdns_migrate_ns.py
index dc473e9..4695c07 100644
--- a/pp_lib/pdns_migrate_ns.py
+++ b/pp_lib/pdns_migrate_ns.py
@@ -24,7 +24,7 @@ from .pdns_app import PpPDNSAppError, PpPDNSApplication, PDNSApiNotFoundError, P
 from .pdns_zone import PdnsApiZone
 from .pdns_record import compare_rrsets
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 LOG = logging.getLogger(__name__)
 
 
@@ -125,12 +125,24 @@ class PDNSMigrateNsApp(PpPDNSApplication):
                 self.zone_names.append(zone.name)
 
         for zone_name in self.zone_names:
-            self.migrate_zone(zone_name)
+            migrated = self.migrate_zone(zone_name)
+            if self.oneshot and migrated:
+                break
 
     # -------------------------------------------------------------------------
     def migrate_zone(self, zone_name):
 
         LOG.info("Migrating zone {!r} ...".format(zone_name))
+        zone = self.get_api_zone(zone_name)
+        if not zone:
+            return False
+
+        if self.is_local(zone_name):
+            LOG.debug("Using local nameservers for substituting.")
+        else:
+            LOG.debug("Using public nameservers for substituting.")
+
+        return True
 
 # =============================================================================