Merge "Update subnet test to not use pre-created share network"
diff --git a/manila_tempest_tests/tests/api/admin/test_share_types.py b/manila_tempest_tests/tests/api/admin/test_share_types.py
index aef202b..a4a093b 100644
--- a/manila_tempest_tests/tests/api/admin/test_share_types.py
+++ b/manila_tempest_tests/tests/api/admin/test_share_types.py
@@ -98,6 +98,7 @@
# Check that backwards compatibility didn't break
self.assertDictMatch(get["volume_type"], get["share_type"])
+ @base.skip_if_microversion_lt("2.50")
@tc.attr(base.TAG_POSITIVE, base.TAG_API)
@ddt.data(
('2.50', data_utils.rand_name("type_updated"),
@@ -145,6 +146,7 @@
st_is_public,
updated_st["share_type"]["share_type_access:is_public"])
+ @base.skip_if_microversion_lt("2.50")
@tc.attr(base.TAG_POSITIVE, base.TAG_API)
@ddt.data(
('2.50', None, '', None),
diff --git a/manila_tempest_tests/tests/api/test_share_types_negative.py b/manila_tempest_tests/tests/api/test_share_types_negative.py
index 9b4f6ba..7ba6f86 100644
--- a/manila_tempest_tests/tests/api/test_share_types_negative.py
+++ b/manila_tempest_tests/tests/api/test_share_types_negative.py
@@ -72,6 +72,7 @@
self.st['id'],
self.shares_client.tenant_id)
+ @base.skip_if_microversion_lt("2.50")
@tc.attr(base.TAG_NEGATIVE, base.TAG_API)
@ddt.data(
('2.50', '', None, None),
@@ -91,6 +92,7 @@
st_id, st_name, st_is_public, st_description,
version)
+ @base.skip_if_microversion_lt("2.50")
@tc.attr(base.TAG_NEGATIVE, base.TAG_API)
@ddt.data('2.50', LATEST_MICROVERSION)
def test_share_type_update_conflict(self, version):
diff --git a/tox.ini b/tox.ini
index f32dd68..00b23d0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@
[testenv]
usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning