On 23/09/14 18:53, Martin Basti wrote:
On 23/09/14 18:35, Petr Spacek wrote:
On 22.9.2014 19:21, Martin Basti wrote:
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

ACK, it works for me.

Please don't push, we discuss this and we will nit use the DeprecatedParam.

Updated patch attached

--
Martin Basti

From baab6c3a2ce1797564e6e6408998c20c6e6d4109 Mon Sep 17 00:00:00 2001
From: Martin Basti <[email protected]>
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
---
 VERSION               | 4 ++--
 ipalib/plugins/dns.py | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

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 24feaa7d83ccab23ee621db44bbc9898819b1883..ea57b7407322b19faf43578323c38199b3ff2d69 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -295,6 +295,7 @@ _zone_top_record_types = ('NS', 'MX', 'LOC', )
 # attributes derived from record types
 _record_attributes = [str('%srecord' % t.lower()) for t in _record_types]
 
+# Deprecated
 # supported DNS classes, IN = internet, rest is almost never used
 _record_classes = (u'IN', u'CS', u'CH', u'HS')
 
@@ -2153,9 +2154,9 @@ class dnszone(DNSZoneBase):
             maxvalue=2147483647, # see RFC 2181
         ),
         StrEnum('dnsclass?',
+            # Deprecated
             cli_name='class',
-            label=_('SOA class'),
-            doc=_('SOA record class'),
+            flags=['no_option'],
             values=_record_classes,
         ),
         Str('idnsupdatepolicy?',
@@ -2597,9 +2598,9 @@ class dnsrecord(LDAPObject):
             doc=_('Time to live'),
         ),
         StrEnum('dnsclass?',
+            # Deprecated
             cli_name='class',
-            label=_('Class'),
-            doc=_('DNS class'),
+            flags=['no_option'],
             values=_record_classes,
         ),
     ) + _dns_record_options
-- 
1.8.3.1

From 375c62e8f34a2e880184a8f8901a5c09ba8cb69a Mon Sep 17 00:00:00 2001
From: Martin Basti <[email protected]>
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 3eaad839a8c831b5bf771b870ed2cefd4378c8de..675a2d7e8d2a400df6079ee82e1757c53358cde8 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -154,13 +154,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
[email protected]
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to