diff --git a/ipatests/test_integration/test_dns_locations.py b/ipatests/test_integration/test_dns_locations.py index 458c50cd0..ac1b00833 100644 --- a/ipatests/test_integration/test_dns_locations.py +++ b/ipatests/test_integration/test_dns_locations.py @@ -38,12 +38,6 @@ IPA_DEFAULT_ADTRUST_SRV_REC = ( (DNSName(u'_kerberos._udp.dc._msdcs'), 88), ) -# we keep NTP SRV record separated as NTP is "optional" -IPA_DEFAULT_NTP_SRV_REC = ( - # srv record name, port - (DNSName("_ntp._udp"), 123), -) - IPA_CA_A_REC = ( (DNSName(six.text_type(IPA_CA_RECORD))), ) @@ -94,8 +88,8 @@ class TestDNSLocations(IntegrationTest): Topology: * 3 servers (replica0 --- master --- replica1) - replica0 with NTP/no CA, master with ADtrust installed later, - replica1 without NTP/with CA + replica0 with no CA, master with ADtrust installed later, + replica1 with CA * 2 locations (prague, paris) """ num_replicas = 2 @@ -115,7 +109,7 @@ class TestDNSLocations(IntegrationTest): tasks.install_replica(cls.master, cls.replicas[0], setup_dns=True, setup_ca=False) tasks.install_replica(cls.master, cls.replicas[1], setup_dns=True, - setup_ca=True, extra_args=(['--no-ntp'])) + setup_ca=True) for host in (cls.master, cls.replicas[0], cls.replicas[1]): ldap = host.ldap_connect() @@ -383,22 +377,6 @@ class TestDNSLocations(IntegrationTest): for ip in (self.master.ip, self.replicas[0].ip, self.replicas[1].ip): self._test_A_rec_against_server(ip, self.domain, expected_servers) - def test_ntp_srv_records(self): - """ Test NTP dns records with firstly removing the records and then - using the nsupdate generated by dns-update-system-records.""" - self.delete_update_system_records(rnames=(r[0] for r in - IPA_DEFAULT_NTP_SRV_REC)) - - # we installed NTP only on master and replica[0] - expected_servers = ( - (self.PRIO_HIGH, self.WEIGHT, DNSName(self.master.hostname)), - (self.PRIO_HIGH, self.WEIGHT, DNSName(self.replicas[0].hostname)), - ) - - for ip in (self.master.ip, self.replicas[0].ip, self.replicas[1].ip): - self._test_SRV_rec_against_server(ip, self.domain, - expected_servers, - rec_list=IPA_DEFAULT_NTP_SRV_REC) def test_adtrust_system_records(self): """ Test ADTrust dns records with firstly installing a trust then @@ -434,18 +412,3 @@ class TestDNSLocations(IntegrationTest): self._test_A_rec_against_server(self.master.ip, self.domain, expected_servers) - - def test_remove_replica_with_ntp(self): - """Test NTP dns records after removing the replica with NTP""" - tasks.uninstall_replica(self.master, self.replicas[0]) - - self.delete_update_system_records(rnames=(r[0] for r in - IPA_DEFAULT_NTP_SRV_REC)) - - expected_servers = ( - (self.PRIO_HIGH, self.WEIGHT, DNSName(self.master.hostname)), - ) - - self._test_SRV_rec_against_server(self.master.ip, self.domain, - expected_servers, - rec_list=IPA_DEFAULT_NTP_SRV_REC)