openstack
/
nova
Code Issues Proposed changes

Merge "Remove redundant policy check from security_group_default_rule"

This commit is contained in:
Jenkins 2015-06-22 11:36:39 +00:00 committed by Gerrit Code Review
parent dcfaf5f642 92807d6638
commit d8c129274f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/api/openstack/compute/plugins/v3/security_group_default_rules.py
View File

@ -35,7 +35,7 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
@extensions.expected_errors((400, 409, 501))
def create(self, req, body):
context = sg._authorize_context(req)
context = req.environ['nova.context']
authorize(context)
sg_rule = self._from_body(body, 'security_group_default_rule')
@ -72,7 +72,7 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
@extensions.expected_errors((400, 404, 501))
def show(self, req, id):
context = sg._authorize_context(req)
context = req.environ['nova.context']
authorize(context)
try:
@ -91,7 +91,7 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
@extensions.expected_errors((400, 404, 501))
@wsgi.response(204)
def delete(self, req, id):
context = sg._authorize_context(req)
context = req.environ['nova.context']
authorize(context)
try:
@ -107,8 +107,7 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
@extensions.expected_errors((404, 501))
def index(self, req):
context = sg._authorize_context(req)
context = req.environ['nova.context']
authorize(context)
ret = {'security_group_default_rules': []}

2
nova/tests/unit/api/openstack/compute/contrib/test_security_group_default_rules.py
View File

@ -347,7 +347,7 @@ class SecurityGroupDefaultRulesPolicyEnforcementV21(test.NoDBTestCase):
self.req = fakes.HTTPRequest.blank('')
def _common_policy_check(self, func, *arg, **kwarg):
rule_name = "os_compute_api:os-security-groups"
rule_name = "os_compute_api:os-security-group-default-rules"
rule = {rule_name: "project:non_fake"}
self.policy.set_rules(rule)
exc = self.assertRaises(