Merge "Add test coverage of existing server diagnostics policies"
This commit is contained in:
commit
a16a194526
|
@ -17,7 +17,6 @@ import mock
|
|||
from oslo_serialization import jsonutils
|
||||
from oslo_utils.fixture import uuidsentinel as uuids
|
||||
|
||||
from nova.api.openstack.compute import server_diagnostics
|
||||
from nova.api.openstack import wsgi as os_wsgi
|
||||
from nova.compute import api as compute_api
|
||||
from nova import exception
|
||||
|
@ -172,26 +171,3 @@ class ServerDiagnosticsTestV248(ServerDiagnosticsTestV21):
|
|||
'memory_details': {'maximum': 8192, 'used': 3072}}
|
||||
|
||||
self._test_get_diagnostics(expected, return_value)
|
||||
|
||||
|
||||
class ServerDiagnosticsEnforcementV21(test.NoDBTestCase):
|
||||
api_version = '2.1'
|
||||
|
||||
def setUp(self):
|
||||
super(ServerDiagnosticsEnforcementV21, self).setUp()
|
||||
self.controller = server_diagnostics.ServerDiagnosticsController()
|
||||
self.req = fakes.HTTPRequest.blank('', version=self.api_version)
|
||||
|
||||
def test_get_diagnostics_policy_failed(self):
|
||||
rule_name = "os_compute_api:os-server-diagnostics"
|
||||
self.policy.set_rules({rule_name: "project:non_fake"})
|
||||
exc = self.assertRaises(
|
||||
exception.PolicyNotAuthorized,
|
||||
self.controller.index, self.req, fakes.FAKE_UUID)
|
||||
self.assertEqual(
|
||||
"Policy doesn't allow %s to be performed." % rule_name,
|
||||
exc.format_message())
|
||||
|
||||
|
||||
class ServerDiagnosticsEnforcementV248(ServerDiagnosticsEnforcementV21):
|
||||
api_version = '2.48'
|
||||
|
|
|
@ -0,0 +1,82 @@
|
|||
# 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 fixtures
|
||||
import mock
|
||||
from oslo_utils.fixture import uuidsentinel as uuids
|
||||
from oslo_utils import timeutils
|
||||
|
||||
from nova.api.openstack.compute import server_diagnostics
|
||||
from nova.compute import vm_states
|
||||
from nova.policies import server_diagnostics as policies
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
from nova.tests.unit import fake_instance
|
||||
from nova.tests.unit.policies import base
|
||||
|
||||
|
||||
class ServerDiagnosticsPolicyTest(base.BasePolicyTest):
|
||||
"""Test Server Diagnostics 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(ServerDiagnosticsPolicyTest, self).setUp()
|
||||
self.controller = server_diagnostics.ServerDiagnosticsController()
|
||||
self.req = fakes.HTTPRequest.blank('', version='2.48')
|
||||
self.controller.compute_api.get_instance_diagnostics = mock.MagicMock()
|
||||
self.mock_get = self.useFixture(
|
||||
fixtures.MockPatch('nova.api.openstack.common.get_instance')).mock
|
||||
self.instance = fake_instance.fake_instance_obj(
|
||||
self.project_member_context, project_id=self.project_id,
|
||||
id=1, uuid=uuids.fake_id, vm_state=vm_states.ACTIVE,
|
||||
task_state=None, launched_at=timeutils.utcnow())
|
||||
self.mock_get.return_value = self.instance
|
||||
|
||||
# Check that admin is able to get server diagnostics.
|
||||
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 server diagnostics.
|
||||
self.admin_unauthorized_contexts = [
|
||||
self.system_member_context, self.system_reader_context,
|
||||
self.system_foo_context, self.project_member_context,
|
||||
self.project_reader_context, self.project_foo_context,
|
||||
self.other_project_member_context
|
||||
]
|
||||
|
||||
def test_server_diagnostics_policy(self):
|
||||
rule_name = policies.BASE_POLICY_NAME
|
||||
self.common_policy_check(self.admin_authorized_contexts,
|
||||
self.admin_unauthorized_contexts,
|
||||
rule_name, self.controller.index,
|
||||
self.req, self.instance.uuid)
|
||||
|
||||
|
||||
class ServerDiagnosticsScopeTypePolicyTest(ServerDiagnosticsPolicyTest):
|
||||
"""Test Server Diagnostics 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(ServerDiagnosticsScopeTypePolicyTest, self).setUp()
|
||||
self.flags(enforce_scope=True, group="oslo_policy")
|
Loading…
Reference in New Issue