From: Frank Brehm Date: Wed, 17 Jan 2018 11:19:26 +0000 (+0100) Subject: Setting domain metadata keys 'SOA-EDIT-DNSUPDATE' and 'SOA-EDIT-API' during import... X-Git-Tag: 0.1.2~21 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=2fba23784f4dc0970fcd38b619fbcb1c20642beb;p=pixelpark%2Fadmin-tools.git Setting domain metadata keys 'SOA-EDIT-DNSUPDATE' and 'SOA-EDIT-API' during import of old PDNS data. --- diff --git a/pp_lib/import_pdnsdata.py b/pp_lib/import_pdnsdata.py index bcb12bb..aa63e31 100644 --- a/pp_lib/import_pdnsdata.py +++ b/pp_lib/import_pdnsdata.py @@ -31,7 +31,7 @@ from .common import pp, to_bool from .cfg_app import PpCfgAppError, PpConfigApplication -__version__ = '0.8.7' +__version__ = '0.8.8' LOG = logging.getLogger(__name__) # ============================================================================= @@ -618,6 +618,13 @@ class ImportPdnsdataApp(PpConfigApplication): if self.verbose > 1: LOG.debug("Target SQL:\n{}".format(tgt_sql)) + tgt_sql_metadata = textwrap.dedent('''\ + INSERT INTO domainmetadata (domain_id, kind, content) + VALUES (%(domain_id)s, %(kind)s, %(content)s) + ''').strip() + if self.verbose > 1: + LOG.debug("Target SQL for domain metadata:\n{}".format(tgt_sql)) + with self.tgt_connection.cursor() as tgt_cursor: with self.src_connection.cursor() as src_cursor: @@ -648,8 +655,32 @@ class ImportPdnsdataApp(PpConfigApplication): LOG.debug("Setting account information of zone {!r} to {!r}.".format( result['name'], cur_account)) result['account'] = cur_account + if self.verbose > 1: + LOG.debug("SQL for insert domain:\n{}".format( + tgt_cursor.mogrify(tgt_sql, result))) if not self.simulate: tgt_cursor.execute(tgt_sql, result) + + # Inserting domain metadata for SOA-EDIT-DNSUPDATE + params = { + 'domain_id': dom_id, + 'kind': 'SOA-EDIT-DNSUPDATE', + 'content': 'DEFAULT', + } + if self.verbose > 1: + LOG.debug("SQL for insert domain metadata 1:\n{}".format( + tgt_cursor.mogrify(tgt_sql_metadata, params))) + if not self.simulate: + tgt_cursor.execute(tgt_sql_metadata, params) + + # Inserting domain metadata for SOA-EDIT-API + params['kind'] = 'SOA-EDIT-API' + if self.verbose > 1: + LOG.debug("SQL for insert domain metadata 2:\n{}".format( + tgt_cursor.mogrify(tgt_sql_metadata, params))) + if not self.simulate: + tgt_cursor.execute(tgt_sql_metadata, params) + LOG.info("Imported {} domains.".format(i)) if self.tgt_db_type != 'mysql':