Merge "Remove APIs for managing security groups"

zun/api/controllers/v1/containers.py

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

zun/api/controllers/versions.py

@@ -47,10 +47,11 @@ REST_API_VERSION_HISTORY = """REST API Version History:
     * 1.12 - Add support to stop container before delete
     * 1.13 - Add support for listing networks of a container
     * 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'
-CURRENT_MAX_VER = '1.14'
+CURRENT_MAX_VER = '1.15'
 
 
 class Version(object):

zun/api/rest_api_version_history.rst

@@ -123,3 +123,9 @@ user documentation.
   a request to the endpoint with the data in the following form:
 
     {'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.

zun/tests/unit/api/controllers/test_root.py

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