openstack
/
neutron
Code Issues Proposed changes

Merge "Add empty policy rule to get_rule_type action"

This commit is contained in:
Jenkins 2015-08-27 23:24:46 +00:00 committed by Gerrit Code Review
parent 9ed4be7559 20459979e0
commit 2a4152745e
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/policy.json
View File

@ -186,6 +186,7 @@
"create_policy_bandwidth_limit_rule": "rule:admin_only",
"delete_policy_bandwidth_limit_rule": "rule:admin_only",
"update_policy_bandwidth_limit_rule": "rule:admin_only",
"get_rule_type": "rule:regular_user",
"restrict_wildcard": "(not field:rbac_policy:target_tenant=*) or rule:admin_only",
"create_rbac_policy": "",

12
neutron/tests/api/test_qos.py
View File

@ -97,7 +97,15 @@ class QosTestJSON(base.BaseAdminNetworkTest):
@test.attr(type='smoke')
@test.idempotent_id('cf776f77-8d3d-49f2-8572-12d6a1557224')
def test_list_rule_types(self):
def test_list_admin_rule_types(self):
self._test_list_rule_types(self.admin_client)
@test.attr(type='smoke')
@test.idempotent_id('49c8ea35-83a9-453a-bd23-239cf3b13929')
def test_list_regular_rule_types(self):
self._test_list_rule_types(self.client)
def _test_list_rule_types(self, client):
# List supported rule types
# TODO(QoS): since in gate we run both ovs and linuxbridge ml2 drivers,
# and since Linux Bridge ml2 driver does not have QoS support yet, ml2
@ -111,7 +119,7 @@ class QosTestJSON(base.BaseAdminNetworkTest):
expected_rule_types = []
expected_rule_details = ['type']
rule_types = self.admin_client.list_qos_rule_types()
rule_types = client.list_qos_rule_types()
actual_list_rule_types = rule_types['rule_types']
actual_rule_types = [rule['type'] for rule in actual_list_rule_types]

1
neutron/tests/etc/policy.json
View File

@ -186,6 +186,7 @@
"create_policy_bandwidth_limit_rule": "rule:admin_only",
"delete_policy_bandwidth_limit_rule": "rule:admin_only",
"update_policy_bandwidth_limit_rule": "rule:admin_only",
"get_rule_type": "rule:regular_user",
"restrict_wildcard": "(not field:rbac_policy:target_tenant=*) or rule:admin_only",
"create_rbac_policy": "",