diff --git a/neutron/conf/policies/network.py b/neutron/conf/policies/network.py index 65d2c85744b..ba0d742f3c8 100644 --- a/neutron/conf/policies/network.py +++ b/neutron/conf/policies/network.py @@ -189,20 +189,6 @@ rules = [ deprecated_reason=DEPRECATED_REASON, deprecated_since=versionutils.deprecated.WALLABY) ), - policy.DocumentedRuleDefault( - name='get_network:router:external', - check_str=base.policy_or( - base.ADMIN, - base.PROJECT_READER), - scope_types=['project'], - description='Get ``router:external`` attribute of a network', - operations=ACTION_GET, - deprecated_rule=policy.DeprecatedRule( - name='get_network:router:external', - check_str=base.RULE_ANY, - deprecated_reason=DEPRECATED_REASON, - deprecated_since=versionutils.deprecated.WALLABY) - ), policy.DocumentedRuleDefault( name='get_network:segments', check_str=base.ADMIN, diff --git a/neutron/tests/unit/conf/policies/test_network.py b/neutron/tests/unit/conf/policies/test_network.py index f95729c9579..caeb784c0d9 100644 --- a/neutron/tests/unit/conf/policies/test_network.py +++ b/neutron/tests/unit/conf/policies/test_network.py @@ -140,18 +140,6 @@ class SystemAdminTests(NetworkAPITestCase): self.context, 'get_network', self.alt_target) - def test_get_network_external(self): - self.assertRaises( - base_policy.InvalidScope, - policy.enforce, - self.context, 'get_network:router:external', - self.target) - self.assertRaises( - base_policy.InvalidScope, - policy.enforce, - self.context, 'get_network:router:external', - self.alt_target) - def test_get_network_segments(self): self.assertRaises( base_policy.InvalidScope, @@ -403,22 +391,6 @@ class AdminTests(NetworkAPITestCase): self.assertTrue( policy.enforce(self.context, 'get_network', self.alt_target)) - def test_get_network_external(self): - self.assertTrue( - policy.enforce(self.context, - 'get_network:router:external', self.target)) - self.assertTrue( - policy.enforce(self.context, - 'get_network:router:external', self.alt_target)) - - def test_get_network_segments(self): - self.assertTrue( - policy.enforce(self.context, - 'get_network:segments', self.target)) - self.assertTrue( - policy.enforce(self.context, - 'get_network:segments', self.alt_target)) - def test_get_network_provider_network_type(self): self.assertTrue( policy.enforce(self.context, @@ -641,15 +613,6 @@ class ProjectMemberTests(AdminTests): policy.enforce, self.context, 'get_network', self.alt_target) - def test_get_network_external(self): - self.assertTrue( - policy.enforce(self.context, - 'get_network:router:external', self.target)) - self.assertRaises( - base_policy.PolicyNotAuthorized, - policy.enforce, - self.context, 'get_network:router:external', self.alt_target) - def test_get_network_segments(self): self.assertRaises( base_policy.PolicyNotAuthorized,