diff --git a/openstack-identity-api/v2.0/src/docbkx/HP-IDM/HP-IDM.xml b/openstack-identity-api/v2.0/src/docbkx/HP-IDM/HP-IDM.xml index e06d91f1..3bdccc7c 100644 --- a/openstack-identity-api/v2.0/src/docbkx/HP-IDM/HP-IDM.xml +++ b/openstack-identity-api/v2.0/src/docbkx/HP-IDM/HP-IDM.xml @@ -158,7 +158,7 @@ Use the HP-IDM extension to perform the following operations on templates: - + diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/create_user_request.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/create_user_request.json deleted file mode 100644 index a8487308..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/create_user_request.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "user": { - "name": "jqsmith", - "OS-KSADM:password": "secrete", - "enabled": true, - "tenantId": "af615b6af60b497e860392ad5e9f8dab", - "email": "john.smith@example.org" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.json deleted file mode 100644 index f405fa79..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "passwordCredentials": { - "username": "test_user", - "password": "mypass" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.xml deleted file mode 100644 index d73991eb..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/passwordcredentials.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.json deleted file mode 100644 index a1b8109d..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "role": { - "id": "123", - "name": "Guest", - "description": "Guest Access" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.xml deleted file mode 100644 index dd25cfff..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/role.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.json deleted file mode 100644 index 9245767e..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "roles":[{ - "id": "123", - "name": "compute:admin", - "description": "Nova Administrator" - } - ], - "roles_links":[] -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.xml deleted file mode 100644 index 30596f92..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/roles.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.json deleted file mode 100644 index e6767f0b..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "OS-KSADM:service":{ - "id": "123", - "name": "nova", - "type": "compute", - "description": "OpenStack Compute Service" - } -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.xml deleted file mode 100644 index 0da67911..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/service.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.json deleted file mode 100644 index ee3ef997..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.json +++ /dev/null @@ -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":[] -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.xml deleted file mode 100644 index 14a5d8d7..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/services.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.json deleted file mode 100644 index 794a61ce..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "tenant": { - "id": "1234", - "name": "ACME corp", - "description": "A description ...", - "enabled": true - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.xml deleted file mode 100644 index ce0137be..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenant.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - A description... - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.json deleted file mode 100644 index 63faba9c..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "tenant": { - "name": "ACME corp", - "description": "A description ...", - "enabled": true - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.xml deleted file mode 100644 index 3983684b..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/tenantwithoutid.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - A description... - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.json deleted file mode 100644 index f26bd077..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "user": { - "name": "jqsmith", - "id": "84cdc81d5ba5448f885f857c3e7ae7dd", - "enabled": true, - "email": "john.smith@example.org", - "tenantId": "af615b6af60b497e860392ad5e9f8dab" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.xml deleted file mode 100644 index ccaf7ec4..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/user.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.json deleted file mode 100644 index 9bedcca7..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.json +++ /dev/null @@ -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":[] -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.xml deleted file mode 100644 index 01b321da..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/users.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.json deleted file mode 100644 index 08014b40..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "user": { - "enabled": true - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.xml deleted file mode 100644 index cf290ceb..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithenabledonly.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.json deleted file mode 100644 index 760500f7..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user": { - "username": "jqsmith", - "email": "john.smith@example.org", - "enabled": true, - "OS-KSADM:password": "secrete" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.xml deleted file mode 100644 index e5775d44..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/userwithoutid.xml +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.json deleted file mode 100644 index ef31c06a..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.json +++ /dev/null @@ -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/" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.xml deleted file mode 100644 index f71112ff..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoint.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.json deleted file mode 100644 index 3c0cdd7d..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.json +++ /dev/null @@ -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 - } -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.xml deleted file mode 100644 index b252fbc2..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplate.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.json deleted file mode 100644 index ba9f87a9..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "OS-KSCATALOG:endpointTemplate":{ - "id": 1 - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml deleted file mode 100644 index 6379b3ae..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplateWithOnlyId.xml +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.json deleted file mode 100644 index 51ec8b3c..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.json +++ /dev/null @@ -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": [] -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.xml deleted file mode 100644 index 94771bef..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpointTemplates.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.json deleted file mode 100644 index d9913f8b..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.json +++ /dev/null @@ -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":[] -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.xml deleted file mode 100644 index 5307ff1f..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/samples/endpoints.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.json deleted file mode 100644 index 9c101ed9..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "auth":{ - "OS-KSEC2-ec2Credentials":{ - "username": "test_user", - "secret": "aaaaa", - "signature": "bbb" - }, - "tenantId": "77654" - } -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml deleted file mode 100644 index ec4f3314..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/auth_credentials-OS-KSEC2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.json deleted file mode 100644 index 54751ddd..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "credentials":[{ - "passwordCredentials":{ - "username": "test_user", - "password": "mypass" - } - }, - { - "OS-KSEC2-ec2Credentials":{ - "username": "test_user", - "secret": "aaaaa", - "signature": "bbb" - } - } - ], - "credentials_links":[] -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.xml deleted file mode 100644 index 45790dfb..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/credentialswithec2.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.json deleted file mode 100644 index 88abe5d9..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "OS-KSEC2-ec2Credentials":{ - "username": "test_user", - "secret": "aaaaa", - "signature": "bbb" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.xml deleted file mode 100644 index 6faf96af..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/samples/ec2Credentials.xml +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml index 0e282840..7a292293 100644 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml +++ b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/OS-KSS3-admin-devguide.xml @@ -36,8 +36,8 @@ - - + + ]> - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.json deleted file mode 100644 index f91b7990..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "credentials":[{ - "passwordCredentials":{ - "username": "test_user", - "password": "mypass" - } - }, - { - "OS-KSS3:s3Credentials":{ - "username": "test_user", - "secret": "aaaaa", - "signature": "bbb" - } - } - ], - "credentials_links":[] -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.xml deleted file mode 100644 index af96e1cb..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/credentialswiths3.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.json deleted file mode 100644 index 76a9d9d6..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "OS-KSS3:s3Credentials":{ - "username": "test_user", - "secret": "aaaaa", - "signature": "bbb" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.xml deleted file mode 100644 index b121feb9..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSS3/samples/s3Credentials.xml +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml index f9f21e39..197ee09a 100644 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml +++ b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/OS-KSVALIDATE-admin-devguide.xml @@ -135,8 +135,8 @@
New Elements
- OS-KSVALIDATE extension to Identity - v2.0 API + OS-KSVALIDATE extension to Identity v2.0 + API
New Elements This extension allows token validation and @@ -166,21 +166,21 @@ - - - - - - - - - -
+ + + + + + + + +
+ diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.json deleted file mode 100644 index d9913f8b..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.json +++ /dev/null @@ -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":[] -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.xml deleted file mode 100644 index 5307ff1f..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/endpoints.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.json b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.json deleted file mode 100644 index 6b2c13bd..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.json +++ /dev/null @@ -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":[] - } - } -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.xml deleted file mode 100644 index 99e956bb..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSVALIDATE/samples/validatetoken.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml index b5814a1f..950c0c77 100644 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml +++ b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/RAX-GRPADM-devguide.xml @@ -32,14 +32,14 @@ '> - - + + - - + + - - + + @@ -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"> - Rackspace extensions to Identity - v2.0 API enabling Group Admin. + Rackspace extensions to Identity v2.0 API + enabling Group Admin. - This document is for software developers - who want to use the Group Admin Extension to the - OpenStack Identity Application Programming Interface + This document is for software developers who want to + use the Group Admin Extension to the OpenStack + Identity Application Programming Interface (API). @@ -191,24 +191,25 @@ - A new resource is created at /RAX-GRPADM/groups that - enables the management of groups. + A new resource is created at + /RAX-GRPADM/groups that enables + the management of groups.
Group Operations + href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/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#group"> - - + diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.json deleted file mode 100644 index 70c83811..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "RAX-KSGRP:group": { - "name": "group1", - "description": "A Description of the group" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.xml deleted file mode 100644 index 687438db..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-create.xml +++ /dev/null @@ -1,3 +0,0 @@ - - A Description of the group - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.json deleted file mode 100644 index 3eb226ef..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "RAX-KSGRP:group": { - "name": "newName", - "description": "A Description of the group" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.xml deleted file mode 100644 index eb53513b..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-for-update.xml +++ /dev/null @@ -1,3 +0,0 @@ - - A new description - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.json deleted file mode 100644 index 20a8e1f1..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "RAX-KSGRP:group": { - "id": "1234", - "name": "newName", - "description": "A new description" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.xml deleted file mode 100644 index e40b8553..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group-updated.xml +++ /dev/null @@ -1,3 +0,0 @@ - - A new description - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.json deleted file mode 100644 index 4b415f42..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "RAX-KSGRP:group": { - "id": "1234", - "name": "group1", - "description": "A Description of the group" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.xml deleted file mode 100644 index 3dcc2fbf..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/group.xml +++ /dev/null @@ -1,3 +0,0 @@ - - A Description of the group - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.json deleted file mode 100644 index 94a7c493..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.json +++ /dev/null @@ -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" - } - ] -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.xml deleted file mode 100644 index 22655cfa..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/groups.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - A Description of the group - - - A Description of the group - - - A Description of the group - - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.json b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.json deleted file mode 100644 index 3fc104d7..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.json +++ /dev/null @@ -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": [] -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.xml deleted file mode 100644 index 01b321da..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-GRPADM/samples/users.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml index c320d482..8d2f30fc 100644 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml +++ b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/RAX-KSGRP-service-devguide.xml @@ -36,15 +36,15 @@ - - - - + + + + - - - - + + + + ]> - Rackspace extensions to Identity v2.0 - API enabling groups. + Rackspace extensions to Identity v2.0 API + enabling groups. Summary of Changes - Rackspace extensions to Identity v2.0 API - allows authenticate call to also return information about - group memberships of the user. + Rackspace extensions to Identity v2.0 API allows + authenticate call to also return information about group + memberships of the user.
New Headers None. @@ -145,8 +145,8 @@
New Elements
- Rackspace extensions to the Identity v2.0 - API enabling groups. + Rackspace extensions to the Identity v2.0 API + enabling groups.
New Elements This extension starts returning groups as a @@ -186,14 +186,15 @@ - The - Rackspace API Groups Service Extension adds the following calls: + The Rackspace API Groups Service Extension + adds the following calls:
Group Operations - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.json deleted file mode 100644 index 425805f5..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "RAX-KSGRP:group": { - "description": "Default Limits", - "id": "1", - "name": "Default" - } -} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.xml deleted file mode 100644 index 507955ed..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-group.xml +++ /dev/null @@ -1,3 +0,0 @@ - - Default Limits - \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.json deleted file mode 100644 index 096df67e..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.json +++ /dev/null @@ -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":[] -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.xml deleted file mode 100644 index 1d0173e7..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSGRP/samples/RAX-KSGRP-groups.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - Default Limits - - - This is the first new group. - - - Defaults with faster rate limits - - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml index 5c548ba9..87c862b4 100644 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml +++ b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-admin-devguide.xml @@ -31,8 +31,8 @@ Description '> - - + + ]> - Rackspace extensions to Identity - v2.0 API enabling API Key authentication. + Rackspace extensions to Identity v2.0 API + enabling API Key authentication. This document is intended for service developers interested in using the Rackspace API Key - Authentication Admin Extension along with - OpenStack Identity (API). - + Authentication Admin Extension along with OpenStack + Identity (API). @@ -136,9 +135,9 @@ RAX-KSKEY Admin Extension This extension enables authentication calls to accept the - apikeyCredentials parameter. - These credentials support Rackspace-style authentication. - + apikeyCredentials + parameter. These credentials support + Rackspace-style authentication. apikeyCredentials XML @@ -172,16 +171,17 @@ - The Rackspace API Key - Authentication Extension adds the following calls: + The Rackspace API Key Authentication Extension adds + the following calls:
User Operations - - + href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSKEY-admin.wadl"> + +
diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml index b894b45d..fc777bd7 100644 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml +++ b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/RAX-KSKEY-service-devguide.xml @@ -33,8 +33,8 @@ '> - - + + ]> @@ -74,9 +74,8 @@ This document is intended for client developers interested in using the Rackspace API Key - Authentication Service Extension along with - OpenStack Identity (API). - + Authentication Service Extension along with OpenStack + Identity (API). @@ -95,7 +94,8 @@ + href="http://docs.rackspacecloud.com/auth/api/v2.0/RAX-KSKEY/xsd/RAX-KSKEY-credentials.xsd" + /> @@ -134,25 +134,28 @@
New Element
- Rackspace Extensions to Identity v2.0 API + Rackspace Extensions to Identity v2.0 + API
- RAX-KSKEY apikeyCredentials Extended Attribute - The - apikeyCredentials extended attribute supports Rackspace style + RAX-KSKEY apikeyCredentials Extended + Attribute + The apikeyCredentials + extended attribute supports Rackspace style authentication. - - - Verb - URI - Description - - + + + Verb + URI + Description + + + &POST; /tokens - Authenticates and - generates a token. + Authenticates and generates a + token. @@ -164,35 +167,42 @@ (400), identityFault (500), serviceUnavailable(503) - 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. + 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. 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 . - 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. + credentials must be included in the body. See + . + 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. - Auth with apikeyCredentials: JSON Request + Auth with apikeyCredentials: JSON + Request - - Auth with apikeyCredentials: XML Request + + Auth with apikeyCredentials: XML + Request - Auth with apikeyCredentials: JSON Response + Auth with apikeyCredentials: JSON + Response - Auth with apikeyCredentials: XML Response + Auth with apikeyCredentials: XML + Response
diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.json deleted file mode 100644 index b1672543..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "credentials":[{ - "passwordCredentials":{ - "username": "test_user", - "password": "mypass" - } - } - ], - "credentials_links":[] -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.xml deleted file mode 100644 index 8efa9f2e..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentials.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml index 91b9a26e..c97d49ef 100644 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml +++ b/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/RAX-KSQA-admin-devguide.xml @@ -31,8 +31,8 @@ Description '> - - + + ]> + 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" + />
diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.json b/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.json deleted file mode 100644 index 4f9b14a8..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "RAX-KSQA:secretQA":{ - "question": "What is the color of my eyes?", - "answer": "Leonardo da Vinci" - } -} diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.xml b/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.xml deleted file mode 100644 index 749b4de4..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSQA/samples/RAX-KSQA-secretQA.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/openstack-identity-api/v2.0/src/docbkx/admin/identity-service-api.xml b/openstack-identity-api/v2.0/src/docbkx/admin/identity-service-api.xml index 65248683..6c9607de 100644 --- a/openstack-identity-api/v2.0/src/docbkx/admin/identity-service-api.xml +++ b/openstack-identity-api/v2.0/src/docbkx/admin/identity-service-api.xml @@ -55,35 +55,35 @@
Token Operations - + + href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/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#endpointsForToken"/>
User Operations - - - + + + + href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#userRoles"/>
Tenant Operations - + + href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/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#usersForTenant"/> + href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#getTenantUser"/>
diff --git a/openstack-identity-api/v2.0/src/docbkx/client/identity-client-api.xml b/openstack-identity-api/v2.0/src/docbkx/client/identity-client-api.xml index eb4b2499..60099a35 100644 --- a/openstack-identity-api/v2.0/src/docbkx/client/identity-client-api.xml +++ b/openstack-identity-api/v2.0/src/docbkx/client/identity-client-api.xml @@ -7,9 +7,9 @@ tenants. - - diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.json b/openstack-identity-api/v2.0/src/docbkx/samples/apiKeyCredentials.json similarity index 69% rename from openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.json rename to openstack-identity-api/v2.0/src/docbkx/samples/apiKeyCredentials.json index 2386b6d6..f39abbe7 100644 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/apiKeyCredentials.json @@ -1,6 +1,6 @@ { - "RAX-KSKEY:apiKeyCredentials":{ + "RAX-KSKEY:apiKeyCredentials": { "username": "test_user", "apiKey": "aaaaa-bbbbb-ccccc-12345678" } -} +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.xml b/openstack-identity-api/v2.0/src/docbkx/samples/apiKeyCredentials.xml similarity index 100% rename from openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/apiKeyCredentials.xml rename to openstack-identity-api/v2.0/src/docbkx/samples/apiKeyCredentials.xml diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/auth.json b/openstack-identity-api/v2.0/src/docbkx/samples/auth.json index c034088f..5b3fefd7 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/auth.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/auth.json @@ -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 @@ } ] } -} +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.json b/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials-RAX-KSKEY.json similarity index 70% rename from openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.json rename to openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials-RAX-KSKEY.json index e34a94df..10b00093 100644 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials-RAX-KSKEY.json @@ -1,9 +1,9 @@ { - "auth":{ - "RAX-KSKEY:apiKeyCredentials":{ + "auth": { + "RAX-KSKEY:apiKeyCredentials": { "username": "test_user", "apiKey": "aaaaa-bbbbb-ccccc-12345678" }, "tenantId": "1234" } -} +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.xml b/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials-RAX-KSKEY.xml similarity index 100% rename from openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/auth_credentials-RAX-KSKEY.xml rename to openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials-RAX-KSKEY.xml diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.json b/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.json index d269baff..3236ed0f 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/auth_credentials.json @@ -1,9 +1,9 @@ { - "auth":{ - "passwordCredentials":{ - "username":"test_user", - "password":"mypass" + "auth": { + "passwordCredentials": { + "username": "test_user", + "password": "mypass" }, - "tenantName":"customer-x" + "tenantName": "customer-x" } } \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/choices.json b/openstack-identity-api/v2.0/src/docbkx/samples/choices.json index 12b44094..0a63f90f 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/choices.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/choices.json @@ -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" }, diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.json b/openstack-identity-api/v2.0/src/docbkx/samples/credentials.json similarity index 53% rename from openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.json rename to openstack-identity-api/v2.0/src/docbkx/samples/credentials.json index b1672543..4160172e 100644 --- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/credentials.json @@ -1,10 +1,11 @@ { - "credentials":[{ - "passwordCredentials":{ + "credentials": [ + { + "passwordCredentials": { "username": "test_user", "password": "mypass" } } ], - "credentials_links":[] -} + "credentials_links": [] +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.xml b/openstack-identity-api/v2.0/src/docbkx/samples/credentials.xml similarity index 100% rename from openstack-identity-api/v2.0/src/docbkx/OS-KSADM/samples/credentials.xml rename to openstack-identity-api/v2.0/src/docbkx/samples/credentials.xml diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.json b/openstack-identity-api/v2.0/src/docbkx/samples/credentialswithapikey.json similarity index 63% rename from openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.json rename to openstack-identity-api/v2.0/src/docbkx/samples/credentialswithapikey.json index 5b704c67..6aa93685 100644 --- a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/credentialswithapikey.json @@ -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": [] +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.xml b/openstack-identity-api/v2.0/src/docbkx/samples/credentialswithapikey.xml similarity index 100% rename from openstack-identity-api/v2.0/src/docbkx/RAX-KSKEY/samples/credentialswithapikey.xml rename to openstack-identity-api/v2.0/src/docbkx/samples/credentialswithapikey.xml diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/endpoints.json b/openstack-identity-api/v2.0/src/docbkx/samples/endpoints.json index 860db67d..51492f7f 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/endpoints.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/endpoints.json @@ -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": [] +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.json b/openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.json index 90499bd4..f34f1d34 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/ext-getuser.json @@ -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" + } + } } - } -} +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/extension.json b/openstack-identity-api/v2.0/src/docbkx/samples/extension.json index ea3ebe4d..eb32456c 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/extension.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/extension.json @@ -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" + } + ] + } +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/extensions.json b/openstack-identity-api/v2.0/src/docbkx/samples/extensions.json index 2480a45b..69612a28 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/extensions.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/extensions.json @@ -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": [] } \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.json b/openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.json index 8cbabbf2..9342068a 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/getuser-1.json @@ -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 } -} +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.json b/openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.json index 9968eec2..953c9e8f 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/identity_fault.json @@ -1,7 +1,7 @@ { - "identityFault": { - "message": "Fault", - "details": "Error Details...", - "code": 500 - } -} + "identityFault": { + "message": "Fault", + "details": "Error Details...", + "code": 500 + } +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.json b/openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.json index 8ba8c207..1994ffe3 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/item_not_found.json @@ -1,7 +1,7 @@ { - "itemNotFound": { - "message": "Item not found.", - "details": "Error Details...", - "code": 404 - } -} + "itemNotFound": { + "message": "Item not found.", + "details": "Error Details...", + "code": 404 + } +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/roles.json b/openstack-identity-api/v2.0/src/docbkx/samples/roles.json index 4a3be168..cad2ba4f 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/roles.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/roles.json @@ -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": [] } \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/tenant.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenant.json index 794a61ce..9e0d4f88 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/tenant.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/tenant.json @@ -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 + } +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.json index 5f90fce8..6360f786 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-1.json @@ -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" } diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.json index ea2b6dff..d295505e 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-2.json @@ -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" }, diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.json index cc34aa97..e876bbd4 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/tenants-3.json @@ -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" } diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/tenants.json b/openstack-identity-api/v2.0/src/docbkx/samples/tenants.json index aec27935..497a628b 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/tenants.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/tenants.json @@ -1,16 +1,17 @@ { - "tenants":[{ - "id":"1234", - "name":"ACME Corp", - "description":"A description ...", - "enabled":true + "tenants": [ + { + "id": "1234", + "name": "ACME Corp", + "description": "A description ...", + "enabled": true }, { - "id":"3456", - "name":"Iron Works", - "description":"A description ...", - "enabled":true + "id": "3456", + "name": "Iron Works", + "description": "A description ...", + "enabled": true } ], - "tenants_links":[] + "tenants_links": [] } \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/user.json b/openstack-identity-api/v2.0/src/docbkx/samples/user.json index 75d1508b..3fe75452 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/user.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/user.json @@ -1,8 +1,8 @@ { - "user": { - "id": "u1000", - "username": "jqsmith", - "email": "john.smith@example.org", - "enabled": true - } -} + "user": { + "id": "u1000", + "username": "jqsmith", + "email": "john.smith@example.org", + "enabled": true + } +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/validatetoken.json b/openstack-identity-api/v2.0/src/docbkx/samples/validatetoken.json index 170db5d2..4a787c36 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/validatetoken.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/validatetoken.json @@ -1,30 +1,28 @@ { - "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" + "access": { + "token": { + "id": "ab48a9efdfedb23ty3494", + "expires": "2010-11-01T03:32:15-05:00", + "tenant": { + "id": "345", + "name": "My Project" } - ], - "roles_links":[ - - ] - } - } + }, + "user": { + "id": "123", + "name": "jqsmith", + "roles": [ + { + "id": "234", + "name": "compute:admin" + }, + { + "id": "234", + "name": "object-store:admin", + "tenantId": "1" + } + ], + "roles_links": [] + } + } } \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/version.json b/openstack-identity-api/v2.0/src/docbkx/samples/version.json index 5085d02c..ee094993 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/version.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/version.json @@ -1,30 +1,33 @@ { - "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/api/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" - } - ] - } -} + "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/api/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" + } + ] + } +} \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/samples/versions.json b/openstack-identity-api/v2.0/src/docbkx/samples/versions.json index c9f4c358..ed806e63 100644 --- a/openstack-identity-api/v2.0/src/docbkx/samples/versions.json +++ b/openstack-identity-api/v2.0/src/docbkx/samples/versions.json @@ -1,9 +1,11 @@ { - "versions":[{ + "versions": [ + { "id": "v1.0", "status": "DEPRECATED", "updated": "2009-10-09T11:30:00Z", - "links":[{ + "links": [ + { "rel": "self", "href": "http://identity.api.openstack.org/v1.0/" } @@ -13,7 +15,8 @@ "id": "v1.1", "status": "CURRENT", "updated": "2010-12-12T18:30:02.25Z", - "links":[{ + "links": [ + { "rel": "self", "href": "http://identity.api.openstack.org/v1.1/" } @@ -23,12 +26,13 @@ "id": "v2.0", "status": "BETA", "updated": "2011-05-27T20:22:02.25Z", - "links":[{ + "links": [ + { "rel": "self", "href": "http://identity.api.openstack.org/v2.0/" } ] } ], - "versions_links":[] + "versions_links": [] } \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/HP-IDM-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/HP-IDM-admin.wadl deleted file mode 100644 index 177552ab..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/HP-IDM-admin.wadl +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - %common; -]> - - - - - - - - - - - - - - - A valid authentication - token. - - - The token ID. - - - Validates that a token - has the specified tenant in scope, for - performance. Valid tokens are in the - /tokens/{tokenId} - path. An itemNotFound - (404) fault is - returned for a token that is not - valid. - - - A comma-separated string of - service IDs. Checks the roles against the - specified service IDs. If a service ID is - not valid or if no roles are associated - with a service ID, a 401 fault is - returned. - - - - - - - - - - - - - - Validates a token and that it - belongs to a specified tenant and services. Returns - the permissions relevant to a particular client. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Validates a token and that it - belongs to a specified tenant and services, for - performance. - - &commonFaults; &getFaults; - - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSADM-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSADM-admin.wadl deleted file mode 100644 index d84cc241..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSADM-admin.wadl +++ /dev/null @@ -1,1006 +0,0 @@ - - - - - - - - - - -%common; -]> - - - - - - - - - - - - - - - - - A valid authentication token - for an administrative user. - - - "application/json" or - "application/xml" - - - - - - - The user - ID. - - - - - - The service - ID. - - - - - - The role - ID. - - - - - - - - - - - - - - - - The credential - type. - - - - - - - - - - - - - - The tenant - ID. - - - - - - The ID of the last - item in the previous - list. - - - The page size. - - - - - - The user - ID. - - - - - - The role - ID. - - - - - - - - - - - - - - The role - name. - - - - - The service - ID. - - - - - - - The role - ID. - - - - - - - - The ID of the last - item in the previous - list. - - - The page size. - - - - - - - - The service - name. - - - - - - - The service - ID. - - - - - - - - - - - - - - - - - Creates a tenant. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; - - - Updates a tenant. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; &postPutFaults; - - - Deletes a tenant. - - &commonFaults; &getFaults; - - - Lists all the users for a - tenant. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Adds a specified role to a user for - a tenant. - - &commonFaults; &postPutFaults; - &getFaults; - - - Deletes a specified role from a - user on a tenant. - - &commonFaults; &getFaults; - - - - Lists users. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Adds a user. - Admin users can create a user with the user role. To - add a user, specify a user name and initial - password. - Admin users access the API through the admin - endpoint, which uses port 35357 by default. Non-admin - users access the API through the public endpoint, - which uses port 5000 by default. These access ports - are configurable. - A successful response echoes the requested values, - except password, and generates an ID. - - - - The user name. Must be unique - within the default domain. - - - The password for the user. Can - be anything, but both password - and OS-KSADM:password - work. - - - Enables or disables the user. - Default is true (enabled). - - - The tenant - ID. - - - Email address for the - user. - - - Can be anything, such as - Title string field, - Send me promotional material - boolean field. - - - - - - - - - - - - - - &commonFaults; &getFaults; &postPutFaults; - - - Updates a user. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - Deletes a user. - - &commonFaults; &getFaults; - - - Enables a specified user. - - - - - - - - - - - - - - -
Enable User Request Attributes
AttributeTypeDescription
userstringRequired. The user name.
- - - - - - - - The user name. - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Lists global roles for a specified - user. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Adds a specific global role to a - user. - - &commonFaults; &postPutFaults; - &getFaults; - - - - Deletes a specific global role from - a user. - - &commonFaults; &getFaults; - - - - Adds a credential to a user. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - Lists credentials. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Updates credentials for a specified - user. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - Deletes credentials for a specified - user. - - &commonFaults; &postPutFaults; - &getFaults; - - - Gets user credentials. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - - Lists roles. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Adds a role. - - - - - - - - - - - - - - - - The location. - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Gets a role by name. - - - - - The location. - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Gets a role. - - - - The location. - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Deletes a role. - - &commonFaults; &getFaults; - - - - - Lists services. - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Gets a service by name. - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Gets a service. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Adds a service. - - - - - - - - - - - - - - - - The location. - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - Deletes a service. - - &commonFaults; &getFaults; - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSCATALOG-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSCATALOG-admin.wadl deleted file mode 100644 index a0a3e432..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSCATALOG-admin.wadl +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - -%common; -]> - - - - - - - - - - - - - - - - - - A valid authentication token for an administrative user. - - The tenant ID. - - - - - - The endpoint ID. - - - - - - - - - - - A valid authentication token for an administrative user. - The service ID. - - - - The endpoint template ID. - - - - - - - - - - - - - - - - - -

Lists endpoint templates.

- - - - - - - - - - - - - - &commonFaults; - &getFaults; - - - - -

Gets endpoint templates.

- - - - - - - - - - - - - - &commonFaults; - &getFaults; - - - - -

Adds endpoint template.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; - &getFaults; - &postPutFaults; - - - - -

Updates endpoint template.

- - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; - &getFaults; - &postPutFaults; - - - - -

Deletes an endpoint template.

- - - &commonFaults; - &getFaults; - - - - -

Adds endpoint to a tenant.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; - &getFaults; - &postPutFaults; - - - - -

Lists endpoints for a tenant.

- - - - - - - - - - - - - - &commonFaults; - &getFaults; - - - - -

Gets endpoint for a tenant.

- - - - - - - - - - - - - - &commonFaults; - &getFaults; - - - - -

Deletes an endpoint from a tenant.

- - - &commonFaults; - &getFaults; - - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSEC2-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSEC2-admin.wadl deleted file mode 100644 index 299aab8c..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSEC2-admin.wadl +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - - - - - -%common; -]> - - - - - - - - - - - - - - - - - - A valid authentication - token. - - - - - The user ID. - - - - - - - The ID of the last - item in the previous - list. - - - The page size. - - - - - - - - - - - - - - - - - - - - - - - - - Adds a credential to a user. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Lists credentials. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Lists credentials by type. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Updates credentials for a specified - user. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Deletes user credentials. - - &commonFaults; &postPutFaults; - &getFaults; - - - - Gets user credentials. - - - - - - - - - - - - - &commonFaults; &getFaults; - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSS3-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSS3-admin.wadl deleted file mode 100644 index 1c727670..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSS3-admin.wadl +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - - - - - -%common; -]> - - - - - - - - - - - - - - - - - A valid authentication - token. - - - - - The user ID. - - - - - The ID of the last - item in the previous - list. - - - The page size. - - - - - - - - - - - - - - - - - - - - - - - - Adds a credential to a user. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Lists credentials. - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Lists credentials - by type. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Updates - credentials. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Deletes user - credentials. - - &commonFaults; &postPutFaults; - &getFaults; - - - - Gets user - credentials. - - - - - - - - - - - - - &commonFaults; &getFaults; - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSVALIDATE-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSVALIDATE-admin.wadl deleted file mode 100644 index da341a39..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/OS-KSVALIDATE-admin.wadl +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - %common; -]> - - - - - - - - - - - - - - - - - - - - A valid authentication token for an - administrative user. - - - A valid authentication token. - - - Validates that a - token has the specified tenant in - scope, for performance. Valid - tokens are in the - /tokens/{tokenId} - path. An itemNotFound - (404) fault is - returned for a token that is not - valid. - - - - - - - - A valid authentication token for an - administrative user. - - - A valid authentication token. - - - A comma-separated string of service - IDs. Checks the roles against the - specified service IDs. If a service ID - is not valid or if no roles are - associated with a service ID, a 401 - fault is returned. - - - - - - - - - - - - - - - - - Checks that a token is valid and that it belongs to a - specified tenant and service IDs. Returns the - permissions for a particular client. - Behavior is - similar to /tokens/{tokenId}. An - itemNotFound (404) fault is returned for - a token that is not valid. - This extension - might decrypt 'X-Subject-Token' header and internally - call the normal validation for OpenStack Identity, - passing in all headers and query parameters. It should - therefore support all existing calls on - /tokens/{tokenId}, including - extensions such as HP-IDM. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Checks that a token is valid and that it belongs to a - specified tenant and service IDs, for performance. - Behavior is - similar to /tokens/{tokenId}. An - itemNotFound (404) fault is returned for - a token that is not valid. - This extension - might decrypt 'X-Subject-Token' header and internally - call the normal validation for OpenStack Identity, - passing in all headers and query parameters. It should - therefore support all existing calls on - /tokens/{tokenId}, including - extensions such as HP-IDM. - - &commonFaults; &getFaults; - - - Lists endpoints - associated with a specific token. - - - - - - - - - - - - - &commonFaults; &getFaults; - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-GRPADM.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-GRPADM.wadl deleted file mode 100644 index f08505a7..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-GRPADM.wadl +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - - - - %common; -]> - - - - - - - - - - - - - -

- A valid authentication token for an administrative user. -

- - - - - - -

- The group ID. -

- - - - - - - - - - -

- The user ID. -

- - - - - - - - - - - - - - -

- A list of users. -

- - - - - - -

- A list of groups. -

- - - The ID of the last item in the previous - list. - - - The page size. - - The group name. - - - - - - -

- Lists groups. -

-

- Lists available groups. Use the - name to display only - those groups that match a specified name. -

- - - - - - - - - - - - - - - - - - - - - &commonFaults; - - - -

- Adds a group. -

- - - - - - - - - - - - - - - - - -

- The full URL to the new group is - returned in the Location - header. -

- - - - - - - - - - - - - - &commonFaults; - &getFaults; - &postPutFaults; - - - -

- Gets group information for a specified group ID. -

- - - - - - - - - - - - - - - &commonFaults; - &getFaults; - - - -

- Updates a group. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; - &getFaults; - &postPutFaults; - - - -

- Deletes a group. -

- - - - &commonFaults; - &getFaults; - - - -

- Lists users for a group. -

-

- A list of users that belong to a specified group. -

- - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; - - - -

- Adds a user to a group. -

- - - - &commonFaults; - &getFaults; - - - -

- Removes a user from a group. -

- - - - &commonFaults; - &getFaults; - - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSGRP-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSGRP-admin.wadl deleted file mode 100644 index 3e52a536..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSGRP-admin.wadl +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - -%common; -]> - - - - - - - - - - - - - - A valid authentication token for an administrative user. - - - - The user ID. - - - - - - - - - - List groups for a specified user. - - - - - - - - - - - - - - &commonFaults; - &getFaults; - - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSKEY-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSKEY-admin.wadl deleted file mode 100644 index 224819cf..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSKEY-admin.wadl +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - -%common; -]> - - - - - - - - - - - - - - - - - A valid authentication token for an - administrative user. - - - - - The user ID. - - - - - - - A valid authentication token - for an administrative user. - - - The ID of the last item in the - previous list. - - - The page size. - - - - - - - - - - - - - - - - - - - - - - - Adds a credential - to a user. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Lists - credentials. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Updates - credentials. - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; &getFaults; - - - - Deletes user - credentials. - - &commonFaults; &postPutFaults; - &getFaults; - - - - Gets user - credentials. - - - - - - - - - - - - - &commonFaults; &getFaults; - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSQA-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSQA-admin.wadl deleted file mode 100644 index 979b3049..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/RAX-KSQA-admin.wadl +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - -%common; -]> - - - - - - - - - - - - - - - - A valid authentication token for an - administrative user. - - - - - The user ID. - - - - - - - - - - - - - -

Gets a secret question and answer for a specified - user.

- - - - - - - - - - - - - &commonFaults; &getFaults; - - -

Updates a secret question and answer for a specified - user.

- - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &postPutFaults; - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/common.ent b/openstack-identity-api/v2.0/src/docbkx/wadl/common.ent deleted file mode 100644 index 6d1db6ab..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/common.ent +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '> - - - - - - '> - - - - - - '> - - -

The user name.

 -

The password of the user.

 -

The tenant name.

 -

The tenant ID.

 -'> \ No newline at end of file diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/identity-admin.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/identity-admin.wadl deleted file mode 100755 index a331e9f0..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/identity-admin.wadl +++ /dev/null @@ -1,613 +0,0 @@ - - - - - - - - - - %common; -]> - - - - - - - - - - - - - - - - - - - - - - Required. The user - name. - - - Required. The password of the - user. - - - Optional. The tenant - name. - - - Optional. The tenant - ID. - - - - - Required. The token ID. - - - Validates that a token - has the specified tenant in scope, for - performance. Valid tokens are in the - /tokens/{tokenId} - path. An itemNotFound - (404) fault is - returned for a token that is not - valid. - - - - - - - - - - - A valid authentication token for an - administrative user. - - - - The user name. - - - - - - The user ID. - - - - - - - - - - A valid authentication token for an - administrative user. - - - The ID of the last item in the previous - list. - - - The page size. - - - - - - The tenant ID. - - - - - - The user ID. - - - - - - - - - - - - - - - - - - - - -

A list of - supported extensions.

- - - - - - - - - - - - -

Gets detailed - information about a specified version of the Identity API.

- - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - -

Lists available - extensions.

- - - - Moves to the next item in the list. - - - - Moves to the previous item in the list. - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - -

Gets detailed - information for a specified extension.

- - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - - Authenticates and generates a - token. - Client authentication is provided through a ReST - interface by using the POST method with v2.0/tokens - supplied as the path. Include a payload of credentials - in the body. - 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. - Each ReST request against the Identity API - requires the X-Auth-Token header. Clients obtain this - token, along with the URL to other service APIs, by - first authenticating against the Identity Service with - valid credentials. - If the authentication token has expired, a - 401 response code is - returned. - If the subject token has expired, this call returns - a 404 response code. - The Identity API treats expired tokens as - invalid tokens. - The deployment determines how long expired tokens - are stored. - As the following example responses show, the - response to an authentication request returns the - token ID in the X-Subject-Token header - instead of in the token data. - - - - The user name. - - - The tenant name. - - - The tenant ID. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Validates a token and confirms that it belongs to a - specified tenant. - Returns the - permissions relevant to a particular client. Valid - tokens are in the /tokens/{tokenId} path. - A user should expect an itemNotFound - (404) fault for an token that is not - valid. - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Validates a token and confirms that it belongs to a - specified tenant, for performance. - - &commonFaults; &getFaults; - - - Lists the - endpoints associated with a specified token. - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - - - Gets detailed - information about a specified user by user name. - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Gets detailed - information about a specified user by user ID. - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Lists global roles for a specified user. Excludes - tenant roles. - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - - - - Lists tenants to which the specified token has - access. - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Gets detailed information about a specified tenant by - name. - - - - The name of the tenant. - - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Gets detailed information about a specified tenant by - ID. - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Lists roles for a specified user on a specified - tenant. Excludes global roles. - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - diff --git a/openstack-identity-api/v2.0/src/docbkx/wadl/identity.wadl b/openstack-identity-api/v2.0/src/docbkx/wadl/identity.wadl deleted file mode 100644 index d3c95719..00000000 --- a/openstack-identity-api/v2.0/src/docbkx/wadl/identity.wadl +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - - - - - - %common; -]> - - - - - - - - - - - - - - - -

The extension name.

- - - - - - - - - - - - A valid authentication - token. - - - The ID of the last item in the - previous list. - - - The page size. - - - - - - - - - - - - - - - - - - Lists supported extensions. - - - - - - - - - - - - -

Gets detailed - information about a specified version of the Identity - API.

- - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Lists available extensions. - - - - Moves to the next item in the list. - - - - Moves to the previous item in the list. - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - Gets detailed information for a - specified extension. - Specify the extension alias in the URI. - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Authenticates and generates a - token. - 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. - Each ReST request against the Identity API - requires the X-Auth-Token header. Clients obtain this - token, along with the URL to other service APIs, by - first authenticating against the Identity API with - valid credentials. - To authenticate, you must provide either a user ID - and password or a token. - If the authentication token has expired, a - 401 response code is - returned. - If the token specified in the request has expired, this call returns - a 404 response code. - The Identity API treats expired tokens as - invalid tokens. - The deployment determines how long expired tokens - are stored. - - - - The user name. If you do not provide a - user name and password, you must provide a - token. - - - The password of the - user. - - - The tenant name. Both the tenantId and - tenantName are optional, but should not be - specified together. If both attributes are - specified, the server responds with a 400 Bad - Request. - - - The tenant ID. Both the tenantId and - tenantName are optional, but should not be - specified together. If both attributes are - specified, the server responds with a 400 Bad - Request. - - - A token. If you do not provide a token, - you must provide a user name and - password. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; - - - - Lists tenants. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &commonFaults; &getFaults; -