Merge "Remove redundant policy check from security_group_default_rule"
This commit is contained in:
commit
d8c129274f
|
@ -35,7 +35,7 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
|
||||||
|
|
||||||
@extensions.expected_errors((400, 409, 501))
|
@extensions.expected_errors((400, 409, 501))
|
||||||
def create(self, req, body):
|
def create(self, req, body):
|
||||||
context = sg._authorize_context(req)
|
context = req.environ['nova.context']
|
||||||
authorize(context)
|
authorize(context)
|
||||||
|
|
||||||
sg_rule = self._from_body(body, 'security_group_default_rule')
|
sg_rule = self._from_body(body, 'security_group_default_rule')
|
||||||
|
@ -72,7 +72,7 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
|
||||||
|
|
||||||
@extensions.expected_errors((400, 404, 501))
|
@extensions.expected_errors((400, 404, 501))
|
||||||
def show(self, req, id):
|
def show(self, req, id):
|
||||||
context = sg._authorize_context(req)
|
context = req.environ['nova.context']
|
||||||
authorize(context)
|
authorize(context)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -91,7 +91,7 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
|
||||||
@extensions.expected_errors((400, 404, 501))
|
@extensions.expected_errors((400, 404, 501))
|
||||||
@wsgi.response(204)
|
@wsgi.response(204)
|
||||||
def delete(self, req, id):
|
def delete(self, req, id):
|
||||||
context = sg._authorize_context(req)
|
context = req.environ['nova.context']
|
||||||
authorize(context)
|
authorize(context)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -107,8 +107,7 @@ class SecurityGroupDefaultRulesController(sg.SecurityGroupControllerBase):
|
||||||
|
|
||||||
@extensions.expected_errors((404, 501))
|
@extensions.expected_errors((404, 501))
|
||||||
def index(self, req):
|
def index(self, req):
|
||||||
|
context = req.environ['nova.context']
|
||||||
context = sg._authorize_context(req)
|
|
||||||
authorize(context)
|
authorize(context)
|
||||||
|
|
||||||
ret = {'security_group_default_rules': []}
|
ret = {'security_group_default_rules': []}
|
||||||
|
|
|
@ -347,7 +347,7 @@ class SecurityGroupDefaultRulesPolicyEnforcementV21(test.NoDBTestCase):
|
||||||
self.req = fakes.HTTPRequest.blank('')
|
self.req = fakes.HTTPRequest.blank('')
|
||||||
|
|
||||||
def _common_policy_check(self, func, *arg, **kwarg):
|
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"}
|
rule = {rule_name: "project:non_fake"}
|
||||||
self.policy.set_rules(rule)
|
self.policy.set_rules(rule)
|
||||||
exc = self.assertRaises(
|
exc = self.assertRaises(
|
||||||
|
|
Loading…
Reference in New Issue