Merge "Fixing test_convert_default_subnetpool_to_non_default"
diff --git a/neutron/tests/tempest/api/test_networks.py b/neutron/tests/tempest/api/test_networks.py
index 0b39569..b350068 100644
--- a/neutron/tests/tempest/api/test_networks.py
+++ b/neutron/tests/tempest/api/test_networks.py
@@ -15,8 +15,10 @@
from tempest.lib import decorators
from tempest import test
+import testtools
from neutron.tests.tempest.api import base
+from neutron.tests.tempest import config
class NetworksTestJSON(base.BaseNetworkTest):
@@ -129,6 +131,35 @@
_check_list_networks_fields(['project_id', 'tenant_id'], True, True)
+# TODO(ihrachys): check that bad mtu is not allowed; current API extension
+# definition doesn't enforce values
+# TODO(ihrachys): check that new segment reservation updates mtu, once
+# https://review.openstack.org/#/c/353115/ is merged
+class NetworksMtuTestJSON(base.BaseNetworkTest):
+ required_extensions = ['net-mtu', 'net-mtu-writable']
+
+ @decorators.idempotent_id('c79dbf94-ee26-420f-a56f-382aaccb1a41')
+ def test_create_network_custom_mtu(self):
+ # 68 should be supported by all implementations, as per api-ref
+ network = self.create_network(mtu=68)
+ body = self.client.show_network(network['id'])['network']
+ self.assertEqual(68, body['mtu'])
+
+ @decorators.idempotent_id('2d35d49d-9d16-465c-92c7-4768eb717688')
+ @testtools.skipUnless(config.CONF.network_feature_enabled.ipv6,
+ 'IPv6 is not enabled')
+ def test_update_network_custom_mtu(self):
+ # 68 should be supported by all implementations, as per api-ref
+ network = self.create_network(mtu=68)
+ body = self.client.show_network(network['id'])['network']
+ self.assertEqual(68, body['mtu'])
+
+ # 1280 should be supported by all ipv6 compliant implementations
+ self.client.update_network(network['id'], mtu=1280)
+ body = self.client.show_network(network['id'])['network']
+ self.assertEqual(1280, body['mtu'])
+
+
class NetworksSearchCriteriaTest(base.BaseSearchCriteriaTest):
resource = 'network'
diff --git a/neutron/tests/tempest/api/test_ports.py b/neutron/tests/tempest/api/test_ports.py
index 8d8468c..acafa57 100644
--- a/neutron/tests/tempest/api/test_ports.py
+++ b/neutron/tests/tempest/api/test_ports.py
@@ -91,6 +91,30 @@
self.assertFalse(port_body['port']['dns_name'])
self._confirm_dns_assignment(port_body['port'])
+ @decorators.idempotent_id('dfe8cc79-18d9-4ae8-acef-3ec6bb719aa7')
+ @test.requires_ext(extension="dns-domain-ports",
+ service="network")
+ def test_create_update_port_with_dns_domain(self):
+ self.create_subnet(self.network)
+ body = self.create_port(self.network, dns_name='d1',
+ dns_domain='test.org.')
+ self.assertEqual('d1', body['dns_name'])
+ self.assertEqual('test.org.', body['dns_domain'])
+ 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'])
+ self.assertEqual('test.org.', body['dns_domain'])
+ body = self.client.update_port(body['id'],
+ dns_name='d2', dns_domain='d.org.')
+ self.assertEqual('d2', body['port']['dns_name'])
+ self.assertEqual('d.org.', body['dns_domain'])
+ self._confirm_dns_assignment(body['port'])
+ body = self.client.show_port(body['port']['id'])['port']
+ self.assertEqual('d2', body['dns_name'])
+ self.assertEqual('d.org.', body['dns_domain'])
+ self._confirm_dns_assignment(body)
+
@decorators.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)