Merge "Remove bug_1573141_fixed"

designate_tempest_plugin/config.py

@@ -77,12 +77,6 @@ DnsFeatureGroup = [
                 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 "

designate_tempest_plugin/data_utils.py

@@ -92,15 +92,10 @@ def rand_quotas(zones=None, zone_records=None, zone_recordsets=None,
             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
 
 

designate_tempest_plugin/tests/api/admin/test_quotas.py

@@ -24,11 +24,9 @@ LOG = logging.getLogger(__name__)
 
 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()
 
 

releasenotes/notes/remove-bug_1573141_fixed-0d485186ade21df3.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``[dns_feature_enabled] bug_1573141_fixed`` option has been removed.