Merge "Ignore irrelevant changes for tempest jobs"
diff --git a/HACKING.rst b/HACKING.rst
index 8c6d928..cd3c49c 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
openstack Style Commandments
===============================================
-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
+Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
diff --git a/neutron_tempest_plugin/common/constants.py b/neutron_tempest_plugin/common/constants.py
index 4ad780d..4dc7844 100644
--- a/neutron_tempest_plugin/common/constants.py
+++ b/neutron_tempest_plugin/common/constants.py
@@ -123,10 +123,6 @@
# agent has just returned to alive after being dead
AGENT_REVIVED = 'revived'
-INGRESS_DIRECTION = 'ingress'
-EGRESS_DIRECTION = 'egress'
-
-VALID_DIRECTIONS = (INGRESS_DIRECTION, EGRESS_DIRECTION)
VALID_ETHERTYPES = (lib_constants.IPv4, lib_constants.IPv6)
IP_ALLOWED_VERSIONS = [lib_constants.IP_VERSION_4, lib_constants.IP_VERSION_6]
diff --git a/neutron_tempest_plugin/scenario/test_mtu.py b/neutron_tempest_plugin/scenario/test_mtu.py
index 9cbb4d8..932c645 100644
--- a/neutron_tempest_plugin/scenario/test_mtu.py
+++ b/neutron_tempest_plugin/scenario/test_mtu.py
@@ -17,6 +17,7 @@
from neutron_lib.api.definitions import provider_net
from tempest.common import utils
from tempest.common import waiters
+from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from neutron_tempest_plugin.common import ssh
@@ -28,21 +29,8 @@
class NetworkMtuBaseTest(base.BaseTempestTestCase):
- credentials = ['primary', 'admin']
- servers = []
- networks = []
@classmethod
- def skip_checks(cls):
- super(NetworkMtuBaseTest, cls).skip_checks()
- if ("vxlan" not in
- config.CONF.neutron_plugin_options.available_type_drivers
- or "gre" not in
- config.CONF.neutron_plugin_options.available_type_drivers):
- raise cls.skipException("GRE or VXLAN type_driver is not enabled")
-
- @classmethod
- @utils.requires_ext(extension=provider_net.ALIAS, service="network")
def resource_setup(cls):
super(NetworkMtuBaseTest, cls).resource_setup()
# setup basic topology for servers we can log into it
@@ -56,6 +44,42 @@
cls.create_pingable_secgroup_rule(
secgroup_id=cls.secgroup['security_group']['id'])
+ def create_pingable_vm(self, net, keypair, secgroup):
+ server = self.create_server(
+ flavor_ref=CONF.compute.flavor_ref,
+ image_ref=CONF.compute.image_ref,
+ key_name=keypair['name'],
+ networks=[{'uuid': net['id']}],
+ security_groups=[{'name': secgroup[
+ 'security_group']['name']}])
+ waiters.wait_for_server_status(
+ self.os_primary.servers_client, server['server']['id'],
+ constants.SERVER_STATUS_ACTIVE)
+ port = self.client.list_ports(
+ network_id=net['id'], device_id=server['server']['id'])['ports'][0]
+ fip = self.create_and_associate_floatingip(port['id'])
+ return server, fip
+
+
+class NetworkMtuTest(NetworkMtuBaseTest):
+ credentials = ['primary', 'admin']
+ servers = []
+ networks = []
+
+ @classmethod
+ def skip_checks(cls):
+ super(NetworkMtuTest, cls).skip_checks()
+ if ("vxlan" not in
+ config.CONF.neutron_plugin_options.available_type_drivers
+ or "gre" not in
+ config.CONF.neutron_plugin_options.available_type_drivers):
+ raise cls.skipException("GRE or VXLAN type_driver is not enabled")
+
+ @classmethod
+ @utils.requires_ext(extension=provider_net.ALIAS, service="network")
+ def resource_setup(cls):
+ super(NetworkMtuTest, cls).resource_setup()
+
def _create_setup(self):
self.admin_client = self.os_admin.network_client
net_kwargs = {'tenant_id': self.client.tenant_id}
@@ -75,12 +99,14 @@
# check that MTUs are different for 2 networks
self.assertNotEqual(self.networks[0]['mtu'], self.networks[1]['mtu'])
self.networks.sort(key=lambda net: net['mtu'])
- server1, fip1 = self.create_pingable_vm(self.networks[0])
+ server1, fip1 = self.create_pingable_vm(self.networks[0],
+ self.keypair, self.secgroup)
server_ssh_client1 = ssh.Client(
self.floating_ips[0]['floating_ip_address'],
CONF.validation.image_ssh_user,
pkey=self.keypair['private_key'])
- server2, fip2 = self.create_pingable_vm(self.networks[1])
+ server2, fip2 = self.create_pingable_vm(self.networks[1],
+ self.keypair, self.secgroup)
server_ssh_client2 = ssh.Client(
self.floating_ips[0]['floating_ip_address'],
CONF.validation.image_ssh_user,
@@ -91,22 +117,6 @@
self.keypair['private_key'])
return server_ssh_client1, fip1, server_ssh_client2, fip2
- def create_pingable_vm(self, net):
- server = self.create_server(
- flavor_ref=CONF.compute.flavor_ref,
- image_ref=CONF.compute.image_ref,
- key_name=self.keypair['name'],
- networks=[{'uuid': net['id']}],
- security_groups=[{'name': self.secgroup[
- 'security_group']['name']}])
- waiters.wait_for_server_status(
- self.os_primary.servers_client, server['server']['id'],
- constants.SERVER_STATUS_ACTIVE)
- port = self.client.list_ports(
- network_id=net['id'], device_id=server['server']['id'])['ports'][0]
- fip = self.create_and_associate_floatingip(port['id'])
- return server, fip
-
@decorators.idempotent_id('3d73ec1a-2ec6-45a9-b0f8-04a273d9d344')
def test_connectivity_min_max_mtu(self):
server_ssh_client, _, _, fip2 = self._create_setup()
@@ -132,3 +142,93 @@
self.check_remote_connectivity(
server_ssh_client, fip2['fixed_ip_address'], should_succeed=False,
mtu=self.networks[1]['mtu'], fragmentation=False)
+
+
+class NetworkWritableMtuTest(NetworkMtuBaseTest):
+ credentials = ['primary', 'admin']
+ servers = []
+ networks = []
+
+ @classmethod
+ def skip_checks(cls):
+ super(NetworkWritableMtuTest, cls).skip_checks()
+ if ("vxlan" not in
+ config.CONF.neutron_plugin_options.available_type_drivers):
+ raise cls.skipException("VXLAN type_driver is not enabled")
+
+ @classmethod
+ @utils.requires_ext(extension="net-mtu-writable", service="network")
+ def resource_setup(cls):
+ super(NetworkWritableMtuTest, cls).resource_setup()
+
+ def _create_setup(self):
+ self.admin_client = self.os_admin.network_client
+ net_kwargs = {'tenant_id': self.client.tenant_id,
+ 'provider:network_type': 'vxlan'}
+ for sub in ('10.100.0.0/16', '10.200.0.0/16'):
+ net_kwargs['name'] = data_utils.rand_name('net')
+ network = self.admin_client.create_network(**net_kwargs)[
+ 'network']
+ self.networks.append(network)
+ self.addCleanup(self.admin_client.delete_network, network['id'])
+ cidr = netaddr.IPNetwork(sub)
+ subnet = self.create_subnet(network, cidr=cidr)
+ self.create_router_interface(self.router['id'], subnet['id'])
+ self.addCleanup(self.client.remove_router_interface_with_subnet_id,
+ self.router['id'], subnet['id'])
+
+ # Update network mtu.
+ net_mtu = self.admin_client.show_network(
+ self.networks[0]['id'])['network']['mtu']
+ self.admin_client.update_network(self.networks[0]['id'],
+ mtu=(net_mtu - 1))
+ self.networks[0]['mtu'] = (
+ self.admin_client.show_network(
+ self.networks[0]['id'])['network']['mtu'])
+
+ # check that MTUs are different for 2 networks
+ self.assertNotEqual(self.networks[0]['mtu'], self.networks[1]['mtu'])
+ self.networks.sort(key=lambda net: net['mtu'])
+ server1, fip1 = self.create_pingable_vm(self.networks[0],
+ self.keypair, self.secgroup)
+ server_ssh_client1 = ssh.Client(
+ self.floating_ips[0]['floating_ip_address'],
+ CONF.validation.image_ssh_user,
+ pkey=self.keypair['private_key'])
+ server2, fip2 = self.create_pingable_vm(self.networks[1],
+ self.keypair, self.secgroup)
+ server_ssh_client2 = ssh.Client(
+ self.floating_ips[0]['floating_ip_address'],
+ CONF.validation.image_ssh_user,
+ pkey=self.keypair['private_key'])
+ for fip in (fip1, fip2):
+ self.check_connectivity(fip['floating_ip_address'],
+ CONF.validation.image_ssh_user,
+ self.keypair['private_key'])
+ return server_ssh_client1, fip1, server_ssh_client2, fip2
+
+ @decorators.idempotent_id('bc470200-d8f4-4f07-b294-1b4cbaaa35b9')
+ def test_connectivity_min_max_mtu(self):
+ server_ssh_client, _, _, fip2 = self._create_setup()
+ # ping with min mtu of 2 networks succeeds even when
+ # fragmentation is disabled
+ self.check_remote_connectivity(
+ server_ssh_client, fip2['fixed_ip_address'],
+ mtu=self.networks[0]['mtu'], fragmentation=False)
+
+ # ping with the size above min mtu of 2 networks
+ # fails when fragmentation is disabled
+ self.check_remote_connectivity(
+ server_ssh_client, fip2['fixed_ip_address'], should_succeed=False,
+ mtu=self.networks[0]['mtu'] + 2, fragmentation=False)
+
+ # ping with max mtu of 2 networks succeeds when
+ # fragmentation is enabled
+ self.check_remote_connectivity(
+ server_ssh_client, fip2['fixed_ip_address'],
+ mtu=self.networks[1]['mtu'])
+
+ # ping with max mtu of 2 networks fails when fragmentation is disabled
+ self.check_remote_connectivity(
+ server_ssh_client, fip2['fixed_ip_address'], should_succeed=False,
+ mtu=self.networks[1]['mtu'], fragmentation=False)
diff --git a/requirements.txt b/requirements.txt
index e546885..77875ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,17 +2,17 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr>=2.0 # Apache-2.0
-neutron-lib>=1.9.0 # Apache-2.0
-oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
+neutron-lib>=1.13.0 # Apache-2.0
+oslo.config>=5.1.0 # Apache-2.0
ipaddress>=1.0.16;python_version<'3.3' # PSF
-netaddr!=0.7.16,>=0.7.13 # BSD
-oslo.log>=3.22.0 # Apache-2.0
-oslo.serialization!=2.19.1,>=1.10.0 # Apache-2.0
-oslo.utils>=3.20.0 # Apache-2.0
-six>=1.9.0 # MIT
-tempest>=16.1.0 # Apache-2.0
+netaddr>=0.7.18 # BSD
+oslo.log>=3.36.0 # Apache-2.0
+oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+oslo.utils>=3.33.0 # Apache-2.0
+six>=1.10.0 # MIT
+tempest>=17.1.0 # Apache-2.0
ddt>=1.0.1 # MIT
-testtools>=1.4.0 # MIT
+testtools>=2.2.0 # MIT
testscenarios>=0.4 # Apache-2.0/BSD
eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
diff --git a/setup.py b/setup.py
index 056c16c..566d844 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@
pass
setuptools.setup(
- setup_requires=['pbr'],
+ setup_requires=['pbr>=2.0.0'],
pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index f559c0e..f4f8c0a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,14 +2,14 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=0.12.0,<0.13 # Apache-2.0
+hacking<0.13,>=0.12.0 # Apache-2.0
-coverage>=4.0,!=4.4 # Apache-2.0
-python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.6.2 # BSD
-oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
-openstackdocstheme>=1.11.0 # Apache-2.0
+coverage!=4.4,>=4.0 # Apache-2.0
+python-subunit>=1.0.0 # Apache-2.0/BSD
+sphinx!=1.6.6,>=1.6.2 # BSD
+oslotest>=3.2.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=2.2.0 # MIT
+openstackdocstheme>=1.18.1 # Apache-2.0
# releasenotes
-reno>=1.8.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index dbd0526..c16664d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,7 @@
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:debug]
-commands = oslo_debug_helper {posargs}
+commands = oslo_debug_helper -t neutron_tempest_plugin/ {posargs}
[flake8]
# E125 continuation line does not distinguish itself from next logical line