openstack-attic/identity-api
Code Issues Proposed changes

Pretty print JSON sample files and remove unused files

Browse Source 
Pretty print JSON samples to follow JSON formatting conventions.

Replace JSON and XML files with reference to api-site, so that we only
have one place with these files.

Remove unused JSON and XML sample files.

Co-Autored-By: Diane Fleming <diane.fleming@rackspace.com>

Partial-Bug: #1217503

Change-Id: If7b98a321b373d183859ba1ebce5cdd131b43161
This commit is contained in:
Andreas Jaeger
2014-05-09 10:56:22 +02:00
parent 95cd8c8fa1
commit e4ef1a357f
118 changed files with 387 additions and 5172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openstack-identity-api/v2.0/src/docbkx/HP-IDM/HP-IDM.xml
View File

@@ -158,7 +158,7 @@
Use the HP-IDM extension to perform the following operations on templates: Use the HP-IDM extension to perform the following operations on templates:
</para> </para>
<wadl:resources> <wadl:resources>
<wadl:resource href="../wadl/HP-IDM-admin.wadl#tokenById"/> <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/HP-IDM-admin.wadl#tokenById"/>
</wadl:resources> </wadl:resources>
</section> </section>
</section> </section>

9
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/create_user_request.json
View File

@@ -1,9 +0,0 @@
{
"user": {
"name": "jqsmith",
"OS-KSADM:password": "secrete",
"enabled": true,
"tenantId": "af615b6af60b497e860392ad5e9f8dab",
"email": "john.smith@example.org"
}
}

6
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.json
View File

@@ -1,6 +0,0 @@
{
"passwordCredentials": {
"username": "test_user",
"password": "mypass"
}
}

3
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.xml
View File

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<passwordCredentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://docs.openstack.org/identity/api/v2.0" username="test_user" password="test"/>

7
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.json
View File

@@ -1,7 +0,0 @@
{
"role": {
"id": "123",
"name": "Guest",
"description": "Guest Access"
}
}

4
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<role xmlns="http://docs.openstack.org/identity/api/v2.0"
id="123" name="Admin" description="All Access" />

9
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.json
View File

@@ -1,9 +0,0 @@
{
"roles":[{
"id": "123",
"name": "compute:admin",
"description": "Nova Administrator"
}
],
"roles_links":[]
}

6
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
<role id="123" name="Admin" description="All Access" />
<role id="234" name="Guest" description="Guest Access" />
</roles>

8
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.json
View File

@@ -1,8 +0,0 @@
{
"OS-KSADM:service":{
"id": "123",
"name": "nova",
"type": "compute",
"description": "OpenStack Compute Service"
}
}

5
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<service
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
id="123" name="nova" type="compute"
description="OpenStack Compute Service"/>

16
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.json
View File

@@ -1,16 +0,0 @@
{
"OS-KSADM:services":[{
"id": "123",
"name": "nova",
"type": "compute",
"description": "OpenStack Compute Service"
},
{
"id": "234",
"name": "glance",
"type": "image",
"description": "OpenStack Image Service"
}
],
"OS-KSADM:services_links":[]
}

8
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<services
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0">
<service id="123" name="nova" type="compute"
description="OpenStack Compute Service"/>
<service id="234" name="glance" type="image"
description="OpenStack Image Service"/>
</services>

8
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.json
View File

@@ -1,8 +0,0 @@
{
"tenant": {
"id": "1234",
"name": "ACME corp",
"description": "A description ...",
"enabled": true
}
}

5
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" id="1234" name="ACME Corp">
<description>A description...</description>
</tenant>

7
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.json
View File

@@ -1,7 +0,0 @@
{
"tenant": {
"name": "ACME corp",
"description": "A description ...",
"enabled": true
}
}

5
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" name="ACME Corp">
<description>A description...</description>
</tenant>

9
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.json
View File

@@ -1,9 +0,0 @@
{
"user": {
"name": "jqsmith",
"id": "84cdc81d5ba5448f885f857c3e7ae7dd",
"enabled": true,
"email": "john.smith@example.org",
"tenantId": "af615b6af60b497e860392ad5e9f8dab"
}
}

4
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
username="jqsmith" id="u1000"/>

16
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.json
View File

@@ -1,16 +0,0 @@
{
"users":[{
"id": "u1000",
"username": "jqsmith",
"email": "john.smith@example.org",
"enabled": true
},
{
"id": "u1001",
"username": "jqsmith",
"email": "john.smith@example.org",
"enabled": true
}
],
"users_links":[]
}

9
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<users xmlns="http://docs.openstack.org/identity/api/v2.0">
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
username="jqsmith" id="u1000"/>
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
username="jqsmith" id="u1001"/>
</users>

5
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.json
View File

@@ -1,5 +0,0 @@
{
"user": {
"enabled": true
}
}

5
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<user xmlns="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:type="UserWithOnlyEnabled"
enabled="true"/>

8
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.json
View File

@@ -1,8 +0,0 @@
{
"user": {
"username": "jqsmith",
"email": "john.smith@example.org",
"enabled": true,
"OS-KSADM:password": "secrete"
}
}

6
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
xmlns:OS-KSADM="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
enabled="true" email="john.smith@example.org"
username="jqsmith"
OS-KSADM:password="secrete"/>

14
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.json
View File

@@ -1,14 +0,0 @@
{
"endpoint": {
"id": 1,
"tenantId": 1,
"region": "North",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
}
}

18
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.xml
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpoint
id="1"
tenantId="1"
type="compute"
name="Compute"
region="North"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>

14
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.json
View File

@@ -1,14 +0,0 @@
{
"OS-KSCATALOG:endpointTemplate":{
"id": 1,
"region": "North",
"global": true,
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/",
"enabled": true
}
}

18
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.xml
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpointTemplate
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
id="1"
region="North"
global="true"
type="compute"
name="Compute"
publicURL="https://service-public.com/v1"
internalURL="https://service-internal.com/v1"
enabled="true">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpointTemplate>

5
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.json
View File

@@ -1,5 +0,0 @@
{
"OS-KSCATALOG:endpointTemplate":{
"id": 1
}
}

6
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpointTemplate
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:type="EndpointTemplateWithOnlyId"
id="1"/>

59
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.json
View File

@@ -1,59 +0,0 @@
{
"OS-KSCATALOG:endpointsTemplates": [
{
"id": 1,
"region": "North",
"global": true,
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/",
"enabled": true
},
{
"id": 2,
"region": "South",
"type": "compute",
"publicURL": "https://compute.south.public.com/v1",
"internalURL": "https://compute.south.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.south.public.com/v1/",
"versionList": "https://compute.south.public.com/",
"enabled": false
},
{
"id": 3,
"region": "North",
"global": true,
"type": "object-store",
"publicURL": "https://object-store.north.public.com/v1.0",
"versionId": "1.0",
"versionInfo": "https://object-store.north.public.com/v1.0/",
"versionList": "https://object-store.north.public.com/",
"enabled": true
},
{
"id": 4,
"region": "South",
"type": "object-store",
"publicURL": "https://object-store.south.public.com/v2",
"versionId": "2",
"versionInfo": "https://object-store.south.public.com/v2/",
"versionList": "https://object-store.south.public.com/",
"enabled": true
},
{
"id": 5,
"global": true,
"type": "OS-DNS:DNS",
"publicURL": "https://dns.public.com/v3.2",
"versionId": "1.0",
"versionInfo": "https://dns.public.com/v1.0/",
"versionList": "https://dns.public.com/",
"enabled": true
}
],
"OS-KSCATALOG:endpointsTemplates_links": []
}

67
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.xml
View File

@@ -1,67 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpointTemplates xmlns="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0">
<endpointTemplate
id="1"
region="North"
global="true"
type="compute"
name="Compute"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
enabled="true">
<version
id="1"
list="https://compute.north.public.com/"
info="https://compute.north.public.com/v1"/>
</endpointTemplate>
<endpointTemplate
id="2"
region="south"
type="compute"
name="Compute"
publicURL="https://service2.public.com/v1"
internalURL="https://service2.internal.public.com/v1"
enabled="false">
<version
id="1"
list="https://service1.public.com/"
info="https://service1.public.com/v1"/>
</endpointTemplate>
<endpointTemplate
id="3"
region="DFW"
global="true"
type="ext1:service1"
name="Compute"
publicURL="https://service1.public.com/v1"
enabled="true">
<version
id="1"
list="https://service1.public.com/"
info="https://service1.public.com/v1"/>
</endpointTemplate>
<endpointTemplate
id="4"
region="ORD"
type="compute"
name="Compute"
publicURL="https://service2.public.com/v1"
enabled="true">
<version
id="1"
list="https://service1.public.com/"
info="https://service1.public.com/v1"/>
</endpointTemplate>
<endpointTemplate
id="5"
global="true"
type="compute"
name="Compute"
publicURL="https://service3.public.com/v1">
<version
id="1"
list="https://service1.public.com/"
info="https://service1.public.com/v1"/>
</endpointTemplate>
</endpointTemplates>

64
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.json
View File

@@ -1,64 +0,0 @@
{
"endpoints":[{
"id": 1,
"tenantId": "1",
"region": "North",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
},
{
"id": 2,
"tenantId": "1",
"region": "South",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
},
{
"id": 3,
"tenantId": "1",
"region": "East",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
},
{
"id": 4,
"tenantId": "1",
"region": "West",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
},
{
"id": 5,
"tenantId": "1",
"region": "Global",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
}
],
"endpoints_links":[]
}

75
openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.xml
View File

@@ -1,75 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpoints
xmlns="http://docs.openstack.org/identity/api/v2.0">
<endpoint
id="1"
tenantId="1"
type="compute"
name="Compute"
region="North"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="2"
tenantId="2"
type="compute"
name="Compute"
region="South"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="3"
tenantId="1"
type="compute"
name="Compute"
region="East"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1"
/>
<endpoint
id="4"
tenantId="1"
type="compute"
name="Compute"
region="West"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="5"
tenantId="1"
type="compute"
name="Compute"
region="Global"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
</endpoints>

10
openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.json
View File

@@ -1,10 +0,0 @@
{
"auth":{
"OS-KSEC2-ec2Credentials":{
"username": "test_user",
"secret": "aaaaa",
"signature": "bbb"
},
"tenantId": "77654"
}
}

10
openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<auth
xmlns="http://docs.openstack.org/identity/api/v2.0"
tenantId="1234">
<ec2Credentials
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
username="testuser"
key="aaaaa"
signature="bbbbb"/>
</auth>

17
openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.json
View File

@@ -1,17 +0,0 @@
{
"credentials":[{
"passwordCredentials":{
"username": "test_user",
"password": "mypass"
}
},
{
"OS-KSEC2-ec2Credentials":{
"username": "test_user",
"secret": "aaaaa",
"signature": "bbb"
}
}
],
"credentials_links":[]
}

7
openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.xml
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<passwordCredentials username="test_user" password="test"/>
<ec2Credentials xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
username="testuser" key="aaaaa" signature="bbbbb"/>
</credentials>

7
openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.json
View File

@@ -1,7 +0,0 @@
{
"OS-KSEC2-ec2Credentials":{
"username": "test_user",
"secret": "aaaaa",
"signature": "bbb"
}
}

6
openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ec2Credentials
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0"
username="testuser"
key="aaaaa"
signature="bbbbb"/>

34
openstack-identity-api/v2.0/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml
View File

@@ -36,8 +36,8 @@
<!ENTITY NAMESPACE "http://docs.rackspace.com/identity/api/ext/OS-KSS3/v1.0"> <!ENTITY NAMESPACE "http://docs.rackspace.com/identity/api/ext/OS-KSS3/v1.0">
<!ENTITY CURRENTGUIDE "http://docs.openstack.org"> <!ENTITY CURRENTGUIDE "http://docs.openstack.org">
<!ENTITY S3CREDENTIALSREQUESTXML "samples/s3Credentials.xml"> <!ENTITY S3CREDENTIALSREQUESTXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/s3Credentials.xml">
<!ENTITY S3CREDENTIALSREQUESTJSON "samples/s3Credentials.json"> <!ENTITY S3CREDENTIALSREQUESTJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/OS-KSS3/samples/s3Credentials.json">
]> ]>
<book xmlns="http://docbook.org/ns/docbook" <book xmlns="http://docbook.org/ns/docbook"
@@ -186,21 +186,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<wadl:resources <wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02"> xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource <wadl:resource
href="../wadl/OS-KSS3-admin.wadl#userCredentials"> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl#userCredentials">
<wadl:method href="listCredentials"/> <wadl:method href="listCredentials"/>
<wadl:method href="addUserCredential"/> <wadl:method href="addUserCredential"/>
</wadl:resource> </wadl:resource>
<wadl:resource <wadl:resource
href="../wadl/OS-KSS3-admin.wadl#userCredentialsByType"> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl#userCredentialsByType">
<wadl:method href="getUserCredential"/> <wadl:method href="getUserCredential"/>
<wadl:method href="updateUserCredential"/> <wadl:method href="updateUserCredential"/>
<wadl:method href="deleteUserCredential"/> <wadl:method href="deleteUserCredential"/>
</wadl:resource> </wadl:resource>
</wadl:resources> </wadl:resources>
</section>
</section> </section>
</section>
</chapter> </chapter>
</book> </book>

17
openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.json
View File

@@ -1,17 +0,0 @@
{
"credentials":[{
"passwordCredentials":{
"username": "test_user",
"password": "mypass"
}
},
{
"OS-KSS3:s3Credentials":{
"username": "test_user",
"secret": "aaaaa",
"signature": "bbb"
}
}
],
"credentials_links":[]
}

7
openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.xml
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<passwordCredentials username="test_user" password="test"/>
<s3Credentials xmlns="http://docs.openstack.org/identity/api/ext/OS-KSS3/v1.0"
username="testuser" key="aaaaa" signature="bbbbb"/>
</credentials>

7
openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.json
View File

@@ -1,7 +0,0 @@
{
"OS-KSS3:s3Credentials":{
"username": "test_user",
"secret": "aaaaa",
"signature": "bbb"
}
}

6
openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<s3Credentials
xmlns="http://docs.openstack.org/identity/api/ext/OS-KSS3/v1.0"
username="testuser"
key="aaaaa"
signature="bbbbb"/>

32
openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml
View File

@@ -135,8 +135,8 @@
<section xml:id="NewElement0001"> <section xml:id="NewElement0001">
<title>New Elements</title> <title>New Elements</title>
<section xml:id="RackExt-0001"> <section xml:id="RackExt-0001">
<title>OS-KSVALIDATE extension to Identity <title>OS-KSVALIDATE extension to Identity v2.0
v2.0 API</title> API</title>
<section xml:id="New-Elements-details-0002"> <section xml:id="New-Elements-details-0002">
<title>New Elements</title> <title>New Elements</title>
<para>This extension allows token validation and <para>This extension allows token validation and
@@ -166,21 +166,21 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<wadl:resources <wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02"> xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource <wadl:resource
href="../wadl/OS-KSVALIDATE-admin.wadl#validate"> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl#validate">
<wadl:method href="validateToken"/> <wadl:method href="validateToken"/>
<wadl:method href="checkToken"/> <wadl:method href="checkToken"/>
</wadl:resource> </wadl:resource>
<wadl:resource <wadl:resource
href="../wadl/OS-KSVALIDATE-admin.wadl#endpointsForToken"> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl#endpointsForToken">
<wadl:method <wadl:method href="listEndpointsForToken"
href="listEndpointsForToken"/> />
</wadl:resource> </wadl:resource>
</wadl:resources> </wadl:resources>
</section>
</section> </section>
</section> </section>
</section>
</chapter> </chapter>
</book> </book>

64
openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.json
View File

@@ -1,64 +0,0 @@
{
"endpoints":[{
"id": 1,
"tenantId": "1",
"region": "North",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
},
{
"id": 2,
"tenantId": "1",
"region": "South",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
},
{
"id": 3,
"tenantId": "1",
"region": "East",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
},
{
"id": 4,
"tenantId": "1",
"region": "West",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
},
{
"id": 5,
"tenantId": "1",
"region": "Global",
"type": "compute",
"publicURL": "https://compute.north.public.com/v1",
"internalURL": "https://compute.north.internal.com/v1",
"adminURL": "https://compute.north.internal.com/v1",
"versionId": "1",
"versionInfo": "https://compute.north.public.com/v1/",
"versionList": "https://compute.north.public.com/"
}
],
"endpoints_links":[]
}

75
openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.xml
View File

@@ -1,75 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<endpoints
xmlns="http://docs.openstack.org/identity/api/v2.0">
<endpoint
id="1"
tenantId="1"
type="compute"
name="Compute"
region="North"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="2"
tenantId="2"
type="compute"
name="Compute"
region="South"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="3"
tenantId="1"
type="compute"
name="Compute"
region="East"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1"
/>
<endpoint
id="4"
tenantId="1"
type="compute"
name="Compute"
region="West"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
<endpoint
id="5"
tenantId="1"
type="compute"
name="Compute"
region="Global"
publicURL="https://compute.north.public.com/v1"
internalURL="https://compute.north.internal.com/v1"
adminURL="https://compute.north.internal.com/v1">
<version
id="1"
info="https://compute.north.public.com/v1/"
list="https://compute.north.public.com/"
/>
</endpoint>
</endpoints>

27
openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.json
View File

@@ -1,27 +0,0 @@
{
"access":{
"token":{
"id": "ab48a9efdfedb23ty3494",
"expires": "2010-11-01T03:32:15-05:00",
"tenant":{
"id": "345",
"name": "My Project"
}
},
"user":{
"id": "123",
"name": "jqsmith",
"roles":[{
"id": "234",
"name": "compute:admin"
},
{
"id": "234",
"name": "object-store:admin",
"tenantId": "1"
}
],
"roles_links":[]
}
}
}

12
openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<access xmlns="http://docs.openstack.org/identity/api/v2.0">
<token id="ab48a9efdfedb23ty3494" expires="2010-11-01T03:32:15-05:00">
<tenant id="456" name="My Project" />
</token>
<user id="123" name="jqsmith">
<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
<role id="123" name="Admin" tenantId="one"/>
<role id="234" name="object-store:admin" tenantId="1"/>
</roles>
</user>
</access>

35
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml
View File

@@ -32,14 +32,14 @@
</tr> </tr>
</thead>'> </thead>'>
<!ENTITY GROUPSREQUESTXML "../RAX-GRPADM/samples/groups.xml"> <!ENTITY GROUPSREQUESTXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-GRPADM/samples/groups.xml">
<!ENTITY GROUPSREQUESTJSON "../RAX-GRPADM/samples/groups.json"> <!ENTITY GROUPSREQUESTJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-GRPADM/samples/groups.json">
<!ENTITY GROUPREQUESTXML "../RAX-GRPADM/samples/group.xml"> <!ENTITY GROUPREQUESTXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-GRPADM/samples/group.xml">
<!ENTITY GROUPREQUESTJSON "../RAX-GRPADM/samples/group.json"> <!ENTITY GROUPREQUESTJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-GRPADM/samples/group.json">
<!ENTITY UPDATEDGROUPREQUESTXML "../RAX-GRPADM/samples/group-updated.xml"> <!ENTITY UPDATEDGROUPREQUESTXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-GRPADM/samples/group-updated.xml">
<!ENTITY UPDATEDGROUPREQUESTJSON "../RAX-GRPADM/samples/group-updated.json"> <!ENTITY UPDATEDGROUPREQUESTJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-GRPADM/samples/group-updated.json">
<!-- Information about the extension --> <!-- Information about the extension -->
<!ENTITY PUB_DATE "2011-01-23"> <!ENTITY PUB_DATE "2011-01-23">
@@ -96,8 +96,8 @@
name="OpenStack Identity Rackspace Group Admin" name="OpenStack Identity Rackspace Group Admin"
namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0" namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0"
alias="RAX-GRPADM" updated="2011-08-14T13:25:27-06:00"> alias="RAX-GRPADM" updated="2011-08-14T13:25:27-06:00">
<description> Rackspace extensions to Identity <description> Rackspace extensions to Identity v2.0 API
v2.0 API enabling Group Admin. </description> enabling Group Admin. </description>
<atom:link rel="describedby" type="application/pdf" <atom:link rel="describedby" type="application/pdf"
href="https://raw.github.com/openstack/identity-api/master/openstack-identity-api/src/docbkx/extensions/RAX-GRPADM/RAX-GRPADM-devguide.pdf"/> href="https://raw.github.com/openstack/identity-api/master/openstack-identity-api/src/docbkx/extensions/RAX-GRPADM/RAX-GRPADM-devguide.pdf"/>
<atom:link rel="describedby" <atom:link rel="describedby"
@@ -106,9 +106,9 @@
/> />
</extension> </extension>
<abstract> <abstract>
<para>This document is for software developers <para>This document is for software developers who want to
who want to use the Group Admin Extension to the use the Group Admin Extension to the OpenStack
OpenStack Identity Application Programming Interface Identity Application Programming Interface
(<abbrev>API</abbrev>).</para> (<abbrev>API</abbrev>).</para>
</abstract> </abstract>
<revhistory> <revhistory>
@@ -191,24 +191,25 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<para>A new resource is created at <literal>/RAX-GRPADM/groups</literal> that <para>A new resource is created at
enables the management of groups.</para> <literal>/RAX-GRPADM/groups</literal> that enables
the management of groups.</para>
<section xml:id="Group_Operations_RAX_KSGRPADM"> <section xml:id="Group_Operations_RAX_KSGRPADM">
<title>Group Operations</title> <title>Group Operations</title>
<wadl:resources <wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02"> xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource <wadl:resource
href="../wadl/RAX-GRPADM.wadl#groups"> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-GRPADM.wadl#groups">
<wadl:method href="addGroup"/> <wadl:method href="addGroup"/>
</wadl:resource> </wadl:resource>
<wadl:resource <wadl:resource
href="../wadl/RAX-GRPADM.wadl#group"> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-GRPADM.wadl#group">
<wadl:method href="getGroup"/> <wadl:method href="getGroup"/>
<wadl:method href="updateGroup"/> <wadl:method href="updateGroup"/>
<wadl:method href="getUsersForGroup"/>
<wadl:method href="deleteGroup"/> <wadl:method href="deleteGroup"/>
</wadl:resource> </wadl:resource>
<wadl:resource href="../wadl/RAX-GRPADM.wadl#user"> <wadl:resource
href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-GRPADM.wadl#user">
<wadl:method href="addUserToGroup"/> <wadl:method href="addUserToGroup"/>
<wadl:method href="removeUserFromGroup"/> <wadl:method href="removeUserFromGroup"/>
</wadl:resource> </wadl:resource>

6
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.json
View File

@@ -1,6 +0,0 @@
{
"RAX-KSGRP:group": {
"name": "group1",
"description": "A Description of the group"
}
}

3
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.xml
View File

@@ -1,3 +0,0 @@
<group name="group1" xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
<description>A Description of the group</description>
</group>

6
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.json
View File

@@ -1,6 +0,0 @@
{
"RAX-KSGRP:group": {
"name": "newName",
"description": "A Description of the group"
}
}

3
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.xml
View File

@@ -1,3 +0,0 @@
<group name="newName" xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
<description>A new description</description>
</group>

7
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.json
View File

@@ -1,7 +0,0 @@
{
"RAX-KSGRP:group": {
"id": "1234",
"name": "newName",
"description": "A new description"
}
}

3
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.xml
View File

@@ -1,3 +0,0 @@
<group id="1234" name="newName" xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
<description>A new description</description>
</group>

7
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.json
View File

@@ -1,7 +0,0 @@
{
"RAX-KSGRP:group": {
"id": "1234",
"name": "group1",
"description": "A Description of the group"
}
}

3
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.xml
View File

@@ -1,3 +0,0 @@
<group id="1234" name="group1" xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
<description>A Description of the group</description>
</group>

25
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.json
View File

@@ -1,25 +0,0 @@
{
"RAX-KSGRP:groups": [
{
"id": "1234",
"name": "group1",
"description": "A Description of the group"
},
{
"id": "1235",
"name": "group2",
"description": "A Description of the group"
},
{
"id": "1236",
"name": "group3",
"description": "A Description of the group"
}
],
"RAX-KSGRP:groups_links": [
{
"rel": "next",
"href": "https://identity.openstack.com/v2.0/RAX-GRPADM/groups?marker=1236"
}
]
}

13
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.xml
View File

@@ -1,13 +0,0 @@
<groups xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0"
xmlns:atom="http://www.w3.org/2005/Atom">
<group id="1234" name="group1">
<description>A Description of the group</description>
</group>
<group id="1235" name="group2">
<description>A Description of the group</description>
</group>
<group id="1236" name="group3">
<description>A Description of the group</description>
</group>
<atom:link rel="next" href="https://identity.openstack.com/v2.0/RAX-GRPADM/groups?marker=1236"/>
</groups>

17
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.json
View File

@@ -1,17 +0,0 @@
{
"users": [
{
"id": "u1000",
"username": "jqsmith",
"email": "john.smith@example.org",
"enabled": true
},
{
"id": "u1001",
"username": "jqsmith",
"email": "john.smith@example.org",
"enabled": true
}
],
"users_links": []
}

9
openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<users xmlns="http://docs.openstack.org/identity/api/v2.0">
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
username="jqsmith" id="u1000"/>
<user xmlns="http://docs.openstack.org/identity/api/v2.0"
enabled="true" email="john.smith@example.org"
username="jqsmith" id="u1001"/>
</users>

41
openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml
View File

@@ -36,15 +36,15 @@
<!ENTITY NAMESPACE "http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0"> <!ENTITY NAMESPACE "http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
<!ENTITY CURRENTGUIDE "http://docs.rackspace.com/api"> <!ENTITY CURRENTGUIDE "http://docs.rackspace.com/api">
<!ENTITY EXTENSIONXSD "xsd/RAX-KSGRP-groups.xsd"> <!ENTITY EXTENSIONXSD "xsd/RAX-KSGRP-groups.xsd">
<!ENTITY GROUPSXML "samples/RAX-KSGRP-groups.xml"> <!ENTITY GROUPSXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSGRP/samples/RAX-KSGRP-groups.xml">
<!ENTITY GROUPSJSON "samples/RAX-KSGRP-groups.json"> <!ENTITY GROUPSJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSGRP/samples/RAX-KSGRP-groups.json">
<!ENTITY GROUPXML "samples/RAX-KSGRP-group.xml"> <!ENTITY GROUPXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSGRP/samples/RAX-KSGRP-group.xml">
<!ENTITY GROUPJSON "samples/RAX-KSGRP-group.json"> <!ENTITY GROUPJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSGRP/samples/RAX-KSGRP-group.json">
<!ENTITY GROUPREQUESTXML "../../common/samples/auth_credentials.xml"> <!ENTITY GROUPREQUESTXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSGRP/samples/auth_credentials.xml">
<!ENTITY GROUPREQUESTJSON "../../common/samples/auth_credentials.json"> <!ENTITY GROUPREQUESTJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSGRP/samples/auth_credentials.json">
<!ENTITY GROUPRESPONSEXML "../../common/samples/authwithgroups.xml"> <!ENTITY GROUPRESPONSEXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSGRP/samples/authwithgroups.xml">
<!ENTITY GROUPRESPONSEJSON "../../common/samples/authwithgroups.json"> <!ENTITY GROUPRESPONSEJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSGRP/samples/authwithgroups.json">
]> ]>
<book xmlns="http://docbook.org/ns/docbook" <book xmlns="http://docbook.org/ns/docbook"
@@ -93,8 +93,8 @@
name="Rackspace Identity Service Group Extensions" name="Rackspace Identity Service Group Extensions"
namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0" namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0"
alias="RAX-KSGRP" updated="2011-08-14T13:25:27-06:00"> alias="RAX-KSGRP" updated="2011-08-14T13:25:27-06:00">
<description>Rackspace extensions to Identity v2.0 <description>Rackspace extensions to Identity v2.0 API
API enabling groups.</description> enabling groups.</description>
<atom:link rel="describedby" type="application/pdf" <atom:link rel="describedby" type="application/pdf"
href="httaw.github.com/openstack/identity-api/master/openstack-identity-api/src/docbkx/extensions/RAX-KSGRP/RAX-KSGRP-devguide.pdf"/> href="httaw.github.com/openstack/identity-api/master/openstack-identity-api/src/docbkx/extensions/RAX-KSGRP/RAX-KSGRP-devguide.pdf"/>
<atom:link rel="describedby" <atom:link rel="describedby"
@@ -123,9 +123,9 @@
</info> </info>
<chapter xml:id="chapter-0001"> <chapter xml:id="chapter-0001">
<title>Summary of Changes</title> <title>Summary of Changes</title>
<para>Rackspace extensions to Identity v2.0 API <para>Rackspace extensions to Identity v2.0 API allows
allows authenticate call to also return information about authenticate call to also return information about group
group memberships of the user.</para> memberships of the user.</para>
<section xml:id="NewHeaders-0001"> <section xml:id="NewHeaders-0001">
<title>New Headers</title> <title>New Headers</title>
<para>None.</para> <para>None.</para>
@@ -145,8 +145,8 @@
<section xml:id="NewElement0001"> <section xml:id="NewElement0001">
<title>New Elements</title> <title>New Elements</title>
<section xml:id="RackExt-0001"> <section xml:id="RackExt-0001">
<title>Rackspace extensions to the Identity v2.0 <title>Rackspace extensions to the Identity v2.0 API
API enabling groups.</title> enabling groups.</title>
<section xml:id="New-Elements-details-0002"> <section xml:id="New-Elements-details-0002">
<title>New Elements</title> <title>New Elements</title>
<para>This extension starts returning groups as a <para>This extension starts returning groups as a
@@ -186,14 +186,15 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<para>The <para>The Rackspace API Groups Service Extension
Rackspace API Groups Service Extension adds the following calls:</para> adds the following calls:</para>
<section xml:id="User_Operations_RAX_KSGRP"> <section xml:id="User_Operations_RAX_KSGRP">
<title>Group Operations</title> <title>Group Operations</title>
<wadl:resources <wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02" href="../wadl/RAX-KSGRP-admin.wadl"> xmlns:wadl="http://wadl.dev.java.net/2009/02"
<!-- <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSGRP-admin.wadl">
href="../wadl/RAX-KSGRP-admin.wadl#user-groups-RAX-KSGRP"> <!-- <wadl:resource
href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSGRP-admin.wadl#user-groups-RAX-KSGRP">
<wadl:method href="listUserGroups"/> <wadl:method href="listUserGroups"/>
</wadl:resource>--> </wadl:resource>-->
</wadl:resources> </wadl:resources>

7
openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.json
View File

@@ -1,7 +0,0 @@
{
"RAX-KSGRP:group": {
"description": "Default Limits",
"id": "1",
"name": "Default"
}
}

3
openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.xml
View File

@@ -1,3 +0,0 @@
<group xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0" id="1" name="Default" >
<description>Default Limits</description>
</group>

20
openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.json
View File

@@ -1,20 +0,0 @@
{
"RAX-KSGRP:groups": [
{
"description": "Default Limits",
"id": "1",
"name": "Default"
},
{
"description": "This is the first new group.",
"id": "1550",
"name": "New Group 1"
},
{
"description": "Defaults with faster rate limits",
"id": "214",
"name": "Faster Defaults"
}
],
"RAX-KSGRP:groups_links":[]
}

11
openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.xml
View File

@@ -1,11 +0,0 @@
<groups xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0">
<group xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0" id="1" name="Default" >
<description>Default Limits</description>
</group>
<group xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0" id="1550" name="New Group 1" >
<description>This is the first new group.</description>
</group>
<group xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0" id="214" name="Faster Defaults" >
<description>Defaults with faster rate limits</description>
</group>
</groups>

32
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml
View File

@@ -31,8 +31,8 @@
<td colspan="4">Description</td> <td colspan="4">Description</td>
</tr> </tr>
</thead>'> </thead>'>
<!ENTITY APIKEYCREDENTIALSREQUESTXML "samples/apiKeyCredentials.xml"> <!ENTITY APIKEYCREDENTIALSREQUESTXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSKEY/samples/apiKeyCredentials.xml">
<!ENTITY APIKEYCREDENTIALSREQUESTJSON "samples/apiKeyCredentials.json"> <!ENTITY APIKEYCREDENTIALSREQUESTJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSKEY/samples/apiKeyCredentials.json">
]> ]>
<book xmlns="http://docbook.org/ns/docbook" <book xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -79,8 +79,8 @@
name="Rackspace API Key authentication" name="Rackspace API Key authentication"
namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0" namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0"
alias="RAX-KSKEY" updated="2011-08-14T13:25:27-06:00"> alias="RAX-KSKEY" updated="2011-08-14T13:25:27-06:00">
<description> Rackspace extensions to Identity <description> Rackspace extensions to Identity v2.0 API
v2.0 API enabling API Key authentication. </description> enabling API Key authentication. </description>
<atom:link rel="describedby" type="application/pdf" <atom:link rel="describedby" type="application/pdf"
href="https://raw.github.com/openstack/identity-api/master/openstack-identity-api/src/docbkx/extensions/RAX-KSKEY/RAX-KSKEY-admin-devguide.pdf"/> href="https://raw.github.com/openstack/identity-api/master/openstack-identity-api/src/docbkx/extensions/RAX-KSKEY/RAX-KSKEY-admin-devguide.pdf"/>
<atom:link rel="describedby" <atom:link rel="describedby"
@@ -91,9 +91,8 @@
<abstract> <abstract>
<para>This document is intended for service developers <para>This document is intended for service developers
interested in using the Rackspace API Key interested in using the Rackspace API Key
Authentication Admin Extension along with Authentication Admin Extension along with OpenStack
OpenStack Identity (<abbrev>API</abbrev>). Identity (<abbrev>API</abbrev>).</para>
</para>
</abstract> </abstract>
<revhistory> <revhistory>
<revision> <revision>
@@ -136,9 +135,9 @@
<title>RAX-KSKEY Admin Extension</title> <title>RAX-KSKEY Admin Extension</title>
<para>This extension enables authentication calls to <para>This extension enables authentication calls to
accept the accept the
<parameter>apikeyCredentials</parameter> parameter. <parameter>apikeyCredentials</parameter>
These credentials support Rackspace-style authentication. parameter. These credentials support
</para> Rackspace-style authentication.</para>
<example> <example>
<title>apikeyCredentials XML</title> <title>apikeyCredentials XML</title>
<programlisting language="xml"><xi:include href="&APIKEYCREDENTIALSREQUESTXML;" parse="text"/></programlisting> <programlisting language="xml"><xi:include href="&APIKEYCREDENTIALSREQUESTXML;" parse="text"/></programlisting>
@@ -172,16 +171,17 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<para>The Rackspace API Key <para>The Rackspace API Key Authentication Extension adds
Authentication Extension adds the following calls:</para> the following calls:</para>
<section xml:id="User_Operations_RAX_KSKEY"> <section xml:id="User_Operations_RAX_KSKEY">
<title>User Operations</title> <title>User Operations</title>
<wadl:resources <wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:wadl="http://wadl.dev.java.net/2009/02"
href="../wadl/RAX-KSKEY-admin.wadl"> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSKEY-admin.wadl">
<wadl:resource <wadl:resource
href="../wadl/RAX-KSKEY-admin.wadl#users"> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSKEY-admin.wadl#users"
</wadl:resource> </wadl:resources> > </wadl:resource>
</wadl:resources>
</section> </section>
</section> </section>
</chapter> </chapter>

82
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml
View File

@@ -33,8 +33,8 @@
</thead>'> </thead>'>
<!ENTITY NAMESPACE "http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0"> <!ENTITY NAMESPACE "http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0">
<!ENTITY EXTENSIONXSD "xsd/RAX-KSKEY-credentials.xsd"> <!ENTITY EXTENSIONXSD "xsd/RAX-KSKEY-credentials.xsd">
<!ENTITY APIKEYCREDENTIALSREQUESTXML "../RAX-KSKEY/samples/apiKeyCredentials.xml"> <!ENTITY APIKEYCREDENTIALSREQUESTXML "../samples/apiKeyCredentials.xml">
<!ENTITY APIKEYCREDENTIALSREQUESTJSON "../RAX-KSKEY/samples/apiKeyCredentials.json"> <!ENTITY APIKEYCREDENTIALSREQUESTJSON "../samples/apiKeyCredentials.json">
<!ENTITY APIKEYCREDENTIALSRESPONSEXML "../samples/auth.xml"> <!ENTITY APIKEYCREDENTIALSRESPONSEXML "../samples/auth.xml">
<!ENTITY APIKEYCREDENTIALSRESPONSEJSON "../samples/auth.json"> <!ENTITY APIKEYCREDENTIALSRESPONSEJSON "../samples/auth.json">
]> ]>
@@ -74,9 +74,8 @@
<abstract> <abstract>
<para>This document is intended for client developers <para>This document is intended for client developers
interested in using the Rackspace API Key interested in using the Rackspace API Key
Authentication Service Extension along with Authentication Service Extension along with OpenStack
OpenStack Identity (<abbrev>API</abbrev>). Identity (<abbrev>API</abbrev>).</para>
</para>
</abstract> </abstract>
<othercredit> <othercredit>
<personname> <personname>
@@ -95,7 +94,8 @@
<atom:link rel="describedby" type="application/pdf" <atom:link rel="describedby" type="application/pdf"
href="http://docs.rackspacecloud.com/auth/api/v2.0/RAX-KSKEY/RAX-KSKEY-service-devguide.pdf"/> href="http://docs.rackspacecloud.com/auth/api/v2.0/RAX-KSKEY/RAX-KSKEY-service-devguide.pdf"/>
<atom:link rel="describedby" type="application/xml" <atom:link rel="describedby" type="application/xml"
href="http://docs.rackspacecloud.com/auth/api/v2.0/RAX-KSKEY/xsd/RAX-KSKEY-credentials.xsd"/> href="http://docs.rackspacecloud.com/auth/api/v2.0/RAX-KSKEY/xsd/RAX-KSKEY-credentials.xsd"
/>
</extension> </extension>
<revhistory> <revhistory>
<revision> <revision>
@@ -134,25 +134,28 @@
<section xml:id="NewElement0001"> <section xml:id="NewElement0001">
<title>New Element</title> <title>New Element</title>
<section xml:id="RackExt-0001"> <section xml:id="RackExt-0001">
<title>Rackspace Extensions to Identity v2.0 API</title> <title>Rackspace Extensions to Identity v2.0
API</title>
<section xml:id="Authenticate-d1e1166"> <section xml:id="Authenticate-d1e1166">
<title>RAX-KSKEY apikeyCredentials Extended Attribute</title> <title>RAX-KSKEY apikeyCredentials Extended
<para>The Attribute</title>
<parameter>apikeyCredentials</parameter> extended attribute supports Rackspace style <para>The <parameter>apikeyCredentials</parameter>
extended attribute supports Rackspace style
authentication.</para> authentication.</para>
<informaltable rules="all"> <informaltable rules="all">
<thead xmlns="http://docbook.org/ns/docbook"> <thead xmlns="http://docbook.org/ns/docbook">
<tr> <tr>
<th>Verb</th> <th>Verb</th>
<th>URI</th> <th>URI</th>
<th>Description</th> <th>Description</th>
</tr> </tr>
</thead> <tbody> </thead>
<tbody>
<tr> <tr>
<td> &POST; </td> <td> &POST; </td>
<td>/tokens</td> <td>/tokens</td>
<td>Authenticates and <td>Authenticates and generates a
generates a token.</td> token.</td>
</tr> </tr>
</tbody> </tbody>
</informaltable> </informaltable>
@@ -164,35 +167,42 @@
(<errorcode>400</errorcode>), (<errorcode>400</errorcode>),
identityFault (<errorcode>500</errorcode>), identityFault (<errorcode>500</errorcode>),
serviceUnavailable(<errorcode>503</errorcode>)</simpara> serviceUnavailable(<errorcode>503</errorcode>)</simpara>
<para>This call returns a token if <para>This call returns a token if successful.
successful. Clients obtain this token, along Clients obtain this token, along with the URL
with the URL to other service APIs, by first to other service APIs, by first authenticating
authenticating against OpenStack Identity against OpenStack Identity and supplying valid
and supplying valid credentials. This credentials. This extension provides support
extension provides support for Rackspace style for Rackspace style API Key
API Key credentials.</para> credentials.</para>
<para>Client authentication is provided through a <para>Client authentication is provided through a
ReST interface using the POST method, with ReST interface using the POST method, with
v2.0/tokens supplied as the path. A payload of v2.0/tokens supplied as the path. A payload of
credentials must be included in the body. See <xref linkend="Service_API_Client_Operations"/>.</para> credentials must be included in the body. See
<para>The Identity API is a ReSTful web <xref
service. It is the entry point to all service linkend="Service_API_Client_Operations"
APIs. To access the Identity API, you must />.</para>
know its URL.</para> <para>The Identity API is a ReSTful web service.
It is the entry point to all service APIs. To
access the Identity API, you must know its
URL.</para>
<example> <example>
<title>Auth with apikeyCredentials: JSON Request</title> <title>Auth with apikeyCredentials: JSON
Request</title>
<programlisting language="json"><xi:include href="&APIKEYCREDENTIALSREQUESTJSON;" parse="text"/></programlisting> <programlisting language="json"><xi:include href="&APIKEYCREDENTIALSREQUESTJSON;" parse="text"/></programlisting>
</example> </example>
<example> <example>
<title>Auth with apikeyCredentials: XML Request</title> <title>Auth with apikeyCredentials: XML
Request</title>
<programlisting language="xml"><xi:include href="&APIKEYCREDENTIALSREQUESTXML;" parse="text"/></programlisting> <programlisting language="xml"><xi:include href="&APIKEYCREDENTIALSREQUESTXML;" parse="text"/></programlisting>
</example> </example>
<example> <example>
<title>Auth with apikeyCredentials: JSON Response</title> <title>Auth with apikeyCredentials: JSON
Response</title>
<programlisting language="json"><xi:include href="&APIKEYCREDENTIALSRESPONSEJSON;" parse="text"/></programlisting> <programlisting language="json"><xi:include href="&APIKEYCREDENTIALSRESPONSEJSON;" parse="text"/></programlisting>
</example> </example>
<example> <example>
<title>Auth with apikeyCredentials: XML Response</title> <title>Auth with apikeyCredentials: XML
Response</title>
<programlisting language="xml"><xi:include href="&APIKEYCREDENTIALSRESPONSEXML;" parse="text"/></programlisting> <programlisting language="xml"><xi:include href="&APIKEYCREDENTIALSRESPONSEXML;" parse="text"/></programlisting>
</example> </example>
</section> </section>

10
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.json
View File

@@ -1,10 +0,0 @@
{
"credentials":[{
"passwordCredentials":{
"username": "test_user",
"password": "mypass"
}
}
],
"credentials_links":[]
}

5
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<credentials xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://docs.openstack.org/identity/api/v2.0">
<passwordCredentials username="test_user" password="test"/>
</credentials>

7
openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml
View File

@@ -31,8 +31,8 @@
<td colspan="4">Description</td> <td colspan="4">Description</td>
</tr> </tr>
</thead>'> </thead>'>
<!ENTITY SECRETQAREQUESTXML "samples/RAX-KSQA-secretQA.xml"> <!ENTITY SECRETQAREQUESTXML "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSQA/samples/RAX-KSQA-secretQA.xml">
<!ENTITY SECRETQAREQUESTJSON "samples/RAX-KSQA-secretQA.json"> <!ENTITY SECRETQAREQUESTJSON "http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/RAX-KSQA/samples/RAX-KSQA-secretQA.json">
]> ]>
<book xmlns="http://docbook.org/ns/docbook" <book xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -173,7 +173,8 @@
<wadl:resources <wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02"> xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource <wadl:resource
href="../wadl/RAX-KSQA-admin.wadl#secretqa"/> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSQA-admin.wadl#secretqa"
/>
</wadl:resources> </wadl:resources>
</section> </section>
</section> </section>

6
openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.json
View File

@@ -1,6 +0,0 @@
{
"RAX-KSQA:secretQA":{
"question": "What is the color of my eyes?",
"answer": "Leonardo da Vinci"
}
}

5
openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<secretQA xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSQA/v1.0"
question="What is the color of my eyes?"
answer="Leonardo da Vinci" />

24
openstack-identity-api/v2.0/src/docbkx/admin/identity-service-api.xml
View File

@@ -55,35 +55,35 @@
<section xml:id="Token_Operations"> <section xml:id="Token_Operations">
<title>Token Operations</title> <title>Token Operations</title>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"> <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/identity-admin.wadl#tokens"/> <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#tokens"/>
<wadl:resource <wadl:resource
href="../wadl/identity-admin.wadl#tokenById"/> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#tokenById"/>
<wadl:resource <wadl:resource
href="../wadl/identity-admin.wadl#endpointsForToken"/> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#endpointsForToken"/>
</wadl:resources> </wadl:resources>
</section> </section>
<section xml:id="User_Operations"> <section xml:id="User_Operations">
<title>User Operations</title> <title>User Operations</title>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"> <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/identity-admin.wadl#users"/> <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#users"/>
<wadl:resource href="../wadl/identity-admin.wadl#name"/> <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#name"/>
<wadl:resource href="../wadl/identity-admin.wadl#userid"/> <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#userid"/>
<wadl:resource <wadl:resource
href="../wadl/identity-admin.wadl#userRoles"/> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#userRoles"/>
</wadl:resources> </wadl:resources>
</section> </section>
<section xml:id="Tenant_Operations"> <section xml:id="Tenant_Operations">
<title>Tenant Operations</title> <title>Tenant Operations</title>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"> <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/identity-admin.wadl#tenants"/> <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#tenants"/>
<wadl:resource <wadl:resource
href="../wadl/identity-admin.wadl#tenantById"/> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#tenantById"/>
<wadl:resource <wadl:resource
href="../wadl/identity-admin.wadl#usersForTenant"/> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#usersForTenant"/>
<wadl:resource <wadl:resource
href="../wadl/identity-admin.wadl#getTenantUser"/> href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#getTenantUser"/>
<wadl:resource <wadl:resource
href="../wadl/identity-admin.wadl#userRolesForTenant" href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#userRolesForTenant"
/> />
</wadl:resources> </wadl:resources>
</section> </section>

4
openstack-identity-api/v2.0/src/docbkx/client/identity-client-api.xml
View File

@@ -7,9 +7,9 @@
tenants.</para> tenants.</para>
<wadl:resources <wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02"> xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/identity.wadl#extensions" <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl#extensions"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/> xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
<wadl:resource href="../wadl/identity.wadl#tokens" <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl#tokens"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/> xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</wadl:resources> </wadl:resources>
</chapter> </chapter>

4
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.json → openstack-identity-api/v2.0/src/docbkx/samples/apiKeyCredentials.json
View File

@@ -1,6 +1,6 @@
{ {
"RAX-KSKEY:apiKeyCredentials":{ "RAX-KSKEY:apiKeyCredentials": {
"username": "test_user", "username": "test_user",
"apiKey": "aaaaa-bbbbb-ccccc-12345678" "apiKey": "aaaaa-bbbbb-ccccc-12345678"
} }
} }

0
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.xml → openstack-identity-api/v2.0/src/docbkx/samples/apiKeyCredentials.xml
View File

29
openstack-identity-api/v2.0/src/docbkx/samples/auth.json
View File

@@ -1,17 +1,18 @@
{ {
"access":{ "access": {
"token":{ "token": {
"id": "ab48a9efdfedb23ty3494", "id": "ab48a9efdfedb23ty3494",
"expires": "2010-11-01T03:32:15-05:00", "expires": "2010-11-01T03:32:15-05:00",
"tenant":{ "tenant": {
"id": "t1000", "id": "t1000",
"name": "My Project" "name": "My Project"
} }
}, },
"user":{ "user": {
"id": "u123", "id": "u123",
"name": "jqsmith", "name": "jqsmith",
"roles":[{ "roles": [
{
"id": "100", "id": "100",
"name": "compute:admin" "name": "compute:admin"
}, },
@@ -21,12 +22,14 @@
"tenantId": "t1000" "tenantId": "t1000"
} }
], ],
"roles_links":[] "roles_links": []
}, },
"serviceCatalog":[{ "serviceCatalog": [
{
"name": "Cloud Servers", "name": "Cloud Servers",
"type": "compute", "type": "compute",
"endpoints":[{ "endpoints": [
{
"tenantId": "t1000", "tenantId": "t1000",
"publicURL": "https://compute.north.host.com/v1/t1000", "publicURL": "https://compute.north.host.com/v1/t1000",
"internalURL": "https://compute.north.internal/v1/t1000", "internalURL": "https://compute.north.internal/v1/t1000",
@@ -45,12 +48,13 @@
"versionList": "https://compute.north.host.com/" "versionList": "https://compute.north.host.com/"
} }
], ],
"endpoints_links":[] "endpoints_links": []
}, },
{ {
"name": "Cloud Files", "name": "Cloud Files",
"type": "object-store", "type": "object-store",
"endpoints":[{ "endpoints": [
{
"tenantId": "t1000", "tenantId": "t1000",
"publicURL": "https://storage.north.host.com/v1/t1000", "publicURL": "https://storage.north.host.com/v1/t1000",
"internalURL": "https://storage.north.internal/v1/t1000", "internalURL": "https://storage.north.internal/v1/t1000",
@@ -73,7 +77,8 @@
{ {
"name": "DNS-as-a-Service", "name": "DNS-as-a-Service",
"type": "dnsextension:dns", "type": "dnsextension:dns",
"endpoints":[{ "endpoints": [
{
"tenantId": "t1000", "tenantId": "t1000",
"publicURL": "https://dns.host.com/v2.0/t1000", "publicURL": "https://dns.host.com/v2.0/t1000",
"versionId": "2.0", "versionId": "2.0",
@@ -84,4 +89,4 @@
} }
] ]
} }
} }

6
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.json → openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials-RAX-KSKEY.json
View File

@@ -1,9 +1,9 @@
{ {
"auth":{ "auth": {
"RAX-KSKEY:apiKeyCredentials":{ "RAX-KSKEY:apiKeyCredentials": {
"username": "test_user", "username": "test_user",
"apiKey": "aaaaa-bbbbb-ccccc-12345678" "apiKey": "aaaaa-bbbbb-ccccc-12345678"
}, },
"tenantId": "1234" "tenantId": "1234"
} }
} }

0
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.xml → openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials-RAX-KSKEY.xml
View File

10
openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.json
View File

@@ -1,9 +1,9 @@
{ {
"auth":{ "auth": {
"passwordCredentials":{ "passwordCredentials": {
"username":"test_user", "username": "test_user",
"password":"mypass" "password": "mypass"
}, },
"tenantName":"customer-x" "tenantName": "customer-x"
} }
} }

27
openstack-identity-api/v2.0/src/docbkx/samples/choices.json
View File

@@ -1,14 +1,17 @@
{ {
"choices":[{ "choices": [
{
"id": "v1.0", "id": "v1.0",
"status": "DEPRECATED", "status": "DEPRECATED",
"links":[{ "links": [
{
"rel": "self", "rel": "self",
"href": "http://identity.api.openstack.org/v1.0" "href": "http://identity.api.openstack.org/v1.0"
} }
], ],
"media-types":{ "media-types": {
"values":[{ "values": [
{
"base": "application/xml", "base": "application/xml",
"type": "application/vnd.openstack.identity+xml;version=1.0" "type": "application/vnd.openstack.identity+xml;version=1.0"
}, },
@@ -22,13 +25,15 @@
{ {
"id": "v1.1", "id": "v1.1",
"status": "CURRENT", "status": "CURRENT",
"links":[{ "links": [
{
"rel": "self", "rel": "self",
"href": "http://identity.api.openstack.org/v1.1" "href": "http://identity.api.openstack.org/v1.1"
} }
], ],
"media-types":{ "media-types": {
"values":[{ "values": [
{
"base": "application/xml", "base": "application/xml",
"type": "application/vnd.openstack.identity+xml;version=1.1" "type": "application/vnd.openstack.identity+xml;version=1.1"
}, },
@@ -42,13 +47,15 @@
{ {
"id": "v2.0", "id": "v2.0",
"status": "BETA", "status": "BETA",
"links":[{ "links": [
{
"rel": "self", "rel": "self",
"href": "http://identity.api.openstack.org/v2.0" "href": "http://identity.api.openstack.org/v2.0"
} }
], ],
"media-types":{ "media-types": {
"values":[{ "values": [
{
"base": "application/xml", "base": "application/xml",
"type": "application/vnd.openstack.identity+xml;version=2.0" "type": "application/vnd.openstack.identity+xml;version=2.0"
}, },

9
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.json → openstack-identity-api/v2.0/src/docbkx/samples/credentials.json
View File

@@ -1,10 +1,11 @@
{ {
"credentials":[{ "credentials": [
"passwordCredentials":{ {
"passwordCredentials": {
"username": "test_user", "username": "test_user",
"password": "mypass" "password": "mypass"
} }
} }
], ],
"credentials_links":[] "credentials_links": []
} }

0
openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.xml → openstack-identity-api/v2.0/src/docbkx/samples/credentials.xml
View File

11
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.json → openstack-identity-api/v2.0/src/docbkx/samples/credentialswithapikey.json
View File

@@ -1,16 +1,17 @@
{ {
"credentials":[{ "credentials": [
"passwordCredentials":{ {
"passwordCredentials": {
"username": "test_user", "username": "test_user",
"password": "mypass" "password": "mypass"
} }
}, },
{ {
"RAX-KSKEY:apiKeyCredentials":{ "RAX-KSKEY:apiKeyCredentials": {
"username": "test_user", "username": "test_user",
"apiKey": "aaaaa-bbbbb-ccccc-12345678" "apiKey": "aaaaa-bbbbb-ccccc-12345678"
} }
} }
], ],
"credentials_links":[] "credentials_links": []
} }

0
openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.xml → openstack-identity-api/v2.0/src/docbkx/samples/credentialswithapikey.xml
View File

26
openstack-identity-api/v2.0/src/docbkx/samples/endpoints.json
View File

@@ -1,14 +1,14 @@
{ {
"endpoints": [ "endpoints": [
{ {
"name": "Nova", "name": "Nova",
"adminURL": "http://admin.openstack/nova", "adminURL": "http://admin.openstack/nova",
"region": "north", "region": "north",
"internalURL": "http://internal.openstack/nova", "internalURL": "http://internal.openstack/nova",
"type": "compute", "type": "compute",
"id": "8c3426bd730c48f5b59527df3a51b901", "id": "8c3426bd730c48f5b59527df3a51b901",
"publicURL": "http://public.openstack/nova" "publicURL": "http://public.openstack/nova"
} }
], ],
"endpoints_links": [] "endpoints_links": []
} }

24
openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.json
View File

@@ -1,14 +1,14 @@
{ {
"user": { "user": {
"id": "1000", "id": "1000",
"username": "jqsmith", "username": "jqsmith",
"email": "john.smith@example.org", "email": "john.smith@example.org",
"enabled": true, "enabled": true,
"RS-META:metadata": { "RS-META:metadata": {
"values": { "values": {
"MetaKey1": "MetaValue1", "MetaKey1": "MetaValue1",
"MetaKey2": "MetaValue2" "MetaKey2": "MetaValue2"
} }
}
} }
} }
}

39
openstack-identity-api/v2.0/src/docbkx/samples/extension.json
View File

@@ -1,20 +1,21 @@
{ {
"extension": { "extension": {
"name": "User Metadata Extension", "name": "User Metadata Extension",
"namespace": "http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0", "namespace": "http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0",
"alias": "RS-META", "alias": "RS-META",
"updated": "2011-01-12T11:22:33-06:00", "updated": "2011-01-12T11:22:33-06:00",
"description": "Allows associating arbitrary metadata with a user.", "description": "Allows associating arbitrary metadata with a user.",
"links": [ "links": [
{ {
"rel": "describedby", "rel": "describedby",
"type": "application/pdf", "type": "application/pdf",
"href": "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf" "href": "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
}, { },
"rel": "describedby", {
"type": "application/vnd.sun.wadl+xml", "rel": "describedby",
"href": "http://docs.rackspacecloud.com/identity/api/ext/identity-cbs.wadl" "type": "application/vnd.sun.wadl+xml",
} "href": "http://docs.rackspacecloud.com/identity/api/ext/identity-cbs.wadl"
] }
} ]
} }
}

11
openstack-identity-api/v2.0/src/docbkx/samples/extensions.json
View File

@@ -1,11 +1,13 @@
{ {
"extensions":[{ "extensions": [
{
"name": "Reset Password Extension", "name": "Reset Password Extension",
"namespace": "http://docs.rackspacecloud.com/identity/api/ext/rpe/v2.0", "namespace": "http://docs.rackspacecloud.com/identity/api/ext/rpe/v2.0",
"alias": "RS-RPE", "alias": "RS-RPE",
"updated": "2011-01-22T13:25:27-06:00", "updated": "2011-01-22T13:25:27-06:00",
"description": "Adds the capability to reset a user's password. The user is emailed when the password has been reset.", "description": "Adds the capability to reset a user's password. The user is emailed when the password has been reset.",
"links":[{ "links": [
{
"rel": "describedby", "rel": "describedby",
"type": "application/pdf", "type": "application/pdf",
"href": "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf" "href": "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"
@@ -23,7 +25,8 @@
"alias": "RS-META", "alias": "RS-META",
"updated": "2011-01-12T11:22:33-06:00", "updated": "2011-01-12T11:22:33-06:00",
"description": "Allows associating arbitrary metadata with a user.", "description": "Allows associating arbitrary metadata with a user.",
"links":[{ "links": [
{
"rel": "describedby", "rel": "describedby",
"type": "application/pdf", "type": "application/pdf",
"href": "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf" "href": "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
@@ -36,5 +39,5 @@
] ]
} }
], ],
"extensions_links":[] "extensions_links": []
} }

10
openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.json
View File

@@ -1,6 +1,7 @@
{ {
"user":{ "user": {
"OS-ROLE:roles":[{ "OS-ROLE:roles": [
{
"tenantId": "1234", "tenantId": "1234",
"id": "Admin" "id": "Admin"
}, },
@@ -9,7 +10,8 @@
"id": "DBUser" "id": "DBUser"
} }
], ],
"OS-ROLE:roles_links":[{ "OS-ROLE:roles_links": [
{
"rel": "next", "rel": "next",
"href": "http://identity.api.openstack.org/v2.0/tenants/1234/users/u1000/roles?marker=Super" "href": "http://identity.api.openstack.org/v2.0/tenants/1234/users/u1000/roles?marker=Super"
} }
@@ -19,4 +21,4 @@
"email": "john.smith@example.org", "email": "john.smith@example.org",
"enabled": true "enabled": true
} }
} }

12
openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.json
View File

@@ -1,7 +1,7 @@
{ {
"identityFault": { "identityFault": {
"message": "Fault", "message": "Fault",
"details": "Error Details...", "details": "Error Details...",
"code": 500 "code": 500
} }
} }

12
openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.json
View File

@@ -1,7 +1,7 @@
{ {
"itemNotFound": { "itemNotFound": {
"message": "Item not found.", "message": "Item not found.",
"details": "Error Details...", "details": "Error Details...",
"code": 404 "code": 404
} }
} }

11
openstack-identity-api/v2.0/src/docbkx/samples/roles.json
View File

@@ -1,9 +1,10 @@
{ {
"roles":[{ "roles": [
"id":"123", {
"name":"compute:admin", "id": "123",
"description":"Nova Administrator" "name": "compute:admin",
"description": "Nova Administrator"
} }
], ],
"roles_links":[] "roles_links": []
} }

14
openstack-identity-api/v2.0/src/docbkx/samples/tenant.json
View File

@@ -1,8 +1,8 @@
{ {
"tenant": { "tenant": {
"id": "1234", "id": "1234",
"name": "ACME corp", "name": "ACME corp",
"description": "A description ...", "description": "A description ...",
"enabled": true "enabled": true
} }
} }

6
openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.json
View File

@@ -1,12 +1,14 @@
{ {
"tenants":[{ "tenants": [
{
"id": "1234", "id": "1234",
"name": "ACME corp", "name": "ACME corp",
"description": "A description ...", "description": "A description ...",
"enabled": true "enabled": true
} }
], ],
"tenants_links":[{ "tenants_links": [
{
"rel": "next", "rel": "next",
"href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234" "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
} }

6
openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.json
View File

@@ -1,12 +1,14 @@
{ {
"tenants":[{ "tenants": [
{
"id": "3645", "id": "3645",
"name": "Iron Works", "name": "Iron Works",
"description": "A description ...", "description": "A description ...",
"enabled": true "enabled": true
} }
], ],
"tenants_links":[{ "tenants_links": [
{
"rel": "next", "rel": "next",
"href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=3645" "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=3645"
}, },

6
openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.json
View File

@@ -1,12 +1,14 @@
{ {
"tenants":[{ "tenants": [
{
"id": "9999", "id": "9999",
"name": "Bigz", "name": "Bigz",
"description": "A description ...", "description": "A description ...",
"enabled": true "enabled": true
} }
], ],
"tenants_links":[{ "tenants_links": [
{
"rel": "previous", "rel": "previous",
"href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234" "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"
} }

Some files were not shown because too many files have changed in this diff Show More