openstack/zun
Code Issues Proposed changes

Merge "Remove APIs for managing security groups"

Browse Source
This commit is contained in:
Zuul 2018-05-21 15:21:52 +00:00 committed by Gerrit Code Review
commit b1c84c46ea
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,6 +496,7 @@ class ContainersController(base.Controller):
else: else:
raise raise
@base.Controller.api_version("1.1", "1.14")
@pecan.expose('json') @pecan.expose('json')
@exception.wrap_pecan_controller_exception @exception.wrap_pecan_controller_exception
@validation.validated(schema.add_security_group) @validation.validated(schema.add_security_group)
@ -523,6 +524,7 @@ class ContainersController(base.Controller):
security_group_id) security_group_id)
pecan.response.status = 202 pecan.response.status = 202
@base.Controller.api_version("1.1", "1.14")
@pecan.expose('json') @pecan.expose('json')
@exception.wrap_pecan_controller_exception @exception.wrap_pecan_controller_exception
@validation.validated(schema.remove_security_group) @validation.validated(schema.remove_security_group)

3
zun/api/controllers/versions.py
View File

@ -47,10 +47,11 @@ REST_API_VERSION_HISTORY = """REST API Version History:
* 1.12 - Add support to stop container before delete * 1.12 - Add support to stop container before delete
* 1.13 - Add support for listing networks of a container * 1.13 - Add support for listing networks of a container
* 1.14 - Add support to rename the container from update api * 1.14 - Add support to rename the container from update api
* 1.15 - Remove add_security_group and remove_security_group
""" """
BASE_VER = '1.1' BASE_VER = '1.1'
CURRENT_MAX_VER = '1.14' CURRENT_MAX_VER = '1.15'
class Version(object): class Version(object):

6
zun/api/rest_api_version_history.rst
View File

@ -123,3 +123,9 @@ user documentation.
a request to the endpoint with the data in the following form: a request to the endpoint with the data in the following form:
{'name': '<new-name>'} {'name': '<new-name>'}
1.15
----
Remove the APIs for adding/removing security group to/from a container.
These APIs are removed because they are proxy APIs to Neutron.

4
zun/tests/unit/api/controllers/test_root.py
View File

@ -28,7 +28,7 @@ class TestRootController(api_base.FunctionalTest):
'default_version': 'default_version':
{'id': 'v1', {'id': 'v1',
'links': [{'href': 'http://localhost/v1/', 'rel': 'self'}], 'links': [{'href': 'http://localhost/v1/', 'rel': 'self'}],
'max_version': '1.14', 'max_version': '1.15',
'min_version': '1.1', 'min_version': '1.1',
'status': 'CURRENT'}, 'status': 'CURRENT'},
'description': 'Zun is an OpenStack project which ' 'description': 'Zun is an OpenStack project which '
@ -37,7 +37,7 @@ class TestRootController(api_base.FunctionalTest):
'versions': [{'id': 'v1', 'versions': [{'id': 'v1',
'links': [{'href': 'http://localhost/v1/', 'links': [{'href': 'http://localhost/v1/',
'rel': 'self'}], 'rel': 'self'}],
'max_version': '1.14', 'max_version': '1.15',
'min_version': '1.1', 'min_version': '1.1',
'status': 'CURRENT'}]} 'status': 'CURRENT'}]}