Merge "Remove bug_1573141_fixed"
diff --git a/designate_tempest_plugin/config.py b/designate_tempest_plugin/config.py
index 2a8e25e..231ad75 100644
--- a/designate_tempest_plugin/config.py
+++ b/designate_tempest_plugin/config.py
@@ -77,12 +77,6 @@
default=False,
help="Is project IDs verified when setting v2 quotas. "
"Must be set to True starting from Rocky release."),
- cfg.BoolOpt('bug_1573141_fixed',
- default=True,
- deprecated_for_removal=True,
- deprecated_reason='This bug was fixed in 3.0.0',
- help="Is https://bugs.launchpad.net/designate/+bug/1573141 "
- "fixed"),
cfg.BoolOpt('bug_1932026_fixed',
default=False,
help="Is https://bugs.launchpad.net/designate/+bug/1932026 "
diff --git a/designate_tempest_plugin/data_utils.py b/designate_tempest_plugin/data_utils.py
index 75a7d41..31989b7 100644
--- a/designate_tempest_plugin/data_utils.py
+++ b/designate_tempest_plugin/data_utils.py
@@ -92,15 +92,10 @@
zone_recordsets or data_utils.rand_int_id(100, 999999),
'recordset_records':
recordset_records or data_utils.rand_int_id(100, 999999),
+ 'api_export_size':
+ api_export_size or data_utils.rand_int_id(100, 999999)
}
- if CONF.dns_feature_enabled.bug_1573141_fixed:
- quotas_dict['api_export_size'] = (
- api_export_size or data_utils.rand_int_id(100, 999999))
- else:
- LOG.warning("Leaving `api_export_size` out of quota data due to: "
- "https://bugs.launchpad.net/designate/+bug/1573141")
-
return quotas_dict
diff --git a/designate_tempest_plugin/tests/api/admin/test_quotas.py b/designate_tempest_plugin/tests/api/admin/test_quotas.py
index da76894..9043e77 100644
--- a/designate_tempest_plugin/tests/api/admin/test_quotas.py
+++ b/designate_tempest_plugin/tests/api/admin/test_quotas.py
@@ -24,11 +24,9 @@
class BaseQuotasTest(base.BaseDnsAdminTest):
- excluded_keys = []
+ excluded_keys = ['api_export_size']
def setUp(self):
- if CONF.dns_feature_enabled.bug_1573141_fixed:
- self.excluded_keys = ['api_export_size']
super(BaseQuotasTest, self).setUp()
diff --git a/releasenotes/notes/remove-bug_1573141_fixed-0d485186ade21df3.yaml b/releasenotes/notes/remove-bug_1573141_fixed-0d485186ade21df3.yaml
new file mode 100644
index 0000000..6e0b87b
--- /dev/null
+++ b/releasenotes/notes/remove-bug_1573141_fixed-0d485186ade21df3.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ The ``[dns_feature_enabled] bug_1573141_fixed`` option has been removed.