From e142c0b6e9d935ec37bdcab4efbca7c2ca9b150e Mon Sep 17 00:00:00 2001 From: James Page Date: Mon, 3 Jun 2019 09:23:40 +0100 Subject: [PATCH] Ensure DNS configuration from conf For internal DNS the DNS configuration including the search path should be derived from configuration rather than from the dns_domain attribute of the network, which is used for external DNS integration. Update test to ensure that configuration based dns domain is present in the server search path and is used to validate resolution of the hostname of the server. This commit also temporaily skips the internal DNS test whilst the associated Neutron reviews are landed; it will be re-enabled afterwards. Change-Id: I145144c042b100f7e12a02a8ac7e0fbbe41e984d Related-Bug: 1826419 Required-By: I5ff03b5ad8af432a9f7919ef953d7d8c434b93bd --- neutron_tempest_plugin/scenario/test_internal_dns.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neutron_tempest_plugin/scenario/test_internal_dns.py b/neutron_tempest_plugin/scenario/test_internal_dns.py index fadabb0d..dfd42b08 100644 --- a/neutron_tempest_plugin/scenario/test_internal_dns.py +++ b/neutron_tempest_plugin/scenario/test_internal_dns.py @@ -35,7 +35,7 @@ class InternalDNSTest(base.BaseTempestTestCase): 2.1) ping the other VM's internal IP 2.2) ping the other VM's hostname """ - + self.skipTest('Disable whilst associated changes land into Neutron') network = self.create_network(dns_domain='starwars.') self.setup_network_and_server(network=network, server_name='luke') self.create_pingable_secgroup_rule( @@ -72,7 +72,9 @@ class InternalDNSTest(base.BaseTempestTestCase): ssh_client, leia_port['fixed_ips'][0]['ip_address'], timeout=CONF.validation.ping_timeout * 10) self.assertIn( - 'starwars', ssh_client.exec_command('cat /etc/resolv.conf')) + 'openstackgate.local', + ssh_client.exec_command('cat /etc/resolv.conf') + ) self.check_remote_connectivity(ssh_client, 'leia') - self.check_remote_connectivity(ssh_client, 'leia.starwars') + self.check_remote_connectivity(ssh_client, 'leia.openstackgate.local')