Merge "Fix mismatch error due to map in python3"
diff --git a/.zuul.yaml b/.zuul.yaml
index e3210fe..0d2005b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -363,6 +363,7 @@
- opendev.org/openstack/cinder-tempest-plugin
- opendev.org/openstack/cloudkitty-tempest-plugin
- opendev.org/openstack/congress-tempest-plugin
+ - opendev.org/openstack/cyborg-tempest-plugin
- opendev.org/openstack/designate-tempest-plugin
- opendev.org/openstack/ec2api-tempest-plugin
- opendev.org/openstack/freezer
@@ -405,7 +406,6 @@
- opendev.org/openstack/neutron-vpnaas
- opendev.org/x/nova-lxd
- opendev.org/x/novajoin-tempest-plugin
- - opendev.org/openstack/octavia
- opendev.org/openstack/octavia-tempest-plugin
- opendev.org/openstack/oswin-tempest-plugin
- opendev.org/openstack/panko
@@ -634,7 +634,6 @@
- tempest-full-queens
- tempest-full-queens-py3
- tempest-full-pike
- - legacy-periodic-tempest-dsvm-neutron-full-ocata
periodic:
jobs:
- tempest-all
diff --git a/releasenotes/notes/deprecate-dns_servers-option-0xf2f297ee47a5ff.yaml b/releasenotes/notes/deprecate-dns_servers-option-0xf2f297ee47a5ff.yaml
new file mode 100644
index 0000000..30551cb
--- /dev/null
+++ b/releasenotes/notes/deprecate-dns_servers-option-0xf2f297ee47a5ff.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+ - |
+ The config option ``CONF.network.dns_servers`` is no longer used
+ anywhere, so it is deprecated and will be removed in the future.
+
diff --git a/tempest/config.py b/tempest/config.py
index 24ae3ae..f692a4b 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -685,7 +685,10 @@
cfg.ListOpt('dns_servers',
default=["8.8.8.8", "8.8.4.4"],
help="List of dns servers which should be used"
- " for subnet creation"),
+ " for subnet creation",
+ deprecated_for_removal=True,
+ deprecated_reason="This config option is no longer "
+ "used anywhere, so it can be removed."),
cfg.StrOpt('port_vnic_type',
choices=[None, 'normal', 'direct', 'macvtap'],
help="vnic_type to use when launching instances"
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index d09f20c..86d37f1 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -346,8 +346,10 @@
def create_volume_type(self, client=None, name=None, backend_name=None):
if not client:
client = self.os_admin.volume_types_client_latest
- randomized_name = name or data_utils.rand_name(
- 'volume-type-' + self.__class__.__name__)
+ if not name:
+ class_name = self.__class__.__name__
+ name = data_utils.rand_name(class_name + '-volume-type')
+ randomized_name = data_utils.rand_name('scenario-type-' + name)
LOG.debug("Creating a volume type: %s on backend %s",
randomized_name, backend_name)
diff --git a/tools/tempest-plugin-sanity.sh b/tools/tempest-plugin-sanity.sh
index 703dce2..6bb87c5 100644
--- a/tools/tempest-plugin-sanity.sh
+++ b/tools/tempest-plugin-sanity.sh
@@ -46,8 +46,8 @@
# List of projects having tempest plugin stale or unmaintained for a long time
# (6 months or more)
# TODO(masayukig): Some of these can be removed from BLACKLIST in the future.
-# airship-tempest-plugin: https://review.openstack.org/#/c/634387/
# barbican-tempest-plugin: https://review.openstack.org/#/c/634631/
+# cyborg-tempest-plugin: https://review.opendev.org/659687
# intel-nfv-ci-tests: https://review.openstack.org/#/c/634640/
# networking-ansible: https://review.openstack.org/#/c/634647/
# networking-generic-switch: https://review.openstack.org/#/c/634846/
@@ -61,8 +61,8 @@
# valet: https://review.openstack.org/#/c/638339/
# vitrage-tempest-plugin: https://review.openstack.org/#/c/639003/
BLACKLIST="
-airship-tempest-plugin
barbican-tempest-plugin
+cyborg-tempest-plugin
intel-nfv-ci-tests
networking-ansible
networking-generic-switch
@@ -94,7 +94,7 @@
# function to create virtualenv to perform sanity operation
function prepare_workspace() {
SANITY_DIR=$(pwd)
- virtualenv --clear "$SANITY_DIR"/.venv
+ virtualenv -p python3 --clear "$SANITY_DIR"/.venv
export TVENV="$SANITY_DIR/tools/with_venv.sh"
cd "$SANITY_DIR"
diff --git a/tox.ini b/tox.ini
index 230249f..9bee3dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -265,6 +265,7 @@
[testenv:plugin-sanity-check]
# perform tempest plugin sanity
+basepython = python3
whitelist_externals = bash
commands =
bash tools/tempest-plugin-sanity.sh