Merge "Add test coverage of existing instance usage log policies"
This commit is contained in:
commit
10438f20a2
|
@ -19,7 +19,6 @@ from oslo_utils import fixture as utils_fixture
|
||||||
|
|
||||||
from nova.api.openstack.compute import instance_usage_audit_log as v21_ial
|
from nova.api.openstack.compute import instance_usage_audit_log as v21_ial
|
||||||
from nova import context
|
from nova import context
|
||||||
from nova import exception
|
|
||||||
from nova import test
|
from nova import test
|
||||||
from nova.tests.unit.api.openstack import fakes
|
from nova.tests.unit.api.openstack import fakes
|
||||||
from nova.tests.unit.objects import test_service
|
from nova.tests.unit.objects import test_service
|
||||||
|
@ -183,31 +182,3 @@ class InstanceUsageAuditLogTestV21(test.NoDBTestCase):
|
||||||
self.assertEqual(0, logs['num_hosts_not_run'])
|
self.assertEqual(0, logs['num_hosts_not_run'])
|
||||||
self.assertEqual("ALL hosts done. 3 errors.",
|
self.assertEqual("ALL hosts done. 3 errors.",
|
||||||
logs['overall_status'])
|
logs['overall_status'])
|
||||||
|
|
||||||
|
|
||||||
class InstanceUsageAuditPolicyEnforcementV21(test.NoDBTestCase):
|
|
||||||
|
|
||||||
def setUp(self):
|
|
||||||
super(InstanceUsageAuditPolicyEnforcementV21, self).setUp()
|
|
||||||
self.controller = v21_ial.InstanceUsageAuditLogController()
|
|
||||||
self.req = fakes.HTTPRequest.blank('')
|
|
||||||
|
|
||||||
def test_index_policy_failed(self):
|
|
||||||
rule_name = "os_compute_api:os-instance-usage-audit-log"
|
|
||||||
self.policy.set_rules({rule_name: "project_id:non_fake"})
|
|
||||||
exc = self.assertRaises(
|
|
||||||
exception.PolicyNotAuthorized,
|
|
||||||
self.controller.index, self.req)
|
|
||||||
self.assertEqual(
|
|
||||||
"Policy doesn't allow %s to be performed." % rule_name,
|
|
||||||
exc.format_message())
|
|
||||||
|
|
||||||
def test_show_policy_failed(self):
|
|
||||||
rule_name = "os_compute_api:os-instance-usage-audit-log"
|
|
||||||
self.policy.set_rules({rule_name: "project_id:non_fake"})
|
|
||||||
exc = self.assertRaises(
|
|
||||||
exception.PolicyNotAuthorized,
|
|
||||||
self.controller.show, self.req, '2012-07-05 10:00:00')
|
|
||||||
self.assertEqual(
|
|
||||||
"Policy doesn't allow %s to be performed." % rule_name,
|
|
||||||
exc.format_message())
|
|
||||||
|
|
|
@ -0,0 +1,77 @@
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
import mock
|
||||||
|
|
||||||
|
from nova.api.openstack.compute import instance_usage_audit_log as iual
|
||||||
|
from nova.policies import instance_usage_audit_log as iual_policies
|
||||||
|
from nova.tests.unit.api.openstack import fakes
|
||||||
|
from nova.tests.unit.policies import base
|
||||||
|
|
||||||
|
|
||||||
|
class InstanceUsageAuditLogPolicyTest(base.BasePolicyTest):
|
||||||
|
"""Test os-instance-usage-audit-log APIs policies with all possible
|
||||||
|
context.
|
||||||
|
This class defines the set of context with different roles
|
||||||
|
which are allowed and not allowed to pass the policy checks.
|
||||||
|
With those set of context, it will call the API operation and
|
||||||
|
verify the expected behaviour.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
super(InstanceUsageAuditLogPolicyTest, self).setUp()
|
||||||
|
self.controller = iual.InstanceUsageAuditLogController()
|
||||||
|
self.req = fakes.HTTPRequest.blank('')
|
||||||
|
self.controller.host_api.task_log_get_all = mock.MagicMock()
|
||||||
|
self.controller.host_api.service_get_all = mock.MagicMock()
|
||||||
|
|
||||||
|
# Check that admin is able to get instance usage audit log.
|
||||||
|
self.admin_authorized_contexts = [
|
||||||
|
self.legacy_admin_context, self.system_admin_context,
|
||||||
|
self.project_admin_context]
|
||||||
|
# Check that non-admin is not able to get instance usage audit log.
|
||||||
|
self.admin_unauthorized_contexts = [
|
||||||
|
self.system_member_context, self.system_reader_context,
|
||||||
|
self.system_foo_context, self.project_member_context,
|
||||||
|
self.other_project_member_context,
|
||||||
|
self.project_foo_context, self.project_reader_context
|
||||||
|
]
|
||||||
|
|
||||||
|
def test_show_policy(self):
|
||||||
|
rule_name = iual_policies.BASE_POLICY_NAME
|
||||||
|
self.common_policy_check(self.admin_authorized_contexts,
|
||||||
|
self.admin_unauthorized_contexts,
|
||||||
|
rule_name, self.controller.show,
|
||||||
|
self.req, '2020-03-25 14:40:00')
|
||||||
|
|
||||||
|
def test_index_policy(self):
|
||||||
|
rule_name = iual_policies.BASE_POLICY_NAME
|
||||||
|
self.common_policy_check(self.admin_authorized_contexts,
|
||||||
|
self.admin_unauthorized_contexts,
|
||||||
|
rule_name, self.controller.index,
|
||||||
|
self.req)
|
||||||
|
|
||||||
|
|
||||||
|
class InstanceUsageScopeTypePolicyTest(InstanceUsageAuditLogPolicyTest):
|
||||||
|
"""Test os-instance-usage-audit-log APIs policies with system scope
|
||||||
|
enabled.
|
||||||
|
This class set the nova.conf [oslo_policy] enforce_scope to True
|
||||||
|
so that we can switch on the scope checking on oslo policy side.
|
||||||
|
It defines the set of context with scoped token
|
||||||
|
which are allowed and not allowed to pass the policy checks.
|
||||||
|
With those set of context, it will run the API operation and
|
||||||
|
verify the expected behaviour.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
super(InstanceUsageScopeTypePolicyTest, self).setUp()
|
||||||
|
self.flags(enforce_scope=True, group="oslo_policy")
|
Loading…
Reference in New Issue