openstack
/
neutron-tempest-plugin
Code Issues Proposed changes

Merge "Enhance scenario test to cover network dns_domain"

This commit is contained in:
Zuul 2018-11-08 00:38:48 +00:00 committed by Gerrit Code Review
parent d1210a16e6 d54ae6c936
commit 299c043aa7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_tempest_plugin/scenario/base.py
View File

@ -176,13 +176,13 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
client.delete_interface(server_id, port_id=port_id) client.delete_interface(server_id, port_id=port_id)
def setup_network_and_server( def setup_network_and_server(
self, router=None, server_name=None, **kwargs): self, router=None, server_name=None, network=None, **kwargs):
"""Create network resources and a server. """Create network resources and a server.
Creating a network, subnet, router, keypair, security group Creating a network, subnet, router, keypair, security group
and a server. and a server.
""" """
self.network = self.create_network() self.network = network or self.create_network()
LOG.debug("Created network %s", self.network['name']) LOG.debug("Created network %s", self.network['name'])
self.subnet = self.create_subnet(self.network) self.subnet = self.create_subnet(self.network)
LOG.debug("Created subnet %s", self.subnet['id']) LOG.debug("Created subnet %s", self.subnet['id'])

11
neutron_tempest_plugin/scenario/test_internal_dns.py
View File

@ -27,16 +27,17 @@ class InternalDNSTest(base.BaseTempestTestCase):
@utils.requires_ext(extension="dns-integration", service="network") @utils.requires_ext(extension="dns-integration", service="network")
@decorators.idempotent_id('988347de-07af-471a-abfa-65aea9f452a6') @decorators.idempotent_id('988347de-07af-471a-abfa-65aea9f452a6')
def test_dns_name(self): def test_dns_domain_and_name(self):
"""Test the ability to ping a VM's hostname from another VM. """Test the ability to ping a VM's hostname from another VM.
1) Create two VMs on the same network, giving each a name 1) Create two VMs on the same network, giving each a name
2) SSH in to the first VM: 2) SSH in to the first VM:
2.1) ping the other VM's internal IP 2.1) ping the other VM's internal IP
2.2) ping the otheR VM's hostname 2.2) ping the other VM's hostname
""" """
self.setup_network_and_server(server_name='luke') network = self.create_network(dns_domain='starwars.')
self.setup_network_and_server(network=network, server_name='luke')
self.create_pingable_secgroup_rule( self.create_pingable_secgroup_rule(
secgroup_id=self.security_groups[-1]['id']) secgroup_id=self.security_groups[-1]['id'])
self.check_connectivity(self.fip['floating_ip_address'], self.check_connectivity(self.fip['floating_ip_address'],
@ -70,4 +71,8 @@ class InternalDNSTest(base.BaseTempestTestCase):
self.check_remote_connectivity( self.check_remote_connectivity(
ssh_client, leia_port['fixed_ips'][0]['ip_address'], ssh_client, leia_port['fixed_ips'][0]['ip_address'],
timeout=CONF.validation.ping_timeout * 10) timeout=CONF.validation.ping_timeout * 10)
self.assertIn(
'starwars', ssh_client.exec_command('cat /etc/resolv.conf'))
self.check_remote_connectivity(ssh_client, 'leia') self.check_remote_connectivity(ssh_client, 'leia')
self.check_remote_connectivity(ssh_client, 'leia.starwars')