From e08e2c8e9e7386b5cf9b7b7f0de396d1a8025571 Mon Sep 17 00:00:00 2001 From: Diane Fleming Date: Wed, 29 Apr 2015 19:56:53 -0500 Subject: [PATCH] Update version and versions responses for Identity v2.0 and v3 Change-Id: I8f4ba9cb2c04d49997863e55bc54619c6993e0e8 Closes-Bug: #1445096 --- .../samples/identity-version-response.json | 6 +- .../samples/identity-version-response.xml | 13 --- .../samples/identity-versions-response.json | 16 +-- .../samples/identity-versions-response.xml | 24 ----- .../src/v2.0/samples/version-atom.xml | 19 ---- .../src/v2.0/samples/version-resp.json | 19 ++-- .../src/v2.0/samples/version-resp.xml | 20 ---- .../src/v2.0/samples/version.json | 2 +- .../identity-api/src/v2.0/samples/version.xml | 13 --- .../src/v2.0/samples/versions-atom.xml | 29 ------ .../src/v2.0/samples/versions.json | 38 ------- .../src/v2.0/samples/versions.xml | 24 ----- .../src/v2.0/wadl/identity-admin.wadl | 8 -- .../identity-api/src/v2.0/wadl/identity.wadl | 12 --- .../src/v3/samples/identity-version-resp.json | 24 ++--- .../src/v3/samples/identity-version-resp.xml | 13 --- .../src/v3/samples/version-resp.json | 23 ----- .../src/v3/samples/version-resp.xml | 20 ---- .../src/v3/wadl/identity-admin-v3.wadl | 99 +++++++++---------- .../samples/identity-versions-response.json | 61 +++++------- .../samples/identity-versions-response.xml | 38 ------- 21 files changed, 94 insertions(+), 427 deletions(-) delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/identity-version-response.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/identity-versions-response.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/version-atom.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/version-resp.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/version.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/versions-atom.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/versions.json delete mode 100644 api-ref/src/wadls/identity-api/src/v2.0/samples/versions.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v3/samples/identity-version-resp.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v3/samples/version-resp.json delete mode 100644 api-ref/src/wadls/identity-api/src/v3/samples/version-resp.xml delete mode 100644 api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.xml diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-version-response.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-version-response.json index f4ca43bb0..2af9d2885 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-version-response.json +++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-version-response.json @@ -6,16 +6,12 @@ { "base": "application/json", "type": "application/vnd.openstack.identity-v2.0+json" - }, - { - "base": "application/xml", - "type": "application/vnd.openstack.identity-v2.0+xml" } ], "id": "v2.0", "links": [ { - "href": "http://192.168.122.176:5000/v2.0/", + "href": "http://localhost:5000/v2.0/", "rel": "self" }, { diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-version-response.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-version-response.xml deleted file mode 100644 index c9778b737..000000000 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-version-response.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-versions-response.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-versions-response.json index 2856e996c..e832fa55f 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-versions-response.json +++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-versions-response.json @@ -2,10 +2,10 @@ "versions": { "values": [ { - "id": "v3.0", + "id": "v3.4", "links": [ { - "href": "http://192.168.122.176:5000/v3/", + "href": "http://localhost:35357/v3/", "rel": "self" } ], @@ -13,20 +13,16 @@ { "base": "application/json", "type": "application/vnd.openstack.identity-v3+json" - }, - { - "base": "application/xml", - "type": "application/vnd.openstack.identity-v3+xml" } ], "status": "stable", - "updated": "2013-03-06T00:00:00Z" + "updated": "2015-03-30T00:00:00Z" }, { "id": "v2.0", "links": [ { - "href": "http://192.168.122.176:5000/v2.0/", + "href": "http://localhost:35357/v2.0/", "rel": "self" }, { @@ -39,10 +35,6 @@ { "base": "application/json", "type": "application/vnd.openstack.identity-v2.0+json" - }, - { - "base": "application/xml", - "type": "application/vnd.openstack.identity-v2.0+xml" } ], "status": "stable", diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-versions-response.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-versions-response.xml deleted file mode 100644 index 7bd96141e..000000000 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/identity-versions-response.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/version-atom.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/version-atom.xml deleted file mode 100644 index 3d78a4a39..000000000 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/version-atom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - About This Version - 2011-01-21T11:33:21-06:00 - http://identity.api.openstack.org/v2.0/ - OpenStackhttp://www.openstack.org/ - - - http://identity.api.openstack.org/v2.0/ - Version v2.0 - 2011-01-21T11:33:21-06:00 - - - - Version v2.0 CURRENT (2011-01-21T11:33:21-06:00) - - diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/version-resp.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/version-resp.json index 2d45c45bc..2af9d2885 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/version-resp.json +++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/version-resp.json @@ -1,23 +1,24 @@ { "version": { "status": "stable", - "updated": "2013-03-06T00:00:00Z", + "updated": "2014-04-17T00:00:00Z", "media-types": [ { "base": "application/json", - "type": "application/vnd.openstack.identity-v3+json" - }, - { - "base": "application/xml", - "type": "application/vnd.openstack.identity-v3+xml" + "type": "application/vnd.openstack.identity-v2.0+json" } ], - "id": "v3.0", + "id": "v2.0", "links": [ { - "href": "http://localhost:5000/v3/", + "href": "http://localhost:5000/v2.0/", "rel": "self" + }, + { + "href": "http://docs.openstack.org/", + "rel": "describedby", + "type": "text/html" } ] } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/version-resp.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/version-resp.xml deleted file mode 100644 index d1eda7f22..000000000 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/version-resp.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/version.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/version.json index 3ecf2148e..2af9d2885 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/version.json +++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/version.json @@ -11,7 +11,7 @@ "id": "v2.0", "links": [ { - "href": "http://localhost:35357/v2.0/", + "href": "http://localhost:5000/v2.0/", "rel": "self" }, { diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/version.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/version.xml deleted file mode 100644 index f5f60224b..000000000 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/version.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/versions-atom.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/versions-atom.xml deleted file mode 100644 index 5c864fcee..000000000 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/versions-atom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - Available API Versions - 2010-12-12T18:30:02.25Z - http://identity.api.openstack.org/ - OpenStackhttp://www.openstack.org/ - - - http://identity.api.openstack.org/v2.0/ - Version v2.0 - 2011-05-27T20:22:02.25Z - - Version v2.1 CURRENT (2011-05-27T20:22:02.25Z) - - - http://identity.api.openstack.org/v1.1/ - Version v1.1 - 2010-12-12T18:30:02.25Z - - Version v1.1 CURRENT (2010-12-12T18:30:02.25Z) - - - http://identity.api.openstack.org/v1.0/ - Version v1.0 - 2009-10-09T11:30:00Z - - Version v1.0 DEPRECATED (2009-10-09T11:30:00Z) - - diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.json deleted file mode 100644 index ed806e631..000000000 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "versions": [ - { - "id": "v1.0", - "status": "DEPRECATED", - "updated": "2009-10-09T11:30:00Z", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v1.0/" - } - ] - }, - { - "id": "v1.1", - "status": "CURRENT", - "updated": "2010-12-12T18:30:02.25Z", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v1.1/" - } - ] - }, - { - "id": "v2.0", - "status": "BETA", - "updated": "2011-05-27T20:22:02.25Z", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v2.0/" - } - ] - } - ], - "versions_links": [] -} \ No newline at end of file diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.xml deleted file mode 100644 index 7e14e1c41..000000000 --- a/api-ref/src/wadls/identity-api/src/v2.0/samples/versions.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl index 2ac2d30c5..fb5dd954f 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl +++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl @@ -12,7 +12,6 @@ %common_project; ]> - - - - - - - - diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl index 3ad59bf54..7a75c21e1 100644 --- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl +++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl @@ -82,11 +82,6 @@ - - - - - &commonFaults; &getFaults; @@ -100,13 +95,6 @@ - - - - - - - &commonFaults; &getFaults; diff --git a/api-ref/src/wadls/identity-api/src/v3/samples/identity-version-resp.json b/api-ref/src/wadls/identity-api/src/v3/samples/identity-version-resp.json index 9581b2d3f..affb2df3a 100644 --- a/api-ref/src/wadls/identity-api/src/v3/samples/identity-version-resp.json +++ b/api-ref/src/wadls/identity-api/src/v3/samples/identity-version-resp.json @@ -1,23 +1,19 @@ { "version": { - "status": "stable", - "updated": "2013-03-06T00:00:00Z", + "id": "v3.4", + "links": [ + { + "href": "http://localhost:35357/v3/", + "rel": "self" + } + ], "media-types": [ { "base": "application/json", "type": "application/vnd.openstack.identity-v3+json" - }, - { - "base": "application/xml", - "type": "application/vnd.openstack.identity-v3+xml" } ], - "id": "v3.0", - "links": [ - { - "href": "http://23.253.228.211:35357/v3/", - "rel": "self" - } - ] + "status": "stable", + "updated": "2015-03-30T00:00:00Z" } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/identity-api/src/v3/samples/identity-version-resp.xml b/api-ref/src/wadls/identity-api/src/v3/samples/identity-version-resp.xml deleted file mode 100644 index 49476a7bc..000000000 --- a/api-ref/src/wadls/identity-api/src/v3/samples/identity-version-resp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/api-ref/src/wadls/identity-api/src/v3/samples/version-resp.json b/api-ref/src/wadls/identity-api/src/v3/samples/version-resp.json deleted file mode 100644 index 2d45c45bc..000000000 --- a/api-ref/src/wadls/identity-api/src/v3/samples/version-resp.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": { - "status": "stable", - "updated": "2013-03-06T00:00:00Z", - "media-types": [ - { - "base": "application/json", - "type": "application/vnd.openstack.identity-v3+json" - }, - { - "base": "application/xml", - "type": "application/vnd.openstack.identity-v3+xml" - } - ], - "id": "v3.0", - "links": [ - { - "href": "http://localhost:5000/v3/", - "rel": "self" - } - ] - } -} \ No newline at end of file diff --git a/api-ref/src/wadls/identity-api/src/v3/samples/version-resp.xml b/api-ref/src/wadls/identity-api/src/v3/samples/version-resp.xml deleted file mode 100644 index d1eda7f22..000000000 --- a/api-ref/src/wadls/identity-api/src/v3/samples/version-resp.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl b/api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl index 189daabde..119217dbb 100644 --- a/api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl +++ b/api-ref/src/wadls/identity-api/src/v3/wadl/identity-admin-v3.wadl @@ -450,14 +450,6 @@ /> - - - - - &commonFaults; &getFaults; - - - - - - - &versionParam; &statusParam; &updatedParam; + &versionParam; &statusParam; &updatedParam; &media-typesParam; &version-idParam; &version-linksParam; @@ -495,48 +478,54 @@ xml:lang="EN" title="Authenticate"> Authenticates and generates a token. - Returns a token, if successful. Each REST request - requires the inclusion of a specific authorization - token HTTP x-header, defined as - X-Auth-Token. Clients obtain - X-Auth-Token and the URL endpoints - for other service APIs by supplying their valid - credentials to the authentication service. - A REST interface provides client authentication by - using the POST method, with auth/tokens - supplied as the path. The body of the request must - include a payload of credentials including the - authentication method and, optionally, the - authorization scope. The scope includes either a - project or domain. If you include both project and - domain, an HTTP 400 Bad Request results, - because a token cannot be simultaneously scoped as - both a project and domain. + + Returns a token, if successful. Each REST request requires the + inclusion of a specific authorization token HTTP x-header, + defined as X-Auth-Token. Clients obtain X + -Auth-Token and the URL endpoints for other service + APIs by supplying their valid credentials to the + authentication service. + + + A REST interface provides client authentication by using the + POST method, with auth/tokens supplied as the + path. The body of the request must include a payload of + credentials including the authentication method and, + optionally, the authorization scope. The scope includes either + a project or domain. If you include both project and domain, + an HTTP 400 Bad Request results, because a token + cannot be simultaneously scoped as both a project and domain. + - If you do not include the optional scope and the - authenticating user has a defined default project - (the default_project_id attribute for - the user), that default project is treated as the - preferred authorization scope. - If no default project is defined, the token is - issued without an explicit scope of - authorization. + + If you do not include the optional scope and the + authenticating user has a defined default project (the + default_project_id attribute for the user), + that default project is treated as the preferred + authorization scope. + + + If no default project is defined, the token is issued + without an explicit scope of authorization. + - Provide one of the following sets of credentials to - authenticate: User ID and password, user name and - password scoped by domain ID or name, user ID and - password scoped by project ID or name with or without - domain scope, or token. + + Provide one of the following sets of credentials to + authenticate: User ID and password, user name and password + scoped by domain ID or name, user ID and password scoped by + project ID or name with or without domain scope, or token. +\ + The following examples demonstrate authentication requests with different types of credentials. - If scope is included, project - id uniquely identifies the - project. However, project - name uniquely identifies the - project only when used in - conjunction with a domain ID or a - domain name. + + If scope is included, project id + uniquely identifies the project. However, + project name uniquely identifies the + project only when used in conjunction with a + domain ID or a domain name. + If the authentication token has expired, a 401 response code is diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.json b/api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.json index 245f3ea20..e832fa55f 100644 --- a/api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.json +++ b/api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.json @@ -2,57 +2,44 @@ "versions": { "values": [ { - "status": "stable", - "updated": "2013-03-06T00:00:00Z", + "id": "v3.4", + "links": [ + { + "href": "http://localhost:35357/v3/", + "rel": "self" + } + ], "media-types": [ { "base": "application/json", "type": "application/vnd.openstack.identity-v3+json" - }, - { - "base": "application/xml", - "type": "application/vnd.openstack.identity-v3+xml" } ], - "id": "v3.0", - "links": [ - { - "href": "http://23.253.228.211:5000/v3/", - "rel": "self" - } - ] + "status": "stable", + "updated": "2015-03-30T00:00:00Z" }, { - "status": "stable", - "updated": "2014-04-17T00:00:00Z", + "id": "v2.0", + "links": [ + { + "href": "http://localhost:35357/v2.0/", + "rel": "self" + }, + { + "href": "http://docs.openstack.org/", + "rel": "describedby", + "type": "text/html" + } + ], "media-types": [ { "base": "application/json", "type": "application/vnd.openstack.identity-v2.0+json" - }, - { - "base": "application/xml", - "type": "application/vnd.openstack.identity-v2.0+xml" } ], - "id": "v2.0", - "links": [ - { - "href": "http://23.253.228.211:5000/v2.0/", - "rel": "self" - }, - { - "href": "http://docs.openstack.org/api/openstack-identity-service/2.0/content/", - "type": "text/html", - "rel": "describedby" - }, - { - "href": "http://docs.openstack.org/api/openstack-identity-service/2.0/identity-dev-guide-2.0.pdf", - "type": "application/pdf", - "rel": "describedby" - } - ] + "status": "stable", + "updated": "2014-04-17T00:00:00Z" } ] } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.xml b/api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.xml deleted file mode 100644 index 43400d267..000000000 --- a/api-ref/src/wadls/identity-api/src/v3/wadl/samples/identity-versions-response.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -