Merge "Remove policy.json from unit test"
This commit is contained in:
commit
fb675068e5
|
@ -11,7 +11,6 @@
|
|||
# under the License.
|
||||
|
||||
import logging
|
||||
import os
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
|
@ -94,17 +93,6 @@ class TestCase(base.BaseTestCase):
|
|||
sql_connection=CONF.database.connection)
|
||||
self.useFixture(_DB_CACHE)
|
||||
|
||||
self.override_config('policy_file',
|
||||
os.path.join(
|
||||
os.path.abspath(
|
||||
os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
'..',
|
||||
)
|
||||
),
|
||||
'tests/unit/policy.json'),
|
||||
group='oslo_policy')
|
||||
|
||||
def override_config(self, name, override, group=None):
|
||||
"""Cleanly override CONF variables."""
|
||||
CONF.set_override(name, override, group)
|
||||
|
|
|
@ -25,8 +25,6 @@ CONF.import_opt('provider_config_dir', 'karbor.services.protection.provider')
|
|||
def set_defaults(conf):
|
||||
conf.set_default('connection', 'sqlite://', group='database')
|
||||
conf.set_default('sqlite_synchronous', False, group='database')
|
||||
conf.set_default('policy_file', 'karbor.tests.unit/policy.json',
|
||||
group='oslo_policy')
|
||||
conf.set_default('policy_dirs', [], group='oslo_policy')
|
||||
conf.set_default('auth_strategy', 'noauth')
|
||||
conf.set_default('state_path', os.path.abspath(
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
"context_is_admin": "role:admin",
|
||||
"admin_or_owner": "is_admin:True or project_id:%(project_id)s",
|
||||
"default": "rule:admin_or_owner",
|
||||
|
||||
"admin_api": "is_admin:True",
|
||||
|
||||
"plan:create": "",
|
||||
"plan:delete": "rule:admin_or_owner",
|
||||
|
||||
"trigger:create": "",
|
||||
"trigger:delete": "rule:admin_or_owner",
|
||||
"trigger:get": "rule:admin_or_owner",
|
||||
"trigger:list": "",
|
||||
|
||||
"scheduled_operation:create": "",
|
||||
"scheduled_operation:delete": "rule:admin_or_owner",
|
||||
"scheduled_operation:get": "rule:admin_or_owner",
|
||||
"scheduled_operation:list": ""
|
||||
}
|
Loading…
Reference in New Issue