Remove FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG

openedx/features/content_type_gating/models.py

@@ -21,9 +21,6 @@ from lms.djangoapps.courseware.masquerade import (
 from openedx.core.djangoapps.config_model_utils.models import StackedConfigurationModel
 from openedx.core.djangoapps.config_model_utils.utils import is_in_holdback
 from openedx.features.content_type_gating.helpers import FULL_ACCESS, LIMITED_ACCESS
-from openedx.features.course_duration_limits.config import (
-    FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG,
-)
 from student.models import CourseEnrollment
 from student.role_helpers import has_staff_roles
 from xmodule.partitions.partitions import ENROLLMENT_TRACK_PARTITION_ID
@@ -105,9 +102,6 @@ class ContentTypeGatingConfig(StackedConfigurationModel):
             user: The user being queried.
             course_key: The CourseKey of the course being queried.
         """
-        if FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG.is_enabled():
-            return False
-
         if enrollment is not None and (user is not None or course_key is not None):
             raise ValueError('Specify enrollment or user/course_key, but not both')
 
@@ -168,9 +162,6 @@ class ContentTypeGatingConfig(StackedConfigurationModel):
             target_datetime: The datetime to checked enablement as of. Defaults to the current date and time.
         """
 
-        if FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG.is_enabled():
-            return False
-
         if target_datetime is None:
             target_datetime = timezone.now()
 
@@ -189,9 +180,6 @@ class ContentTypeGatingConfig(StackedConfigurationModel):
             target_datetime (:class:`datetime.datetime`): The datetime that ``enabled_as_of`` must be equal to or before
         """
 
-        if FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG.is_enabled():
-            return False
-
         # Explicitly cast this to bool, so that when self.enabled is None the method doesn't return None
         return bool(self.enabled and self.enabled_as_of <= target_datetime)
 

openedx/features/content_type_gating/tests/test_models.py

@@ -73,9 +73,9 @@ class TestContentTypeGatingConfig(CacheIsolationTestCase):
             user = self.user
             course_key = self.course_overview.id
 
-        query_count = 7
+        query_count = 6
         if not already_enrolled or not pass_enrollment and already_enrolled:
-            query_count = 8
+            query_count = 7
 
         with self.assertNumQueries(query_count):
             enabled = ContentTypeGatingConfig.enabled_for_enrollment(

openedx/features/course_duration_limits/config.py

@@ -7,18 +7,9 @@ from django.dispatch import receiver
 from django.db import IntegrityError
 
 from experiments.models import ExperimentData, ExperimentKeyValue
-from openedx.core.djangoapps.waffle_utils import WaffleFlagNamespace, WaffleFlag
 from student.models import EnrollStatusChange
 from student.signals import ENROLL_STATUS_CHANGE
 
 
-WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name=u'content_type_gating')
-
-FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG = WaffleFlag(
-    waffle_namespace=WAFFLE_FLAG_NAMESPACE,
-    flag_name=u'global_kill_switch',
-    flag_undefined_default=False
-)
-
 EXPERIMENT_ID = 11
 EXPERIMENT_DATA_HOLDBACK_KEY = 'holdback'

openedx/features/course_duration_limits/models.py

@@ -21,9 +21,6 @@ from lms.djangoapps.courseware.masquerade import (
 from openedx.core.djangoapps.config_model_utils.models import StackedConfigurationModel
 from openedx.core.djangoapps.config_model_utils.utils import is_in_holdback
 from openedx.features.content_type_gating.helpers import CONTENT_GATING_PARTITION_ID, CONTENT_TYPE_GATE_GROUP_IDS
-from openedx.features.course_duration_limits.config import (
-    FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG,
-)
 from student.models import CourseEnrollment
 from student.role_helpers import has_staff_roles
 from xmodule.partitions.partitions import ENROLLMENT_TRACK_PARTITION_ID
@@ -96,9 +93,6 @@ class CourseDurationLimitConfig(StackedConfigurationModel):
             course_key: The CourseKey of the course being queried.
         """
 
-        if FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG.is_enabled():
-            return False
-
         if enrollment is not None and (user is not None or course_key is not None):
             raise ValueError('Specify enrollment or user/course_key, but not both')
 
@@ -163,9 +157,6 @@ class CourseDurationLimitConfig(StackedConfigurationModel):
             target_datetime: The datetime to checked enablement as of. Defaults to the current date and time.
         """
 
-        if FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG.is_enabled():
-            return False
-
         if target_datetime is None:
             target_datetime = timezone.now()
 
@@ -184,9 +175,6 @@ class CourseDurationLimitConfig(StackedConfigurationModel):
             target_datetime (:class:`datetime.datetime`): The datetime that ``enabled_as_of`` must be equal to or before
         """
 
-        if FEATURE_BASED_ENROLLMENT_GLOBAL_KILL_FLAG.is_enabled():
-            return True
-
         # Explicitly cast this to bool, so that when self.enabled is None the method doesn't return None
         return bool(self.enabled and self.enabled_as_of <= target_datetime)
 

openedx/features/course_duration_limits/tests/test_models.py

@@ -80,9 +80,9 @@ class TestCourseDurationLimitConfig(CacheIsolationTestCase):
             user = self.user
             course_key = self.course_overview.id
 
-        query_count = 8
+        query_count = 7
         if pass_enrollment and already_enrolled:
-            query_count = 7
+            query_count = 6
 
         with self.assertNumQueries(query_count):
             enabled = CourseDurationLimitConfig.enabled_for_enrollment(