DNS tests: tests update to due to change in options

Affected options --name-server, --ip-address

Part of ticket: https://fedorahosted.org/freeipa/ticket/4149

Reviewed-By: Petr Spacek <pspacek@redhat.com>

ipatests/test_cmdline/test_cli.py

@@ -139,14 +139,13 @@ class TestCLIParsing(object):
 
     def test_dnsrecord_del_all(self):
         try:
-            self.run_command('dnszone_add', idnsname=u'test-example.com',
-                idnssoamname=u'ns.test-example.com', force=True)
+            self.run_command('dnszone_add', idnsname=u'test-example.com')
         except errors.NotFound:
             raise nose.SkipTest('DNS is not configured')
         try:
             self.run_command('dnsrecord_add',
                 dnszoneidnsname=u'test-example.com',
-                idnsname=u'ns', arecord=u'1.2.3.4')
+                idnsname=u'ns', arecord=u'1.2.3.4', force=True)
             with self.fake_stdin('yes\n'):
                 self.check_command('dnsrecord_del test-example.com ns',
                     'dnsrecord_del',
@@ -168,8 +167,7 @@ class TestCLIParsing(object):
 
     def test_dnsrecord_del_one_by_one(self):
         try:
-            self.run_command('dnszone_add', idnsname=u'test-example.com',
-                idnssoamname=u'ns.test-example.com', force=True)
+            self.run_command('dnszone_add', idnsname=u'test-example.com')
         except errors.NotFound:
             raise nose.SkipTest('DNS is not configured')
         try:
@@ -243,8 +241,7 @@ class TestCLIParsing(object):
     def test_dnsrecord_del_comma(self):
         try:
             self.run_command(
-                'dnszone_add', idnsname=u'test-example.com',
-                idnssoamname=u'ns.test-example.com', force=True)
+                'dnszone_add', idnsname=u'test-example.com')
         except errors.NotFound:
             raise nose.SkipTest('DNS is not configured')
         try:
@@ -266,73 +263,6 @@ class TestCLIParsing(object):
         finally:
             self.run_command('dnszone_del', idnsname=u'test-example.com')
 
-    def test_dnszone_add(self):
-        """
-        Test dnszone-add with nameserver IP passed interatively
-        """
-        # Pass IP of nameserver interactively for nameserver in zone
-        # (absolute name)
-        with self.fake_stdin('1.1.1.1\n'):
-            self.check_command(
-                'dnszone_add example.com --name-server=ns.example.com. '
-                '--admin-email=admin@example.com',
-                'dnszone_add',
-                idnsname=u'example.com',
-                idnssoamname=u'ns.example.com.',
-                idnssoarname=u'admin@example.com',
-                ip_address=u'1.1.1.1',
-                idnssoaexpire=util.Fuzzy(type=int),
-                idnssoaserial=util.Fuzzy(type=int),
-                idnssoaretry=util.Fuzzy(type=int),
-                idnssoaminimum=util.Fuzzy(type=int),
-                idnssoarefresh=util.Fuzzy(type=int),
-                all=False,
-                raw=False,
-                force=False,
-                version=API_VERSION
-            )
-
-        # Pass IP of nameserver interactively for nameserver in zone
-        # (relative name)
-        with self.fake_stdin('1.1.1.1\n'):
-            self.check_command(
-                'dnszone_add example.com --name-server=ns '
-                '--admin-email=admin@example.com',
-                'dnszone_add',
-                idnsname=u'example.com',
-                idnssoamname=u'ns',
-                idnssoarname=u'admin@example.com',
-                ip_address=u'1.1.1.1',
-                idnssoaexpire=util.Fuzzy(type=int),
-                idnssoaserial=util.Fuzzy(type=int),
-                idnssoaretry=util.Fuzzy(type=int),
-                idnssoaminimum=util.Fuzzy(type=int),
-                idnssoarefresh=util.Fuzzy(type=int),
-                all=False,
-                raw=False,
-                force=False,
-                version=API_VERSION
-            )
-
-        # Nameserver is outside the zone - no need to pass the IP
-        self.check_command(
-            'dnszone_add example.com --name-server=ns.example.net. '
-            '--admin-email=admin@example.com',
-            'dnszone_add',
-            idnsname=u'example.com',
-            idnssoamname=u'ns.example.net.',
-            idnssoarname=u'admin@example.com',
-            idnssoaexpire=util.Fuzzy(type=int),
-            idnssoaserial=util.Fuzzy(type=int),
-            idnssoaretry=util.Fuzzy(type=int),
-            idnssoaminimum=util.Fuzzy(type=int),
-            idnssoarefresh=util.Fuzzy(type=int),
-            all=False,
-            raw=False,
-            force=False,
-            version=API_VERSION
-        )
-
     def test_idrange_add(self):
         """
         Test idrange-add with interative prompt

ipatests/test_xmlrpc/test_dns_realmdomains_integration.py

@@ -23,6 +23,7 @@ Test integration of DNS and realmdomains.
 """
 
 from ipalib import api, errors
+from ipalib.util import normalize_zone
 from ipapython.dn import DN
 from ipapython.dnsutil import DNSName
 from ipatests.test_xmlrpc import objectclasses
@@ -43,6 +44,8 @@ dnszone_2_absolute = "%s." % dnszone_2
 dnszone_2_dn = DN(('idnsname', dnszone_2_absolute), api.env.container_dns,
                   api.env.basedn)
 
+self_server_ns = normalize_zone(api.env.host)
+self_server_ns_dnsname = DNSName(self_server_ns)
 
 def assert_realmdomain_and_txt_record_present(response):
     zone = response['value']
@@ -92,9 +95,7 @@ class test_dns_realmdomains_integration(Declarative):
                  'during dnszone_add',
             command=(
                 'dnszone_add', [dnszone_1], {
-                    'idnssoamname': idnssoamname,
                     'idnssoarname': idnssoarname,
-                    'ip_address': u'1.2.3.4',
                 }
             ),
             expected={
@@ -104,8 +105,8 @@ class test_dns_realmdomains_integration(Declarative):
                     'dn': dnszone_1_dn,
                     'idnsname': [DNSName(dnszone_1_absolute)],
                     'idnszoneactive': [u'TRUE'],
-                    'idnssoamname': [DNSName(idnssoamname)],
-                    'nsrecord': [idnssoamname],
+                    'idnssoamname': [self_server_ns_dnsname],
+                    'nsrecord': lambda x: True,
                     'idnssoarname': [DNSName(idnssoarname)],
                     'idnssoaserial': [fuzzy_digits],
                     'idnssoarefresh': [fuzzy_digits],
@@ -131,11 +132,9 @@ class test_dns_realmdomains_integration(Declarative):
                  'during dnszone_add for forwarded zone',
             command=(
                 'dnszone_add', [dnszone_2], {
-                    'idnssoamname': idnssoamname,
                     'idnssoarname': idnssoarname,
                     'idnsforwarders': u'1.2.3.4',
                     'idnsforwardpolicy': u'only',
-                    'force': True,
                 }
             ),
             expected={
@@ -154,10 +153,10 @@ class test_dns_realmdomains_integration(Declarative):
                     'dn': dnszone_2_dn,
                     'idnsname': [DNSName(dnszone_2_absolute)],
                     'idnszoneactive': [u'TRUE'],
-                    'idnssoamname': [DNSName(idnssoamname)],
+                    'idnssoamname': [self_server_ns_dnsname],
                     'idnsforwarders': [u'1.2.3.4'],
                     'idnsforwardpolicy': [u'only'],
-                    'nsrecord': [idnssoamname],
+                    'nsrecord': lambda x: True,
                     'idnssoarname': [DNSName(idnssoarname)],
                     'idnssoaserial': [fuzzy_digits],
                     'idnssoarefresh': [fuzzy_digits],

ipatests/test_xmlrpc/test_host_plugin.py

@@ -26,6 +26,7 @@ import os
 import tempfile
 from ipapython import ipautil
 from ipalib import api, errors, x509
+from ipalib.util import normalize_zone
 from ipapython.dn import DN
 from ipapython.dnsutil import DNSName
 from nose.tools import raises, assert_raises
@@ -37,6 +38,8 @@ from ipatests.test_xmlrpc import objectclasses
 from ipatests.test_xmlrpc.testcert import get_testcert
 import base64
 
+self_server_ns = normalize_zone(api.env.host)
+self_server_ns_dnsname = DNSName(self_server_ns)
 
 fqdn1 = u'testhost1.%s' % api.env.domain
 short1 = u'testhost1'
@@ -1052,9 +1055,7 @@ class test_host_dns(Declarative):
             desc='Create zone %r' % dnszone,
             command=(
                 'dnszone_add', [dnszone], {
-                    'idnssoamname': dnszone_ns,
                     'idnssoarname': dnszone_rname,
-                    'ip_address' : dnszone_ip,
                 }
             ),
             expected={
@@ -1064,8 +1065,8 @@ class test_host_dns(Declarative):
                     'dn': dnszone_dn,
                     'idnsname': [dnszone_dnsname],
                     'idnszoneactive': [u'TRUE'],
-                    'idnssoamname': [dnszone_ns_dnsname],
-                    'nsrecord': [dnszone_ns],
+                    'idnssoamname': [self_server_ns_dnsname],
+                    'nsrecord': lambda x: True,
                     'idnssoarname': [dnszone_rname_dnsname],
                     'idnssoaserial': [fuzzy_digits],
                     'idnssoarefresh': [fuzzy_digits],
@@ -1089,7 +1090,6 @@ class test_host_dns(Declarative):
             desc='Create reverse zone %r' % revzone,
             command=(
                 'dnszone_add', [revzone], {
-                    'idnssoamname': dnszone_ns,
                     'idnssoarname': dnszone_rname,
                 }
             ),
@@ -1100,8 +1100,8 @@ class test_host_dns(Declarative):
                     'dn': revzone_dn,
                     'idnsname': [revzone_dnsname],
                     'idnszoneactive': [u'TRUE'],
-                    'idnssoamname': [dnszone_ns_dnsname],
-                    'nsrecord': [dnszone_ns],
+                    'idnssoamname': [self_server_ns_dnsname],
+                    'nsrecord': lambda x: True,
                     'idnssoarname': [dnszone_rname_dnsname],
                     'idnssoaserial': [fuzzy_digits],
                     'idnssoarefresh': [fuzzy_digits],
@@ -1123,7 +1123,6 @@ class test_host_dns(Declarative):
             desc='Create reverse zone %r' % revipv6zone,
             command=(
                 'dnszone_add', [revipv6zone], {
-                    'idnssoamname': dnszone_ns,
                     'idnssoarname': dnszone_rname,
                 }
             ),
@@ -1134,8 +1133,8 @@ class test_host_dns(Declarative):
                     'dn': revipv6zone_dn,
                     'idnsname': [revipv6zone_dnsname],
                     'idnszoneactive': [u'TRUE'],
-                    'idnssoamname': [dnszone_ns_dnsname],
-                    'nsrecord': [dnszone_ns],
+                    'idnssoamname': [self_server_ns_dnsname],
+                    'nsrecord': lambda x: True,
                     'idnssoarname': [dnszone_rname_dnsname],
                     'idnssoaserial': [fuzzy_digits],
                     'idnssoarefresh': [fuzzy_digits],