From 1794fae8f311cb0789c553aba8984855eb3a914e Mon Sep 17 00:00:00 2001
From: He Jie Xu <hejie.xu@intel.com>
Date: Mon, 4 Jul 2016 13:33:22 +0800
Subject: [PATCH] Bump Microversion to 2.36 for Proxy API deprecation

This is the final patch in this series. This patch bumps the
microversion to 2.36, all the proxy APIs were deprecated.

Partially implements blueprint deprecate-api-proxies

Change-Id: I1a8a44530be29292561e90d6f7bd7ed512a88ee3
---
 .../versions/v21-version-get-resp.json        |  2 +-
 .../versions/versions-get-resp.json           |  2 +-
 nova/api/openstack/api_version_request.py     |  4 ++-
 .../openstack/rest_api_version_history.rst    | 24 +++++++++++++++
 ...eprecates-proxy-apis-5e11d7c4ae5227d2.yaml | 29 +++++++++++++++++++
 5 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/deprecates-proxy-apis-5e11d7c4ae5227d2.yaml

diff --git a/doc/api_samples/versions/v21-version-get-resp.json b/doc/api_samples/versions/v21-version-get-resp.json
index 15d4d28d2f90..2c78868b6229 100644
--- a/doc/api_samples/versions/v21-version-get-resp.json
+++ b/doc/api_samples/versions/v21-version-get-resp.json
@@ -19,7 +19,7 @@
             }
         ],
         "status": "CURRENT",
-        "version": "2.35",
+        "version": "2.36",
         "min_version": "2.1",
         "updated": "2013-07-23T11:33:21Z"
     }
diff --git a/doc/api_samples/versions/versions-get-resp.json b/doc/api_samples/versions/versions-get-resp.json
index 83eedf97d4b9..643a7c3ffa71 100644
--- a/doc/api_samples/versions/versions-get-resp.json
+++ b/doc/api_samples/versions/versions-get-resp.json
@@ -22,7 +22,7 @@
                 }
             ],
             "status": "CURRENT",
-            "version": "2.35",
+            "version": "2.36",
             "min_version": "2.1",
             "updated": "2013-07-23T11:33:21Z"
         }
diff --git a/nova/api/openstack/api_version_request.py b/nova/api/openstack/api_version_request.py
index 7145116e15d1..52f7256cad78 100644
--- a/nova/api/openstack/api_version_request.py
+++ b/nova/api/openstack/api_version_request.py
@@ -88,6 +88,8 @@ REST_API_VERSION_HISTORY = """REST API Version History:
              pre-checks failure. Verification result is available over
              instance-actions.
     * 2.35 - Adds keypairs pagination support.
+    * 2.36 - Deprecates all the API which proxy to another service and fping
+             API.
 """
 
 # The minimum and maximum versions of the API supported
@@ -96,7 +98,7 @@ REST_API_VERSION_HISTORY = """REST API Version History:
 # Note(cyeoh): This only applies for the v2.1 API once microversions
 # support is fully merged. It does not affect the V2 API.
 _MIN_API_VERSION = "2.1"
-_MAX_API_VERSION = "2.35"
+_MAX_API_VERSION = "2.36"
 DEFAULT_API_VERSION = _MIN_API_VERSION
 
 # All the proxy APIs which related network, images and baremetal
diff --git a/nova/api/openstack/rest_api_version_history.rst b/nova/api/openstack/rest_api_version_history.rst
index fed6afa5b435..f44e4a3235b5 100644
--- a/nova/api/openstack/rest_api_version_history.rst
+++ b/nova/api/openstack/rest_api_version_history.rst
@@ -361,3 +361,27 @@ user documentation.
   the generic request format is::
 
     GET /os-keypairs?limit={limit}&marker={kp_name}
+
+2.36
+----
+
+  All the APIs which proxy to another service were deprecated in this version,
+  also the fping API. Those APIs will return 404 with Microversion 2.36. The
+  network related quotas and limits are removed from API also. The deprecated
+  API endpoints as below::
+
+    '/images'
+    '/os-networks'
+    '/os-tenant-networks'
+    '/os-fixed-ips'
+    '/os-floating-ips'
+    '/os-floating-ips-bulk'
+    '/os-floating-ip-pools'
+    '/os-floating-ip-dns'
+    '/os-security-groups'
+    '/os-security-group-rules'
+    '/os-security-group-default-rules'
+    '/os-volumes'
+    '/os-snapshots'
+    '/os-baremetal-nodes'
+    '/os-fping'
diff --git a/releasenotes/notes/deprecates-proxy-apis-5e11d7c4ae5227d2.yaml b/releasenotes/notes/deprecates-proxy-apis-5e11d7c4ae5227d2.yaml
new file mode 100644
index 000000000000..b4d1a82faf00
--- /dev/null
+++ b/releasenotes/notes/deprecates-proxy-apis-5e11d7c4ae5227d2.yaml
@@ -0,0 +1,29 @@
+---
+deprecations:
+  - |
+    All the APIs which proxy to another services were deprecated in this API
+    version. Those APIs will return 404 on Microversion 2.36 or higher. The API
+    user should use native API as instead of using those pure proxy for other
+    REST APIs. The quotas and limits related to network resources 'fixed_ips',
+    'floating ips', 'security_groups', 'security_group_rules', 'networks' are
+    filtered out of os-quotas and limit APIs respectively and those quotas
+    should be managed through OpenStack network service. For using
+    nova-network, you only can use API and manage quotas under Microversion
+    '2.36'. The 'os-fping' API was deprecated also, this API is only related to
+    nova-network and depend on the deployment. The deprecated APIs are as
+    below:
+
+    - /os-images
+    - /os-networks
+    - /os-fixed-ips
+    - /os-floating-ips
+    - /os-floating-ips-bulk
+    - /os-floating-ip-pools
+    - /os-floating-ip-dns
+    - /os-security-groups
+    - /os-security-group-rules
+    - /os-security-group-default-rules
+    - /os-volumes
+    - /os-snapshots
+    - /os-baremetal-nodes
+    - /os-fping