Add parent_id information in the Project options

In kilo, Keystone provide the possibility to create a project hierarchy.
Now, in the project operations, you can provide a parent_id to represent the
parent project.

This patch add the parent_id information in the identity API ref.
Updated code samples to use actual values rather than
placeholders like --endpoint-id-- (DF)

Change-Id: Idc22d9f0ff55f161bd0dc5a81974e91018e37b7b
This commit is contained in:
Raildo Mascena 2015-06-12 15:41:55 -03:00 committed by Diane Fleming
parent b7fecce212
commit c51138f746
13 changed files with 63 additions and 52 deletions

View File

@ -1,8 +1,9 @@
{ {
"project": { "project": {
"description": "...", "description": "My new project",
"domain_id": "...", "domain_id": "1789d1",
"enabled": "...", "parent_id": "123c56",
"name": "..." "enabled": true,
"name": "myNewProject"
} }
} }

View File

@ -1,11 +1,12 @@
{ {
"project": { "project": {
"domain_id": "--domain-id--", "domain_id": "1789d1",
"parent_id": "123c56",
"enabled": true, "enabled": true,
"id": "--project-id--", "id": "456789",
"links": { "links": {
"self": "http://identity:35357/v3/projects/--project-id--" "self": "http://identity:35357/v3/projects/456789"
}, },
"name": "a project name" "name": "myNewProject"
} }
} }

View File

@ -1,11 +1,12 @@
{ {
"project": { "project": {
"domain_id": "--domain-id--", "domain_id": "1789d1",
"parent_id": "123c56",
"enabled": true, "enabled": true,
"id": "--project-id--", "id": "456789",
"links": { "links": {
"self": "http://identity:35357/v3/projects/--project-id--" "self": "http://identity:35357/v3/projects/456789"
}, },
"name": "a project name" "name": "myNewProject"
} }
} }

View File

@ -1,22 +1,22 @@
{ {
"roles": [ "roles": [
{ {
"id": "--role-id--", "id": "123456",
"links": { "links": {
"self": "http://identity:35357/v3/roles/--role-id--" "self": "http://identity:35357/v3/roles/123456"
}, },
"name": "admin" "name": "admin"
}, },
{ {
"id": "--role-id--", "id": "123456",
"links": { "links": {
"self": "http://identity:35357/v3/roles/--role-id--" "self": "http://identity:35357/v3/roles/123456"
}, },
"name": "manager" "name": "manager"
} }
], ],
"links": { "links": {
"self": "http://identity:35357/v3/projects/--project-id--/groups/--group-id--/roles", "self": "http://identity:35357/v3/projects/456789/groups/101112/roles",
"previous": null, "previous": null,
"next": null "next": null
} }

View File

@ -1,22 +1,22 @@
{ {
"roles": [ "roles": [
{ {
"id": "--role-id--", "id": "123456",
"links": { "links": {
"self": "http://identity:35357/v3/roles/--role-id--" "self": "http://identity:35357/v3/roles/123456"
}, },
"name": "admin" "name": "admin"
}, },
{ {
"id": "--role-id--", "id": "123456",
"links": { "links": {
"self": "http://identity:35357/v3/roles/--role-id--" "self": "http://identity:35357/v3/roles/123456"
}, },
"name": "manager" "name": "manager"
} }
], ],
"links": { "links": {
"self": "http://identity:35357/v3/projects/--project-id--/users/--user-id--/roles", "self": "http://identity:35357/v3/projects/456789/users/313233/roles",
"previous": null, "previous": null,
"next": null "next": null
} }

View File

@ -1,7 +1,8 @@
{ {
"project": { "project": {
"description": "my updated project", "description": "My updated project",
"domain_id": "...", "domain_id": "1789d1",
"parent_id": "123c56",
"enabled": true, "enabled": true,
"name": "myUpdatedProject" "name": "myUpdatedProject"
} }

View File

@ -1,11 +1,12 @@
{ {
"project": { "project": {
"description": "my updated project", "description": "My updated project",
"domain_id": "--domain-id--", "domain_id": "1789d1",
"parent_id": "123c56",
"enabled": true, "enabled": true,
"id": "--project-id--", "id": "263fd9",
"links": { "links": {
"self": "http://identity:35357/v3/projects/--project-id--" "self": "http://identity:35357/v3/projects/263fd9"
}, },
"name": "myUpdatedProject" "name": "myUpdatedProject"
} }

View File

@ -2,6 +2,7 @@
"projects": [ "projects": [
{ {
"domain_id": "1789d1", "domain_id": "1789d1",
"parent_id": "123c56",
"enabled": true, "enabled": true,
"id": "263fd9", "id": "263fd9",
"links": { "links": {
@ -11,6 +12,7 @@
}, },
{ {
"domain_id": "1789d1", "domain_id": "1789d1",
"parent_id": "123c56",
"enabled": true, "enabled": true,
"id": "50ef01", "id": "50ef01",
"links": { "links": {

View File

@ -1,6 +1,7 @@
{ {
"project": { "project": {
"domain_id": "1789d1", "domain_id": "1789d1",
"parent_id": "123c56",
"enabled": true, "enabled": true,
"id": "263fd9", "id": "263fd9",
"name": "project-x", "name": "project-x",

View File

@ -2,29 +2,29 @@
"projects": [ "projects": [
{ {
"description": "description of this project", "description": "description of this project",
"domain_id": "--domain-id--", "domain_id": "161718",
"enabled": true, "enabled": true,
"id": "--project-id--", "id": "456789",
"parent_id": "--parent-project-id--", "parent_id": "212223",
"links": { "links": {
"self": "http://identity:35357/v3/projects/--project-id--" "self": "http://identity:35357/v3/projects/456789"
}, },
"name": "a project name" "name": "a project name"
}, },
{ {
"description": "description of this project", "description": "description of this project",
"domain_id": "--domain-id--", "domain_id": "161718",
"enabled": true, "enabled": true,
"id": "--project-id--", "id": "456789",
"parent_id": "--parent-project-id--", "parent_id": "212223",
"links": { "links": {
"self": "http://identity:35357/v3/projects/--project-id--" "self": "http://identity:35357/v3/projects/456789"
}, },
"name": "another domain" "name": "another domain"
} }
], ],
"links": { "links": {
"self": "http://identity:35357/v3/users/--user-id--/projects", "self": "http://identity:35357/v3/users/313233/projects",
"previous": null, "previous": null,
"next": null "next": null
} }

View File

@ -107,6 +107,14 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN"><para>Filters xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN"><para>Filters
on domain_id.</para></wadl:doc> on domain_id.</para></wadl:doc>
</param>'> </param>'>
<!ENTITY parent_idQueryParam '
<param name="parent_id" style="query"
xmlns="http://wadl.dev.java.net/2009/02" type="xsd:string"
required="false">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN"><para>Filters
on parent_id.</para></wadl:doc>
</param>'>
<!--<!ENTITY addPolicyParams '--> <!--<!ENTITY addPolicyParams '-->
<!ENTITY blobRequestParam ' <!ENTITY blobRequestParam '
<param name="blob" style="plain" type="xsd:string" <param name="blob" style="plain" type="xsd:string"

View File

@ -1296,9 +1296,10 @@
<!--No request body is provided--> <!--No request body is provided-->
<request> <request>
<representation mediaType="application/json"> <representation mediaType="application/json">
&domain_idQueryParam; &nameQueryParam; &domain_idQueryParam; &parent_idQueryParam;
&enabledQueryParam; &pageQueryParam; &nameQueryParam; &enabledQueryParam;
&per_pageQueryParam; </representation> &pageQueryParam; &per_pageQueryParam;
</representation>
</request> </request>
<response status="200"> <response status="200">
<representation mediaType="application/json"> <representation mediaType="application/json">

6
{
View File

@ -1,6 +0,0 @@
{
"remove_interface": {
"address": "aa:aa:aa:aa:aa:aa"
}
}