From e8b66e866801d03ff9f553685c36962b2c7b5d43 Mon Sep 17 00:00:00 2001
From: Jane Zadorozhna <izadorozhna@mirantis.com>
Date: Thu, 22 Oct 2015 14:51:02 +0300
Subject: [PATCH] Shared File Systems API: removed info about Quota Classes

Removed the information about quota classes (and the API requests)
in the Shared File Systems API, because the quota classes are not
used in the Shared File Systems service and are not working properly
for the current moment (in Liberty release and all releases earlier).

Change-Id: I9e5ead6af1c09feb27088d7f9898c1959af32e1c
Closes-Bug: #1508882
---
 api-ref/src/docbkx/ch_share-v2.xml            | 12 ---
 api-ref/src/wadls/share-api/src/v2/common.ent | 81 -------------------
 .../wadls/share-api/src/v2/os-share-v2.wadl   | 49 -----------
 ...anila-quota-class-quota-show-response.json | 10 ---
 ...nila-quota-class-quota-update-request.json |  6 --
 ...ila-quota-class-quota-update-response.json |  9 ---
 6 files changed, 167 deletions(-)
 delete mode 100644 api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-show-response.json
 delete mode 100644 api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-update-request.json
 delete mode 100644 api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-update-response.json

diff --git a/api-ref/src/docbkx/ch_share-v2.xml b/api-ref/src/docbkx/ch_share-v2.xml
index 29916f419..e2f9b70c6 100644
--- a/api-ref/src/docbkx/ch_share-v2.xml
+++ b/api-ref/src/docbkx/ch_share-v2.xml
@@ -952,16 +952,4 @@
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="share-os-quota-class-sets" xmlns="http://docbook.org/ns/docbook">
-        <title>Quota classes</title>
-        <para>
-            Provides quota classes management support.
-        </para>
-        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/share-api/src/v2/os-share-v2.wadl#quota-class_name">
-                <wadl:method href="#getQuotaClassQuotas"/>
-                <wadl:method href="#updateQuotaClassQuotas"/>
-            </wadl:resource>
-        </wadl:resources>
-    </section>
 </chapter>
diff --git a/api-ref/src/wadls/share-api/src/v2/common.ent b/api-ref/src/wadls/share-api/src/v2/common.ent
index da7904c11..7cdc6b16b 100644
--- a/api-ref/src/wadls/share-api/src/v2/common.ent
+++ b/api-ref/src/wadls/share-api/src/v2/common.ent
@@ -4424,87 +4424,6 @@
        </para>
     </wadl:doc>
 </param>'>
-<!ENTITY getQuotaClassQuotasResponseParameters '
-<param name="id" style="plain" required="true"
-   xmlns="http://wadl.dev.java.net/2009/02"
-   type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-       xmlns:wadl="http://wadl.dev.java.net/2009/02"
-       xml:lang="EN">
-        <para>
-            The quota class ID.
-        </para>
-    </wadl:doc>
-</param>
-&QuotaResponseParameters;'>
-<!ENTITY updateQuotaClassQuotasRequestParameters '
-<param name="class_name" style="plain" required="true"
-   xmlns="http://wadl.dev.java.net/2009/02"
-   type="xsd:string">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-       xmlns:wadl="http://wadl.dev.java.net/2009/02"
-       xml:lang="EN">
-        <para>
-            The name of a quota class for which you
-            want to update the quotas.
-        </para>
-    </wadl:doc>
-</param>
-<param name="gigabytes" style="plain" required="false"
-   xmlns="http://wadl.dev.java.net/2009/02"
-   type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-       xmlns:wadl="http://wadl.dev.java.net/2009/02"
-       xml:lang="EN">
-        <para>
-            The number of gigabytes for the tenant.
-        </para>
-    </wadl:doc>
-</param>
-<param name="snapshots" style="plain" required="false"
-   xmlns="http://wadl.dev.java.net/2009/02"
-   type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-       xmlns:wadl="http://wadl.dev.java.net/2009/02"
-       xml:lang="EN">
-        <para>
-            The number of snapshots for the tenant.
-        </para>
-    </wadl:doc>
-</param>
-<param name="shares" style="plain" required="false"
-   xmlns="http://wadl.dev.java.net/2009/02"
-   type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-       xmlns:wadl="http://wadl.dev.java.net/2009/02"
-       xml:lang="EN">
-        <para>
-            The number of shares for the tenant.
-        </para>
-    </wadl:doc>
-</param>
-<param name="snapshot_gigabytes" style="plain" required="false"
-   xmlns="http://wadl.dev.java.net/2009/02"
-   type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-       xmlns:wadl="http://wadl.dev.java.net/2009/02"
-       xml:lang="EN">
-        <para>
-            The number of gigabytes for the snapshots for the tenant.
-        </para>
-    </wadl:doc>
-</param>
-<param name="share_networks" style="plain" required="false"
-   xmlns="http://wadl.dev.java.net/2009/02"
-   type="xsd:int">
-    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-       xmlns:wadl="http://wadl.dev.java.net/2009/02"
-       xml:lang="EN">
-        <para>
-            The number of share networks for the tenant.
-        </para>
-    </wadl:doc>
-</param>'>
 <!ENTITY manageShareRequestParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="protocol" style="plain" required="true"
diff --git a/api-ref/src/wadls/share-api/src/v2/os-share-v2.wadl b/api-ref/src/wadls/share-api/src/v2/os-share-v2.wadl
index 9eedfafa1..3304d4849 100644
--- a/api-ref/src/wadls/share-api/src/v2/os-share-v2.wadl
+++ b/api-ref/src/wadls/share-api/src/v2/os-share-v2.wadl
@@ -277,21 +277,6 @@
                         </resource>
                     </resource>
                </resource>
-               <resource id="os-quota-class-sets" path="os-quota-class-sets">
-                  <resource path="{class_name}" id="quota-class_name">
-                     <param name="class_name" style="template"
-                            type="xsd:string" required="true">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Project ID">
-                                <para>The name of the quota class for which you
-                                   want to manage quotas.</para>
-                            </wadl:doc>
-                     </param>
-                     <method href="#getQuotaClassQuotas" />
-                     <method href="#updateQuotaClassQuotas" />
-                  </resource>
-               </resource>
                <resource id="os-availability-zone" path="os-availability-zone">
                   <method href="#getAvailabilityZones" />
                </resource>
@@ -1461,38 +1446,4 @@
       </wadl:doc>
       <response status="202" />
    </method>
-   <method name="GET" id="getQuotaClassQuotas">
-      <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Show quotas for a quota class">
-         <para role="shortdesc">Shows the quotas for a specified quota class.</para>
-      </wadl:doc>
-      <response status="200">
-         <representation mediaType="application/json">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-               <xsdxt:code href="samples/manila-quota-class-quota-show-response.json" />
-            </wadl:doc>
-            &getQuotaClassQuotasResponseParameters;
-         </representation>
-      </response>
-   </method>
-   <method name="PUT" id="updateQuotaClassQuotas">
-      <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Update quotas for a quota class">
-         <para role="shortdesc">Updates the quotas for a specified for a quota class.</para>
-      </wadl:doc>
-      <request>
-         <representation mediaType="application/json">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-               <xsdxt:code href="samples/manila-quota-class-quota-update-request.json" />
-            </wadl:doc>
-            &updateQuotaClassQuotasRequestParameters;
-         </representation>
-      </request>
-      <response status="200">
-         <representation mediaType="application/json">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-               <xsdxt:code href="samples/manila-quota-class-quota-update-response.json" />
-            </wadl:doc>
-            &QuotaResponseParameters;
-         </representation>
-      </response>
-   </method>
 </application>
diff --git a/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-show-response.json b/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-show-response.json
deleted file mode 100644
index 6c786a573..000000000
--- a/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-show-response.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "quota_class_set": {
-        "gigabytes": 1000,
-        "shares": 50,
-        "snapshot_gigabytes": 1000,
-        "snapshots": 50,
-        "id": "abc",
-        "share_networks": 10
-    }
-}
diff --git a/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-update-request.json b/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-update-request.json
deleted file mode 100644
index 28abe67f2..000000000
--- a/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-update-request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "quota_class_set": {
-        "class_name": "abc",
-        "shares": 49
-    }
-}
diff --git a/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-update-response.json b/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-update-response.json
deleted file mode 100644
index c421ba612..000000000
--- a/api-ref/src/wadls/share-api/src/v2/samples/manila-quota-class-quota-update-response.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "quota_class_set": {
-        "gigabytes": 1000,
-        "snapshot_gigabytes": 1000,
-        "snapshots": 50,
-        "shares": 49,
-        "share_networks": 10
-    }
-}