From 8235e6e1e27bc6832095fb5c36957c162b7be8b1 Mon Sep 17 00:00:00 2001
From: Andrey Volkov <avolkov@mirantis.com>
Date: Fri, 2 Dec 2016 12:17:08 +0300
Subject: [PATCH] api-ref cleanup: required flag for tenants

Current url scheme doesn't allow to skip admin_tenant_id
or tenant_id params. This change marks them as required
in api-ref. Get default quotas for a project signature
was changed on correct also.

Partial-Bug: #1415214

Change-Id: I0c528d1c49346477b608a12f8f35ee6d47404bd3
---
 api-ref/source/v2/parameters.yaml | 8 +++++++-
 api-ref/source/v2/quota-sets.inc  | 9 +++++----
 api-ref/source/v3/parameters.yaml | 8 +++++++-
 api-ref/source/v3/quota-sets.inc  | 9 +++++----
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/api-ref/source/v2/parameters.yaml b/api-ref/source/v2/parameters.yaml
index de9df219816..25925d3475c 100644
--- a/api-ref/source/v2/parameters.yaml
+++ b/api-ref/source/v2/parameters.yaml
@@ -11,7 +11,7 @@ admin_tenant_id:
   description: |
     The UUID of the administrative tenant.
   in: path
-  required: false
+  required: true
   type: string
 backup_id:
   description: |
@@ -83,6 +83,12 @@ qos_id:
   in: path
   required: false
   type: string
+quotas_tenant_id:
+  description: |
+    The UUID of the tenant in a multi-tenancy cloud.
+  in: path
+  required: true
+  type: string
 snapshot_id_1:
   description: |
     The UUID of the snapshot.
diff --git a/api-ref/source/v2/quota-sets.inc b/api-ref/source/v2/quota-sets.inc
index 83368b375a8..174cd2cd9f9 100644
--- a/api-ref/source/v2/quota-sets.inc
+++ b/api-ref/source/v2/quota-sets.inc
@@ -24,7 +24,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - tenant_id: tenant_id
+   - tenant_id: quotas_tenant_id
    - admin_tenant_id: admin_tenant_id
    - usage: usage
 
@@ -91,7 +91,7 @@ Request
    - fixed_ips: fixed_ips
    - id: id
    - security_groups: security_groups
-   - tenant_id: tenant_id
+   - tenant_id: quotas_tenant_id
    - admin_tenant_id: admin_tenant_id
 
 Request Example
@@ -146,7 +146,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - tenant_id: tenant_id
+   - tenant_id: quotas_tenant_id
    - admin_tenant_id: admin_tenant_id
 
 Response Example
@@ -158,7 +158,7 @@ Response Example
 Get default quotas
 ~~~~~~~~~~~~~~~~~~
 
-.. rest_method::  GET /v2/{tenant_id}/os-quota-sets/defaults
+.. rest_method::  GET /v2/{admin_tenant_id}/os-quota-sets/{tenant_id}/defaults
 
 Gets default quotas for a tenant.
 
@@ -173,6 +173,7 @@ Request
 .. rest_parameters:: parameters.yaml
 
    - tenant_id: tenant_id
+   - admin_tenant_id: admin_tenant_id
 
 
 Response Parameters
diff --git a/api-ref/source/v3/parameters.yaml b/api-ref/source/v3/parameters.yaml
index 0c02d1a02cf..64cbd2f6c2a 100644
--- a/api-ref/source/v3/parameters.yaml
+++ b/api-ref/source/v3/parameters.yaml
@@ -11,7 +11,7 @@ admin_project_id:
   description: |
     The UUID of the administrative project.
   in: path
-  required: false
+  required: true
   type: string
 all_tenants:
   description: |
@@ -113,6 +113,12 @@ qos_id:
   in: path
   required: false
   type: string
+quotas_project_id:
+  description: |
+    The UUID of the tenant in a multi-tenancy cloud.
+  in: path
+  required: true
+  type: string
 resource:
   description: |
     Filter filters by resource name.
diff --git a/api-ref/source/v3/quota-sets.inc b/api-ref/source/v3/quota-sets.inc
index 28058c6a3af..fedd885404f 100644
--- a/api-ref/source/v3/quota-sets.inc
+++ b/api-ref/source/v3/quota-sets.inc
@@ -25,7 +25,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - project_id: project_id_path
+   - project_id: quotas_project_id
    - admin_project_id: admin_project_id
    - usage: usage
 
@@ -92,7 +92,7 @@ Request
    - fixed_ips: fixed_ips
    - id: id
    - security_groups: security_groups
-   - project_id: project_id_path
+   - project_id: quotas_project_id
    - admin_project_id: admin_project_id
 
 Request Example
@@ -147,7 +147,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - project_id: project_id_path
+   - project_id: quotas_project_id
    - admin_project_id: admin_project_id
 
 Response Example
@@ -160,7 +160,7 @@ Response Example
 Get default quotas for a project
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. rest_method::  GET /v3/{project_id}/os-quota-sets/defaults
+.. rest_method::  GET /v3/{admin_project_id}/os-quota-sets/{project_id}/defaults
 
 Gets default quotas for a project.
 
@@ -175,6 +175,7 @@ Request
 .. rest_parameters:: parameters.yaml
 
    - project_id: project_id_path
+   - admin_project_id: admin_project_id
 
 
 Response Parameters