From 3cc3986a89723c483ee55d6c383b54cb973336f2 Mon Sep 17 00:00:00 2001
From: wangxiyuan <wangxiyuan@huawei.com>
Date: Mon, 11 Dec 2017 16:52:51 +0800
Subject: [PATCH] Remove extra parameter for token auth

The /v3/auth/token API's response body doesn't contain
extra at all.
It has been removed here: https://review.openstack.org/#/c/249480/

This patch remove the "extra" from api-ref to avoid misleading.

Change-Id: I3d41c022835bc43e5bf46d1d522dfcdcc0a8922e
---
 api-ref/source/v3/authenticate-v3.inc                       | 4 ----
 api-ref/source/v3/parameters.yaml                           | 6 ------
 .../admin/auth-password-explicit-unscoped-response.json     | 1 -
 .../admin/auth-password-project-scoped-response.json        | 1 -
 .../v3/samples/admin/auth-password-unscoped-response.json   | 1 -
 .../source/v3/samples/admin/auth-token-scoped-response.json | 1 -
 .../v3/samples/admin/auth-token-unscoped-response.json      | 1 -
 7 files changed, 15 deletions(-)

diff --git a/api-ref/source/v3/authenticate-v3.inc b/api-ref/source/v3/authenticate-v3.inc
index d621c485e0..efd6cfb0f8 100644
--- a/api-ref/source/v3/authenticate-v3.inc
+++ b/api-ref/source/v3/authenticate-v3.inc
@@ -142,7 +142,6 @@ Response Parameters
    - methods: auth_methods_passwd
    - expires_at: expires_at
    - token: token
-   - extras: extras
    - user: user
    - audit_ids: audit_ids
    - issued_at: issued_at
@@ -211,7 +210,6 @@ Response Parameters
    - project: project
    - issued_at: issued_at
    - catalog: catalog
-   - extras: extras
    - user: user
    - audit_ids: audit_ids
    - interface: endpoint_interface
@@ -275,7 +273,6 @@ Response Parameters
    - roles: roles
    - expires_at: expires_at
    - token: token
-   - extras: extras
    - user: user
    - audit_ids: audit_ids
    - issued_at: issued_at
@@ -476,7 +473,6 @@ Response Parameters
    - expires_at: expires_at
    - project: project
    - catalog: catalog
-   - extras: extras
    - roles: roles
    - audit_ids: audit_ids
    - issued_at: issued_at
diff --git a/api-ref/source/v3/parameters.yaml b/api-ref/source/v3/parameters.yaml
index b3f1a2e32a..49b16e0319 100644
--- a/api-ref/source/v3/parameters.yaml
+++ b/api-ref/source/v3/parameters.yaml
@@ -849,12 +849,6 @@ explicit_unscoped_string:
   in: body
   required: false
   type: string
-extras:
-  description: |
-    A set of metadata key and value pairs, if any.
-  in: body
-  required: true
-  type: object
 group:
   description: |
     A ``group`` object, containing:
diff --git a/api-ref/source/v3/samples/admin/auth-password-explicit-unscoped-response.json b/api-ref/source/v3/samples/admin/auth-password-explicit-unscoped-response.json
index 2d6a05d01a..49546673fd 100644
--- a/api-ref/source/v3/samples/admin/auth-password-explicit-unscoped-response.json
+++ b/api-ref/source/v3/samples/admin/auth-password-explicit-unscoped-response.json
@@ -4,7 +4,6 @@
             "password"
         ],
         "expires_at": "2015-11-09T01:42:57.527363Z",
-        "extras": {},
         "user": {
             "domain": {
                 "id": "default",
diff --git a/api-ref/source/v3/samples/admin/auth-password-project-scoped-response.json b/api-ref/source/v3/samples/admin/auth-password-project-scoped-response.json
index 232b41d60a..84ff49a11d 100644
--- a/api-ref/source/v3/samples/admin/auth-password-project-scoped-response.json
+++ b/api-ref/source/v3/samples/admin/auth-password-project-scoped-response.json
@@ -385,7 +385,6 @@
                 "name": "heat-cfn"
             }
         ],
-        "extras": {},
         "user": {
             "domain": {
                 "id": "default",
diff --git a/api-ref/source/v3/samples/admin/auth-password-unscoped-response.json b/api-ref/source/v3/samples/admin/auth-password-unscoped-response.json
index 9f7ba48296..7102ea32b6 100644
--- a/api-ref/source/v3/samples/admin/auth-password-unscoped-response.json
+++ b/api-ref/source/v3/samples/admin/auth-password-unscoped-response.json
@@ -4,7 +4,6 @@
             "password"
         ],
         "expires_at": "2015-11-06T15:32:17.893769Z",
-        "extras": {},
         "user": {
             "domain": {
                 "id": "default",
diff --git a/api-ref/source/v3/samples/admin/auth-token-scoped-response.json b/api-ref/source/v3/samples/admin/auth-token-scoped-response.json
index afd3dd0642..7517e1565f 100644
--- a/api-ref/source/v3/samples/admin/auth-token-scoped-response.json
+++ b/api-ref/source/v3/samples/admin/auth-token-scoped-response.json
@@ -385,7 +385,6 @@
                 "name": "swift"
             }
         ],
-        "extras": {},
         "user": {
             "domain": {
                 "id": "default",
diff --git a/api-ref/source/v3/samples/admin/auth-token-unscoped-response.json b/api-ref/source/v3/samples/admin/auth-token-unscoped-response.json
index 83b81791ff..41b54814de 100644
--- a/api-ref/source/v3/samples/admin/auth-token-unscoped-response.json
+++ b/api-ref/source/v3/samples/admin/auth-token-unscoped-response.json
@@ -4,7 +4,6 @@
             "token"
         ],
         "expires_at": "2015-11-05T22:00:11.000000Z",
-        "extras": {},
         "user": {
             "domain": {
                 "id": "default",