Merge "NetApp: Support share revert to snapshot"
diff --git a/manila_tempest_tests/config.py b/manila_tempest_tests/config.py
index 590912e..d25cb8d 100644
--- a/manila_tempest_tests/config.py
+++ b/manila_tempest_tests/config.py
@@ -30,7 +30,7 @@
help="The minimum api microversion is configured to be the "
"value of the minimum microversion supported by Manila."),
cfg.StrOpt("max_api_microversion",
- default="2.30",
+ default="2.31",
help="The maximum api microversion is configured to be the "
"value of the latest microversion supported by Manila."),
cfg.StrOpt("region",
@@ -171,7 +171,7 @@
"to snapshots or not. Enable this feature if used "
"driver supports it."),
cfg.BoolOpt("run_consistency_group_tests",
- default=True,
+ default=False,
help="Defines whether to run consistency group tests or not. "
"Disable this feature if used driver doesn't support "
"it."),
diff --git a/manila_tempest_tests/tests/api/test_shares_actions.py b/manila_tempest_tests/tests/api/test_shares_actions.py
index 0f904fc..cfebdd3 100644
--- a/manila_tempest_tests/tests/api/test_shares_actions.py
+++ b/manila_tempest_tests/tests/api/test_shares_actions.py
@@ -94,9 +94,6 @@
expected_keys.extend(["export_location", "export_locations"])
if utils.is_microversion_ge(version, '2.2'):
expected_keys.append("snapshot_support")
- if utils.is_microversion_ge(version, '2.4'):
- expected_keys.extend(["consistency_group_id",
- "source_cgsnapshot_member_id"])
if utils.is_microversion_ge(version, '2.5'):
expected_keys.append("share_type_name")
if utils.is_microversion_ge(version, '2.10'):
@@ -137,11 +134,6 @@
self._get_share('2.2')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
- @utils.skip_if_microversion_not_supported('2.4')
- def test_get_share_with_consistency_groups_keys(self):
- self._get_share('2.4')
-
- @tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@utils.skip_if_microversion_not_supported('2.6')
def test_get_share_with_share_type_name_key(self):
self._get_share('2.6')
@@ -210,9 +202,6 @@
keys.extend(["export_location", "export_locations"])
if utils.is_microversion_ge(version, '2.2'):
keys.append("snapshot_support")
- if utils.is_microversion_ge(version, '2.4'):
- keys.extend(["consistency_group_id",
- "source_cgsnapshot_member_id"])
if utils.is_microversion_ge(version, '2.6'):
keys.append("share_type_name")
if utils.is_microversion_ge(version, '2.10'):
@@ -243,11 +232,6 @@
self._list_shares_with_detail('2.2')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
- @utils.skip_if_microversion_not_supported('2.4')
- def test_list_shares_with_detail_consistency_groups_keys(self):
- self._list_shares_with_detail('2.4')
-
- @tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@utils.skip_if_microversion_not_supported('2.6')
def test_list_shares_with_detail_share_type_name_key(self):
self._list_shares_with_detail('2.6')