IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Set 'idnssoaserial' to deprecated

Browse Source 
A warning message (regarding the SOA serial deprecation) is shown
on the webui and CLI every time a new DNS zone is added (even if the
'--serial' option is not being explicitly set) or the SOA serial is modified.

This should be managed by setting the 'idnssoaserial' as deprecated and
not required parameter.

Fixes: https://pagure.io/freeipa/issue/9249
Signed-off-by: Carla Martinez <carlmart@redhat.com>
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Rafael Guterres Jeffman <rjeffman@redhat.com>
This commit is contained in:
Carla Martinez 2022-09-19 17:19:57 +02:00
parent 59db0faf21
commit c74c701cac
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ipaserver/plugins/dns.py
View File

@ -2431,15 +2431,14 @@ class dnszone(DNSZoneBase):
normalizer=normalize_zonemgr, normalizer=normalize_zonemgr,
autofill=True, autofill=True,
), ),
Int('idnssoaserial', Int('idnssoaserial?',
# Deprecated # Deprecated
cli_name='serial', cli_name='serial',
label=_('SOA serial'), label=_('SOA serial'),
doc=_('SOA record serial number'), doc=_('SOA record serial number'),
minvalue=1, minvalue=1,
maxvalue=4294967295, maxvalue=4294967295,
default_from=_create_zone_serial, deprecated=True,
autofill=True,
flags=['no_option'], flags=['no_option'],
), ),
Int('idnssoarefresh', Int('idnssoarefresh',
@ -2778,14 +2777,6 @@ class dnszone_add(DNSZoneBase_add):
option='ip-address', option='ip-address',
additional_info=u"Value will be ignored.") additional_info=u"Value will be ignored.")
) )
if 'idnssoaserial' in options:
messages.add_message(
options['version'],
result,
messages.OptionDeprecatedWarning(
option='idnssoaserial',
additional_info=u"Value will be ignored.")
)
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
assert isinstance(dn, DN) assert isinstance(dn, DN)
@ -2827,6 +2818,7 @@ class dnszone_add(DNSZoneBase_add):
return dn return dn
def execute(self, *keys, **options): def execute(self, *keys, **options):
options['idnssoaserial'] = _create_zone_serial()
result = super(dnszone_add, self).execute(*keys, **options) result = super(dnszone_add, self).execute(*keys, **options)
self._warning_deprecated_option(result, **options) self._warning_deprecated_option(result, **options)
self.obj._warning_forwarding(result, **options) self.obj._warning_forwarding(result, **options)
@ -2899,16 +2891,6 @@ class dnszone_mod(DNSZoneBase_mod):
doc=_('Force nameserver change even if nameserver not in DNS')), doc=_('Force nameserver change even if nameserver not in DNS')),
) )
def _warning_deprecated_option(self, result, **options):
if 'idnssoaserial' in options:
messages.add_message(
options['version'],
result,
messages.OptionDeprecatedWarning(
option='idnssoaserial',
additional_info=u"Value will be ignored.")
)
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, def pre_callback(self, ldap, dn, entry_attrs, attrs_list,
*keys, **options): *keys, **options):
if not _check_DN_objectclass(ldap, dn, self.obj.object_class): if not _check_DN_objectclass(ldap, dn, self.obj.object_class):
@ -2929,7 +2911,6 @@ class dnszone_mod(DNSZoneBase_mod):
def execute(self, *keys, **options): def execute(self, *keys, **options):
result = super(dnszone_mod, self).execute(*keys, **options) result = super(dnszone_mod, self).execute(*keys, **options)
self._warning_deprecated_option(result, **options)
self.obj._warning_forwarding(result, **options) self.obj._warning_forwarding(result, **options)
self.obj._warning_name_server_option(result, context, **options) self.obj._warning_name_server_option(result, context, **options)
self.obj._warning_dnssec_master_is_not_installed(result, **options) self.obj._warning_dnssec_master_is_not_installed(result, **options)