On 22/09/14 13:17, Petr Vobornik wrote:
On 19.9.2014 16:15, Martin Basti wrote:
Ticket: https://fedorahosted.org/freeipa/ticket/3414
Patch attached.
Patch 126:
1. I think that just
DeprecatedParam('dnsclass?'),
should be enough.
Also
2. You forgot to update API.txt and VERSION
Patch 127:
ACK
Updated patchset attached
--
Martin Basti
From 87b25573c7d236440c02edc35ae5da6a7a2e27c1 Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Fri, 19 Sep 2014 16:05:40 +0200
Subject: [PATCH 1/2] DNS: remove --class option
This option haven't been working, it is time to remove it.
Ticket: https://fedorahosted.org/freeipa/ticket/3414
---
API.txt | 14 +++++++-------
VERSION | 4 ++--
ipalib/plugins/dns.py | 9 ++-------
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/API.txt b/API.txt
index ae869ffce94a30859eb9ace414374172d238f8b3..9b6448338597b67b99d23679399b3a997a4e3d95 100644
--- a/API.txt
+++ b/API.txt
@@ -831,7 +831,7 @@ option: Int('dlv_part_key_tag', attribute=False, cli_name='dlv_key_tag', maxvalu
option: DLVRecord('dlvrecord', attribute=True, cli_name='dlv_rec', csv=True, multivalue=True, option_group=u'DLV Record', required=False)
option: DNSNameParam('dname_part_target', attribute=False, cli_name='dname_target', multivalue=False, option_group=u'DNAME Record', required=False)
option: DNAMERecord('dnamerecord', attribute=True, cli_name='dname_rec', csv=True, multivalue=True, option_group=u'DNAME Record', required=False)
-option: StrEnum('dnsclass', attribute=True, cli_name='class', multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: DeprecatedParam('dnsclass', attribute=True, cli_name='class', multivalue=False, required=False)
option: DNSKEYRecord('dnskeyrecord', attribute=True, cli_name='dnskey_rec', csv=True, multivalue=True, option_group=u'DNSKEY Record', required=False)
option: Int('dnsttl', attribute=True, cli_name='ttl', multivalue=False, required=False)
option: Int('ds_part_algorithm', attribute=False, cli_name='ds_algorithm', maxvalue=255, minvalue=0, multivalue=False, option_group=u'DS Record', required=False)
@@ -921,7 +921,7 @@ option: Flag('del_all', autofill=True, default=False)
option: DHCIDRecord('dhcidrecord', attribute=True, autofill=False, cli_name='dhcid_rec', csv=True, multivalue=True, option_group=None, required=False)
option: DLVRecord('dlvrecord', attribute=True, autofill=False, cli_name='dlv_rec', csv=True, multivalue=True, option_group=None, required=False)
option: DNAMERecord('dnamerecord', attribute=True, autofill=False, cli_name='dname_rec', csv=True, multivalue=True, option_group=None, required=False)
-option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: DeprecatedParam('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, required=False)
option: DNSKEYRecord('dnskeyrecord', attribute=True, autofill=False, cli_name='dnskey_rec', csv=True, multivalue=True, option_group=None, required=False)
option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', multivalue=False, required=False)
option: DSRecord('dsrecord', attribute=True, autofill=False, cli_name='ds_rec', csv=True, multivalue=True, option_group=None, required=False)
@@ -977,7 +977,7 @@ option: CNAMERecord('cnamerecord', attribute=True, autofill=False, cli_name='cna
option: DHCIDRecord('dhcidrecord', attribute=True, autofill=False, cli_name='dhcid_rec', csv=True, multivalue=True, option_group=None, query=True, required=False)
option: DLVRecord('dlvrecord', attribute=True, autofill=False, cli_name='dlv_rec', csv=True, multivalue=True, option_group=None, query=True, required=False)
option: DNAMERecord('dnamerecord', attribute=True, autofill=False, cli_name='dname_rec', csv=True, multivalue=True, option_group=None, query=True, required=False)
-option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, query=True, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: DeprecatedParam('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, query=True, required=False)
option: DNSKEYRecord('dnskeyrecord', attribute=True, autofill=False, cli_name='dnskey_rec', csv=True, multivalue=True, option_group=None, query=True, required=False)
option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', multivalue=False, query=True, required=False)
option: DSRecord('dsrecord', attribute=True, autofill=False, cli_name='ds_rec', csv=True, multivalue=True, option_group=None, query=True, required=False)
@@ -1047,7 +1047,7 @@ option: Int('dlv_part_key_tag', attribute=False, autofill=False, cli_name='dlv_k
option: DLVRecord('dlvrecord', attribute=True, autofill=False, cli_name='dlv_rec', csv=True, multivalue=True, option_group=u'DLV Record', required=False)
option: DNSNameParam('dname_part_target', attribute=False, autofill=False, cli_name='dname_target', multivalue=False, option_group=u'DNAME Record', required=False)
option: DNAMERecord('dnamerecord', attribute=True, autofill=False, cli_name='dname_rec', csv=True, multivalue=True, option_group=u'DNAME Record', required=False)
-option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: DeprecatedParam('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, required=False)
option: DNSKEYRecord('dnskeyrecord', attribute=True, autofill=False, cli_name='dnskey_rec', csv=True, multivalue=True, option_group=u'DNSKEY Record', required=False)
option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', multivalue=False, required=False)
option: Int('ds_part_algorithm', attribute=False, autofill=False, cli_name='ds_algorithm', maxvalue=255, minvalue=0, multivalue=False, option_group=u'DS Record', required=False)
@@ -1140,7 +1140,7 @@ args: 1,26,3
arg: DNSNameParam('idnsname', attribute=True, cli_name='name', multivalue=False, only_absolute=True, primary_key=True, required=True)
option: Str('addattr*', cli_name='addattr', exclude='webui')
option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
-option: StrEnum('dnsclass', attribute=True, cli_name='class', multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: DeprecatedParam('dnsclass', attribute=True, cli_name='class', multivalue=False, required=False)
option: Int('dnsttl', attribute=True, cli_name='ttl', maxvalue=2147483647, minvalue=0, multivalue=False, required=False)
option: Flag('force', autofill=True, default=False)
option: Bool('idnsallowdynupdate', attribute=True, autofill=True, cli_name='dynamic_update', default=False, multivalue=False, required=False)
@@ -1200,7 +1200,7 @@ command: dnszone_find
args: 1,28,4
arg: Str('criteria?', noextrawhitespace=False)
option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
-option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, query=True, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: DeprecatedParam('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, query=True, required=False)
option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', maxvalue=2147483647, minvalue=0, multivalue=False, query=True, required=False)
option: Flag('forward_only', autofill=True, cli_name='forward_only', default=False)
option: Bool('idnsallowdynupdate', attribute=True, autofill=False, cli_name='dynamic_update', default=False, multivalue=False, query=True, required=False)
@@ -1237,7 +1237,7 @@ arg: DNSNameParam('idnsname', attribute=True, cli_name='name', multivalue=False,
option: Str('addattr*', cli_name='addattr', exclude='webui')
option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
option: Str('delattr*', cli_name='delattr', exclude='webui')
-option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: DeprecatedParam('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, required=False)
option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', maxvalue=2147483647, minvalue=0, multivalue=False, required=False)
option: Flag('force', autofill=True, default=False)
option: Bool('idnsallowdynupdate', attribute=True, autofill=False, cli_name='dynamic_update', default=False, multivalue=False, required=False)
diff --git a/VERSION b/VERSION
index 60c62a3e237be5e4f15525cc35d51479d056834e..e94e069837ac7d9cc4aa3eaf11ff6c4825c11429 100644
--- a/VERSION
+++ b/VERSION
@@ -89,5 +89,5 @@ IPA_DATA_VERSION=20100614120000
# #
########################################################
IPA_API_VERSION_MAJOR=2
-IPA_API_VERSION_MINOR=104
-# Last change: mbasti - autofill --admin-email in DNS zone
+IPA_API_VERSION_MINOR=105
+# Last change: mbasti - deprecate DNS --class option
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index 81c16441f82794107ca333ef4ed1047a7a567f8b..3079b92c50777920225c2df3ed9cbe048c01e163 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -294,9 +294,6 @@ _zone_top_record_types = ('NS', 'MX', 'LOC', )
# attributes derived from record types
_record_attributes = [str('%srecord' % t.lower()) for t in _record_types]
-# supported DNS classes, IN = internet, rest is almost never used
-_record_classes = (u'IN', u'CS', u'CH', u'HS')
-
# IN record class
_IN = dns.rdataclass.IN
@@ -2151,11 +2148,10 @@ class dnszone(DNSZoneBase):
minvalue=0,
maxvalue=2147483647, # see RFC 2181
),
- StrEnum('dnsclass?',
+ DeprecatedParam('dnsclass?',
cli_name='class',
label=_('SOA class'),
doc=_('SOA record class'),
- values=_record_classes,
),
Str('idnsupdatepolicy?',
cli_name='update_policy',
@@ -2586,11 +2582,10 @@ class dnsrecord(LDAPObject):
label=_('Time to live'),
doc=_('Time to live'),
),
- StrEnum('dnsclass?',
+ DeprecatedParam('dnsclass?',
cli_name='class',
label=_('Class'),
doc=_('DNS class'),
- values=_record_classes,
),
) + _dns_record_options
--
1.8.3.1
From 1c113855406a2ab3fa0d2a65215ade30384f379c Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Fri, 19 Sep 2014 16:07:40 +0200
Subject: [PATCH 2/2] WebUI: DNS: remove --class option
Ticket: https://fedorahosted.org/freeipa/ticket/3414
---
install/ui/src/freeipa/dns.js | 7 -------
1 file changed, 7 deletions(-)
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index a1b881e1ee1bbaa67cd6d86e64771f4f10177860..b1bc4d3fd4bfa1fd30e1cb717010f103e7b1850e 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -151,13 +151,6 @@ return {
'idnssoaminimum',
'dnsttl',
{
- $type: 'combobox',
- name: 'dnsclass',
- options: [
- 'IN', 'CS', 'CH', 'HS'
- ]
- },
- {
$type: 'radio',
name: 'idnsallowdynupdate',
options: [
--
1.8.3.1
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
