diff --git a/aodh/tests/functional/api/v2/test_alarm_scenarios.py b/aodh/tests/functional/api/v2/test_alarm_scenarios.py index 23e541d2b..d9ccc7cc9 100644 --- a/aodh/tests/functional/api/v2/test_alarm_scenarios.py +++ b/aodh/tests/functional/api/v2/test_alarm_scenarios.py @@ -138,16 +138,6 @@ def default_alarms(auth_headers): ] -class LegacyPolicyFileMixin(object): - def setUp(self): - super(LegacyPolicyFileMixin, self).setUp() - self.CONF.set_override( - 'policy_file', - os.path.abspath('aodh/tests/policy.json-pre-mikita'), - group='oslo_policy') - self.app = self._make_app() - - class TestAlarmsBase(v2.FunctionalTest): def setUp(self): @@ -1772,10 +1762,6 @@ class TestAlarms(TestAlarmsBase): 'user_id']).issubset(payload.keys())) -class TestAlarmsLegacy(LegacyPolicyFileMixin, TestAlarms): - pass - - class TestAlarmsHistory(TestAlarmsBase): def setUp(self): @@ -2146,10 +2132,6 @@ class TestAlarmsHistory(TestAlarmsBase): self._get_alarm_history('foobar', expect_errors=True, status=404) -class TestAlarmsHistoryLegacy(LegacyPolicyFileMixin, TestAlarmsHistory): - pass - - class TestAlarmsQuotas(TestAlarmsBase): def _test_alarm_quota(self): @@ -2836,11 +2818,6 @@ class TestAlarmsRuleCombination(TestAlarmsBase): self.assertEqual(['c', 'a', 'b'], alarms[0].rule.get('alarm_ids')) -class TestAlarmsRuleCombinationLegacy(LegacyPolicyFileMixin, - TestAlarmsRuleCombination): - pass - - class TestAlarmsRuleGnocchi(TestAlarmsBase): def setUp(self): @@ -3085,11 +3062,6 @@ class TestAlarmsRuleGnocchi(TestAlarmsBase): self._verify_alarm(json, alarms[0]) -class TestAlarmsRuleGnocchiLegacy(LegacyPolicyFileMixin, - TestAlarmsRuleGnocchi): - pass - - class TestAlarmsEvent(TestAlarmsBase): def test_list_alarms(self): diff --git a/aodh/tests/policy.json-pre-mikita b/aodh/tests/policy.json-pre-mikita deleted file mode 100644 index 8f0602afb..000000000 --- a/aodh/tests/policy.json-pre-mikita +++ /dev/null @@ -1,5 +0,0 @@ -{ - "context_is_admin": "role:admin", - "segregation": "rule:context_is_admin", - "default": "" -}