Merge "Add ndp proxy policy rules"
This commit is contained in:
commit
76ccae3ed7
@ -29,6 +29,7 @@ from neutron.conf.policies import local_ip
|
||||
from neutron.conf.policies import local_ip_association
|
||||
from neutron.conf.policies import logging
|
||||
from neutron.conf.policies import metering
|
||||
from neutron.conf.policies import ndp_proxy
|
||||
from neutron.conf.policies import network
|
||||
from neutron.conf.policies import network_ip_availability
|
||||
from neutron.conf.policies import network_segment_range
|
||||
@ -62,6 +63,7 @@ def list_rules():
|
||||
local_ip_association.list_rules(),
|
||||
logging.list_rules(),
|
||||
metering.list_rules(),
|
||||
ndp_proxy.list_rules(),
|
||||
network.list_rules(),
|
||||
network_ip_availability.list_rules(),
|
||||
network_segment_range.list_rules(),
|
||||
|
102
neutron/conf/policies/ndp_proxy.py
Normal file
102
neutron/conf/policies/ndp_proxy.py
Normal file
@ -0,0 +1,102 @@
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo_log import versionutils
|
||||
from oslo_policy import policy
|
||||
|
||||
from neutron.conf.policies import base
|
||||
|
||||
|
||||
COLLECTION_PATH = '/ndp_proxies'
|
||||
RESOURCE_PATH = '/ndp_proxies/{id}'
|
||||
|
||||
DEPRECATION_REASON = (
|
||||
"The ndp proxy API now supports system scope and default roles.")
|
||||
|
||||
rules = [
|
||||
policy.DocumentedRuleDefault(
|
||||
name='create_ndp_proxy',
|
||||
check_str=base.PROJECT_MEMBER,
|
||||
description='Create a ndp proxy',
|
||||
operations=[
|
||||
{
|
||||
'method': 'POST',
|
||||
'path': COLLECTION_PATH,
|
||||
},
|
||||
],
|
||||
scope_types=['project'],
|
||||
deprecated_rule=policy.DeprecatedRule(
|
||||
name='create_ndp_proxy',
|
||||
check_str=base.RULE_ANY,
|
||||
deprecated_reason=DEPRECATION_REASON,
|
||||
deprecated_since=versionutils.deprecated.WALLABY)
|
||||
),
|
||||
policy.DocumentedRuleDefault(
|
||||
name='get_ndp_proxy',
|
||||
check_str=base.PROJECT_READER,
|
||||
description='Get a ndp proxy',
|
||||
operations=[
|
||||
{
|
||||
'method': 'GET',
|
||||
'path': COLLECTION_PATH,
|
||||
},
|
||||
{
|
||||
'method': 'GET',
|
||||
'path': RESOURCE_PATH,
|
||||
},
|
||||
],
|
||||
scope_types=['project'],
|
||||
deprecated_rule=policy.DeprecatedRule(
|
||||
name='get_ndp_proxy',
|
||||
check_str=base.RULE_ADMIN_OR_OWNER,
|
||||
deprecated_reason=DEPRECATION_REASON,
|
||||
deprecated_since=versionutils.deprecated.WALLABY)
|
||||
),
|
||||
policy.DocumentedRuleDefault(
|
||||
name='update_ndp_proxy',
|
||||
check_str=base.PROJECT_MEMBER,
|
||||
description='Update a ndp proxy',
|
||||
operations=[
|
||||
{
|
||||
'method': 'PUT',
|
||||
'path': RESOURCE_PATH,
|
||||
},
|
||||
],
|
||||
scope_types=['project'],
|
||||
deprecated_rule=policy.DeprecatedRule(
|
||||
name='update_ndp_proxy',
|
||||
check_str=base.RULE_ADMIN_OR_OWNER,
|
||||
deprecated_reason=DEPRECATION_REASON,
|
||||
deprecated_since=versionutils.deprecated.WALLABY)
|
||||
),
|
||||
policy.DocumentedRuleDefault(
|
||||
name='delete_ndp_proxy',
|
||||
check_str=base.PROJECT_MEMBER,
|
||||
description='Delete a ndp proxy',
|
||||
operations=[
|
||||
{
|
||||
'method': 'DELETE',
|
||||
'path': RESOURCE_PATH,
|
||||
},
|
||||
],
|
||||
scope_types=['project'],
|
||||
deprecated_rule=policy.DeprecatedRule(
|
||||
name='delete_ndp_proxy',
|
||||
check_str=base.RULE_ADMIN_OR_OWNER,
|
||||
deprecated_reason=DEPRECATION_REASON,
|
||||
deprecated_since=versionutils.deprecated.WALLABY)
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
def list_rules():
|
||||
return rules
|
168
neutron/tests/unit/conf/policies/test_ndp_proxy.py
Normal file
168
neutron/tests/unit/conf/policies/test_ndp_proxy.py
Normal file
@ -0,0 +1,168 @@
|
||||
# Copyright (c) 2022 Troila.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from oslo_policy import policy as base_policy
|
||||
|
||||
from neutron import policy
|
||||
from neutron.tests.unit.conf.policies import test_base as base
|
||||
|
||||
|
||||
class NDPProxyAPITestCase(base.PolicyBaseTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(NDPProxyAPITestCase, self).setUp()
|
||||
self.target = {'project_id': self.project_id}
|
||||
self.alt_target = {'project_id': self.alt_project_id}
|
||||
|
||||
|
||||
class SystemAdminTests(NDPProxyAPITestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(SystemAdminTests, self).setUp()
|
||||
self.context = self.system_admin_ctx
|
||||
|
||||
def test_create_ndp_proxy(self):
|
||||
self.assertRaises(
|
||||
base_policy.InvalidScope,
|
||||
policy.enforce,
|
||||
self.context, "create_ndp_proxy", self.target)
|
||||
self.assertRaises(
|
||||
base_policy.InvalidScope,
|
||||
policy.enforce,
|
||||
self.context, "create_ndp_proxy", self.alt_target)
|
||||
|
||||
def test_get_ndp_proxy(self):
|
||||
self.assertRaises(
|
||||
base_policy.InvalidScope,
|
||||
policy.enforce,
|
||||
self.context, "get_ndp_proxy", self.target)
|
||||
self.assertRaises(
|
||||
base_policy.InvalidScope,
|
||||
policy.enforce,
|
||||
self.context, "get_ndp_proxy", self.alt_target)
|
||||
|
||||
def test_update_ndp_proxy(self):
|
||||
self.assertRaises(
|
||||
base_policy.InvalidScope,
|
||||
policy.enforce,
|
||||
self.context, "update_ndp_proxy", self.target)
|
||||
self.assertRaises(
|
||||
base_policy.InvalidScope,
|
||||
policy.enforce,
|
||||
self.context, "update_ndp_proxy", self.alt_target)
|
||||
|
||||
def test_delete_ndp_proxy(self):
|
||||
self.assertRaises(
|
||||
base_policy.InvalidScope,
|
||||
policy.enforce,
|
||||
self.context, "delete_ndp_proxy", self.target)
|
||||
self.assertRaises(
|
||||
base_policy.InvalidScope,
|
||||
policy.enforce,
|
||||
self.context, "delete_ndp_proxy", self.alt_target)
|
||||
|
||||
|
||||
class SystemMemberTests(SystemAdminTests):
|
||||
|
||||
def setUp(self):
|
||||
super(SystemMemberTests, self).setUp()
|
||||
self.context = self.system_member_ctx
|
||||
|
||||
|
||||
class SystemReaderTests(SystemMemberTests):
|
||||
|
||||
def setUp(self):
|
||||
super(SystemReaderTests, self).setUp()
|
||||
self.context = self.system_reader_ctx
|
||||
|
||||
|
||||
class ProjectAdminTests(NDPProxyAPITestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(ProjectAdminTests, self).setUp()
|
||||
self.context = self.project_admin_ctx
|
||||
|
||||
def test_create_ndp_proxy(self):
|
||||
self.assertTrue(
|
||||
policy.enforce(self.context, "create_ndp_proxy", self.target))
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce,
|
||||
self.context, "create_ndp_proxy", self.alt_target)
|
||||
|
||||
def test_get_ndp_proxy(self):
|
||||
self.assertTrue(
|
||||
policy.enforce(self.context, "get_ndp_proxy", self.target))
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce, self.context, "get_ndp_proxy", self.alt_target)
|
||||
|
||||
def test_update_ndp_proxy(self):
|
||||
self.assertTrue(
|
||||
policy.enforce(self.context, "update_ndp_proxy", self.target))
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce, self.context, "update_ndp_proxy", self.alt_target)
|
||||
|
||||
def test_delete_ndp_proxy(self):
|
||||
self.assertTrue(
|
||||
policy.enforce(self.context, "delete_ndp_proxy", self.target))
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce, self.context, "delete_ndp_proxy", self.alt_target)
|
||||
|
||||
|
||||
class ProjectMemberTests(ProjectAdminTests):
|
||||
|
||||
def setUp(self):
|
||||
super(ProjectMemberTests, self).setUp()
|
||||
self.context = self.project_member_ctx
|
||||
|
||||
|
||||
class ProjectReaderTests(ProjectMemberTests):
|
||||
|
||||
def setUp(self):
|
||||
super(ProjectReaderTests, self).setUp()
|
||||
self.context = self.project_reader_ctx
|
||||
|
||||
def test_create_ndp_proxy(self):
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce,
|
||||
self.context, "create_ndp_proxy", self.target)
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce,
|
||||
self.context, "create_ndp_proxy", self.alt_target)
|
||||
|
||||
def test_update_ndp_proxy(self):
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce,
|
||||
self.context, "update_ndp_proxy", self.target)
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce,
|
||||
self.context, "update_ndp_proxy", self.alt_target)
|
||||
|
||||
def test_delete_ndp_proxy(self):
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce,
|
||||
self.context, "delete_ndp_proxy", self.target)
|
||||
self.assertRaises(
|
||||
base_policy.PolicyNotAuthorized,
|
||||
policy.enforce,
|
||||
self.context, "delete_ndp_proxy", self.alt_target)
|
Loading…
x
Reference in New Issue
Block a user