From 88a21ab20e2487692d8dcf38ba58e0329e974a56 Mon Sep 17 00:00:00 2001
From: liuyamin <liuyamin@fiberhome.com>
Date: Mon, 15 Jan 2018 14:00:29 +0800
Subject: [PATCH] Fix 'volume_type' for in the api-ref

1 The 'volume_type' shoud be required in the rest_method of request.
  So fix the request paremeter about volume_type
2 Fix  the parameters of 'volume_type' in the volumes-v3-volumes.inc

Change-Id: I585db62579ac134885a49dc020508a9f0fba3c78
---
 api-ref/source/v2/parameters.yaml        |  6 ++++++
 api-ref/source/v2/volume-type-access.inc |  6 +++---
 api-ref/source/v3/parameters.yaml        |  6 ++++++
 api-ref/source/v3/quota-classes.inc      |  2 +-
 api-ref/source/v3/volume-type-access.inc |  6 +++---
 api-ref/source/v3/volumes-v3-volumes.inc | 10 +++++-----
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/api-ref/source/v2/parameters.yaml b/api-ref/source/v2/parameters.yaml
index 11e8c374f49..72fcafd45b0 100644
--- a/api-ref/source/v2/parameters.yaml
+++ b/api-ref/source/v2/parameters.yaml
@@ -133,6 +133,12 @@ volume_type:
   in: path
   required: false
   type: string
+volume_type_access:
+  description: |
+    The ID of Volume Type to be accessed by project.
+  in: path
+  required: true
+  type: string
 volume_type_id:
   description: |
     The UUID for an existing volume type.
diff --git a/api-ref/source/v2/volume-type-access.inc b/api-ref/source/v2/volume-type-access.inc
index 4d04553dc1a..c2426272527 100644
--- a/api-ref/source/v2/volume-type-access.inc
+++ b/api-ref/source/v2/volume-type-access.inc
@@ -30,7 +30,7 @@ Request
 
    - project: project
    - project_id: project_id_path
-   - volume_type: volume_type
+   - volume_type: volume_type_access
 
 Request Example
 ---------------
@@ -56,7 +56,7 @@ Request
 
    - project: project
    - project_id: project_id_path
-   - volume_type: volume_type
+   - volume_type: volume_type_access
 
 Request Example
 ---------------
@@ -82,7 +82,7 @@ Request
 .. rest_parameters:: parameters.yaml
 
    - project_id: project_id_path
-   - volume_type: volume_type
+   - volume_type: volume_type_access
 
 
 Response Parameters
diff --git a/api-ref/source/v3/parameters.yaml b/api-ref/source/v3/parameters.yaml
index 03d75d642f6..b8fb601d6be 100644
--- a/api-ref/source/v3/parameters.yaml
+++ b/api-ref/source/v3/parameters.yaml
@@ -194,6 +194,12 @@ volume_type:
   in: path
   required: false
   type: string
+volume_type_access:
+  description: |
+    The ID of Volume Type to be accessed by project.
+  in: path
+  required: true
+  type: string
 volume_type_id:
   description: |
     The UUID for an existing volume type.
diff --git a/api-ref/source/v3/quota-classes.inc b/api-ref/source/v3/quota-classes.inc
index 9653c60a3ec..914ad45cb2b 100644
--- a/api-ref/source/v3/quota-classes.inc
+++ b/api-ref/source/v3/quota-classes.inc
@@ -74,7 +74,7 @@ Request
    - gigabytes: maxTotalVolumeGigabytesOptional
    - snapshots: maxTotalSnapshotsOptional
    - volumes: maxTotalVolumesOptional
-   - volume-type: volume_type
+   - volume-type: volume_type_2
 
 Request Example
 ---------------
diff --git a/api-ref/source/v3/volume-type-access.inc b/api-ref/source/v3/volume-type-access.inc
index 172321ab812..ed890048a2e 100644
--- a/api-ref/source/v3/volume-type-access.inc
+++ b/api-ref/source/v3/volume-type-access.inc
@@ -30,7 +30,7 @@ Request
 
    - project: project
    - project_id: project_id_path
-   - volume_type: volume_type
+   - volume_type: volume_type_access
 
 Request Example
 ---------------
@@ -56,7 +56,7 @@ Request
 
    - project: project
    - project_id: project_id_path
-   - volume_type: volume_type
+   - volume_type: volume_type_access
 
 Request Example
 ---------------
@@ -82,7 +82,7 @@ Request
 .. rest_parameters:: parameters.yaml
 
    - project_id: project_id_path
-   - volume_type: volume_type
+   - volume_type: volume_type_access
 
 
 Response Parameters
diff --git a/api-ref/source/v3/volumes-v3-volumes.inc b/api-ref/source/v3/volumes-v3-volumes.inc
index 32d31ea109c..537a3166a99 100644
--- a/api-ref/source/v3/volumes-v3-volumes.inc
+++ b/api-ref/source/v3/volumes-v3-volumes.inc
@@ -122,7 +122,7 @@ Response Parameters
    - created_at: created_at
    - os-volume-replication:driver_data: os-volume-replication:driver_data
    - volumes: volumes
-   - volume_type: volume_type
+   - volume_type: volume_type_6
    - count: count
 
 
@@ -191,7 +191,7 @@ Request
    - backup_id: backup_id_1
    - name: name_13
    - imageRef: imageRef
-   - volume_type: volume_type
+   - volume_type: volume_type_2
    - metadata: metadata
    - consistencygroup_id: consistencygroup_id
    - OS-SCH-HNT:scheduler_hints: OS-SCH-HNT:scheduler_hints
@@ -230,7 +230,7 @@ Response Parameters
    - name: name_13
    - bootable: bootable_response
    - created_at: created_at
-   - volume_type: volume_type
+   - volume_type: volume_type_6
 
 Response Example
 ----------------
@@ -346,7 +346,7 @@ Response Parameters
    - bootable: bootable_response
    - created_at: created_at
    - os-volume-replication:driver_data: os-volume-replication:driver_data
-   - volume_type: volume_type
+   - volume_type: volume_type_6
    - service_uuid: service_uuid
    - shared_targets: shared_targets
 
@@ -417,7 +417,7 @@ Response Parameters
    - name: name_13
    - bootable: bootable_response
    - created_at: created_at
-   - volume_type: volume_type
+   - volume_type: volume_type_6