openstack
/
zun
Code Issues Proposed changes

Merge "Return 406 on force delete with bad api version"

This commit is contained in:
Zuul 2017-12-06 06:30:31 +00:00 committed by Gerrit Code Review
parent 8498bc2fe3 e82959493a
commit 007586c8b8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zun/api/controllers/v1/containers.py
View File

@ -566,11 +566,10 @@ class ContainersController(base.Controller):
policy.enforce(context, "container:delete_force", policy.enforce(context, "container:delete_force",
action="container:delete_force") action="container:delete_force")
utils.validate_container_state(container, 'delete_force') utils.validate_container_state(container, 'delete_force')
# Remove this line temporarily for tempest issues. else:
# else: raise exception.InvalidParamInVersion(param='force',
# raise exception.InvalidParamInVersion(param='force', req_version=req_version,
# req_version=req_version, min_version=min_version)
# min_version=min_version)
elif stop: elif stop:
req_version = pecan.request.version req_version = pecan.request.version
min_version = versions.Version('', '', '', '1.12') min_version = versions.Version('', '', '', '1.12')