diff options
49 files changed, 838 insertions, 773 deletions
diff --git a/examples/echo/echo/samples/echo.json b/examples/echo/echo/samples/echo.json index 05b60ef4..b20afb60 100644 --- a/examples/echo/echo/samples/echo.json +++ b/examples/echo/echo/samples/echo.json @@ -1,11 +1,11 @@ { - "echo" : { - "method" : "GET", - "pathInfo" : "/bla/bla", - "queryString" : "hello", - "content" : { - "type" : "application/xml", - "value" : " This is some content. " - } + "echo": { + "method": "GET", + "pathInfo": "/bla/bla", + "queryString": "hello", + "content": { + "type": "application/xml", + "value": " This is some content. " } + } } diff --git a/keystone/content/admin/extensions.json b/keystone/content/admin/extensions.json index 9e1c96d0..7a514fd7 100644 --- a/keystone/content/admin/extensions.json +++ b/keystone/content/admin/extensions.json @@ -1 +1,5 @@ -{ "extensions" : { "values" : []}}
\ No newline at end of file +{ + "extensions": { + "values": [] + } +} diff --git a/keystone/content/common/samples/RAX-KSGRP-groups.json b/keystone/content/common/samples/RAX-KSGRP-groups.json index bd3c5104..7e5ac29d 100644 --- a/keystone/content/common/samples/RAX-KSGRP-groups.json +++ b/keystone/content/common/samples/RAX-KSGRP-groups.json @@ -1,8 +1,9 @@ { - "RAX-KSGRP:groups":[{ - "id":"test_global_group_add", - "description":"A description ..." - } - ], - "RAX-KSGRP:groups_links":[] -}
\ No newline at end of file + "RAX-KSGRP:groups": [ + { + "id": "test_global_group_add", + "description": "A description ..." + } + ], + "RAX-KSGRP:groups_links": [] +} diff --git a/keystone/content/common/samples/RAX-KSQA-secretQA.json b/keystone/content/common/samples/RAX-KSQA-secretQA.json index 9e003c8b..6baf6e32 100644 --- a/keystone/content/common/samples/RAX-KSQA-secretQA.json +++ b/keystone/content/common/samples/RAX-KSQA-secretQA.json @@ -1,6 +1,6 @@ { - "RAX-KSQA:secretQA":{ - "question":"What is the color of my eyes?", - "answer":"Leonardo Da Vinci" - } + "RAX-KSQA:secretQA": { + "question": "What is the color of my eyes?", + "answer": "Leonardo Da Vinci" + } } diff --git a/keystone/content/common/samples/apiKeyCredentials.json b/keystone/content/common/samples/apiKeyCredentials.json index 1289d520..4b59ac3b 100644 --- a/keystone/content/common/samples/apiKeyCredentials.json +++ b/keystone/content/common/samples/apiKeyCredentials.json @@ -1,6 +1,6 @@ { - "RAX-KSKEY:apiKeyCredentials":{ - "username":"test_user", - "apiKey":"aaaaa-bbbbb-ccccc-12345678" - } + "RAX-KSKEY:apiKeyCredentials": { + "username": "test_user", + "apiKey": "aaaaa-bbbbb-ccccc-12345678" + } } diff --git a/keystone/content/common/samples/auth.json b/keystone/content/common/samples/auth.json index eaba9310..bd6ef6e6 100644 --- a/keystone/content/common/samples/auth.json +++ b/keystone/content/common/samples/auth.json @@ -1,87 +1,92 @@ { - "access":{ - "token":{ - "id":"ab48a9efdfedb23ty3494", - "expires":"2010-11-01T03:32:15-05:00", - "tenant":{ - "id": "t1000", - "name": "My Project" - } + "access": { + "token": { + "id": "ab48a9efdfedb23ty3494", + "expires": "2010-11-01T03:32:15-05:00", + "tenant": { + "id": "t1000", + "name": "My Project" + } + }, + "user": { + "id": "u123", + "name": "jqsmith", + "roles": [ + { + "id": "100", + "name": "compute:admin" }, - "user":{ - "id":"u123", - "name":"jqsmith", - "roles":[{ - "id":"100", - "name":"compute:admin" - }, - { - "id":"101", - "name":"object-store:admin", - "tenantId":"t1000" - } - ], - "roles_links":[] - }, - "serviceCatalog":[{ - "name":"Cloud Servers", - "type":"compute", - "endpoints":[{ - "tenantId":"t1000", - "publicURL":"https://compute.north.host.com/v1/t1000", - "internalURL":"https://compute.north.internal/v1/t1000", - "region":"North", - "versionId":"1", - "versionInfo":"https://compute.north.host.com/v1/", - "versionList":"https://compute.north.host.com/" - }, - { - "tenantId":"t1000", - "publicURL":"https://compute.north.host.com/v1.1/t1000", - "internalURL":"https://compute.north.internal/v1.1/t1000", - "region":"North", - "versionId":"1.1", - "versionInfo":"https://compute.north.host.com/v1.1/", - "versionList":"https://compute.north.host.com/" - } - ], - "endpoints_links":[] - }, - { - "name":"Cloud Files", - "type":"object-store", - "endpoints":[{ - "tenantId":"t1000", - "publicURL":"https://storage.north.host.com/v1/t1000", - "internalURL":"https://storage.north.internal/v1/t1000", - "region":"North", - "versionId":"1", - "versionInfo":"https://storage.north.host.com/v1/", - "versionList":"https://storage.north.host.com/" - }, - { - "tenantId":"t1000", - "publicURL":"https://storage.south.host.com/v1/t1000", - "internalURL":"https://storage.south.internal/v1/t1000", - "region":"South", - "versionId":"1", - "versionInfo":"https://storage.south.host.com/v1/", - "versionList":"https://storage.south.host.com/" - } - ] - }, - { - "name":"DNS-as-a-Service", - "type":"dnsextension:dns", - "endpoints":[{ - "tenantId":"t1000", - "publicURL":"https://dns.host.com/v2.0/t1000", - "versionId":"2.0", - "versionInfo":"https://dns.host.com/v2.0/", - "versionList":"https://dns.host.com/" - } - ] - } + { + "id": "101", + "name": "object-store:admin", + "tenantId": "t1000" + } + ], + "roles_links": [] + }, + "serviceCatalog": [ + { + "name": "Cloud Servers", + "type": "compute", + "endpoints": [ + { + "tenantId": "t1000", + "publicURL": "https://compute.north.host.com/v1/t1000", + "internalURL": "https://compute.north.internal/v1/t1000", + "region": "North", + "versionId": "1", + "versionInfo": "https://compute.north.host.com/v1/", + "versionList": "https://compute.north.host.com/" + }, + { + "tenantId": "t1000", + "publicURL": "https://compute.north.host.com/v1.1/t1000", + "internalURL": "https://compute.north.internal/v1.1/t1000", + "region": "North", + "versionId": "1.1", + "versionInfo": "https://compute.north.host.com/v1.1/", + "versionList": "https://compute.north.host.com/" + } + ], + "endpoints_links": [] + }, + { + "name": "Cloud Files", + "type": "object-store", + "endpoints": [ + { + "tenantId": "t1000", + "publicURL": "https://storage.north.host.com/v1/t1000", + "internalURL": "https://storage.north.internal/v1/t1000", + "region": "North", + "versionId": "1", + "versionInfo": "https://storage.north.host.com/v1/", + "versionList": "https://storage.north.host.com/" + }, + { + "tenantId": "t1000", + "publicURL": "https://storage.south.host.com/v1/t1000", + "internalURL": "https://storage.south.internal/v1/t1000", + "region": "South", + "versionId": "1", + "versionInfo": "https://storage.south.host.com/v1/", + "versionList": "https://storage.south.host.com/" + } + ] + }, + { + "name": "DNS-as-a-Service", + "type": "dnsextension:dns", + "endpoints": [ + { + "tenantId": "t1000", + "publicURL": "https://dns.host.com/v2.0/t1000", + "versionId": "2.0", + "versionInfo": "https://dns.host.com/v2.0/", + "versionList": "https://dns.host.com/" + } ] - } + } + ] + } } diff --git a/keystone/content/common/samples/auth_credentials-OS-KSEC2.json b/keystone/content/common/samples/auth_credentials-OS-KSEC2.json index 7767c06b..3ea94ccc 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" - } -}
\ No newline at end of file + "auth": { + "OS-KSEC2-ec2Credentials": { + "username": "test_user", + "secret": "aaaaa", + "signature": "bbb" + }, + "tenantId": "77654" + } +} diff --git a/keystone/content/common/samples/auth_credentials-RAX-KSKEY.json b/keystone/content/common/samples/auth_credentials-RAX-KSKEY.json index 7b00db13..29f78dcd 100644 --- a/keystone/content/common/samples/auth_credentials-RAX-KSKEY.json +++ b/keystone/content/common/samples/auth_credentials-RAX-KSKEY.json @@ -1,9 +1,9 @@ { - "auth":{ - "RAX-KSKEY:apiKeyCredentials":{ - "username":"test_user", - "apiKey":"aaaaa-bbbbb-ccccc-12345678" - }, - "tenantId":"1234" - } + "auth": { + "RAX-KSKEY:apiKeyCredentials": { + "username": "test_user", + "apiKey": "aaaaa-bbbbb-ccccc-12345678" + }, + "tenantId": "1234" + } } diff --git a/keystone/content/common/samples/auth_credentials.json b/keystone/content/common/samples/auth_credentials.json index d269baff..00fb7826 100644 --- a/keystone/content/common/samples/auth_credentials.json +++ b/keystone/content/common/samples/auth_credentials.json @@ -1,9 +1,9 @@ { - "auth":{ - "passwordCredentials":{ - "username":"test_user", - "password":"mypass" - }, - "tenantName":"customer-x" - } -}
\ No newline at end of file + "auth": { + "passwordCredentials": { + "username": "test_user", + "password": "mypass" + }, + "tenantName": "customer-x" + } +} diff --git a/keystone/content/common/samples/auth_with_token.json b/keystone/content/common/samples/auth_with_token.json index efcf2622..7a765eba 100644 --- a/keystone/content/common/samples/auth_with_token.json +++ b/keystone/content/common/samples/auth_with_token.json @@ -1,8 +1,8 @@ { - "auth": { - "tenantName": "customer-x", - "token": { - "id": "abcdefghijk" - } + "auth": { + "tenantName": "customer-x", + "token": { + "id": "abcdefghijk" } -}
\ No newline at end of file + } +} diff --git a/keystone/content/common/samples/authwithgroups.json b/keystone/content/common/samples/authwithgroups.json index 527c639f..d364ebb4 100644 --- a/keystone/content/common/samples/authwithgroups.json +++ b/keystone/content/common/samples/authwithgroups.json @@ -1,87 +1,94 @@ { - "access":{ - "token":{ - "id":"asdasdasd-adsasdads-asdasdasd-adsadsasd", - "expires":"2010-11-01T03:32:15-05:00" + "access": { + "token": { + "id": "asdasdasd-adsasdads-asdasdasd-adsadsasd", + "expires": "2010-11-01T03:32:15-05:00" + }, + "user": { + "id": "123", + "name": "testName", + "roles": [ + { + "id": "234", + "name": "compute:admin" }, - "user":{ - "id":"123", - "name":"testName", - "roles":[{ - "id":"234", - "name":"compute:admin" - }, - { - "id":"235", - "name":"object-store:admin", - "tenantId":"1" - } - ], - "roles_links":[], - "RAX-KSGRP:groups":[{ - "id":"test_global_group_add", - "description":"A description ..." - } - ], - "RAX-KSGRP:groups_links":[] - }, - "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/" - } - ], - "endpoints_links":[] - }, - { - "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/" - } - ], - "endpoints_links":[{ - "rel":"next", - "href":"https://identity.north.host/v2.0/endpoints?marker=2" - } - ] - } + { + "id": "235", + "name": "object-store:admin", + "tenantId": "1" + } + ], + "roles_links": [], + "RAX-KSGRP:groups": [ + { + "id": "test_global_group_add", + "description": "A description ..." + } + ], + "RAX-KSGRP:groups_links": [] + }, + "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/" + } + ], + "endpoints_links": [] + }, + { + "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/" + } ], - "serviceCatalog_links":[{ - "rel":"next", - "href":"https://identity.host/v2.0/endpoints?session=2hfh8Ar&marker=2" - } + "endpoints_links": [ + { + "rel": "next", + "href": "https://identity.north.host/v2.0/endpoints?marker=2" + } ] - } -}
\ No newline at end of file + } + ], + "serviceCatalog_links": [ + { + "rel": "next", + "href": "https://identity.host/v2.0/endpoints?session=2hfh8Ar&marker=2" + } + ] + } +} diff --git a/keystone/content/common/samples/choices.json b/keystone/content/common/samples/choices.json index 71c8b77b..259b8c42 100644 --- a/keystone/content/common/samples/choices.json +++ b/keystone/content/common/samples/choices.json @@ -1,64 +1,71 @@ { - "choices":[{ - "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" - } - ] - } - }, + "choices": [ + { + "id": "v1.0", + "status": "DEPRECATED", + "links": [ { - "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" - } - ] - } - }, + "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": [ { - "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" - } - ] - } + "rel": "self", + "href": "http://identity.api.openstack.org/v2.0" } - ], - "choices_links":"" -}
\ No newline at end of file + ], + "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" + } + ] + } + } + ], + "choices_links": "" +} diff --git a/keystone/content/common/samples/credentials.json b/keystone/content/common/samples/credentials.json index 07e9c371..584fc3a1 100644 --- a/keystone/content/common/samples/credentials.json +++ b/keystone/content/common/samples/credentials.json @@ -1,10 +1,11 @@ { - "credentials":[{ - "passwordCredentials":{ - "username":"test_user", - "password":"mypass" - } - } - ], - "credentials_links":[] + "credentials": [ + { + "passwordCredentials": { + "username": "test_user", + "password": "mypass" + } + } + ], + "credentials_links": [] } diff --git a/keystone/content/common/samples/credentialswithapikey.json b/keystone/content/common/samples/credentialswithapikey.json index cf889f49..8ab8f2cd 100644 --- a/keystone/content/common/samples/credentialswithapikey.json +++ b/keystone/content/common/samples/credentialswithapikey.json @@ -1,16 +1,17 @@ { - "credentials":[{ - "passwordCredentials":{ - "username":"test_user", - "password":"mypass" - } - }, - { - "RAX-KSKEY:apiKeyCredentials":{ - "username":"test_user", - "apiKey":"aaaaa-bbbbb-ccccc-12345678" - } - } - ], - "credentials_links":[] + "credentials": [ + { + "passwordCredentials": { + "username": "test_user", + "password": "mypass" + } + }, + { + "RAX-KSKEY:apiKeyCredentials": { + "username": "test_user", + "apiKey": "aaaaa-bbbbb-ccccc-12345678" + } + } + ], + "credentials_links": [] } diff --git a/keystone/content/common/samples/credentialswithec2.json b/keystone/content/common/samples/credentialswithec2.json index f0a28eda..a4aaab87 100644 --- a/keystone/content/common/samples/credentialswithec2.json +++ b/keystone/content/common/samples/credentialswithec2.json @@ -1,17 +1,18 @@ { - "credentials":[{ - "passwordCredentials":{ - "username":"test_user", - "password":"mypass" - } - }, - { - "OS-KSEC2-ec2Credentials":{ - "username":"test_user", - "secret":"aaaaa", - "signature":"bbb" - } - } - ], - "credentials_links":[] + "credentials": [ + { + "passwordCredentials": { + "username": "test_user", + "password": "mypass" + } + }, + { + "OS-KSEC2-ec2Credentials": { + "username": "test_user", + "secret": "aaaaa", + "signature": "bbb" + } + } + ], + "credentials_links": [] } diff --git a/keystone/content/common/samples/ec2Credentials.json b/keystone/content/common/samples/ec2Credentials.json index ba54b883..71033a56 100644 --- a/keystone/content/common/samples/ec2Credentials.json +++ b/keystone/content/common/samples/ec2Credentials.json @@ -1,7 +1,7 @@ { - "OS-KSEC2-ec2Credentials":{ - "username":"test_user", - "secret":"aaaaa", - "signature":"bbb" - } + "OS-KSEC2-ec2Credentials": { + "username": "test_user", + "secret": "aaaaa", + "signature": "bbb" + } } diff --git a/keystone/content/common/samples/endpoint.json b/keystone/content/common/samples/endpoint.json index 06c85bfc..aad05b62 100644 --- a/keystone/content/common/samples/endpoint.json +++ b/keystone/content/common/samples/endpoint.json @@ -1,14 +1,14 @@ { "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/" + "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/keystone/content/common/samples/endpointTemplate.json b/keystone/content/common/samples/endpointTemplate.json index 2b291d58..4cf6c4d1 100644 --- a/keystone/content/common/samples/endpointTemplate.json +++ b/keystone/content/common/samples/endpointTemplate.json @@ -1,15 +1,15 @@ { - "OS-KSCATALOG:endpointTemplate":{ - "id":1, - "region":"North", - "global":true, - "name":"nova", - "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 + "OS-KSCATALOG:endpointTemplate": { + "id": 1, + "region": "North", + "global": true, + "name": "nova", + "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/common/samples/endpointTemplateWithOnlyId.json b/keystone/content/common/samples/endpointTemplateWithOnlyId.json index 869bc5fb..e2fa47f7 100644 --- a/keystone/content/common/samples/endpointTemplateWithOnlyId.json +++ b/keystone/content/common/samples/endpointTemplateWithOnlyId.json @@ -1,5 +1,5 @@ { - "OS-KSCATALOG:endpointTemplate":{ - "id":1 - } + "OS-KSCATALOG:endpointTemplate": { + "id": 1 + } } diff --git a/keystone/content/common/samples/endpointTemplates.json b/keystone/content/common/samples/endpointTemplates.json index 51ec8b3c..ab683ae8 100644 --- a/keystone/content/common/samples/endpointTemplates.json +++ b/keystone/content/common/samples/endpointTemplates.json @@ -1,59 +1,59 @@ { - "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": [] + "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/keystone/content/common/samples/endpoints.json b/keystone/content/common/samples/endpoints.json index e84a7b3b..e10f05e3 100644 --- a/keystone/content/common/samples/endpoints.json +++ b/keystone/content/common/samples/endpoints.json @@ -1,64 +1,65 @@ { - "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 + "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": [] +} diff --git a/keystone/content/common/samples/ext-getuser.json b/keystone/content/common/samples/ext-getuser.json index 8bad31b6..f4071ccf 100644 --- a/keystone/content/common/samples/ext-getuser.json +++ b/keystone/content/common/samples/ext-getuser.json @@ -1,11 +1,11 @@ { "user": { "roles": [ - { - "tenantId": "1234", - "id": "Admin" - } - ], + { + "tenantId": "1234", + "id": "Admin" + } + ], "roles_links": [], "id": "1000", "username": "jqsmith", diff --git a/keystone/content/common/samples/extension.json b/keystone/content/common/samples/extension.json index a62ea97a..bb66a50c 100644 --- a/keystone/content/common/samples/extension.json +++ b/keystone/content/common/samples/extension.json @@ -10,7 +10,8 @@ "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/common/samples/extensions.json b/keystone/content/common/samples/extensions.json index 304576f1..75b0f7e8 100644 --- a/keystone/content/common/samples/extensions.json +++ b/keystone/content/common/samples/extensions.json @@ -1,40 +1,43 @@ { - "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":[{ - "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" - } - ] + "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": [ + { + "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" }, { - "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" - } - ] + "rel": "describedby", + "type": "application/vnd.sun.wadl+xml", + "href": "http://docs.rackspacecloud.com/identity/api/ext/identity-meta.wadl" } - ], - "extensions_links":[] -}
\ No newline at end of file + ] + } + ], + "extensions_links": [] +} diff --git a/keystone/content/common/samples/getuser-1.json b/keystone/content/common/samples/getuser-1.json index 5354744b..741312cc 100644 --- a/keystone/content/common/samples/getuser-1.json +++ b/keystone/content/common/samples/getuser-1.json @@ -1,22 +1,24 @@ { - "user":{ - "roles":[{ - "tenantId":"1234", - "id":"Admin" - }, - { - "tenantId":"1234", - "id":"DBUser" - } - ], - "roles_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 - } -}
\ No newline at end of file + "user": { + "roles": [ + { + "tenantId": "1234", + "id": "Admin" + }, + { + "tenantId": "1234", + "id": "DBUser" + } + ], + "roles_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/common/samples/passwordcredentials.json b/keystone/content/common/samples/passwordcredentials.json index f405fa79..c57309ba 100644 --- a/keystone/content/common/samples/passwordcredentials.json +++ b/keystone/content/common/samples/passwordcredentials.json @@ -1,6 +1,6 @@ { - "passwordCredentials": { - "username": "test_user", - "password": "mypass" - } + "passwordCredentials": { + "username": "test_user", + "password": "mypass" + } } diff --git a/keystone/content/common/samples/roles.json b/keystone/content/common/samples/roles.json index 6d1e6fb4..2504a2b1 100644 --- a/keystone/content/common/samples/roles.json +++ b/keystone/content/common/samples/roles.json @@ -1,9 +1,10 @@ { - "roles":[{ - "id":"123", - "name":"compute:admin", - "description":"Nova Administrator" - } - ], - "roles_links":[] + "roles": [ + { + "id": "123", + "name": "compute:admin", + "description": "Nova Administrator" + } + ], + "roles_links": [] } diff --git a/keystone/content/common/samples/service.json b/keystone/content/common/samples/service.json index 9262cc90..f2a783f2 100644 --- a/keystone/content/common/samples/service.json +++ b/keystone/content/common/samples/service.json @@ -1,8 +1,8 @@ { - "OS-KSADM:service":{ - "id":"123", - "name":"nova", - "type":"compute", - "description":"OpenStack Compute Service" - } -}
\ No newline at end of file + "OS-KSADM:service": { + "id": "123", + "name": "nova", + "type": "compute", + "description": "OpenStack Compute Service" + } +} diff --git a/keystone/content/common/samples/services.json b/keystone/content/common/samples/services.json index 0add2504..dd8dea4f 100644 --- a/keystone/content/common/samples/services.json +++ b/keystone/content/common/samples/services.json @@ -1,16 +1,17 @@ { - "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 + "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": [] +} diff --git a/keystone/content/common/samples/tenants-1.json b/keystone/content/common/samples/tenants-1.json index d9766ae8..b3f42349 100644 --- a/keystone/content/common/samples/tenants-1.json +++ b/keystone/content/common/samples/tenants-1.json @@ -1,14 +1,16 @@ { - "tenants":[{ - "id":"1234", - "name":"ACME corp", - "description":"A description ...", - "enabled":true - } - ], - "tenants_links":[{ - "rel":"next", - "href":"http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234" - } - ] -}
\ No newline at end of file + "tenants": [ + { + "id": "1234", + "name": "ACME corp", + "description": "A description ...", + "enabled": true + } + ], + "tenants_links": [ + { + "rel": "next", + "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234" + } + ] +} diff --git a/keystone/content/common/samples/tenants-2.json b/keystone/content/common/samples/tenants-2.json index 003fe952..c464a446 100644 --- a/keystone/content/common/samples/tenants-2.json +++ b/keystone/content/common/samples/tenants-2.json @@ -1,18 +1,20 @@ { - "tenants":[{ - "id":"3645", - "name":"Iron Works", - "description":"A description ...", - "enabled":true - } - ], - "tenants_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" - } - ] -}
\ No newline at end of file + "tenants": [ + { + "id": "3645", + "name": "Iron Works", + "description": "A description ...", + "enabled": true + } + ], + "tenants_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/common/samples/tenants-3.json b/keystone/content/common/samples/tenants-3.json index 1f2538ff..5b62bd7e 100644 --- a/keystone/content/common/samples/tenants-3.json +++ b/keystone/content/common/samples/tenants-3.json @@ -1,14 +1,16 @@ { - "tenants":[{ - "id":"9999", - "name":"Bigz", - "description":"A description ...", - "enabled":true - } - ], - "tenants_links":[{ - "rel":"previous", - "href":"http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234" - } - ] -}
\ No newline at end of file + "tenants": [ + { + "id": "9999", + "name": "Bigz", + "description": "A description ...", + "enabled": true + } + ], + "tenants_links": [ + { + "rel": "previous", + "href": "http://identity.api.openstack.org/v2.0/tenants?limit=1&marker=1234" + } + ] +} diff --git a/keystone/content/common/samples/tenants.json b/keystone/content/common/samples/tenants.json index aec27935..a249472f 100644 --- a/keystone/content/common/samples/tenants.json +++ b/keystone/content/common/samples/tenants.json @@ -1,16 +1,17 @@ { - "tenants":[{ - "id":"1234", - "name":"ACME Corp", - "description":"A description ...", - "enabled":true - }, - { - "id":"3456", - "name":"Iron Works", - "description":"A description ...", - "enabled":true - } - ], - "tenants_links":[] -}
\ No newline at end of file + "tenants": [ + { + "id": "1234", + "name": "ACME Corp", + "description": "A description ...", + "enabled": true + }, + { + "id": "3456", + "name": "Iron Works", + "description": "A description ...", + "enabled": true + } + ], + "tenants_links": [] +} diff --git a/keystone/content/common/samples/users.json b/keystone/content/common/samples/users.json index 08db72b5..3fc104d7 100644 --- a/keystone/content/common/samples/users.json +++ b/keystone/content/common/samples/users.json @@ -1,16 +1,17 @@ { - "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 + "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/keystone/content/common/samples/userwithenabledonly.json b/keystone/content/common/samples/userwithenabledonly.json index 23265395..fdd74562 100644 --- a/keystone/content/common/samples/userwithenabledonly.json +++ b/keystone/content/common/samples/userwithenabledonly.json @@ -1,5 +1,5 @@ { "user": { "enabled": true - } + } } diff --git a/keystone/content/common/samples/userwithoutid.json b/keystone/content/common/samples/userwithoutid.json index 2a891811..8d15f3af 100644 --- a/keystone/content/common/samples/userwithoutid.json +++ b/keystone/content/common/samples/userwithoutid.json @@ -3,5 +3,5 @@ "username": "jqsmith", "email": "john.smith@example.org", "enabled": true - } + } } diff --git a/keystone/content/common/samples/validatetoken.json b/keystone/content/common/samples/validatetoken.json index 9d20e529..4a8db881 100644 --- a/keystone/content/common/samples/validatetoken.json +++ b/keystone/content/common/samples/validatetoken.json @@ -1,27 +1,28 @@ { - "access":{ - "token":{ - "id":"ab48a9efdfedb23ty3494", - "expires":"2010-11-01T03:32:15-05:00", - "tenant":{ - "id": "345", - "name": "My Project" - } + "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" }, - "user":{ - "id":"123", - "name":"jqsmith", - "roles":[{ - "id":"234", - "name":"compute:admin" - }, - { - "id":"234", - "name":"object-store:admin", - "tenantId":"1" - } - ], - "roles_links":[] + { + "id": "234", + "name": "object-store:admin", + "tenantId": "1" } + ], + "roles_links": [] } -}
\ No newline at end of file + } +} diff --git a/keystone/content/common/samples/version.json b/keystone/content/common/samples/version.json index db42ac80..4410f93f 100644 --- a/keystone/content/common/samples/version.json +++ b/keystone/content/common/samples/version.json @@ -7,11 +7,13 @@ { "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" @@ -21,7 +23,8 @@ { "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/common/samples/versions.json b/keystone/content/common/samples/versions.json index 21bacffd..e1e590f4 100644 --- a/keystone/content/common/samples/versions.json +++ b/keystone/content/common/samples/versions.json @@ -1,34 +1,38 @@ { - "versions":[{ - "id":"v1.0", - "status":"DEPRECATED", - "updated":"2009-10-09T11:30:00Z", - "links":[{ - "rel":"self", - "href":"http://identity.api.openstack.org/v1.0/" - } - ] - }, + "versions": [ + { + "id": "v1.0", + "status": "DEPRECATED", + "updated": "2009-10-09T11:30:00Z", + "links": [ { - "id":"v1.1", - "status":"CURRENT", - "updated":"2010-12-12T18:30:02.25Z", - "links":[{ - "rel":"self", - "href":"http://identity.api.openstack.org/v1.1/" - } - ] - }, + "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": [ { - "id":"v2.0", - "status":"BETA", - "updated":"2011-05-27T20:22:02.25Z", - "links":[{ - "rel":"self", - "href":"http://identity.api.openstack.org/v2.0/" - } - ] + "rel": "self", + "href": "http://identity.api.openstack.org/v2.0/" } - ], - "versions_links":[] -}
\ No newline at end of file + ] + } + ], + "versions_links": [] +} diff --git a/keystone/content/service/extensions.json b/keystone/content/service/extensions.json index b71e3b66..7a514fd7 100644 --- a/keystone/content/service/extensions.json +++ b/keystone/content/service/extensions.json @@ -1,5 +1,5 @@ { - "extensions": { - "values": [] - } -}
\ No newline at end of file + "extensions": { + "values": [] + } +} diff --git a/keystone/contrib/extensions/admin/osec2/extension.json b/keystone/contrib/extensions/admin/osec2/extension.json index df0a6a59..195091b5 100644 --- a/keystone/contrib/extensions/admin/osec2/extension.json +++ b/keystone/contrib/extensions/admin/osec2/extension.json @@ -1,21 +1,21 @@ { - "extension":{ - "name": "OpenStack EC2 authentication Extension", - "namespace": "http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0", - "alias": "OS-KSEC2", - "updated": "2011-08-25T09:50:00-00:00", - "description": "Adds the capability to support EC2 style authentication.", - "links": [ - { - "rel": "describedby", - "type": "application/pdf", - "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/OS-KSEC2-admin-devguide.pdf" - }, - { - "rel": "describedby", - "type": "application/vnd.sun.wadl+xml", - "href": "https://raw.github.com/openstack/keystone/master/keystone/content/admin/OS-KSEC2-admin.wadl" - } - ] - } + "extension": { + "name": "OpenStack EC2 authentication Extension", + "namespace": "http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0", + "alias": "OS-KSEC2", + "updated": "2011-08-25T09:50:00-00:00", + "description": "Adds the capability to support EC2 style authentication.", + "links": [ + { + "rel": "describedby", + "type": "application/pdf", + "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/OS-KSEC2-admin-devguide.pdf" + }, + { + "rel": "describedby", + "type": "application/vnd.sun.wadl+xml", + "href": "https://raw.github.com/openstack/keystone/master/keystone/content/admin/OS-KSEC2-admin.wadl" + } + ] + } } diff --git a/keystone/contrib/extensions/admin/osksadm/extension.json b/keystone/contrib/extensions/admin/osksadm/extension.json index ffa573f2..2c644f97 100644 --- a/keystone/contrib/extensions/admin/osksadm/extension.json +++ b/keystone/contrib/extensions/admin/osksadm/extension.json @@ -1,20 +1,21 @@ { - "extension":{ + "extension": { "name": "Openstack Keystone Admin", "namespace": "http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0", "alias": "OS-KSADM", "updated": "2011-08-19T13:25:27-06:00", "description": "Openstack extensions to Keystone v2.0 API enabling Admin Operations.", - "links": [{ + "links": [ + { "rel": "describedby", "type": "application/pdf", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/OS-KSADM-admin-devguide.pdf" - }, - { + }, + { "rel": "describedby", "type": "application/vnd.sun.wadl+xml", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/OS-KSADM-admin.wadl" - } - ] - } + } + ] + } } diff --git a/keystone/contrib/extensions/admin/oskscatalog/extension.json b/keystone/contrib/extensions/admin/oskscatalog/extension.json index d44c170b..c84c0e59 100644 --- a/keystone/contrib/extensions/admin/oskscatalog/extension.json +++ b/keystone/contrib/extensions/admin/oskscatalog/extension.json @@ -1,20 +1,21 @@ { - "extension":{ + "extension": { "name": "Openstack Keystone Catalog", "namespace": "http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0", "alias": "OS-KSCATALOG", "updated": "2011-07-13T13:25:27-06:00", "description": "Openstack extensions to Keystone v2.0 API enabling Admin Operations to support Catalog.", - "links": [{ + "links": [ + { "rel": "describedby", "type": "application/pdf", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/OS-KSCATALOG-admin-devguide.pdf" - }, - { + }, + { "rel": "describedby", "type": "application/vnd.sun.wadl+xml", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/OS-KSCATALOG-admin.wadl" - } - ] - } + } + ] + } } diff --git a/keystone/contrib/extensions/admin/raxgrp/extension.json b/keystone/contrib/extensions/admin/raxgrp/extension.json index 6af6d049..31744b3d 100644 --- a/keystone/contrib/extensions/admin/raxgrp/extension.json +++ b/keystone/contrib/extensions/admin/raxgrp/extension.json @@ -1,19 +1,21 @@ { - "extension":{ + "extension": { "name": "Rackspace Keystone Group Extensions", "namespace": "http://docs.rackspace.com/identity/api/ext/RAX-KSGROUP/v1.0", "alias": "RAX-KSGRP", "updated": "2011-08-14T13:25:27-06:00", "description": "Rackspace extensions to Keystone v2.0 API enabling groups.", - "links": [{ + "links": [ + { "rel": "describedby", "type": "application/pdf", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/RAX-KSGRP-admin-devguide.pdf" - }, - { + }, + { "rel": "describedby", "type": "application/vnd.sun.wadl+xml", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/RAX-KSGRP-admin.wadl" - }] - } -}
\ No newline at end of file + } + ] + } +} diff --git a/keystone/contrib/extensions/admin/raxkey/extension.json b/keystone/contrib/extensions/admin/raxkey/extension.json index 16e2b5b0..301ad6a2 100644 --- a/keystone/contrib/extensions/admin/raxkey/extension.json +++ b/keystone/contrib/extensions/admin/raxkey/extension.json @@ -1,20 +1,21 @@ { - "extension":{ + "extension": { "name": "Rackspace API Key Authentication", "namespace": "http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0", "alias": "RAX-KSKEY", "updated": "2011-07-13T13:25:27-06:00", "description": "Rackspace extensions to Keystone v2.0 API enabling API Key authentication.", - "links": [{ + "links": [ + { "rel": "describedby", "type": "application/pdf", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/RAX-KSKEY-admin-devguide.pdf" - }, - { + }, + { "rel": "describedby", "type": "application/vnd.sun.wadl+xml", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/admin/RAX-KSKEY-admin.wadl" - } - ] - } + } + ] + } } diff --git a/keystone/contrib/extensions/extensions.json b/keystone/contrib/extensions/extensions.json index 9e1c96d0..7a514fd7 100644 --- a/keystone/contrib/extensions/extensions.json +++ b/keystone/contrib/extensions/extensions.json @@ -1 +1,5 @@ -{ "extensions" : { "values" : []}}
\ No newline at end of file +{ + "extensions": { + "values": [] + } +} diff --git a/keystone/contrib/extensions/service/osec2/extension.json b/keystone/contrib/extensions/service/osec2/extension.json index 78054933..a2d28717 100644 --- a/keystone/contrib/extensions/service/osec2/extension.json +++ b/keystone/contrib/extensions/service/osec2/extension.json @@ -1,16 +1,16 @@ { - "extension":{ - "name": "OpenStack EC2 authentication Extension", - "namespace": "http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0", - "alias": "OS-KSEC2", - "updated": "2011-08-25T09:50:00-00:00", - "description": "Adds the capability to support EC2 style authentication.", - "links": [ - { - "rel": "describedby", - "type": "application/pdf", - "href": "https://github.com/openstack/keystone/raw/master/keystone/content/service/OS-KSEC2-service-devguide.pdf" - } - ] - } -}
\ No newline at end of file + "extension": { + "name": "OpenStack EC2 authentication Extension", + "namespace": "http://docs.openstack.org/identity/api/ext/OS-KSEC2/v1.0", + "alias": "OS-KSEC2", + "updated": "2011-08-25T09:50:00-00:00", + "description": "Adds the capability to support EC2 style authentication.", + "links": [ + { + "rel": "describedby", + "type": "application/pdf", + "href": "https://github.com/openstack/keystone/raw/master/keystone/content/service/OS-KSEC2-service-devguide.pdf" + } + ] + } +} diff --git a/keystone/contrib/extensions/service/raxgrp/extension.json b/keystone/contrib/extensions/service/raxgrp/extension.json index 08f34b25..e2c889dd 100644 --- a/keystone/contrib/extensions/service/raxgrp/extension.json +++ b/keystone/contrib/extensions/service/raxgrp/extension.json @@ -1,14 +1,16 @@ { - "extension":{ + "extension": { "name": "Rackspace Keystone Group Extensions", "namespace": "http://docs.rackspace.com/identity/api/ext/RAX-KSGROUP/v1.0", "alias": "RAX-KSGRP", "updated": "2011-08-14T13:25:27-06:00", "description": "Rackspace extensions to Keystone v2.0 API enabling groups.", - "links": [{ + "links": [ + { "rel": "describedby", "type": "application/pdf", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/service/RAX-KSGRP-service-devguide.pdf" - }] - } -}
\ No newline at end of file + } + ] + } +} diff --git a/keystone/contrib/extensions/service/raxkey/extension.json b/keystone/contrib/extensions/service/raxkey/extension.json index 9a8e6a15..ad72420e 100644 --- a/keystone/contrib/extensions/service/raxkey/extension.json +++ b/keystone/contrib/extensions/service/raxkey/extension.json @@ -1,14 +1,16 @@ { - "extension":{ + "extension": { "name": "Rackspace API Key Authentication", "namespace": "http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0", "alias": "RAX-KSKEY", "updated": "2011-08-14T13:25:27-06:00", "description": "Rackspace extensions to Keystone v2.0 API enabling API Key authentication.", - "links": [{ + "links": [ + { "rel": "describedby", "type": "application/pdf", "href": "https://github.com/openstack/keystone/raw/master/keystone/content/service/RAX-KSKEY-service-devguide.pdf" - }] - } -}
\ No newline at end of file + } + ] + } +} |