diff options
| author | Yogeshwar Srikrishnan <yoga80@yahoo.com> | 2011-09-07 17:29:46 -0500 |
|---|---|---|
| committer | Yogeshwar Srikrishnan <yoga80@yahoo.com> | 2011-09-07 17:29:46 -0500 |
| commit | eac83e5fa00a8357ab7981179a81a8988bcacef1 (patch) | |
| tree | d7a0912131d54b3f537ba4f2f97d6de4de283cc1 | |
| parent | ae88dafb117b508a88d453fe95f9abb15c964103 (diff) | |
| download | keystone-eac83e5fa00a8357ab7981179a81a8988bcacef1.tar.gz keystone-eac83e5fa00a8357ab7981179a81a8988bcacef1.tar.xz keystone-eac83e5fa00a8357ab7981179a81a8988bcacef1.zip | |
Fixing sample content.
Change-Id: Ib66b28d90a2fc091852f7ef2d3bf2419d335702e
86 files changed, 343 insertions, 1462 deletions
diff --git a/keystone/content/admin/identityadminguide.pdf b/keystone/content/admin/identityadminguide.pdf Binary files differindex f913e79d..40e47a32 100644 --- a/keystone/content/admin/identityadminguide.pdf +++ b/keystone/content/admin/identityadminguide.pdf diff --git a/keystone/content/admin/samples/auth.json b/keystone/content/admin/samples/auth.json deleted file mode 100644 index 76583b02..00000000 --- a/keystone/content/admin/samples/auth.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "auth": { - "token": { - "id": "asdasdasd-adsasdads-asdasdasd-adsadsasd", - "expires": "2010-11-01T03:32:15-05:00" - }, - "serviceCatalog": [ - { - "name": "Cloud Servers", - "type": "compute", - "endpoints": [ - { - "publicURL": "https://compute.north.host/v1/1234", - "internalURL": "https://compute.north.host/v1/1234", - "region": "North", - "tenantId": "1234", - "versionId": "1.0", - "versionInfo": "https://compute.north.host/v1.0/", - "versionList": "https://compute.north.host/" - }, { - "publicURL": "https://compute.north.host/v1.1/3456", - "internalURL": "https://compute.north.host/v1.1/3456", - "region": "North", - "tenantId": "3456", - "versionId": "1.1", - "versionInfo": "https://compute.north.host/v1.1/", - "versionList": "https://compute.north.host/" - } - ] - }, { - "name": "Cloud Files", - "type": "object-store", - "endpoints": [ - { - "publicURL": "https://compute.north.host/v1/blah-blah", - "internalURL": "https://compute.north.host/v1/blah-blah", - "region": "South", - "tenantId": "1234", - "versionId": "1.0", - "versionInfo": "uri", - "versionList": "uri" - }, { - "publicURL": "https://compute.north.host/v1.1/blah-blah", - "internalURL": "https://compute.north.host/v1.1/blah-blah", - "region": "South", - "tenantId": "3456", - "versionId": "1.1", - "versionInfo": "https://compute.north.host/v1.1/", - "versionList": "https://compute.north.host/" - } - ], - "endpoint_links": [ - { - "rel": "next", - "href": "https://identity.north.host/v2.0/endpoints?marker=2" - } - ] - } - ], - "serviceCatalog_links": [ - { - "rel": "next", - "href": "https://identity.host/v2.0/endpoints?session=2hfh8Ar&marker=2" - } - ] - } -}
\ No newline at end of file diff --git a/keystone/content/admin/samples/auth.xml b/keystone/content/admin/samples/auth.xml deleted file mode 100644 index 01f3036b..00000000 --- a/keystone/content/admin/samples/auth.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<auth xmlns="http://docs.openstack.org/identity/api/v2.0"> - <token expires="2010-11-01T03:32:15-05:00" - id="ab48a9efdfedb23ty3494"/> - <serviceCatalog> - <service type="compute" name="Computers in the Cloud"> - <endpoint - region="North" - tenantId="1234" - publicURL="https://north.compute.public.com/v2.0/1234" - internalURL="https://north.compute.internal.com/v2.0/1234"> - <version - id="2.0" - info="https://north.compute.public.com/v2.0/" - list="https://north.compute.public.com/" /> - </endpoint> - <endpoint - region="South" - tenantId="3456" - publicURL="https://south.compute.public.com/v2.0/3456" - internalURL="https://south.compute.internal.com/v2.0/3456"> - <version - id="2.0" - info="https://south.compute.public.com/v2.0/" - list="https://south.compute.public.com/" /> - </endpoint> - </service> - <service type="object-store" name="HTTP Object Store"> - <endpoint - region="North" - tenantId="1234" - publicURL="https://north.object-store.public.com/v1/1234" - internalURL="https://north.object-store.internal.com/v1/1234"> - <version - id="1" - info="https://north.object-store.public.com/v1/" - list="https://north.object-store.public.com/" /> - </endpoint> - <endpoint - region="South" - tenantId="3456" - publicURL="https://south.object-store.public.com/v2.0/3456" - internalURL="https://south.object-store.internal.com/v2.0/3456"> - <version - id="2.0" - info="https://south.object-store.public.com/v1/" - list="https://south.object-store.public.com/" /> - </endpoint> - </service> - <service type="dns" name="DNS-as-a-Service"> - <endpoint - publicURL="https://dns.public.com/v2.0/blah-blah"> - <version - id="2.0" - info="https://dns.public.com/v2.0/" - list="https://dns.public.com/" /> - </endpoint> - </service> - </serviceCatalog> -</auth> diff --git a/keystone/content/admin/samples/auth_credentials-OS-EC2.json b/keystone/content/admin/samples/auth_credentials-OS-EC2.json deleted file mode 100644 index 93461cea..00000000 --- a/keystone/content/admin/samples/auth_credentials-OS-EC2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "auth": { - "OS-EC2-ec2Credentials": { - "username": "test_user", - "secret": "aaaaa", - "signature": "bbb", - }, - "tenantId": "77654" - } -}
\ No newline at end of file diff --git a/keystone/content/admin/samples/auth_credentials-OS-EC2.xml b/keystone/content/admin/samples/auth_credentials-OS-EC2.xml deleted file mode 100644 index b3c6abb0..00000000 --- a/keystone/content/admin/samples/auth_credentials-OS-EC2.xml +++ /dev/null @@ -1,11 +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-EC2/v1.0" - username="testuser" - key="aaaaa" - signature="bbbbb" - tenantId="77654"/> -</auth>
\ No newline at end of file diff --git a/keystone/content/admin/samples/auth_credentials-RAX-KEY.json b/keystone/content/admin/samples/auth_credentials-RAX-KEY.json deleted file mode 100644 index adc7507c..00000000 --- a/keystone/content/admin/samples/auth_credentials-RAX-KEY.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "auth": { - "RAX-KEY:apikeyCredentials": { - "username": "test_user", - "apikey": "aaaaa-bbbbb-ccccc-12345678" - } - } -}
\ No newline at end of file diff --git a/keystone/content/admin/samples/auth_credentials-RAX-KEY.xml b/keystone/content/admin/samples/auth_credentials-RAX-KEY.xml deleted file mode 100644 index d8529896..00000000 --- a/keystone/content/admin/samples/auth_credentials-RAX-KEY.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<auth xmlns="http://docs.openstack.org/identity/api/v2.0"> - <apikeyCredentials - xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KEY/v1.0" - username="testuser" - apikey="aaaaa-bbbbb-ccccc-12345678"/> -</auth> diff --git a/keystone/content/admin/samples/auth_credentials.json b/keystone/content/admin/samples/auth_credentials.json deleted file mode 100644 index 282f321d..00000000 --- a/keystone/content/admin/samples/auth_credentials.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "auth": { - "passwordCredentials": { - "username": "test_user", - "password": "mypass" - }, - "tenantId": "1234" - } -}
\ No newline at end of file diff --git a/keystone/content/admin/samples/auth_credentials.xml b/keystone/content/admin/samples/auth_credentials.xml deleted file mode 100644 index a02c7c8e..00000000 --- a/keystone/content/admin/samples/auth_credentials.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<auth - xmlns="http://docs.openstack.org/identity/api/v2.0" - tenantId="1234"> - <passwordCredentials - username="testuser" - password="P@ssword1"/> -</auth>
\ No newline at end of file diff --git a/keystone/content/admin/samples/choices.json b/keystone/content/admin/samples/choices.json deleted file mode 100644 index 9f1783c1..00000000 --- a/keystone/content/admin/samples/choices.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "choices": { - "values": [ - { - "id": "v1.0", - "status": "DEPRECATED", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v1.0" - } - ], - "media-types": { - "values": [ - { - "base": "application/xml", - "type": "application/vnd.openstack.identity+xml;version=1.0" - }, { - "base": "application/json", - "type": "application/vnd.openstack.identity+json;version=1.0" - } - ] - } - }, { - "id": "v1.1", - "status": "CURRENT", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v1.1" - } - ], - "media-types": { - "values": [ - { - "base": "application/xml", - "type": "application/vnd.openstack.identity+xml;version=1.1" - }, { - "base": "application/json", - "type": "application/vnd.openstack.identity+json;version=1.1" - } - ] - } - }, { - "id": "v2.0", - "status": "BETA", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v2.0" - } - ], - "media-types": { - "values": [ - { - "base": "application/xml", - "type": "application/vnd.openstack.identity+xml;version=2.0" - }, { - "base": "application/json", - "type": "application/vnd.openstack.identity+json;version=2.0" - } - ] - } - } - ] - } -} diff --git a/keystone/content/admin/samples/choices.xml b/keystone/content/admin/samples/choices.xml deleted file mode 100644 index 229b4868..00000000 --- a/keystone/content/admin/samples/choices.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<choices - xmlns="http://docs.openstack.org/common/api/v2.0" - xmlns:atom="http://www.w3.org/2005/Atom"> - <version id="v1.0" status="DEPRECATED"> - <media-types> - <media-type - base="application/xml" - type="application/vnd.openstack.identity+xml;version=1.0" /> - <media-type - base="application/json" - type="application/vnd.openstack.identity+json;version=1.0" /> - </media-types> - <atom:link rel="self" href="http://identity.api.openstack.org/v1.0" /> - </version> - <version id="v1.1" status="CURRENT"> - <media-types> - <media-type - base="application/xml" - type="application/vnd.openstack.identity+xml;version=1.1" /> - <media-type - base="application/json" - type="application/vnd.openstack.identity+json;version=1.1" /> - </media-types> - <atom:link rel="self" href="http://identity.api.openstack.org/v1.1" /> - </version> - <version id="v2.0" status="BETA"> - <media-types> - <media-type - base="application/xml" - type="application/vnd.openstack.identity+xml;version=2.0" /> - <media-type - base="application/json" - type="application/vnd.openstack.identity+json;version=2.0" /> - </media-types> - <atom:link rel="self" href="http://identity.api.openstack.org/v2.0" /> - </version> -</choices> diff --git a/keystone/content/admin/samples/endpoint.json b/keystone/content/admin/samples/endpoint.json deleted file mode 100644 index e3b2bb21..00000000 --- a/keystone/content/admin/samples/endpoint.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "endpoint": { - "id": 3, - "href": "https://auth.keystone.com/v2.0/endpoints/3" - } -} diff --git a/keystone/content/admin/samples/endpoint.xml b/keystone/content/admin/samples/endpoint.xml deleted file mode 100644 index 6fabeaff..00000000 --- a/keystone/content/admin/samples/endpoint.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<endpoint xmlns="http://docs.openstack.org/identity/api/v2.0" - id="3" - href="https://auth.keystone.com/v2.0/endpoints/3" -/> diff --git a/keystone/content/admin/samples/endpointTemplate.json b/keystone/content/admin/samples/endpointTemplate.json deleted file mode 100644 index fc75a0a1..00000000 --- a/keystone/content/admin/samples/endpointTemplate.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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 - } -} diff --git a/keystone/content/admin/samples/endpointTemplate.xml b/keystone/content/admin/samples/endpointTemplate.xml deleted file mode 100644 index 1c4c6e90..00000000 --- a/keystone/content/admin/samples/endpointTemplate.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<endpointTemplate - xmlns="http://docs.openstack.org/identity/api/v2.0" - id="1" - region="North" - global="true" - type="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>
\ No newline at end of file diff --git a/keystone/content/admin/samples/endpointTemplates.json b/keystone/content/admin/samples/endpointTemplates.json deleted file mode 100644 index 77f96ef9..00000000 --- a/keystone/content/admin/samples/endpointTemplates.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "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", - "serviceName": "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, - "serviceName": "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", - "serviceName": "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, - "serviceName": "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 - } - ] -} diff --git a/keystone/content/admin/samples/endpointTemplates.xml b/keystone/content/admin/samples/endpointTemplates.xml deleted file mode 100644 index fb13a3b2..00000000 --- a/keystone/content/admin/samples/endpointTemplates.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<endpointTemplates xmlns="http://docs.openstack.org/identity/api/v2.0"> - <endpointTemplate - id="1" - region="North" - global="true" - serviceType="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" - serviceType="service2" - 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" - serviceType="service1" - 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" - serviceType="service2" - 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" - serviceType="service3" - publicURL="https://service3.public.com/v1"> - <version - ID="1" - List="https://service1.public.com/" - Info="https://service1.public.com/v1"/> - </endpointTemplate> -</endpointTemplates> diff --git a/keystone/content/admin/samples/endpoints.json b/keystone/content/admin/samples/endpoints.json deleted file mode 100644 index 951a6228..00000000 --- a/keystone/content/admin/samples/endpoints.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "endpoints": [ - { - "id": 1, - "href": "https://auth.keystone.com/v2.0/endpoints/1" - }, { - "id": 2, - "href": "https://auth.keystone.com/v2.0/endpoints/2" - }, { - "id": 3, - "href": "https://auth.keystone.com/v2.0/endpoints/3" - }, { - "id": 4, - "href": "https://auth.keystone.com/v2.0/endpoints/4" - }, { - "id": 5, - "href": "https://auth.keystone.com/v2.0/endpoints/5" - } - ] -} diff --git a/keystone/content/admin/samples/endpoints.xml b/keystone/content/admin/samples/endpoints.xml deleted file mode 100644 index df8480f9..00000000 --- a/keystone/content/admin/samples/endpoints.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<endpoints - xmlns="http://docs.openstack.org/identity/api/v2.0"> - <endpoint - href="https://auth.keystone.com/v2.0/endpoints/1" - id="1" /> - <endpoint - href="https://auth.keystone.com/v2.0/endpoints/2" - id="2" /> - <endpoint - href="https://auth.keystone.com/v2.0/endpoints/3" - id="3" /> - <endpoint - href="https://auth.keystone.com/v2.0/endpoints/4" - id="4" /> - <endpoint - href="https://auth.keystone.com/v2.0/endpoints/5" - id="5" /> -</endpoints> diff --git a/keystone/content/admin/samples/ext-getuser.json b/keystone/content/admin/samples/ext-getuser.json deleted file mode 100644 index b1c80306..00000000 --- a/keystone/content/admin/samples/ext-getuser.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "user": { - "roles": { - "values": [ - { - "tenantId": "1234", - "id": "Admin" - } - ] - }, - "id": "u1000", - "username": "jqsmith", - "email": "john.smith@example.org", - "enabled": true, - "RS-META:metadata": { - "values": { - "MetaKey1": "MetaValue1", - "MetaKey2": "MetaValue2" - } - } - } -} diff --git a/keystone/content/admin/samples/ext-getuser.xml b/keystone/content/admin/samples/ext-getuser.xml deleted file mode 100644 index b155904a..00000000 --- a/keystone/content/admin/samples/ext-getuser.xml +++ /dev/null @@ -1,13 +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" - id="u1000" username="jqsmith"> - <roles> - <role tenantId="1234" id="Admin"/> - </roles> - <metadata - xmlns="http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0"> - <meta key="MetaKey1">MetaValue1</meta> - <meta key="MetaKey2">MetaValue2</meta> - </metadata> -</user> diff --git a/keystone/content/admin/samples/extension.json b/keystone/content/admin/samples/extension.json deleted file mode 100644 index a62ea97a..00000000 --- a/keystone/content/admin/samples/extension.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 arbritrary 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" - } - ] - } -} diff --git a/keystone/content/admin/samples/extension.xml b/keystone/content/admin/samples/extension.xml deleted file mode 100644 index 056d7e96..00000000 --- a/keystone/content/admin/samples/extension.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<extension xmlns="http://docs.openstack.org/common/api/v1.0" - xmlns:atom="http://www.w3.org/2005/Atom" - 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 arbritrary metadata with a user. - </description> - - <atom:link rel="describedby" - type="application/pdf" - href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"/> - <atom:link rel="describedby" - type="application/vnd.sun.wadl+xml" - href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"/> - -</extension> - - diff --git a/keystone/content/admin/samples/extensions.json b/keystone/content/admin/samples/extensions.json deleted file mode 100644 index 18803f07..00000000 --- a/keystone/content/admin/samples/extensions.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "extensions": { - "values": [ - { - "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": [ - { - "rel": "describedby", - "type": "application/pdf", - "href": "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf" - }, { - "rel": "describedby", - "type": "application/vnd.sun.wadl+xml", - "href": "http://docs.rackspacecloud.com/identity/api/ext/identity-rpe.wadl" - } - ] - }, { - "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 arbritrary 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-meta.wadl" - } - ] - } - ] - } -} diff --git a/keystone/content/admin/samples/extensions.xml b/keystone/content/admin/samples/extensions.xml deleted file mode 100644 index c11b06d7..00000000 --- a/keystone/content/admin/samples/extensions.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<extensions xmlns="http://docs.openstack.org/common/api/v1.0" - xmlns:atom="http://www.w3.org/2005/Atom"> - <extension - name="Reset Password Extension" - namespace="http://docs.rackspacecloud.com/identity/api/ext/rpe/v1.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. - </description> - - <atom:link rel="describedby" - type="application/pdf" - href="http://docs.rackspacecloud.com/identity/api/ext/identity-rpe-20111111.pdf"/> - <atom:link rel="describedby" - type="application/vnd.sun.wadl+xml" - href="http://docs.rackspacecloud.com/identity/api/ext/identity-rpe.wadl"/> - </extension> - <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 arbritrary metadata with a user. - </description> - - <atom:link rel="describedby" - type="application/pdf" - href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta-20111201.pdf"/> - <atom:link rel="describedby" - type="application/vnd.sun.wadl+xml" - href="http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl"/> - </extension> -</extensions> diff --git a/keystone/content/admin/samples/getuser-1.json b/keystone/content/admin/samples/getuser-1.json deleted file mode 100644 index 1439651d..00000000 --- a/keystone/content/admin/samples/getuser-1.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "user": { - "roles": { - "values": [ - { - "tenantId": "1234", - "id": "Admin" - }, { - "tenantId": "1234", - "id": "DBUser" - } - ], - "links": [ - { - "rel": "next", - "href": "http://identity.api.openstack.org/v2.0/tenants/1234/users/u1000/roles?marker=Super" - } - ] - }, - "id": "u1000", - "username": "jqsmith", - "email": "john.smith@example.org", - "enabled": true - } -} diff --git a/keystone/content/admin/samples/getuser-1.xml b/keystone/content/admin/samples/getuser-1.xml deleted file mode 100644 index 531a229f..00000000 --- a/keystone/content/admin/samples/getuser-1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<user xmlns="http://docs.openstack.org/identity/api/v2.0" - xmlns:atom="http://www.w3.org/2005/Atom" - enabled="true" email="john.smith@example.org" - username="jqsmith" id="u1000"> - <roles> - <role tenantId="1234" id="Admin"/> - <role tenantId="1234" id="DBUser"/> - <atom:link - rel="next" - href="http://identity.api.openstack.org/v2.0/tenants/1234/users/u1000/groups?marker=Super"/> - </roles> -</user> diff --git a/keystone/content/admin/samples/identity_fault.json b/keystone/content/admin/samples/identity_fault.json deleted file mode 100644 index 9968eec2..00000000 --- a/keystone/content/admin/samples/identity_fault.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "identityFault": { - "message": "Fault", - "details": "Error Details...", - "code": 500 - } -} diff --git a/keystone/content/admin/samples/identity_fault.xml b/keystone/content/admin/samples/identity_fault.xml deleted file mode 100644 index 6787af21..00000000 --- a/keystone/content/admin/samples/identity_fault.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<identityFault xmlns="http://docs.openstack.org/identity/api/v2.0" - code="500"> - <message>Fault</message> - <details>Error Details...</details> -</identityFault> diff --git a/keystone/content/admin/samples/item_not_found.json b/keystone/content/admin/samples/item_not_found.json deleted file mode 100644 index 8ba8c207..00000000 --- a/keystone/content/admin/samples/item_not_found.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "itemNotFound": { - "message": "Item not found.", - "details": "Error Details...", - "code": 404 - } -} diff --git a/keystone/content/admin/samples/item_not_found.xml b/keystone/content/admin/samples/item_not_found.xml deleted file mode 100644 index 3f78b498..00000000 --- a/keystone/content/admin/samples/item_not_found.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<itemNotFound xmlns="http://docs.openstack.org/identity/api/v2.0" - code="404"> - <message>Item not found.</message> - <details>Error Details...</details> -</itemNotFound> diff --git a/keystone/content/admin/samples/role.json b/keystone/content/admin/samples/role.json deleted file mode 100644 index b649810a..00000000 --- a/keystone/content/admin/samples/role.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "role": { - "id": "Guest", - "description": "Guest Access" - } -} diff --git a/keystone/content/admin/samples/role.xml b/keystone/content/admin/samples/role.xml deleted file mode 100644 index 48fe20d8..00000000 --- a/keystone/content/admin/samples/role.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<role xmlns="http://docs.openstack.org/identity/api/v2.0" id="Admin" - description="All Access" /> diff --git a/keystone/content/admin/samples/roles.json b/keystone/content/admin/samples/roles.json deleted file mode 100644 index a55481bb..00000000 --- a/keystone/content/admin/samples/roles.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "roles": [ - { - "id": "Admin", - "tenantId": "1234", - "description": "All access" - }, { - "id": "Guest", - "tenantId": "3456", - "description": "Guest Access" - } - ] -} diff --git a/keystone/content/admin/samples/roles.xml b/keystone/content/admin/samples/roles.xml deleted file mode 100644 index 952c7b7c..00000000 --- a/keystone/content/admin/samples/roles.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<roles xmlns="http://docs.openstack.org/identity/api/v2.0"> - <role id="Admin" tenantId="1234" description="All Access" /> - <role id="Guest" tenantId="3456" description="Guest Access" /> -</roles>
\ No newline at end of file diff --git a/keystone/content/admin/samples/samplerequestheader.txt b/keystone/content/admin/samples/samplerequestheader.txt deleted file mode 100644 index 5641d874..00000000 --- a/keystone/content/admin/samples/samplerequestheader.txt +++ /dev/null @@ -1,4 +0,0 @@ -POST /v2.0/tokens HTTP/1.1 -Host: identity.api.openstack.org -Content-Type: application/json -Accept: application/xml
\ No newline at end of file diff --git a/keystone/content/admin/samples/sampleresponseheader.txt b/keystone/content/admin/samples/sampleresponseheader.txt deleted file mode 100644 index aee1205a..00000000 --- a/keystone/content/admin/samples/sampleresponseheader.txt +++ /dev/null @@ -1,4 +0,0 @@ -HTTP/1.1 200 OKAY -Date: Mon, 12 Nov 2010 15:55:01 GMT -Content-Length: -Content-Type: application/xml; charset=UTF-8
\ No newline at end of file diff --git a/keystone/content/admin/samples/service.json b/keystone/content/admin/samples/service.json deleted file mode 100644 index 1b31aac4..00000000 --- a/keystone/content/admin/samples/service.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "service": { - "id": "nova", - "type": "compute", - "description": "A description ..." - } -} diff --git a/keystone/content/admin/samples/service.xml b/keystone/content/admin/samples/service.xml deleted file mode 100644 index f79a6724..00000000 --- a/keystone/content/admin/samples/service.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<service xmlns="http://docs.openstack.org/identity/api/v2.0" id="nova" - type="compute" description="OpenStack Compute Service" /> diff --git a/keystone/content/admin/samples/services.json b/keystone/content/admin/samples/services.json deleted file mode 100644 index 6a0ac8e2..00000000 --- a/keystone/content/admin/samples/services.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "services": [ - { - "id": "nova", - "type": "compute", - "description": "Computers in the Cloud" - }, { - "id": "glance", - "type": "image-service", - "description": "Server Images" - } - ] -} diff --git a/keystone/content/admin/samples/services.xml b/keystone/content/admin/samples/services.xml deleted file mode 100644 index dd5327ef..00000000 --- a/keystone/content/admin/samples/services.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<services xmlns="http://docs.openstack.org/identity/api/v2.0"> - <service id="Nova" type="compute" description="Openstack Service" /> - <service id="Glance" type="image-service" description="Openstack Service" /> -</services>
\ No newline at end of file diff --git a/keystone/content/admin/samples/tenant.json b/keystone/content/admin/samples/tenant.json deleted file mode 100644 index 794a61ce..00000000 --- a/keystone/content/admin/samples/tenant.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "tenant": { - "id": "1234", - "name": "ACME corp", - "description": "A description ...", - "enabled": true - } -} diff --git a/keystone/content/admin/samples/tenant.xml b/keystone/content/admin/samples/tenant.xml deleted file mode 100644 index ce0137be..00000000 --- a/keystone/content/admin/samples/tenant.xml +++ /dev/null @@ -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> diff --git a/keystone/content/admin/samples/tenantlock.json b/keystone/content/admin/samples/tenantlock.json deleted file mode 100644 index 611e4adb..00000000 --- a/keystone/content/admin/samples/tenantlock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "tenant": { - "description": "A NEW description..." - } -} diff --git a/keystone/content/admin/samples/tenantlock.xml b/keystone/content/admin/samples/tenantlock.xml deleted file mode 100644 index 06a68a83..00000000 --- a/keystone/content/admin/samples/tenantlock.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"> - <description>A NEW description...</description> -</tenant> diff --git a/keystone/content/admin/samples/tenants-1.json b/keystone/content/admin/samples/tenants-1.json deleted file mode 100644 index 4f845760..00000000 --- a/keystone/content/admin/samples/tenants-1.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "tenants": { - "values": [ - { - "id": "1234", - "name": "ACME corp", - "description": "A description ...", - "enabled": true - } - ], - "links": [ - { - "rel": "next", - "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234" - } - ] - } -} diff --git a/keystone/content/admin/samples/tenants-1.xml b/keystone/content/admin/samples/tenants-1.xml deleted file mode 100644 index e486649e..00000000 --- a/keystone/content/admin/samples/tenants-1.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tenants xmlns="http://docs.openstack.org/identity/api/v2.0" - xmlns:atom="http://www.w3.org/2005/Atom"> - <tenant enabled="true" id="1234" name="ACME Corp"> - <description>A description...</description> - </tenant> - <atom:link - rel="next" - href="http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"/> -</tenants> diff --git a/keystone/content/admin/samples/tenants-2.json b/keystone/content/admin/samples/tenants-2.json deleted file mode 100644 index c966c505..00000000 --- a/keystone/content/admin/samples/tenants-2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "tenants": { - "values": [ - { - "id": "3645", - "name": "Iron Works", - "description": "A description ...", - "enabled": true - } - ], - "links": [ - { - "rel": "next", - "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=3645" - }, { - "rel": "previous", - "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1" - } - ] - } -} diff --git a/keystone/content/admin/samples/tenants-2.xml b/keystone/content/admin/samples/tenants-2.xml deleted file mode 100644 index 7b049c40..00000000 --- a/keystone/content/admin/samples/tenants-2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tenants xmlns="http://docs.openstack.org/identity/api/v2.0" - xmlns:atom="http://www.w3.org/2005/Atom"> - <tenant enabled="true" id="3645" name="Iron Works"> - <description>A description...</description> - </tenant> - <atom:link - rel="previous" - href="http://identity.api.openstack.org/v2.0/tenants?limit=1"/> - <atom:link - rel="next" - href="http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=3645"/> -</tenants> diff --git a/keystone/content/admin/samples/tenants-3.json b/keystone/content/admin/samples/tenants-3.json deleted file mode 100644 index 8546234f..00000000 --- a/keystone/content/admin/samples/tenants-3.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "tenants": { - "values": [ - { - "id": "9999", - "name": "Bigz", - "description": "A description ...", - "enabled": true - } - ], - "links": [ - { - "rel": "previous", - "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234" - } - ] - } -} diff --git a/keystone/content/admin/samples/tenants-3.xml b/keystone/content/admin/samples/tenants-3.xml deleted file mode 100644 index a0edcadb..00000000 --- a/keystone/content/admin/samples/tenants-3.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tenants xmlns="http://docs.openstack.org/identity/api/v2.0" - xmlns:atom="http://www.w3.org/2005/Atom"> - <tenant enabled="true" id="9999" name="Bigz"> - <description>A description...</description> - </tenant> - <atom:link - rel="previous" - href="http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234"/> -</tenants> diff --git a/keystone/content/admin/samples/tenants-request.txt b/keystone/content/admin/samples/tenants-request.txt deleted file mode 100644 index 9dbf85e5..00000000 --- a/keystone/content/admin/samples/tenants-request.txt +++ /dev/null @@ -1,5 +0,0 @@ -GET /v2.0/tenants HTTP/1.1 -Host: identity.api.openstack.org -Content-Type: application/json -X-Auth-Token: fa8426a0-8eaf-4d22-8e13-7c1b16a9370c -Accept: application/json
\ No newline at end of file diff --git a/keystone/content/admin/samples/tenants.json b/keystone/content/admin/samples/tenants.json deleted file mode 100644 index c0f2b5d6..00000000 --- a/keystone/content/admin/samples/tenants.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "tenants": { - "values": [ - { - "id": "1234", - "name": "ACME Corp", - "description": "A description ...", - "enabled": true - }, { - "id": "3456", - "name": "Iron Works", - "description": "A description ...", - "enabled": true - } - ] - } -}
\ No newline at end of file diff --git a/keystone/content/admin/samples/tenants.xml b/keystone/content/admin/samples/tenants.xml deleted file mode 100644 index ac5fa2d9..00000000 --- a/keystone/content/admin/samples/tenants.xml +++ /dev/null @@ -1,14 +0,0 @@ -HTTP/1.1 200 OK -Content-Type: application/xml; charset=UTF-8 -Content-Length: 200 -Date: Sun, 1 Jan 2011 9:00:00 GMT - -<?xml version="1.0" encoding="UTF-8"?> -<tenants xmlns="http://docs.openstack.org/identity/api/v2.0"> - <tenant enabled="true" id="1234" name="ACME Corp"> - <description>A description...</description> - </tenant> - <tenant enabled="true" id="3645" name="Iron Works"> - <description>A description...</description> - </tenant> -</tenants> diff --git a/keystone/content/admin/samples/updatedtenant.json b/keystone/content/admin/samples/updatedtenant.json deleted file mode 100644 index 2acf53d1..00000000 --- a/keystone/content/admin/samples/updatedtenant.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "tenant": { - "id": "1234", - "name": "ACME Corp", - "description": "A NEW description...", - "enabled": true - } -} diff --git a/keystone/content/admin/samples/updatedtenant.xml b/keystone/content/admin/samples/updatedtenant.xml deleted file mode 100644 index 5b36701a..00000000 --- a/keystone/content/admin/samples/updatedtenant.xml +++ /dev/null @@ -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 NEW description...</description> -</tenant> diff --git a/keystone/content/admin/samples/user.json b/keystone/content/admin/samples/user.json deleted file mode 100644 index 1623e95d..00000000 --- a/keystone/content/admin/samples/user.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user": { - "id": "u1000", - "username": "jqsmith", - "email": "john.smith@example.org", - "enabled": true - } -} diff --git a/keystone/content/admin/samples/user.xml b/keystone/content/admin/samples/user.xml deleted file mode 100644 index af035dee..00000000 --- a/keystone/content/admin/samples/user.xml +++ /dev/null @@ -1,5 +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"> -</user> diff --git a/keystone/content/admin/samples/validatetoken.json b/keystone/content/admin/samples/validatetoken.json deleted file mode 100644 index 6f655374..00000000 --- a/keystone/content/admin/samples/validatetoken.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "auth": { - "token": { - "expires": "2010-11-01T03:32:15-05:00", - "id": "ab48a9efdfedb23ty3494" - }, - "user": { - "username": "jqsmith", - "roles": [ - { - "id": "Admin", - "tenantId": "one" - }, { - "id": "compute:cloud_admin" - } - ] - } - } -} diff --git a/keystone/content/admin/samples/validatetoken.xml b/keystone/content/admin/samples/validatetoken.xml deleted file mode 100644 index 5987ff46..00000000 --- a/keystone/content/admin/samples/validatetoken.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<auth xmlns="http://docs.openstack.org/identity/api/v2.0"> - <token expires="2010-11-01T03:32:15-05:00" - id="ab48a9efdfedb23ty3494"/> - <user username="jqsmith"> - <roles xmlns="http://docs.openstack.org/identity/api/v2.0"> - <role xmlns="http://docs.openstack.org/identity/api/v2.0" - id="Admin" tenantId="one"/> - <role xmlns="http://docs.openstack.org/identity/api/v2.0" - id="compute:cloud_admin"/> - </roles> - </user> -</auth> diff --git a/keystone/content/admin/samples/version-atom.xml b/keystone/content/admin/samples/version-atom.xml deleted file mode 100644 index 3d78a4a3..00000000 --- a/keystone/content/admin/samples/version-atom.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feed xmlns="http://www.w3.org/2005/Atom"> - <title type="text">About This Version</title> - <updated>2011-01-21T11:33:21-06:00</updated> - <id>http://identity.api.openstack.org/v2.0/</id> - <author><name>OpenStack</name><uri>http://www.openstack.org/</uri></author> - <link rel="self" href="http://identity.api.openstack.org/v2.0/"/> - <entry> - <id>http://identity.api.openstack.org/v2.0/</id> - <title type="text">Version v2.0</title> - <updated>2011-01-21T11:33:21-06:00</updated> - <link rel="self" href="http://identity.api.openstack.org/v2.0/"/> - <link rel="describedby" type="application/pdf" - href="http://docs.openstack.org/identity/api/v2.0/identity-latest.pdf"/> - <link rel="describedby" type="application/vnd.sun.wadl+xml" - href="http://docs.openstack.org/identity/api/v2.0/application.wadl"/> - <content type="text">Version v2.0 CURRENT (2011-01-21T11:33:21-06:00)</content> - </entry> -</feed> diff --git a/keystone/content/admin/samples/version.json b/keystone/content/admin/samples/version.json deleted file mode 100644 index db42ac80..00000000 --- a/keystone/content/admin/samples/version.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": { - "id": "v2.0", - "status": "CURRENT", - "updated": "2011-01-21T11:33:21-06:00", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v2.0/" - }, { - "rel": "describedby", - "type": "application/pdf", - "href": "http://docs.openstack.org/identity/api/v2.0/identity-latest.pdf" - }, { - "rel": "describedby", - "type": "application/vnd.sun.wadl+xml", - "href": "http://docs.openstack.org/identity/api/v2.0/identity.wadl" - } - ], - "media-types": [ - { - "base": "application/xml", - "type": "application/vnd.openstack.identity+xml;version=2.0" - }, { - "base": "application/json", - "type": "application/vnd.openstack.identity+json;version=2.0" - } - ] - } -} diff --git a/keystone/content/admin/samples/version.xml b/keystone/content/admin/samples/version.xml deleted file mode 100644 index d0f77e42..00000000 --- a/keystone/content/admin/samples/version.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<version xmlns="http://docs.openstack.org/common/api/v1.0" - xmlns:atom="http://www.w3.org/2005/Atom" - id="v2.0" status="CURRENT" updated="2011-01-21T11:33:21-06:00"> - - <media-types> - <media-type base="application/xml" - type="application/vnd.openstack.identity+xml;version=2.0"/> - <media-type base="application/json" - type="application/vnd.openstack.identity+json;version=2.0"/> - </media-types> - - <atom:link rel="self" - href="http://identity.api.openstack.org/v2.0/"/> - - <atom:link rel="describedby" - type="application/pdf" - href="http://docs.openstack.org/identity/api/v2.0/identity-latest.pdf" /> - - <atom:link rel="describedby" - type="application/vnd.sun.wadl+xml" - href="http://docs.openstack.org/identity/api/v2.0/identity.wadl" /> -</version> diff --git a/keystone/content/admin/samples/versions-atom.xml b/keystone/content/admin/samples/versions-atom.xml deleted file mode 100644 index 5c864fce..00000000 --- a/keystone/content/admin/samples/versions-atom.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feed xmlns="http://www.w3.org/2005/Atom"> - <title type="text">Available API Versions</title> - <updated>2010-12-12T18:30:02.25Z</updated> - <id>http://identity.api.openstack.org/</id> - <author><name>OpenStack</name><uri>http://www.openstack.org/</uri></author> - <link rel="self" href="http://identity.api.openstack.org/"/> - <entry> - <id>http://identity.api.openstack.org/v2.0/</id> - <title type="text">Version v2.0</title> - <updated>2011-05-27T20:22:02.25Z</updated> - <link rel="self" href="http://identity.api.openstack.org/v2.0/"/> - <content type="text">Version v2.1 CURRENT (2011-05-27T20:22:02.25Z)</content> - </entry> - <entry> - <id>http://identity.api.openstack.org/v1.1/</id> - <title type="text">Version v1.1</title> - <updated>2010-12-12T18:30:02.25Z</updated> - <link rel="self" href="http://identity.api.openstack.org/v1.1/"/> - <content type="text">Version v1.1 CURRENT (2010-12-12T18:30:02.25Z)</content> - </entry> - <entry> - <id>http://identity.api.openstack.org/v1.0/</id> - <title type="text">Version v1.0</title> - <updated>2009-10-09T11:30:00Z</updated> - <link rel="self" href="http://identity.api.openstack.org/v1.0/"/> - <content type="text">Version v1.0 DEPRECATED (2009-10-09T11:30:00Z)</content> - </entry> -</feed> diff --git a/keystone/content/admin/samples/versions.json b/keystone/content/admin/samples/versions.json deleted file mode 100644 index 4c90ea05..00000000 --- a/keystone/content/admin/samples/versions.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "versions": { - "values": [ - { - "id": "v1.0", - "status": "DEPRECATED", - "updated": "2009-10-09T11:30:00Z", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v1.0/" - } - ] - }, { - "id": "v1.1", - "status": "CURRENT", - "updated": "2010-12-12T18:30:02.25Z", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v1.1/" - } - ] - }, { - "id": "v2.0", - "status": "BETA", - "updated": "2011-05-27T20:22:02.25Z", - "links": [ - { - "rel": "self", - "href": "http://identity.api.openstack.org/v2.0/" - } - ] - } - ] - } -} diff --git a/keystone/content/admin/samples/versions.xml b/keystone/content/admin/samples/versions.xml deleted file mode 100644 index caa9801b..00000000 --- a/keystone/content/admin/samples/versions.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<versions xmlns="http://docs.openstack.org/common/api/v1.0" - xmlns:atom="http://www.w3.org/2005/Atom"> - - <version id="v1.0" status="DEPRECATED" - updated="2009-10-09T11:30:00Z"> - <atom:link rel="self" - href="http://identity.api.openstack.org/v1.0/"/> - </version> - - <version id="v1.1" status="CURRENT" - updated="2010-12-12T18:30:02.25Z"> - <atom:link rel="self" - href="http://identity.api.openstack.org/v1.1/"/> - </version> - - <version id="v2.0" status="BETA" - updated="2011-05-27T20:22:02.25Z"> - <atom:link rel="self" - href="http://identity.api.openstack.org/v2.0/"/> - </version> - -</versions> diff --git a/keystone/content/common/samples/RAX-KSGRP-group.json b/keystone/content/common/samples/RAX-KSGRP-group.json deleted file mode 100644 index 0ec60c60..00000000 --- a/keystone/content/common/samples/RAX-KSGRP-group.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "group": { - "id": "test_global_group", - "description": "A description ..." - } -} diff --git a/keystone/content/common/samples/RAX-KSGRP-group.xml b/keystone/content/common/samples/RAX-KSGRP-group.xml deleted file mode 100644 index 998c120d..00000000 --- a/keystone/content/common/samples/RAX-KSGRP-group.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<group xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0" id="test group"> - <description>A Description of the group</description> -</group> diff --git a/keystone/content/common/samples/RAX-KSGRP-groups.json b/keystone/content/common/samples/RAX-KSGRP-groups.json index a85ed112..3cf4be23 100644 --- a/keystone/content/common/samples/RAX-KSGRP-groups.json +++ b/keystone/content/common/samples/RAX-KSGRP-groups.json @@ -1,5 +1,5 @@ { - "groups": { + "RAX-KSGRP:groups": { "values": [ { "id": "test_global_group_add", diff --git a/keystone/content/common/samples/auth.json b/keystone/content/common/samples/auth.json index 63e54bff..df289f69 100644 --- a/keystone/content/common/samples/auth.json +++ b/keystone/content/common/samples/auth.json @@ -1,75 +1,84 @@ { - "auth": { - "token": { - "id": "asdasdasd-adsasdads-asdasdasd-adsadsasd", - "expires": "2010-11-01T03:32:15-05:00" - }, - "user":{ - "id":"testId", - "name":"testName", - "roles":[ - { - "id":"compute:admin" - } - ]}, - "serviceCatalog": [ - { - "name": "Cloud Servers", - "type": "compute", - "endpoints": [ - { - "publicURL": "https://compute.north.host/v1/1234", - "internalURL": "https://compute.north.host/v1/1234", - "region": "North", - "tenantId": "1234", - "versionId": "1.0", - "versionInfo": "https://compute.north.host/v1.0/", - "versionList": "https://compute.north.host/" - }, { - "publicURL": "https://compute.north.host/v1.1/3456", - "internalURL": "https://compute.north.host/v1.1/3456", - "region": "North", - "tenantId": "3456", - "versionId": "1.1", - "versionInfo": "https://compute.north.host/v1.1/", - "versionList": "https://compute.north.host/" - } - ] - }, { - "name": "Cloud Files", - "type": "object-store", - "endpoints": [ - { - "publicURL": "https://compute.north.host/v1/blah-blah", - "internalURL": "https://compute.north.host/v1/blah-blah", - "region": "South", - "tenantId": "1234", - "versionId": "1.0", - "versionInfo": "uri", - "versionList": "uri" - }, { - "publicURL": "https://compute.north.host/v1.1/blah-blah", - "internalURL": "https://compute.north.host/v1.1/blah-blah", - "region": "South", - "tenantId": "1234", - "versionId": "1.1", - "versionInfo": "https://compute.north.host/v1.1/", - "versionList": "https://compute.north.host/" - } - ], - "endpoint_links": [ - { - "rel": "next", - "href": "https://identity.north.host/v2.0/endpoints?marker=2" - } - ] - } - ], - "serviceCatalog_links": [ - { - "rel": "next", - "href": "https://identity.host/v2.0/endpoints?session=2hfh8Ar&marker=2" - } - ] - } -} + "auth":{ + "token":{ + "id":"asdasdasd-adsasdads-asdasdasd-adsadsasd", + "expires":"2010-11-01T03:32:15-05:00" + }, + "user":{ + "id":"testId", + "name":"testName", + "roles":{ + "values":[{ + "id":"compute:admin" + } + ], + "links": [] + } + }, + "serviceCatalog":{ + "values":[{ + "name":"Cloud Servers", + "type":"compute", + "endpoints":{ + "values":[{ + "publicURL":"https://compute.north.host/v1/1234", + "internalURL":"https://compute.north.host/v1/1234", + "region":"North", + "tenantId":"1234", + "versionId":"1.0", + "versionInfo":"https://compute.north.host/v1.0/", + "versionList":"https://compute.north.host/" + }, + { + "publicURL":"https://compute.north.host/v1.1/3456", + "internalURL":"https://compute.north.host/v1.1/3456", + "region":"North", + "tenantId":"3456", + "versionId":"1.1", + "versionInfo":"https://compute.north.host/v1.1/", + "versionList":"https://compute.north.host/" + } + + ], + "links": [] + } + }, + { + "name":"Cloud Files", + "type":"object-store", + "endpoints":{ + "values":[{ + "publicURL":"https://compute.north.host/v1/blah-blah", + "internalURL":"https://compute.north.host/v1/blah-blah", + "region":"South", + "tenantId":"1234", + "versionId":"1.0", + "versionInfo":"uri", + "versionList":"uri" + }, + { + "publicURL":"https://compute.north.host/v1.1/blah-blah", + "internalURL":"https://compute.north.host/v1.1/blah-blah", + "region":"South", + "tenantId":"1234", + "versionId":"1.1", + "versionInfo":"https://compute.north.host/v1.1/", + "versionList":"https://compute.north.host/" + } + ], + "links":[{ + "rel":"next", + "href":"https://identity.north.host/v2.0/endpoints?marker=2" + } + ] + } + } + ], + "links":[{ + "rel":"next", + "href":"https://identity.host/v2.0/endpoints?session=2hfh8Ar&marker=2" + } + ] + } + } +}
\ No newline at end of file diff --git a/keystone/content/common/samples/auth.xml b/keystone/content/common/samples/auth.xml index 1e897890..5d89a8f2 100644 --- a/keystone/content/common/samples/auth.xml +++ b/keystone/content/common/samples/auth.xml @@ -6,7 +6,7 @@ xmlns="http://docs.openstack.org/identity/api/v2.0"> id="ab48a9efdfedb23ty3494"/> <user id="testId" name="test"> <roles> - <role id="compute:admin"></role> + <role id="compute:admin"/> </roles> </user> <serviceCatalog> diff --git a/keystone/content/common/samples/auth_credentials-OS-KSEC2.json b/keystone/content/common/samples/auth_credentials-OS-KSEC2.json index 93e16ef4..7767c06b 100644 --- a/keystone/content/common/samples/auth_credentials-OS-KSEC2.json +++ b/keystone/content/common/samples/auth_credentials-OS-KSEC2.json @@ -1,10 +1,10 @@ { - "auth": { - "OS-KSEC2-ec2Credentials": { - "username": "test_user", - "secret": "aaaaa", - "signature": "bbb" - }, - "tenantId": "77654" - } + "auth":{ + "OS-KSEC2-ec2Credentials":{ + "username":"test_user", + "secret":"aaaaa", + "signature":"bbb" + }, + "tenantId":"77654" + } }
\ No newline at end of file diff --git a/keystone/content/common/samples/auth_credentials-RAX-KSKEY.json b/keystone/content/common/samples/auth_credentials-RAX-KSKEY.json index f1399f01..9dcbd240 100644 --- a/keystone/content/common/samples/auth_credentials-RAX-KSKEY.json +++ b/keystone/content/common/samples/auth_credentials-RAX-KSKEY.json @@ -1,8 +1,8 @@ { - "auth": { - "RAX-KSKEY:apikeyCredentials": { - "username": "test_user", - "apikey": "aaaaa-bbbbb-ccccc-12345678" + "auth": { + "RAX-KSKEY:apikeyCredentials": { + "username": "test_user", + "apikey": "aaaaa-bbbbb-ccccc-12345678" + }"tenantId": "1234" } - } }
\ No newline at end of file diff --git a/keystone/content/common/samples/authwithgroups.json b/keystone/content/common/samples/authwithgroups.json index d1c09251..0acc5e2d 100644 --- a/keystone/content/common/samples/authwithgroups.json +++ b/keystone/content/common/samples/authwithgroups.json @@ -1,81 +1,92 @@ { - "auth": { - "token": { - "id": "asdasdasd-adsasdads-asdasdasd-adsadsasd", - "expires": "2010-11-01T03:32:15-05:00" - }, - "serviceCatalog": [ - { - "name": "Cloud Servers", - "type": "compute", - "endpoints": [ - { - "publicURL": "https://compute.north.host/v1/1234", - "internalURL": "https://compute.north.host/v1/1234", - "region": "North", - "tenantId": "1234", - "versionId": "1.0", - "versionInfo": "https://compute.north.host/v1.0/", - "versionList": "https://compute.north.host/" - }, { - "publicURL": "https://compute.north.host/v1.1/3456", - "internalURL": "https://compute.north.host/v1.1/3456", - "region": "North", - "tenantId": "3456", - "versionId": "1.1", - "versionInfo": "https://compute.north.host/v1.1/", - "versionList": "https://compute.north.host/" - } - ] - }, { - "name": "Cloud Files", - "type": "object-store", - "endpoints": [ - { - "publicURL": "https://compute.north.host/v1/blah-blah", - "internalURL": "https://compute.north.host/v1/blah-blah", - "region": "South", - "tenantId": "1234", - "versionId": "1.0", - "versionInfo": "uri", - "versionList": "uri" - }, { - "publicURL": "https://compute.north.host/v1.1/blah-blah", - "internalURL": "https://compute.north.host/v1.1/blah-blah", - "region": "South", - "tenantId": "3456", - "versionId": "1.1", - "versionInfo": "https://compute.north.host/v1.1/", - "versionList": "https://compute.north.host/" - } - ], - "endpoint_links": [ - { - "rel": "next", - "href": "https://identity.north.host/v2.0/endpoints?marker=2" - } - ] - } - ], - "serviceCatalog_links": [ - { - "rel": "next", - "href": "https://identity.host/v2.0/endpoints?session=2hfh8Ar&marker=2" - } - ], - "user": { - "id": "u1000", - "username": "jqsmith", - "groups": { - "values": [ - { - "id": "test_global_group_add", - "description": "A description ..." - } - ], - "links": [] + "auth":{ + "token":{ + "id":"asdasdasd-adsasdads-asdasdasd-adsadsasd", + "expires":"2010-11-01T03:32:15-05:00" + }, + "user":{ + "id":"testId", + "name":"testName", + "roles":{ + "values":[{ + "id":"compute:admin" + } + ], + "links": [] + }, + "RAX-KSGRP:groups": { + "values": [ + { + "id": "test_global_group_add", + "description": "A description ..." + } + ], + "links": [] + } + }, + "serviceCatalog":{ + "values":[{ + "name":"Cloud Servers", + "type":"compute", + "endpoints":{ + "values":[{ + "publicURL":"https://compute.north.host/v1/1234", + "internalURL":"https://compute.north.host/v1/1234", + "region":"North", + "tenantId":"1234", + "versionId":"1.0", + "versionInfo":"https://compute.north.host/v1.0/", + "versionList":"https://compute.north.host/" + }, + { + "publicURL":"https://compute.north.host/v1.1/3456", + "internalURL":"https://compute.north.host/v1.1/3456", + "region":"North", + "tenantId":"3456", + "versionId":"1.1", + "versionInfo":"https://compute.north.host/v1.1/", + "versionList":"https://compute.north.host/" + } + ], + "links": [] + } + }, + { + "name":"Cloud Files", + "type":"object-store", + "endpoints":{ + "values":[{ + "publicURL":"https://compute.north.host/v1/blah-blah", + "internalURL":"https://compute.north.host/v1/blah-blah", + "region":"South", + "tenantId":"1234", + "versionId":"1.0", + "versionInfo":"uri", + "versionList":"uri" + }, + { + "publicURL":"https://compute.north.host/v1.1/blah-blah", + "internalURL":"https://compute.north.host/v1.1/blah-blah", + "region":"South", + "tenantId":"1234", + "versionId":"1.1", + "versionInfo":"https://compute.north.host/v1.1/", + "versionList":"https://compute.north.host/" + } + ], + "links":[{ + "rel":"next", + "href":"https://identity.north.host/v2.0/endpoints?marker=2" + } + ] + } + } + ], + "links":[{ + "rel":"next", + "href":"https://identity.host/v2.0/endpoints?session=2hfh8Ar&marker=2" + } + ] } - } } - } }
\ No newline at end of file diff --git a/keystone/content/common/samples/authwithgroups.xml b/keystone/content/common/samples/authwithgroups.xml index 8c85a26f..d4c3506d 100644 --- a/keystone/content/common/samples/authwithgroups.xml +++ b/keystone/content/common/samples/authwithgroups.xml @@ -4,16 +4,13 @@ id="ab48a9efdfedb23ty3494"/> <serviceCatalog> <service type="compute" name="Computers in the Cloud"> - <endpoint - region="North" - tenantId="1234" - publicURL="https://north.compute.public.com/v2.0/1234" - internalURL="https://north.compute.internal.com/v2.0/1234"> - <version - id="2.0" - info="https://north.compute.public.com/v2.0/" - list="https://north.compute.public.com/" /> - </endpoint> + <endpoint region="North" tenantId="1234" + publicURL="https://north.compute.public.com/v2.0/1234" + internalURL="https://north.compute.internal.com/v2.0/1234"> + <version id="2.0" + info="https://north.compute.public.com/v2.0/" + list="https://north.compute.public.com/"/> + </endpoint> <endpoint region="South" tenantId="3456" @@ -63,8 +60,8 @@ <role id="Admin" tenantId="1234" description="All Access" /> </roles> <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="test_global_group_add"> - <description>A Description of the group</description> + <group id="test_global_group_add"> + <description>A Description of the group</description> </group> </groups> </user> diff --git a/keystone/content/common/samples/endpointTemplate.json b/keystone/content/common/samples/endpointTemplate.json index 8e6c68a7..52864436 100644 --- a/keystone/content/common/samples/endpointTemplate.json +++ b/keystone/content/common/samples/endpointTemplate.json @@ -1,14 +1,14 @@ { -"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 - } -} + "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 + } +}
\ No newline at end of file diff --git a/keystone/content/common/samples/endpointTemplate.xml b/keystone/content/common/samples/endpointTemplate.xml index 0b307077..b6222c59 100644 --- a/keystone/content/common/samples/endpointTemplate.xml +++ b/keystone/content/common/samples/endpointTemplate.xml @@ -11,8 +11,8 @@ internalURL="https://service-internal.com/v1" enabled="true"> <version - ID="1" - Info="https://compute.north.public.com/v1/" - List="https://compute.north.public.com/" + id="1" + info="https://compute.north.public.com/v1/" + list="https://compute.north.public.com/" /> </endpointTemplate>
\ No newline at end of file diff --git a/keystone/content/common/samples/endpointTemplates.xml b/keystone/content/common/samples/endpointTemplates.xml index 958a6892..965be9be 100644 --- a/keystone/content/common/samples/endpointTemplates.xml +++ b/keystone/content/common/samples/endpointTemplates.xml @@ -11,57 +11,57 @@ 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"/> + id="1" + list="https://compute.north.public.com/" + info="https://compute.north.public.com/v1"/> </endpointTemplate> <endpointTemplate id="2" region="south" - type="service" + 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"/> + id="1" + list="https://service1.public.com/" + info="https://service1.public.com/v1"/> </endpointTemplate> <endpointTemplate id="3" region="DFW" global="true" - type="service1" + 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"/> + id="1" + list="https://service1.public.com/" + info="https://service1.public.com/v1"/> </endpointTemplate> <endpointTemplate id="4" region="ORD" - type="service3" + 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"/> + id="1" + list="https://service1.public.com/" + info="https://service1.public.com/v1"/> </endpointTemplate> <endpointTemplate id="5" global="true" - type="service4" + type="compute" name="Compute" publicURL="https://service3.public.com/v1"> <version - ID="1" - List="https://service1.public.com/" - Info="https://service1.public.com/v1"/> + id="1" + list="https://service1.public.com/" + info="https://service1.public.com/v1"/> </endpointTemplate> </endpointTemplates> diff --git a/keystone/content/common/samples/endpoints.json b/keystone/content/common/samples/endpoints.json index 91617df8..dd37717e 100644 --- a/keystone/content/common/samples/endpoints.json +++ b/keystone/content/common/samples/endpoints.json @@ -1,50 +1,56 @@ { - "endpoints": [ - { - "id": 1, - "region": "North", - "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/" - }, { - "id": 2, - "region": "South", - "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/" - }, { - "id": 3, - "region": "East", - "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/" - }, { - "id": 4, - "region": "West", - "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/" - }, { - "id": 5, - "region": "Global", - "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/" - } - ] -} + "endpoints":{ + "values":[{ + "id":1, + "region":"North", + "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/" + }, + { + "id":2, + "region":"South", + "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/" + }, + { + "id":3, + "region":"East", + "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/" + }, + { + "id":4, + "region":"West", + "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/" + }, + { + "id":5, + "region":"Global", + "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/" + } + ], + "links":[] + } +}
\ No newline at end of file diff --git a/keystone/content/common/samples/roles.json b/keystone/content/common/samples/roles.json index ac460655..7385cc8e 100644 --- a/keystone/content/common/samples/roles.json +++ b/keystone/content/common/samples/roles.json @@ -1,11 +1,9 @@ { - "roles": [ - { - "id": "Admin", - "description": "All access" - }, { - "id": "Guest", - "description": "Guest Access" + "roles":{ + "values":[{ + "id":"compute:admin" + } + ], + "links":[] } - ] -} +}
\ No newline at end of file diff --git a/keystone/content/common/samples/service.json b/keystone/content/common/samples/service.json index 7d8e297a..175945a7 100644 --- a/keystone/content/common/samples/service.json +++ b/keystone/content/common/samples/service.json @@ -1,7 +1,7 @@ { -"OS-KSADM:service": { - "id": "nova", - "type": "compute", - "description": "A description ..." - } -} + "OS-KSADM:service":{ + "id":"nova", + "type":"compute", + "description":"A description ..." + } +}
\ No newline at end of file diff --git a/keystone/content/common/samples/services.json b/keystone/content/common/samples/services.json index 7cc38715..9ef7cb69 100644 --- a/keystone/content/common/samples/services.json +++ b/keystone/content/common/samples/services.json @@ -1,13 +1,16 @@ { -"OS-KSADM:services": [ - { - "id": "nova", - "type": "compute", - "description": "Computers in the Cloud" - }, { - "id": "glance", - "type": "image-service", - "description": "Server Images" - } - ] -} + "OS-KSADM:services":{ + "values":[{ + "id":"nova", + "type":"compute", + "description":"Computers in the Cloud" + }, + { + "id":"glance", + "type":"image-service", + "description":"Server Images" + } + ] + }, + "links":[] +}
\ No newline at end of file diff --git a/keystone/content/common/samples/validatetoken.json b/keystone/content/common/samples/validatetoken.json index bbaf5f52..b97e8e36 100644 --- a/keystone/content/common/samples/validatetoken.json +++ b/keystone/content/common/samples/validatetoken.json @@ -1,19 +1,19 @@ { - "access": { - "token": { - "expires": "2010-11-01T03:32:15-05:00", - "id": "ab48a9efdfedb23ty3494" - }, - "user": { - "username": "jqsmith", - "roles": [ - { - "id": "Admin", - "tenantId": "one" - }, { - "id": "compute:cloud_admin" + "access":{ + "token":{ + "expires":"2010-11-01T03:32:15-05:00", + "id":"ab48a9efdfedb23ty3494" + }, + "user":{ + "id":"testId", + "name":"testName", + "roles":{ + "values":[{ + "id":"compute:admin" + } + ], + "links":[] + } } - ] } - } -} +}
\ No newline at end of file diff --git a/keystone/content/common/xsd/RAX-KSGRP-groups.xsd b/keystone/content/common/xsd/RAX-KSGRP-groups.xsd index 0360997f..267bacc3 100644 --- a/keystone/content/common/xsd/RAX-KSGRP-groups.xsd +++ b/keystone/content/common/xsd/RAX-KSGRP-groups.xsd @@ -17,8 +17,12 @@ <!--Import schema we are extending --> <import namespace="http://docs.openstack.org/identity/api/v2.0" schemaLocation="token.xsd"/> + + <import namespace="http://docs.openstack.org/identity/api/v2.0" + schemaLocation="api.xsd" /> + - <element name="groups" type="RAX-KSGRP:Group"/> + <element name="groups" type="RAX-KSGRP:Groups"/> <complexType name="Groups"> <sequence> @@ -29,8 +33,12 @@ </complexType> <complexType name="Group"> + <sequence> + <element name="description" type="xsd:string" maxOccurs="1"/> + <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> + </sequence> <attribute name="id" type="xsd:string" use="required"/> - <attribute name="name" type="xsd:string" use="required"/> + <attribute name="name" type="xsd:string" use="optional"/> <anyAttribute namespace="##other" processContents="lax"/> </complexType> diff --git a/keystone/content/common/xsd/RAX-KSKEY-credentials.xsd b/keystone/content/common/xsd/RAX-KSKEY-credentials.xsd index 50a17b8d..24f1fe0e 100644 --- a/keystone/content/common/xsd/RAX-KSKEY-credentials.xsd +++ b/keystone/content/common/xsd/RAX-KSKEY-credentials.xsd @@ -18,13 +18,13 @@ schemaLocation="credentials.xsd"/> <!-- Elements --> - <element name="apikeyCredentials" type="RAX-KSKEY:apikeyCredentials"/> + <element name="apikeyCredentials" type="RAX-KSKEY:apikeyCredentialsWithUsername" substitutionGroup="identity:credential"/> <!-- Complex Types --> <complexType name="apikeyCredentials"> <complexContent> <extension base="identity:CredentialType"> - <attribute name="APIKey" type="xsd:string" use="required" ></attribute> + <attribute name="apikey" type="xsd:string" use="required" ></attribute> </extension> </complexContent> </complexType> @@ -33,7 +33,7 @@ <complexContent> <extension base="identity:CredentialType"> <attribute name="username" type="xsd:string" use="required" ></attribute> - <attribute name="APIKey" type="xsd:string" use="required" ></attribute> + <attribute name="apikey" type="xsd:string" use="required" ></attribute> </extension> </complexContent> </complexType> diff --git a/keystone/content/common/xsd/token.xsd b/keystone/content/common/xsd/token.xsd index ce29f9b0..396f052d 100644 --- a/keystone/content/common/xsd/token.xsd +++ b/keystone/content/common/xsd/token.xsd @@ -65,7 +65,7 @@ <sequence> <element name="token" type="identity:Token"/> <element name="user" type="identity:UserForAuthenticateResponse"/> - <element name="serviceCatalog" type="identity:ServiceCatalog"/> + <element name="serviceCatalog" type="identity:ServiceCatalog" minOccurs="0"/> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> </sequence> <anyAttribute namespace="##other" processContents="lax"/> |