From b7f85fe0c9714f4b49682e58b8f3225dbc0705fa Mon Sep 17 00:00:00 2001
From: luqitao <qtlu@fiberhome.com>
Date: Fri, 26 May 2017 09:23:23 -0400
Subject: [PATCH] Add the missing "vol_type_id" param for qos association
 api-ref

According to the code [1], "vol_type_id" is a required param,
so do "project_id/tenant_id" and "qos_id", they aren't optional params.

[1] https://github.com/openstack/cinder/blob/master/cinder/api/contrib/qos_specs_manage.py#L261:L269

Change-Id: I7727a9b675080bb92d2e42e293868a1e4eb92e10
---
 api-ref/source/v2/parameters.yaml            | 10 ++++++++--
 api-ref/source/v2/qos-specs-v2-qos-specs.inc |  2 ++
 api-ref/source/v3/parameters.yaml            | 10 ++++++++--
 api-ref/source/v3/qos-specs-v3-qos-specs.inc |  2 ++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/api-ref/source/v2/parameters.yaml b/api-ref/source/v2/parameters.yaml
index 25925d3475c..35e1cbd7703 100644
--- a/api-ref/source/v2/parameters.yaml
+++ b/api-ref/source/v2/parameters.yaml
@@ -75,13 +75,13 @@ project_id_path:
   description: |
     The UUID of the project in a multi-tenancy cloud.
   in: path
-  required: false
+  required: true
   type: string
 qos_id:
   description: |
     The ID of the QoS specification.
   in: path
-  required: false
+  required: true
   type: string
 quotas_tenant_id:
   description: |
@@ -114,6 +114,12 @@ user_id_1:
   in: path
   required: false
   type: string
+vol_type_id:
+  description: |
+    The UUID for an existing volume type.
+  in: path
+  required: true
+  type: string
 volume_id_path:
   description: |
     The UUID of the volume.
diff --git a/api-ref/source/v2/qos-specs-v2-qos-specs.inc b/api-ref/source/v2/qos-specs-v2-qos-specs.inc
index e05ecb2215e..1e9e01ace8e 100644
--- a/api-ref/source/v2/qos-specs-v2-qos-specs.inc
+++ b/api-ref/source/v2/qos-specs-v2-qos-specs.inc
@@ -110,6 +110,7 @@ Request
 
    - tenant_id: tenant_id
    - qos_id: qos_id
+   - vol_type_id: vol_type_id
 
 
 Disassociate QoS specification from volume type
@@ -129,6 +130,7 @@ Request
 
    - tenant_id: tenant_id
    - qos_id: qos_id
+   - vol_type_id: vol_type_id
 
 
 Show QoS specification details
diff --git a/api-ref/source/v3/parameters.yaml b/api-ref/source/v3/parameters.yaml
index 64cbd2f6c2a..9ef3921eb27 100644
--- a/api-ref/source/v3/parameters.yaml
+++ b/api-ref/source/v3/parameters.yaml
@@ -105,13 +105,13 @@ project_id_path:
   description: |
     The UUID of the project in a multi-tenancy cloud.
   in: path
-  required: false
+  required: true
   type: string
 qos_id:
   description: |
     The ID of the QoS specification.
   in: path
-  required: false
+  required: true
   type: string
 quotas_project_id:
   description: |
@@ -144,6 +144,12 @@ user_id_1:
   in: path
   required: false
   type: string
+vol_type_id:
+  description: |
+    The UUID for an existing volume type.
+  in: path
+  required: true
+  type: string
 volume_id_path:
   description: |
     The UUID of the volume.
diff --git a/api-ref/source/v3/qos-specs-v3-qos-specs.inc b/api-ref/source/v3/qos-specs-v3-qos-specs.inc
index 5847222595f..4aa4a1557d8 100644
--- a/api-ref/source/v3/qos-specs-v3-qos-specs.inc
+++ b/api-ref/source/v3/qos-specs-v3-qos-specs.inc
@@ -110,6 +110,7 @@ Request
 
    - project_id: project_id_path
    - qos_id: qos_id
+   - vol_type_id: vol_type_id
 
 
 Disassociate QoS specification from a volume type
@@ -129,6 +130,7 @@ Request
 
    - project_id: project_id_path
    - qos_id: qos_id
+   - vol_type_id: vol_type_id
 
 
 Show a QoS specification details