openstack
/
neutron-fwaas
Code Issues Proposed changes

tests: don't rely on configuration files outside tests directory 

Following the similar Neutron change. [1]

Recently, the way sibling projects are installed were changed.
It broke networking-midonet gate as neutron-fwaas was installed
under site-packages, where the etc directory is not available.

[1] If1f5ebd981cf06558d5102524211799676068889

Closes-Bug: #1758062
Change-Id: I72aeeac8cbe07f6fc6cb4acf54fb632587d890a0
This commit is contained in:
YAMAMOTO Takashi 2018-03-23 17:40:53 +09:00
parent 244e2a647b
commit e1231cd6ea
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_fwaas/tests/base.py
View File

@ -39,6 +39,6 @@ class NeutronDbPluginV2TestCase(test_db_plugin.NeutronDbPluginV2TestCase):
## our own stuff
dirpath = os.path.join(os.path.dirname(__file__),
'./../../etc/neutron/policy.d')
'etc/neutron/policy.d')
args.extend(['--config-dir', dirpath])
self.config_parse(args=args)

52
neutron_fwaas/tests/etc/neutron/policy.d/neutron-fwaas.json Normal file
View File

@ -0,0 +1,52 @@
{
"shared_firewalls": "field:firewalls:shared=True",
"shared_firewall_policies": "field:firewall_policies:shared=True",
"shared_firewall_rules": "field:firewall_rules:shared=True",
"create_firewall": "",
"update_firewall": "rule:admin_or_owner",
"delete_firewall": "rule:admin_or_owner",
"create_firewall:shared": "rule:admin_only",
"update_firewall:shared": "rule:admin_only",
"delete_firewall:shared": "rule:admin_only",
"get_firewall": "rule:admin_or_owner or rule:shared_firewalls",
"shared_firewall_groups": "field:firewall_groups:shared=True",
"shared_firewall_policies": "field:firewall_policies:shared=True",
"shared_firewall_rules": "field:firewall_rules:shared=True",
"create_firewall_group": "",
"update_firewall_group": "rule:admin_or_owner",
"delete_firewall_group": "rule:admin_or_owner",
"create_firewall_group:shared": "rule:admin_only",
"update_firewall_group:shared": "rule:admin_only",
"delete_firewall_group:shared": "rule:admin_only",
"get_firewall_group": "rule:admin_or_owner or rule:shared_firewall_groups",
"create_firewall_policy": "",
"update_firewall_policy": "rule:admin_or_owner",
"delete_firewall_policy": "rule:admin_or_owner",
"create_firewall_policy:shared": "rule:admin_only",
"update_firewall_policy:shared": "rule:admin_only",
"delete_firewall_policy:shared": "rule:admin_only",
"get_firewall_policy": "rule:admin_or_owner or rule:shared_firewall_policies",
"insert_rule": "rule:admin_or_owner",
"remove_rule": "rule:admin_or_owner",
"create_firewall_rule": "",
"update_firewall_rule": "rule:admin_or_owner",
"delete_firewall_rule": "rule:admin_or_owner",
"create_firewall_rule:shared": "rule:admin_only",
"update_firewall_rule:shared": "rule:admin_only",
"delete_firewall_rule:shared": "rule:admin_only",
"get_firewall_rule": "rule:admin_or_owner or rule:shared_firewall_rules"
}