From 86cee5627e43c2d0a07bb61dbbb43af04c8e2e35 Mon Sep 17 00:00:00 2001 From: yangweiwei Date: Thu, 19 Nov 2015 01:25:40 +0000 Subject: [PATCH] Update sample responses to list v3/endpoints and v3/policies The GET v3/endpoints response does not contain 'name' but does contain 'url'. The GET v3/policies response contains the key of 'policies' rather than 'blob'. Also, it does not necessarily return 'Project_id' and 'user_id'. Change-Id: Ib2ffc21d8ff2c2c9f80b8823628c55bacc455bf6 --- .../src/v3/samples/EndpointsListResponse.json | 31 +++++++------ .../src/v3/samples/PoliciesListResponse.json | 45 +++++++------------ 2 files changed, 31 insertions(+), 45 deletions(-) diff --git a/api-ref/src/wadls/identity-api/src/v3/samples/EndpointsListResponse.json b/api-ref/src/wadls/identity-api/src/v3/samples/EndpointsListResponse.json index f2f51ba52..e2638d744 100644 --- a/api-ref/src/wadls/identity-api/src/v3/samples/EndpointsListResponse.json +++ b/api-ref/src/wadls/identity-api/src/v3/samples/EndpointsListResponse.json @@ -1,22 +1,21 @@ { "endpoints": [ { - "id": "828384", + "region_id": "RegionOne", + "links": { + "self": "http://identity:35357/v3/endpoints/16cc0008313544c198ed50f33ba863d1" + }, + "url": "http://identity:8774/v2/$(tenant_id)s", + "region": "RegionOne", + "enabled": true, "interface": "public", - "links": { - "self": "http://identity:35357/v3/endpoints/828384" - }, - "name": "the public volume endpoint", - "service_id": "686766" - }, - { - "id": "642136", - "interface": "internal", - "links": { - "self": "http://identity:35357/v3/endpoints/642136" - }, - "name": "the internal volume endpoint", - "service_id": "686766" + "service_id": "b9e34f93ef0b459b94fbaf77fc9ee976", + "id": "16cc0008313544c198ed50f33ba863d1" } - ] + ], + "links": { + "self": "http://identity:35357/v3/endpoints", + "previous": null, + "next": null + } } diff --git a/api-ref/src/wadls/identity-api/src/v3/samples/PoliciesListResponse.json b/api-ref/src/wadls/identity-api/src/v3/samples/PoliciesListResponse.json index e7fe0b9d8..1060afb90 100644 --- a/api-ref/src/wadls/identity-api/src/v3/samples/PoliciesListResponse.json +++ b/api-ref/src/wadls/identity-api/src/v3/samples/PoliciesListResponse.json @@ -1,30 +1,17 @@ -[ - { - "blob": { - "foobar_user": [ - "role:compute-user" - ] - }, - "id": "717273", - "links": { - "self": "http://identity:35357/v3/policies/717273" - }, - "project_id": "456789", - "type": "application/json", - "user_id": "616263" +{ + "links": { + "self": "http://identity:35357/v3/policies", + "previous": null, + "next": null }, - { - "blob": { - "foobar_user": [ - "role:compute-user" - ] - }, - "id": "717274", - "links": { - "self": "http://identity:35357/v3/policies/717274" - }, - "project_id": "456789", - "type": "application/json", - "user_id": "616263" - } -] + "policies": [ + { + "type": "application/json", + "id": "ea578b7ac0604b699d255e62d07677db", + "links": { + "self": "http://identity:35357/v3/policies/ea578b7ac0604b699d255e62d07677db" + }, + "blob": "{'foobar_user': 'role:compute-user'}" + } + ] +}