From 070bc7f725dc33e61bf421b9973292721ae6fbfa Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Tue, 11 Oct 2011 10:54:34 +0200 Subject: Fix dnszone-add name_from_ip server validation Ticket 1627 contained a (temporary hack-ish) fix for dnszone-add name_from_ip validation which works fine for CLI. However, when the command is not proceeded via CLI and sent directly to the RPC server, the server throws Internal Server Error. Make sure that the server returns a reasonable error. Also implement 2 unit cases testing this option https://fedorahosted.org/freeipa/ticket/1941 --- tests/test_xmlrpc/test_dns_plugin.py | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'tests') diff --git a/tests/test_xmlrpc/test_dns_plugin.py b/tests/test_xmlrpc/test_dns_plugin.py index f9bce61d..679f285d 100644 --- a/tests/test_xmlrpc/test_dns_plugin.py +++ b/tests/test_xmlrpc/test_dns_plugin.py @@ -29,6 +29,7 @@ from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid dnszone1 = u'dnszone.test' dnszone2 = u'dnszone2.test' revdnszone1 = u'15.142.80.in-addr.arpa.' +revdnszone1_ip = u'80.142.15.0/24' dnsres1 = u'testdnsres' class test_dns(Declarative): @@ -550,6 +551,53 @@ class test_dns(Declarative): ), + dict( + desc='Try to create a reverse zone from invalid IP', + command=( + 'dnszone_add', [], { + 'name_from_ip': u'foo', + 'idnssoamname': u'ns1.%s' % dnszone1, + 'idnssoarname': u'root.%s' % dnszone1, + 'ip_address' : u'1.2.3.4', + } + ), + expected=errors.ValidationError(name='name_from_ip', error='invalid format'), + ), + + + dict( + desc='Create reverse from IP %s zone using name_from_ip option' % revdnszone1_ip, + command=( + 'dnszone_add', [], { + 'name_from_ip': revdnszone1_ip, + 'idnssoamname': u'ns1.%s' % dnszone1, + 'idnssoarname': u'root.%s' % dnszone1, + 'ip_address' : u'1.2.3.4', + } + ), + expected={ + 'value': revdnszone1, + 'summary': None, + 'result': { + 'dn': lambda x: DN(x) == \ + DN(('idnsname',revdnszone1),('cn','dns'),api.env.basedn), + 'idnsname': [revdnszone1], + 'idnszoneactive': [u'TRUE'], + 'idnssoamname': [u'ns1.%s.' % dnszone1], + 'nsrecord': [u'ns1.%s.' % dnszone1], + 'idnssoarname': [u'root.%s.' % dnszone1], + 'idnssoaserial': [fuzzy_digits], + 'idnssoarefresh': [fuzzy_digits], + 'idnssoaretry': [fuzzy_digits], + 'idnssoaexpire': [fuzzy_digits], + 'idnssoaminimum': [fuzzy_digits], + 'idnsallowdynupdate': [u'FALSE'], + 'objectclass': [u'top', u'idnsrecord', u'idnszone'], + }, + }, + ), + + dict( desc='Delete zone %r' % dnszone1, command=('dnszone_del', [dnszone1], {}), -- cgit