Merge "Add Service Catalog definition to identity-api"

This commit is contained in:
Jenkins 2013-12-28 08:14:09 +00:00 committed by Gerrit Code Review
commit fa69275135

View File

@ -975,11 +975,27 @@ Optional attributes:
Includes the full resource description of a domain.
- `catalog` (object)
- `catalog` (list of object)
Specifies all endpoints available to/for the token.
Specifies all the services available to/for the token. It is represented as a
list of service dictionaries with the following format:
FIXME(dolph): revise with specific expectations.
[
{
"id": "--service-id--",
"type": "--service-type--",
"endpoints": [
{
"id": "--endpoint-id--",
"interface": "--interface-name--",
"region": "--region-name--",
"url": "--endpoint-url--"
},
...
]
},
...
]
- `bind` (object) *New in version 3.1*
@ -1363,7 +1379,32 @@ the user's roles applicable to the `project`. Example response:
{
"token": {
"catalog": "FIXME(dolph): need an example here",
"catalog": [
{
"endpoints": [
{
"id": "39dc322ce86c4111b4f06c2eeae0841b",
"interface": "public",
"region": "RegionOne",
"url": "http://localhost:5000"
},
{
"id": "ec642f27474842e78bf059f6c48f4e99",
"interface": "internal",
"region": "RegionOne",
"url": "http://localhost:5000"
},
{
"id": "c609fc430175452290b62a4242e8a7e8",
"interface": "admin",
"region": "RegionOne",
"url": "http://localhost:35357"
}
],
"id": "4363ae44bdf34a3981fde3b823cb9aa2",
"type": "identity"
}
],
"expires_at": "2013-02-27T18:30:59.999999Z",
"issued_at": "2013-02-27T16:30:59.999999Z",
"methods": [
@ -1425,7 +1466,32 @@ user's roles applicable to the `domain`. Example response:
{
"token": {
"catalog": "FIXME(dolph): need an example here",
"catalog": [
{
"endpoints": [
{
"id": "39dc322ce86c4111b4f06c2eeae0841b",
"interface": "public",
"region": "RegionOne",
"url": "http://localhost:5000"
},
{
"id": "ec642f27474842e78bf059f6c48f4e99",
"interface": "internal",
"region": "RegionOne",
"url": "http://localhost:5000"
},
{
"id": "c609fc430175452290b62a4242e8a7e8",
"interface": "admin",
"region": "RegionOne",
"url": "http://localhost:35357"
}
],
"id": "4363ae44bdf34a3981fde3b823cb9aa2",
"type": "identity"
}
],
"expires_at": "2013-02-27T18:30:59.999999Z",
"issued_at": "2013-02-27T16:30:59.999999Z",
"methods": [