Merge "Create router and dhcp when create_default_network set"
diff --git a/bindep.txt b/bindep.txt
index efd3a10..7d34939 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -5,7 +5,6 @@
libffi-devel [platform:rpm]
gcc [platform:rpm]
gcc [platform:dpkg]
-python-dev [platform:dpkg]
python-devel [platform:rpm]
python3-dev [platform:dpkg]
python3-devel [platform:rpm]
diff --git a/doc/source/supported_version.rst b/doc/source/supported_version.rst
index 4ca7f0d..f630578 100644
--- a/doc/source/supported_version.rst
+++ b/doc/source/supported_version.rst
@@ -9,9 +9,10 @@
Tempest master supports the below OpenStack Releases:
+* Yoga
+* Xena
+* Wallaby
* Victoria
-* Ussuri
-* Train
For older OpenStack Release:
@@ -32,6 +33,5 @@
Tempest master supports the below python versions:
-* Python 3.6
-* Python 3.7
* Python 3.8
+* Python 3.9
diff --git a/releasenotes/notes/drop-py-3-6-and-3-7-a34f2294f5341539.yaml b/releasenotes/notes/drop-py-3-6-and-3-7-a34f2294f5341539.yaml
new file mode 100644
index 0000000..ec4e2f2
--- /dev/null
+++ b/releasenotes/notes/drop-py-3-6-and-3-7-a34f2294f5341539.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ Python 3.6 and 3.7 support has been dropped. Last release of Tempest
+ to support python 3.6 and 3.7 is Temepst 30.0.0. The minimum version
+ of Python now supported by Tempest is Python 3.8.
diff --git a/releasenotes/notes/measure-downtime-during-live-migration-5e8305be270de680.yaml b/releasenotes/notes/measure-downtime-during-live-migration-5e8305be270de680.yaml
new file mode 100644
index 0000000..9f4abd1
--- /dev/null
+++ b/releasenotes/notes/measure-downtime-during-live-migration-5e8305be270de680.yaml
@@ -0,0 +1,9 @@
+---
+features:
+ - |
+ Added new module net_downtime including the fixture NetDowntimeMeter that
+ can be used to measure how long the connectivity with an IP is lost
+ during certain operations like a server live migration.
+ The configuration option allowed_network_downtime has been added with a
+ default value of 5.0 seconds, which would be the maximum time that
+ the connectivity downtime is expected to last.
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 122f7c7..e1e6597 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ v31.0.0
v30.0.0
v29.2.0
v29.1.0
diff --git a/releasenotes/source/v31.0.0.rst b/releasenotes/source/v31.0.0.rst
new file mode 100644
index 0000000..8fb797c
--- /dev/null
+++ b/releasenotes/source/v31.0.0.rst
@@ -0,0 +1,5 @@
+=====================
+v31.0.0 Release Notes
+=====================
+.. release-notes:: 31.0.0 Release Notes
+ :version: 31.0.0
diff --git a/setup.cfg b/setup.cfg
index a41eccf..a531eb4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@
author = OpenStack
author_email = openstack-discuss@lists.openstack.org
home_page = https://docs.openstack.org/tempest/latest/
-python_requires = >=3.6
+python_requires = >=3.8
classifier =
Intended Audience :: Information Technology
Intended Audience :: System Administrators
@@ -15,8 +15,6 @@
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.6
- Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3 :: Only
diff --git a/tempest/api/compute/admin/test_live_migration.py b/tempest/api/compute/admin/test_live_migration.py
index c91b557..0975702 100644
--- a/tempest/api/compute/admin/test_live_migration.py
+++ b/tempest/api/compute/admin/test_live_migration.py
@@ -34,11 +34,6 @@
class LiveMigrationTestBase(base.BaseV2ComputeAdminTest):
"""Test live migration operations supported by admin user"""
- # These tests don't attempt any SSH validation nor do they use
- # floating IPs on the instance, so all we need is a network and
- # a subnet so the instance being migrated has a single port, but
- # we need that to make sure we are properly updating the port
- # host bindings during the live migration.
create_default_network = True
@classmethod
@@ -104,6 +99,11 @@
max_microversion = '2.24'
block_migration = None
+ @classmethod
+ def setup_credentials(cls):
+ cls.prepare_instance_network()
+ super(LiveMigrationTest, cls).setup_credentials()
+
def _test_live_migration(self, state='ACTIVE', volume_backed=False):
"""Tests live migration between two hosts.
@@ -182,7 +182,12 @@
attach volume. This differs from test_volume_backed_live_migration
above that tests live-migration with only an attached volume.
"""
- server = self.create_test_server(wait_until="ACTIVE")
+ validation_resources = self.get_test_validation_resources(
+ self.os_primary)
+ server = self.create_test_server(
+ validatable=True,
+ validation_resources=validation_resources,
+ wait_until="SSHABLE")
server_id = server['id']
if not CONF.compute_feature_enabled.can_migrate_between_any_hosts:
# not to specify a host so that the scheduler will pick one
diff --git a/tempest/api/compute/admin/test_volume_swap.py b/tempest/api/compute/admin/test_volume_swap.py
index c1236a7..7da87c7 100644
--- a/tempest/api/compute/admin/test_volume_swap.py
+++ b/tempest/api/compute/admin/test_volume_swap.py
@@ -26,6 +26,11 @@
create_default_network = True
@classmethod
+ def setup_credentials(cls):
+ cls.prepare_instance_network()
+ super(TestVolumeSwapBase, cls).setup_credentials()
+
+ @classmethod
def skip_checks(cls):
super(TestVolumeSwapBase, cls).skip_checks()
if not CONF.compute_feature_enabled.swap_volume:
@@ -100,7 +105,16 @@
volume1 = self.create_volume()
volume2 = self.create_volume()
# Boot server
- server = self.create_test_server(wait_until='ACTIVE')
+ validation_resources = self.get_class_validation_resources(
+ self.os_primary)
+ # NOTE(gibi): We need to wait for the guest to fully boot as the test
+ # will attach a volume to the server and therefore cleanup will try to
+ # detach it. See bug 1960346 for details.
+ server = self.create_test_server(
+ validatable=True,
+ validation_resources=validation_resources,
+ wait_until='SSHABLE'
+ )
# Attach "volume1" to server
self.attach_volume(server, volume1)
# Swap volume from "volume1" to "volume2"
@@ -200,9 +214,18 @@
volume2 = self.create_volume(multiattach=True)
# Create two servers and wait for them to be ACTIVE.
+ validation_resources = self.get_class_validation_resources(
+ self.os_primary)
+ # NOTE(gibi): We need to wait for the guests to fully boot as the test
+ # will attach volumes to the servers and therefore cleanup will try to
+ # detach them. See bug 1960346 for details.
reservation_id = self.create_test_server(
- wait_until='ACTIVE', min_count=2,
- return_reservation_id=True)['reservation_id']
+ validatable=True,
+ validation_resources=validation_resources,
+ wait_until='SSHABLE',
+ min_count=2,
+ return_reservation_id=True,
+ )['reservation_id']
# Get the servers using the reservation_id.
servers = self.servers_client.list_servers(
reservation_id=reservation_id)['servers']
diff --git a/tempest/api/compute/admin/test_volumes_negative.py b/tempest/api/compute/admin/test_volumes_negative.py
index 10d522b..91ab09e 100644
--- a/tempest/api/compute/admin/test_volumes_negative.py
+++ b/tempest/api/compute/admin/test_volumes_negative.py
@@ -28,21 +28,22 @@
create_default_network = True
@classmethod
+ def setup_credentials(cls):
+ cls.prepare_instance_network()
+ super(VolumesAdminNegativeTest, cls).setup_credentials()
+
+ @classmethod
def skip_checks(cls):
super(VolumesAdminNegativeTest, cls).skip_checks()
if not CONF.service_available.cinder:
skip_msg = ("%s skipped as Cinder is not available" % cls.__name__)
raise cls.skipException(skip_msg)
- @classmethod
- def resource_setup(cls):
- super(VolumesAdminNegativeTest, cls).resource_setup()
- cls.server = cls.create_test_server(wait_until='ACTIVE')
-
@decorators.attr(type=['negative'])
@decorators.idempotent_id('309b5ecd-0585-4a7e-a36f-d2b2bf55259d')
def test_update_attached_volume_with_nonexistent_volume_in_uri(self):
"""Test swapping non existent volume should fail"""
+ self.server = self.create_test_server(wait_until="ACTIVE")
volume = self.create_volume()
nonexistent_volume = data_utils.rand_uuid()
self.assertRaises(lib_exc.NotFound,
@@ -55,6 +56,17 @@
@decorators.idempotent_id('7dcac15a-b107-46d3-a5f6-cb863f4e454a')
def test_update_attached_volume_with_nonexistent_volume_in_body(self):
"""Test swapping volume to a non existence volume should fail"""
+ validation_resources = self.get_class_validation_resources(
+ self.os_primary)
+ # NOTE(gibi): We need to wait for the guest to fully boot as
+ # test_update_attached_volume_with_nonexistent_volume_in_body case
+ # will attach a volume to it and therefore cleanup will try to detach
+ # it. See bug 1960346 for details.
+ self.server = self.create_test_server(
+ validatable=True,
+ validation_resources=validation_resources,
+ wait_until="SSHABLE")
+
volume = self.create_volume()
self.attach_volume(self.server, volume)
@@ -76,6 +88,13 @@
min_microversion = '2.60'
volume_min_microversion = '3.27'
+ create_default_network = True
+
+ @classmethod
+ def setup_credentials(cls):
+ cls.prepare_instance_network()
+ super(UpdateMultiattachVolumeNegativeTest, cls).setup_credentials()
+
@classmethod
def skip_checks(cls):
super(UpdateMultiattachVolumeNegativeTest, cls).skip_checks()
@@ -101,8 +120,21 @@
vol2 = self.create_volume(multiattach=True)
# Create two instances.
- server1 = self.create_test_server(wait_until='ACTIVE')
- server2 = self.create_test_server(wait_until='ACTIVE')
+ validation_resources = self.get_class_validation_resources(
+ self.os_primary)
+ # NOTE(gibi): We need to wait for the guests to fully boot as the test
+ # will attach volumes to the servers and therefore cleanup will try to
+ # detach them. See bug 1960346 for details.
+ server1 = self.create_test_server(
+ validatable=True,
+ validation_resources=validation_resources,
+ wait_until='SSHABLE'
+ )
+ server2 = self.create_test_server(
+ validatable=True,
+ validation_resources=validation_resources,
+ wait_until='SSHABLE'
+ )
# Attach vol1 to both of these instances.
vol1_attachment1 = self.attach_volume(server1, vol1)
diff --git a/tempest/api/object_storage/test_object_temp_url.py b/tempest/api/object_storage/test_object_temp_url.py
index e75e22a..4ca7412 100644
--- a/tempest/api/object_storage/test_object_temp_url.py
+++ b/tempest/api/object_storage/test_object_temp_url.py
@@ -78,7 +78,7 @@
hmac_body = '%s\n%s\n%s' % (method, expires, path)
sig = hmac.new(
- key.encode(), hmac_body.encode(), hashlib.sha1
+ key.encode(), hmac_body.encode(), hashlib.sha256
).hexdigest()
url = "%s/%s?temp_url_sig=%s&temp_url_expires=%s" % (container,
diff --git a/tempest/api/object_storage/test_object_temp_url_negative.py b/tempest/api/object_storage/test_object_temp_url_negative.py
index 4ad8428..e5f4cf2 100644
--- a/tempest/api/object_storage/test_object_temp_url_negative.py
+++ b/tempest/api/object_storage/test_object_temp_url_negative.py
@@ -83,7 +83,7 @@
hmac_body = '%s\n%s\n%s' % (method, expires, path)
sig = hmac.new(
- key.encode(), hmac_body.encode(), hashlib.sha1
+ key.encode(), hmac_body.encode(), hashlib.sha256
).hexdigest()
url = "%s/%s?temp_url_sig=%s&temp_url_expires=%s" % (container,
diff --git a/tempest/api/volume/admin/test_backends_capabilities.py b/tempest/api/volume/admin/test_backends_capabilities.py
index 3c76eca..9a85ed4 100644
--- a/tempest/api/volume/admin/test_backends_capabilities.py
+++ b/tempest/api/volume/admin/test_backends_capabilities.py
@@ -47,6 +47,11 @@
'volume_backend_name',
'storage_protocol')
+ # List of storage protocols variants defined in cinder.common.constants
+ # The canonical name for storage protocol comes first in the list
+ VARIANTS = [['iSCSI', 'iscsi'], ['FC', 'fibre_channel', 'fc'],
+ ['NFS', 'nfs'], ['NVMe-oF', 'NVMeOF', 'nvmeof']]
+
# Get list backend capabilities using show_pools
cinder_pools = [
pool['capabilities'] for pool in
@@ -64,4 +69,23 @@
cinder_pools)))
observed_list = sorted(list(map(operator.itemgetter(*VOLUME_STATS),
capabilities)))
+
+ # Cinder Bug #1966103: Some drivers were reporting different strings
+ # to represent the same storage protocol. For backward compatibility,
+ # the scheduler can handle the variants, but to standardize this for
+ # operators (who may need to refer to the protocol in volume-type
+ # extra-specs), the get-pools response was changed by I07d74078dbb1
+ # to only report the canonical name for a storage protocol. Thus, the
+ # expected_list (which we got from the get-pools call) will only
+ # contain canonical names, while the observed_list (which we got
+ # from the driver capabilities call) may contain a variant. So before
+ # comparing the lists, we need to look for known variants in the
+ # observed_list elements and replace them with their canonical values
+ for item in range(len(observed_list)):
+ for variants in VARIANTS:
+ if observed_list[item][2] in variants:
+ observed_list[item] = (observed_list[item][0],
+ observed_list[item][1],
+ variants[0])
+
self.assertEqual(expected_list, observed_list)
diff --git a/tempest/common/utils/net_downtime.py b/tempest/common/utils/net_downtime.py
new file mode 100644
index 0000000..9675ec8
--- /dev/null
+++ b/tempest/common/utils/net_downtime.py
@@ -0,0 +1,63 @@
+# Copyright 2022 OpenStack Foundation
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+import signal
+import subprocess
+
+import fixtures
+
+from oslo_log import log
+
+
+LOG = log.getLogger(__name__)
+
+
+class NetDowntimeMeter(fixtures.Fixture):
+ def __init__(self, dest_ip, interval='0.2'):
+ self.dest_ip = dest_ip
+ # Note: for intervals lower than 0.2 ping requires root privileges
+ self.interval = interval
+ self.ping_process = None
+
+ def _setUp(self):
+ self.start_background_pinger()
+
+ def start_background_pinger(self):
+ cmd = ['ping', '-q', '-s1']
+ cmd.append('-i{}'.format(self.interval))
+ cmd.append(self.dest_ip)
+ LOG.debug("Starting background pinger to '{}' with interval {}".format(
+ self.dest_ip, self.interval))
+ self.ping_process = subprocess.Popen(
+ cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.addCleanup(self.cleanup)
+
+ def cleanup(self):
+ if self.ping_process and self.ping_process.poll() is None:
+ LOG.debug('Terminating background pinger with pid {}'.format(
+ self.ping_process.pid))
+ self.ping_process.terminate()
+ self.ping_process = None
+
+ def get_downtime(self):
+ self.ping_process.send_signal(signal.SIGQUIT)
+ # Example of the expected output:
+ # 264/274 packets, 3% loss
+ output = self.ping_process.stderr.readline().strip().decode('utf-8')
+ if output and len(output.split()[0].split('/')) == 2:
+ succ, total = output.split()[0].split('/')
+ return (int(total) - int(succ)) * float(self.interval)
+ else:
+ LOG.warning('Unexpected output obtained from the pinger: %s',
+ output)
diff --git a/tempest/config.py b/tempest/config.py
index ebde421..4098f32 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -965,6 +965,12 @@
default='ecdsa',
help='Type of key to use for ssh connections. '
'Valid types are rsa, ecdsa'),
+ cfg.IntOpt('allowed_network_downtime',
+ default=5.0,
+ help="Allowed VM network connection downtime during live "
+ "migration, in seconds. "
+ "When the measured downtime exceeds this value, an "
+ "exception is raised."),
]
volume_group = cfg.OptGroup(name='volume',
diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
index b48ac3c..1c00212 100644
--- a/tempest/scenario/test_network_advanced_server_ops.py
+++ b/tempest/scenario/test_network_advanced_server_ops.py
@@ -15,7 +15,9 @@
import testtools
+from oslo_log import log
from tempest.common import utils
+from tempest.common.utils import net_downtime
from tempest.common import waiters
from tempest import config
from tempest.lib import decorators
@@ -23,6 +25,8 @@
CONF = config.CONF
+LOG = log.getLogger(__name__)
+
class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
"""Check VM connectivity after some advanced instance operations executed:
@@ -252,6 +256,11 @@
block_migration = (CONF.compute_feature_enabled.
block_migration_for_live_migration)
old_host = self.get_host_for_server(server['id'])
+
+ downtime_meter = net_downtime.NetDowntimeMeter(
+ floating_ip['floating_ip_address'])
+ self.useFixture(downtime_meter)
+
self.admin_servers_client.live_migrate_server(
server['id'], host=None, block_migration=block_migration,
disk_over_commit=False)
@@ -261,6 +270,16 @@
new_host = self.get_host_for_server(server['id'])
self.assertNotEqual(old_host, new_host, 'Server did not migrate')
+ downtime = downtime_meter.get_downtime()
+ self.assertIsNotNone(downtime)
+ LOG.debug("Downtime seconds measured with downtime_meter = %r",
+ downtime)
+ allowed_downtime = CONF.validation.allowed_network_downtime
+ self.assertLess(
+ downtime, allowed_downtime,
+ "Downtime of {} seconds is higher than expected '{}'".format(
+ downtime, allowed_downtime))
+
self._wait_server_status_and_check_network_connectivity(
server, keypair, floating_ip)
diff --git a/tox.ini b/tox.ini
index b07fdaf..94eb4d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = pep8,py36,py39,bashate,pip-check-reqs
+envlist = pep8,py39,bashate,pip-check-reqs
minversion = 3.18.0
skipsdist = True
ignore_basepython_conflict = True
diff --git a/zuul.d/integrated-gate.yaml b/zuul.d/integrated-gate.yaml
index 3dd8c49..7535ccc 100644
--- a/zuul.d/integrated-gate.yaml
+++ b/zuul.d/integrated-gate.yaml
@@ -350,12 +350,18 @@
- grenade-skip-level:
voting: false
- tempest-integrated-networking
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
gate:
jobs:
- grenade
- tempest-integrated-networking
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
- project-template:
name: integrated-gate-compute
@@ -380,12 +386,18 @@
# centos-9-stream is tested from zed release onwards
- tempest-integrated-compute-centos-9-stream:
branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|yoga)).*$
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
gate:
jobs:
- tempest-integrated-compute
- tempest-integrated-compute-centos-9-stream
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
- project-template:
name: integrated-gate-placement
@@ -400,12 +412,18 @@
- grenade-skip-level:
voting: false
- tempest-integrated-placement
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
gate:
jobs:
- grenade
- tempest-integrated-placement
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
- project-template:
name: integrated-gate-storage
@@ -420,12 +438,18 @@
- grenade-skip-level:
voting: false
- tempest-integrated-storage
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
gate:
jobs:
- grenade
- tempest-integrated-storage
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
- project-template:
name: integrated-gate-object-storage
@@ -438,9 +462,15 @@
jobs:
- grenade
- tempest-integrated-object-storage
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
gate:
jobs:
- grenade
- tempest-integrated-object-storage
- - openstacksdk-functional-devstack
+ # Do not run it on ussuri until below issue is fixed
+ # https://storyboard.openstack.org/#!/story/2010057
+ - openstacksdk-functional-devstack:
+ branches: ^(?!stable/ussuri).*$
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ce2c233..0b34ae0 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,11 +8,9 @@
check:
jobs:
- openstack-tox-pep8
- # TODO(gmann): run these jobs once bug#1975036 is resolved
- #- openstack-tox-py36
- #- openstack-tox-py37
- openstack-tox-py38
- openstack-tox-py39
+ - openstack-tox-py310
- tempest-full-parallel:
# Define list of irrelevant files to use everywhere else
irrelevant-files: &tempest-irrelevant-files
@@ -132,11 +130,9 @@
gate:
jobs:
- openstack-tox-pep8
- # TODO(gmann): run these jobs once bug#1975036 is resolved
- # - openstack-tox-py36
- # - openstack-tox-py37
- openstack-tox-py38
- openstack-tox-py39
+ - openstack-tox-py310
- tempest-slow-py3:
irrelevant-files: *tempest-irrelevant-files
- neutron-ovs-grenade-multinode: