Merge "Add api test for create update network and port with dns"
diff --git a/neutron/tests/tempest/api/test_networks.py b/neutron/tests/tempest/api/test_networks.py
index 279964a..8c00c86 100644
--- a/neutron/tests/tempest/api/test_networks.py
+++ b/neutron/tests/tempest/api/test_networks.py
@@ -121,6 +121,22 @@
self.assertEqual(project_id, new_net['project_id'])
self.assertEqual(project_id, new_net['tenant_id'])
+ @test.idempotent_id('94e2a44c-3367-4253-8c2a-22deaf59e96c')
+ @test.requires_ext(extension="dns-integration",
+ service="network")
+ def test_create_update_network_dns_domain(self):
+ domain1 = 'test.org.'
+ body = self.create_network(dns_domain=domain1)
+ self.assertEqual(domain1, body['dns_domain'])
+ net_id = body['id']
+ body = self.client.list_networks(id=net_id)['networks'][0]
+ self.assertEqual(domain1, body['dns_domain'])
+ domain2 = 'd.org.'
+ body = self.client.update_network(net_id, dns_domain=domain2)
+ self.assertEqual(domain2, body['network']['dns_domain'])
+ body = self.client.show_network(net_id)['network']
+ self.assertEqual(domain2, body['dns_domain'])
+
@test.idempotent_id('6ae6d24f-9194-4869-9c85-c313cb20e080')
def test_list_networks_fields(self):
# Verify specific fields of the networks
diff --git a/neutron/tests/tempest/api/test_ports.py b/neutron/tests/tempest/api/test_ports.py
index 093de07..034f07e 100644
--- a/neutron/tests/tempest/api/test_ports.py
+++ b/neutron/tests/tempest/api/test_ports.py
@@ -25,6 +25,23 @@
super(PortsTestJSON, cls).resource_setup()
cls.network = cls.create_network()
+ def _confirm_dns_assignment(self, port):
+ # NOTE(manjeets) port created with single subnet
+ # would have only one dns_assignment
+ dns_assignment = port['dns_assignment'][0]
+ ip = port['fixed_ips'][0]['ip_address']
+ if port['dns_name']:
+ hostname = port['dns_name']
+ else:
+ hostname = 'host-%s' % ip.replace('.', '-')
+ self.assertEqual(hostname, dns_assignment['hostname'])
+
+ # To avoid hard coding the expected dns_domain value
+ # in neutron.conf we just check that the fqdn starts
+ # with correct hostname
+ self.assertTrue(dns_assignment['fqdn'].startswith(hostname))
+ self.assertEqual(ip, dns_assignment['ip_address'])
+
@test.idempotent_id('c72c1c0c-2193-4aca-bbb4-b1442640bbbb')
@test.requires_ext(extension="standard-attr-description",
service="network")
@@ -40,6 +57,39 @@
body = self.client.list_ports(id=body['port']['id'])['ports'][0]
self.assertEqual('d2', body['description'])
+ @test.idempotent_id('539fbefe-fb36-48aa-9a53-8c5fbd44e492')
+ @test.requires_ext(extension="dns-integration",
+ service="network")
+ def test_create_update_port_with_dns_name(self):
+ # NOTE(manjeets) dns_domain is set to openstackgate.local
+ # so dns_name for port can be set
+ self.create_subnet(self.network)
+ body = self.create_port(self.network, dns_name='d1')
+ self.assertEqual('d1', body['dns_name'])
+ self._confirm_dns_assignment(body)
+ body = self.client.list_ports(id=body['id'])['ports'][0]
+ self._confirm_dns_assignment(body)
+ self.assertEqual('d1', body['dns_name'])
+ body = self.client.update_port(body['id'],
+ dns_name='d2')
+ self.assertEqual('d2', body['port']['dns_name'])
+ self._confirm_dns_assignment(body['port'])
+ body = self.client.show_port(body['port']['id'])['port']
+ self.assertEqual('d2', body['dns_name'])
+ self._confirm_dns_assignment(body)
+
+ @test.idempotent_id('435e89df-a8bb-4b41-801a-9f20d362d777')
+ @test.requires_ext(extension="dns-integration",
+ service="network")
+ def test_create_update_port_with_no_dns_name(self):
+ self.create_subnet(self.network)
+ body = self.create_port(self.network)
+ self.assertFalse(body['dns_name'])
+ self._confirm_dns_assignment(body)
+ port_body = self.client.show_port(body['id'])
+ self.assertFalse(port_body['port']['dns_name'])
+ self._confirm_dns_assignment(port_body['port'])
+
@test.idempotent_id('c72c1c0c-2193-4aca-bbb4-b1442640c123')
def test_change_dhcp_flag_then_create_port(self):
s = self.create_subnet(self.network, enable_dhcp=False)