Adjust feature flag metadata

Author: zkayyali812

ansible_base/feature_flags/definitions/feature_flags.yaml

@@ -1,61 +1,51 @@
 - name: FEATURE_INDIRECT_NODE_COUNTING_ENABLED
   ui_name: Indirect Node Counting
-  visibility: public
+  visibility: True
   condition: boolean
   value: 'False'
-  support_level: NOT_FOR_PRODUCTION
-  description: TBD
-  support_url: https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.5/
-  labels:
-    - controller
-- name: FEATURE_POLICY_AS_CODE_ENABLED
-  ui_name: Policy as Code
-  visibility: public
-  condition: boolean
-  value: 'False'
-  support_level: NOT_FOR_PRODUCTION
+  support_level: TECHNICAL_PREVIEW
   description: TBD
   support_url: https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.5/
   labels:
     - controller
 - name: FEATURE_EDA_ANALYTICS_ENABLED
   ui_name: Event-Driven Ansible Analytics
-  visibility: public
+  visibility: True
   condition: boolean
   value: 'False'
-  support_level: NOT_FOR_PRODUCTION
-  description: TBD
-  support_url: https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.5/
+  support_level: TECHNICAL_PREVIEW
+  description: Submit Event-Driven Ansible usage analytics to console.redhat.com
+  support_url: https://access.redhat.com/solutions/7112810
   labels:
     - eda
 - name: FEATURE_GATEWAY_IPV6_USAGE_ENABLED
   ui_name: Gateway IPv6 Usage
-  visibility: private
+  visibility: False
   condition: boolean
   value: 'False'
-  support_level: NOT_FOR_PRODUCTION
+  support_level: TECHNICAL_PREVIEW
   description: TBD
-  support_url: https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.5/
+  support_url: https://access.redhat.com/articles/7116569
   labels:
     - gateway
 - name: FEATURE_GATEWAY_CREATE_CRC_SERVICE_TYPE_ENABLED
   ui_name: Gateway Create CRC Service Type
-  visibility: private
+  visibility: False
   condition: boolean
   value: 'False'
-  support_level: NOT_FOR_PRODUCTION
+  support_level: DEVELOPER_PREVIEW
   description: TBD
-  support_url: https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.5/
+  support_url: https://access.redhat.com/articles/7122668
   labels:
     - gateway
 - name: FEATURE_DISPATCHERD_ENABLED
   ui_name: AAP Dispatcherd
-  visibility: private
+  visibility: True
   condition: boolean
   value: 'False'
-  support_level: NOT_FOR_PRODUCTION
-  description: TBD
-  support_url: https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.5/
+  support_level: DEVELOPER_PREVIEW
+  description: A service to run python tasks in subprocesses, designed specifically to work well with pg_notify, but intended to be extensible to other message delivery means.
+  support_url: ''
   labels:
     - eda
     - controller

ansible_base/feature_flags/definitions/schema.json

@@ -18,8 +18,7 @@
       },
       "visibility": {
         "description": "Controls whether the feature is visible in the UI.",
-        "type": "string",
-        "enum": ["public", "private"]
+        "type": "boolean"
       },
       "condition": {
         "description": "The type of condition for the feature flag's value. Currently only boolean is supported.",
@@ -35,9 +34,8 @@
         "description": "The level of support provided for this feature.",
         "type": "string",
         "enum": [
-          "NOT_FOR_USE",
-          "NOT_FOR_PRODUCTION",
-          "READY_FOR_PRODUCTION"
+          "TECHNICAL_PREVIEW",
+          "DEVELOPER_PREVIEW"
         ]
       },
       "description": {

ansible_base/feature_flags/flag_source.py

@@ -2,7 +2,19 @@
 from flags.sources import Condition
 
 
+class DatabaseCondition(Condition):
+    """Condition that includes the AAPFlags database object
+    This is required to ensure that enable_flag/disable_flag calls
+    can work as expected, with the custom flag objects
+    """
+
+    def __init__(self, condition, value, required=False, obj=None):
+        super().__init__(condition, value, required=required)
+        self.obj = obj
+
+
 class AAPFlagSource(object):
+    """The customer AAP flag source, retrieves a list of all flags in the database"""
 
     def get_queryset(self):
         aap_flags = apps.get_model('dab_feature_flags', 'AAPFlag')
@@ -13,5 +25,5 @@ def get_flags(self):
         for o in self.get_queryset():
             if o.name not in flags:
                 flags[o.name] = []
-            flags[o.name].append(Condition(o.condition, o.value, required=o.required))
+            flags[o.name].append(DatabaseCondition(o.condition, o.value, required=o.required, obj=o))
         return flags

ansible_base/feature_flags/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.17 on 2025-06-06 16:22
+# Generated by Django 4.2.21 on 2025-06-17 20:08
 
 import ansible_base.feature_flags.models.aap_flag
 from django.conf import settings
@@ -26,8 +26,8 @@ class Migration(migrations.Migration):
                 ('condition', models.CharField(default='boolean', help_text='Used to specify a condition, which if met, will enable the feature flag.', max_length=64)),
                 ('value', models.CharField(default='False', help_text='The value used to evaluate the conditional specified.', max_length=127)),
                 ('required', models.BooleanField(default=False, help_text="If multiple conditions are required to be met to enable a feature flag, 'required' can be used to specify the necessary conditionals.")),
-                ('support_level', models.CharField(choices=[('NOT_FOR_USE', 'Not for use'), ('NOT_FOR_PRODUCTION', 'Not for production'), ('READY_FOR_PRODUCTION', 'Ready for production')], help_text='The support criteria for the feature flag. Must be one of (NOT_FOR_USE, NOT_FOR_PRODUCTION, READY_FOR_PRODUCTION).', max_length=25)),
-                ('visibility', models.CharField(choices=[('public', 'public'), ('private', 'private')], help_text='The visibility level of the feature flag. If private, flag is hidden.', max_length=20)),
+                ('support_level', models.CharField(choices=[('DEVELOPER_PREVIEW', 'Developer Preview'), ('TECHNICAL_PREVIEW', 'Technical Preview')], help_text='The support criteria for the feature flag. Must be one of (DEVELOPER_PREVIEW or TECHNICAL_PREVIEW).', max_length=25)),
+                ('visibility', models.BooleanField(default=False, help_text='The visibility of the feature flag. If false, flag is hidden.')),
                 ('toggle_type', models.CharField(choices=[('install-time', 'install-time'), ('run-time', 'run-time')], default='run-time', help_text="Details whether a flag is toggle-able at run-time or install-time. (Default: 'run-time').", max_length=20)),
                 ('description', models.CharField(default='', help_text='A detailed description giving an overview of the feature flag.', max_length=500)),
                 ('support_url', models.CharField(blank=True, default='', help_text='A link to the documentation support URL for the feature', max_length=250)),

ansible_base/feature_flags/models/aap_flag.py

@@ -47,16 +47,13 @@ def __str__(self):
     support_level = models.CharField(
         max_length=25,
         null=False,
-        help_text=_("The support criteria for the feature flag. Must be one of (NOT_FOR_USE, NOT_FOR_PRODUCTION, READY_FOR_PRODUCTION)."),
-        choices=(('NOT_FOR_USE', 'Not for use'), ('NOT_FOR_PRODUCTION', 'Not for production'), ('READY_FOR_PRODUCTION', 'Ready for production')),
+        help_text=_("The support criteria for the feature flag. Must be one of (DEVELOPER_PREVIEW or TECHNICAL_PREVIEW)."),
+        choices=(('DEVELOPER_PREVIEW', 'Developer Preview'), ('TECHNICAL_PREVIEW', 'Technical Preview')),
         blank=False,
     )
-    visibility = models.CharField(
-        max_length=20,
-        null=False,
-        choices=[('public', 'public'), ('private', 'private')],
-        help_text=_("The visibility level of the feature flag. If private, flag is hidden."),
-        blank=False,
+    visibility = models.BooleanField(
+        default=False,
+        help_text=_("The visibility of the feature flag. If false, flag is hidden."),
     )
     toggle_type = models.CharField(
         max_length=20,

docs/apps/feature_flags.md

@@ -57,7 +57,7 @@ An example flag could resemble -
 ```yaml
 - name: FEATURE_FOO_ENABLED
   ui_name: Foo
-  visibility: public
+  visibility: True
   condition: boolean
   value: 'False'
   support_level: NOT_FOR_PRODUCTION

test_app/tests/feature_flags/models/test_aap_flag.py

@@ -1,13 +1,14 @@
 import pytest
 from django.conf import settings
+from flags.state import disable_flag, enable_flag, flag_state
 
 from ansible_base.feature_flags.models import AAPFlag
 from ansible_base.feature_flags.utils import feature_flags_list
 
 
 @pytest.mark.django_db
 def test_total_platform_flags(aap_flags):
-    assert AAPFlag.objects.count() == 6
+    assert AAPFlag.objects.count() == len(feature_flags_list())
 
 
 @pytest.mark.django_db
@@ -35,8 +36,6 @@ def test_feature_flags_from_db(aap_flags, feature_flag):
     "feature_flag, value",
     [
         ('FEATURE_INDIRECT_NODE_COUNTING_ENABLED', True),
-        ('FEATURE_POLICY_AS_CODE_ENABLED', True),
-        ('FEATURE_EDA_ANALYTICS_ENABLED', False),
         ('FEATURE_GATEWAY_IPV6_USAGE_ENABLED', False),
     ],
 )
@@ -48,3 +47,17 @@ def test_feature_flag_database_setting_override(feature_flag, value):
     create_initial_data()
     flag = AAPFlag.objects.get(name=feature_flag)
     assert flag.value == str(value)
+
+
+@pytest.mark.django_db
+def test_enable_and_disable_flag_functions(aap_flags):
+    flag_name = "FEATURE_INDIRECT_NODE_COUNTING_ENABLED"
+    # Assert Initial State
+    assert flag_state(flag_name) is False
+
+    # Ensure flag can be enabled via django-flags enable_flag function
+    enable_flag(flag_name)
+    assert flag_state(flag_name) is True
+    # Ensure flag can be disabled via django-flags enable_flag function
+    disable_flag(flag_name)
+    assert flag_state(flag_name) is False

test_app/tests/feature_flags/views/test_feature_flag.py

@@ -2,6 +2,7 @@
 from django.conf import settings
 
 from ansible_base.feature_flags.models import AAPFlag
+from ansible_base.feature_flags.utils import feature_flags_list
 from ansible_base.lib.utils.response import get_relative_url
 
 
@@ -10,7 +11,7 @@
     [
         [
             {'name': 'FEATURE_INDIRECT_NODE_COUNTING_ENABLED', 'value': True},
-            {'name': 'FEATURE_POLICY_AS_CODE_ENABLED', 'value': True},
+            {'name': 'FEATURE_EDA_ANALYTICS_ENABLED', 'value': True},
         ],
         [
             {'name': 'FEATURE_GATEWAY_IPV6_USAGE_ENABLED', 'value': False},
@@ -33,7 +34,7 @@ def test_feature_flags_states_list(admin_api_client, flags_list):
     url = get_relative_url("aap_flags_states-list")
     response = admin_api_client.get(url)
     assert response.status_code == 200
-    assert len(response.data['results']) == 6
+    assert len(response.data['results']) == len(feature_flags_list())
 
     found_and_verified_flags_count = 0
     for flag_from_api in response.data['results']:
@@ -55,4 +56,4 @@ def test_old_feature_flags_list(admin_api_client, aap_flags):
     url = get_relative_url("feature-flags-state-list")
     response = admin_api_client.get(url)
     assert response.status_code == 200
-    assert len(response.data) == 6
+    assert len(response.data) == len(feature_flags_list())