Merge "Pretty print JSON sample files and remove unused files"

This commit is contained in:
Jenkins 2014-05-10 17:20:33 +00:00 committed by Gerrit Code Review
commit 4efd367b88
118 changed files with 387 additions and 5172 deletions

View File

@ -158,7 +158,7 @@
Use the HP-IDM extension to perform the following operations on templates:
</para>
<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>
</section>
</section>

View File

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

View File

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

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"/>

View File

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

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" />

View File

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

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>

View File

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

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"/>

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":[]
}

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>

View File

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

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>

View File

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

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>

View File

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

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"/>

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":[]
}

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>

View File

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

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"/>

View File

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

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"/>

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/"
}
}

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>

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
}
}

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>

View File

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

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"/>

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": []
}

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>

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":[]
}

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>

View File

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

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>

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":[]
}

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>

View File

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

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"/>

View File

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

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":[]
}

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>

View File

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

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"/>

View File

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

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":[]
}

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>

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":[]
}
}
}

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>

View File

@ -32,14 +32,14 @@
</tr>
</thead>'>
<!ENTITY GROUPSREQUESTXML "../RAX-GRPADM/samples/groups.xml">
<!ENTITY GROUPSREQUESTJSON "../RAX-GRPADM/samples/groups.json">
<!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 "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 GROUPREQUESTJSON "../RAX-GRPADM/samples/group.json">
<!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 "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 UPDATEDGROUPREQUESTJSON "../RAX-GRPADM/samples/group-updated.json">
<!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 "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 -->
<!ENTITY PUB_DATE "2011-01-23">
@ -96,8 +96,8 @@
name="OpenStack Identity Rackspace Group Admin"
namespace="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0"
alias="RAX-GRPADM" updated="2011-08-14T13:25:27-06:00">
<description> Rackspace extensions to Identity
v2.0 API enabling Group Admin. </description>
<description> Rackspace extensions to Identity v2.0 API
enabling Group Admin. </description>
<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"/>
<atom:link rel="describedby"
@ -106,9 +106,9 @@
/>
</extension>
<abstract>
<para>This document is for software developers
who want to use the Group Admin Extension to the
OpenStack Identity Application Programming Interface
<para>This document is for software developers who want to
use the Group Admin Extension to the OpenStack
Identity Application Programming Interface
(<abbrev>API</abbrev>).</para>
</abstract>
<revhistory>
@ -191,24 +191,25 @@
</tr>
</tbody>
</table>
<para>A new resource is created at <literal>/RAX-GRPADM/groups</literal> that
enables the management of groups.</para>
<para>A new resource is created at
<literal>/RAX-GRPADM/groups</literal> that enables
the management of groups.</para>
<section xml:id="Group_Operations_RAX_KSGRPADM">
<title>Group Operations</title>
<wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02">
<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: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="updateGroup"/>
<wadl:method href="getUsersForGroup"/>
<wadl:method href="deleteGroup"/>
</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="removeUserFromGroup"/>
</wadl:resource>

View File

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

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>

View File

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

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>

View File

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

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>

View File

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

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>

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"
}
]
}

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>

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": []
}

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>

View File

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

View File

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

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>

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":[]
}

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>

View File

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

View File

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

View File

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

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>

View File

@ -31,8 +31,8 @@
<td colspan="4">Description</td>
</tr>
</thead>'>
<!ENTITY SECRETQAREQUESTXML "samples/RAX-KSQA-secretQA.xml">
<!ENTITY SECRETQAREQUESTJSON "samples/RAX-KSQA-secretQA.json">
<!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 "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"
xmlns:xlink="http://www.w3.org/1999/xlink"
@ -173,7 +173,8 @@
<wadl:resources
xmlns:wadl="http://wadl.dev.java.net/2009/02">
<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>
</section>
</section>

View File

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

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" />

View File

@ -55,35 +55,35 @@
<section xml:id="Token_Operations">
<title>Token Operations</title>
<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
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
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>
</section>
<section xml:id="User_Operations">
<title>User Operations</title>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadl/identity-admin.wadl#users"/>
<wadl:resource href="../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#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#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#userid"/>
<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>
</section>
<section xml:id="Tenant_Operations">
<title>Tenant Operations</title>
<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
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
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
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
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>
</section>

View File

@ -7,9 +7,9 @@
tenants.</para>
<wadl:resources
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"/>
<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"/>
</wadl:resources>
</chapter>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,11 +1,13 @@
{
"extensions":[{
"extensions": [
{
"name": "Reset Password Extension",
"namespace": "http://docs.rackspacecloud.com/identity/api/ext/rpe/v2.0",
"alias": "RS-RPE",
"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.",
"links":[{
"links": [
{
"rel": "describedby",
"type": "application/pdf",
"href": "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"
@ -23,7 +25,8 @@
"alias": "RS-META",
"updated": "2011-01-12T11:22:33-06:00",
"description": "Allows associating arbitrary metadata with a user.",
"links":[{
"links": [
{
"rel": "describedby",
"type": "application/pdf",
"href": "http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"
@ -36,5 +39,5 @@
]
}
],
"extensions_links":[]
"extensions_links": []
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,12 +1,14 @@
{
"tenants":[{
"tenants": [
{
"id": "9999",
"name": "Bigz",
"description": "A description ...",
"enabled": true
}
],
"tenants_links":[{
"tenants_links": [
{
"rel": "previous",
"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