Repository: jclouds Updated Branches: refs/heads/master c857ccc47 -> a6c89d915
Pretty formatted json test resources Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a6c89d91 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a6c89d91 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a6c89d91 Branch: refs/heads/master Commit: a6c89d9150cc4464515e2108712d4cd8d55f614b Parents: c857ccc Author: Jeremy Daggett <[email protected]> Authored: Thu Jun 5 15:46:32 2014 -0700 Committer: Andrew Phillips <[email protected]> Committed: Wed Jun 11 15:37:02 2014 -0400 ---------------------------------------------------------------------- .../src/test/resources/access_minimal.json | 17 +- .../src/test/resources/access_version_uids.json | 118 ++++++++- .../src/test/resources/adminAuth.json | 187 +++++++++----- .../src/test/resources/admin_extensions.json | 12 +- .../src/test/resources/devstackVersion.json | 34 ++- .../test/resources/keystoneAuthResponse.json | 12 +- .../keystoneAuthResponse_openstack.json | 80 +++--- .../src/test/resources/raxAuth.json | 253 +++++++++++-------- .../src/test/resources/raxVersion.json | 47 ++-- .../test/resources/role_create_response.json | 7 +- .../src/test/resources/role_list_response.json | 15 +- .../test/resources/service_create_response.json | 9 +- .../test/resources/service_list_response.json | 17 +- .../test/resources/tenant_create_response.json | 9 +- .../src/test/resources/tenant_details.json | 9 +- .../src/test/resources/tenant_list.json | 18 +- .../src/test/resources/tenant_list_att.json | 14 +- .../test/resources/tenant_update_response.json | 9 +- .../src/test/resources/token_details.json | 27 +- .../test/resources/user_create_response.json | 9 +- .../src/test/resources/user_details.json | 10 +- .../src/test/resources/user_endpoints.json | 22 +- .../src/test/resources/user_list.json | 33 ++- .../src/test/resources/user_role_list.json | 9 +- .../test/resources/user_tenant_role_list.json | 17 +- .../test/resources/user_update_response.json | 9 +- 26 files changed, 735 insertions(+), 268 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/access_minimal.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/access_minimal.json b/apis/openstack-keystone/src/test/resources/access_minimal.json index 3a168b7..69cde97 100644 --- a/apis/openstack-keystone/src/test/resources/access_minimal.json +++ b/apis/openstack-keystone/src/test/resources/access_minimal.json @@ -1 +1,16 @@ -{"access": {"token": {"expires": "2012-12-02T01:44:54Z", "id": "5afc3adea6654e758b4a9cf01bafe507"}, "serviceCatalog": [], "user": {"username": "nova", "roles_links": [], "id": "bf45fd7586c2410c980c651b918aa850", "roles": [], "name": "nova"}}} \ No newline at end of file +{ + "access": { + "token": { + "expires": "2012-12-02T01:44:54Z", + "id": "5afc3adea6654e758b4a9cf01bafe507" + }, + "serviceCatalog": [], + "user": { + "username": "nova", + "roles_links": [], + "id": "bf45fd7586c2410c980c651b918aa850", + "roles": [], + "name": "nova" + } + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/access_version_uids.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/access_version_uids.json b/apis/openstack-keystone/src/test/resources/access_version_uids.json index 3349580..3271f63 100644 --- a/apis/openstack-keystone/src/test/resources/access_version_uids.json +++ b/apis/openstack-keystone/src/test/resources/access_version_uids.json @@ -1 +1,117 @@ -{"access": {"token": {"expires": "2012-09-29T19:53:45Z", "id": "b267e2e240624b108b1ed5bba6e5882e", "tenant": {"enabled": true, "description": null, "name": "demo", "id": "82d8d2f865484776a1daf1e2245d3317"}}, "serviceCatalog": [{"endpoints": [{"adminURL": "http://10.10.10.10:8774/v2/82d8d2f865484776a1daf1e2245d3317";, "region": "RegionOne", "internalURL": "http://10.10.10.10:8774/v2/82d8d2f865484776a1daf1e2245d3317";, "id": "bb3ce9ccdc5045909882688b90cc3ff0", "publicURL": "http://10.10.10.10:8774/v2/82d8d2f865484776a1daf1e2245d3317"}], "endpoints_links": [], "type": "compute", "name": "nova"}, {"endpoints": [{"adminURL": "http://10.10.10.10:3333";, "region": "RegionOne", "internalURL": "http://10.10.10.10:3333";, "id": "9646263f31ea4f499732c5e1370ecf5e", "publicURL": "http://10.10.10.10:3333"}], "endpoints_links": [], "type": "s3", "name": "s3"}, {"endpoints": [{"adminURL": "http://10.10.10.10:9292";, "region": "RegionOne", "internalURL": "http://10.10.10.10:9292";, "id": "aa5d0b2574824ba0 97dc07faacf3be65", "publicURL": "http://10.10.10.10:9292"}], "endpoints_links": [], "type": "image", "name": "glance"}, {"endpoints": [{"adminURL": "http://10.10.10.10:8776/v1/82d8d2f865484776a1daf1e2245d3317";, "region": "RegionOne", "internalURL": "http://10.10.10.10:8776/v1/82d8d2f865484776a1daf1e2245d3317";, "id": "7679065b1405447eb5f1a38a6b99ccc0", "publicURL": "http://10.10.10.10:8776/v1/82d8d2f865484776a1daf1e2245d3317"}], "endpoints_links": [], "type": "volume", "name": "cinder"}, {"endpoints": [{"adminURL": "http://10.10.10.10:8773/services/Admin";, "region": "RegionOne", "internalURL": "http://10.10.10.10:8773/services/Cloud";, "id": "22b007f023fb4c42be094916eb2bf18b", "publicURL": "http://10.10.10.10:8773/services/Cloud"}], "endpoints_links": [], "type": "ec2", "name": "ec2"}, {"endpoints": [{"adminURL": "http://10.10.10.10:35357/v2.0";, "region": "RegionOne", "internalURL": "http://10.10.10.10:5000/v2.0";, "id": "57ee5fb4f9a840f3b965909681d0fc53", "publicURL": "http://10.10.10 .10:5000/v2.0"}], "endpoints_links": [], "type": "identity", "name": "keystone"}], "user": {"username": "demo", "roles_links": [], "id": "ca248caf55844c14a4876c22112bbbb9", "roles": [{"name": "Member"}], "name": "demo"}, "metadata": {"is_admin": 0, "roles": ["1f697d8e3ace4f5a80f7701e554ee5d9"]}}} \ No newline at end of file +{ + "access": { + "token": { + "expires": "2012-09-29T19:53:45Z", + "id": "b267e2e240624b108b1ed5bba6e5882e", + "tenant": { + "enabled": true, + "description": null, + "name": "demo", + "id": "82d8d2f865484776a1daf1e2245d3317" + } + }, + "serviceCatalog": [ + { + "endpoints": [ + { + "adminURL": "http://10.10.10.10:8774/v2/82d8d2f865484776a1daf1e2245d3317";, + "region": "RegionOne", + "internalURL": "http://10.10.10.10:8774/v2/82d8d2f865484776a1daf1e2245d3317";, + "id": "bb3ce9ccdc5045909882688b90cc3ff0", + "publicURL": "http://10.10.10.10:8774/v2/82d8d2f865484776a1daf1e2245d3317"; + } + ], + "endpoints_links": [], + "type": "compute", + "name": "nova" + }, + { + "endpoints": [ + { + "adminURL": "http://10.10.10.10:3333";, + "region": "RegionOne", + "internalURL": "http://10.10.10.10:3333";, + "id": "9646263f31ea4f499732c5e1370ecf5e", + "publicURL": "http://10.10.10.10:3333"; + } + ], + "endpoints_links": [], + "type": "s3", + "name": "s3" + }, + { + "endpoints": [ + { + "adminURL": "http://10.10.10.10:9292";, + "region": "RegionOne", + "internalURL": "http://10.10.10.10:9292";, + "id": "aa5d0b2574824ba097dc07faacf3be65", + "publicURL": "http://10.10.10.10:9292"; + } + ], + "endpoints_links": [], + "type": "image", + "name": "glance" + }, + { + "endpoints": [ + { + "adminURL": "http://10.10.10.10:8776/v1/82d8d2f865484776a1daf1e2245d3317";, + "region": "RegionOne", + "internalURL": "http://10.10.10.10:8776/v1/82d8d2f865484776a1daf1e2245d3317";, + "id": "7679065b1405447eb5f1a38a6b99ccc0", + "publicURL": "http://10.10.10.10:8776/v1/82d8d2f865484776a1daf1e2245d3317"; + } + ], + "endpoints_links": [], + "type": "volume", + "name": "cinder" + }, + { + "endpoints": [ + { + "adminURL": "http://10.10.10.10:8773/services/Admin";, + "region": "RegionOne", + "internalURL": "http://10.10.10.10:8773/services/Cloud";, + "id": "22b007f023fb4c42be094916eb2bf18b", + "publicURL": "http://10.10.10.10:8773/services/Cloud"; + } + ], + "endpoints_links": [], + "type": "ec2", + "name": "ec2" + }, + { + "endpoints": [ + { + "adminURL": "http://10.10.10.10:35357/v2.0";, + "region": "RegionOne", + "internalURL": "http://10.10.10.10:5000/v2.0";, + "id": "57ee5fb4f9a840f3b965909681d0fc53", + "publicURL": "http://10.10.10.10:5000/v2.0"; + } + ], + "endpoints_links": [], + "type": "identity", + "name": "keystone" + } + ], + "user": { + "username": "demo", + "roles_links": [], + "id": "ca248caf55844c14a4876c22112bbbb9", + "roles": [ + { + "name": "Member" + } + ], + "name": "demo" + }, + "metadata": { + "is_admin": 0, + "roles": [ + "1f697d8e3ace4f5a80f7701e554ee5d9" + ] + } + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/adminAuth.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/adminAuth.json b/apis/openstack-keystone/src/test/resources/adminAuth.json index b26eb71..5ac73e0 100644 --- a/apis/openstack-keystone/src/test/resources/adminAuth.json +++ b/apis/openstack-keystone/src/test/resources/adminAuth.json @@ -1,72 +1,119 @@ -{"access": { - "token": { - "expires": "2012-08-01T13:08:52Z", - "id": "946b8ad1ede4422f87ab21dcba27896d", - "tenant": { - "enabled": true, - "description": null, - "name": "admin", - "id": "2fdc88ae152948c690b97ba307acae9b" - }}, - "serviceCatalog": [ - {"endpoints": [{ - "adminURL": "http://10.0.1.13:8774/v2/2fdc88ae152948c690b97ba307acae9b";, - "region": "RegionOne", - "publicURL": "http://10.0.1.13:8774/v2/2fdc88ae152948c690b97ba307acae9b";, - "internalURL": "http://10.0.1.13:8774/v2/2fdc88ae152948c690b97ba307acae9b"}], - "endpoints_links": [], - "type": "compute", - "name": "Compute Service"}, - {"endpoints": [{ - "adminURL": "http://10.0.1.13:3333";, - "region": "RegionOne", - "publicURL": "http://10.0.1.13:3333";, - "internalURL": "http://10.0.1.13:3333"}], - "endpoints_links": [], - "type": "s3", - "name": "S3 Service"}, - {"endpoints": [{ - "adminURL": "http://10.0.1.13:9292";, - "region": "RegionOne", - "publicURL": "http://10.0.1.13:9292";, - "internalURL": "http://10.0.1.13:9292"}], - "endpoints_links": [], - "type": "image", - "name": "Image Service"}, - {"endpoints": [{ - "adminURL": "http://10.0.1.13:8776/v1/2fdc88ae152948c690b97ba307acae9b";, - "region": "RegionOne", - "publicURL": "http://10.0.1.13:8776/v1/2fdc88ae152948c690b97ba307acae9b";, - "internalURL": "http://10.0.1.13:8776/v1/2fdc88ae152948c690b97ba307acae9b"}], - "endpoints_links": [], "type": "volume", "name": "Volume Service"}, - {"endpoints": [{"adminURL": "http://10.0.1.13:8773/services/Admin";, - "region": "RegionOne", - "publicURL": "http://10.0.1.13:8773/services/Cloud";, - "internalURL": "http://10.0.1.13:8773/services/Cloud"}], - "endpoints_links": [], - "type": "ec2", - "name": "EC2 Service"}, - {"endpoints": [{ - "adminURL": "http://10.0.1.13:35357/v2.0";, - "region": "RegionOne", "publicURL": - "http://10.0.1.13:5000/v2.0";, "internalURL": "http://10.0.1.13:5000/v2.0"}], - "endpoints_links": [], "type": "identity", "name": "Identity Service"} - ], - "user": { - "username": "admin", - "roles_links": [], - "id": "b4d134cfe3cf43ad8ba0c2fc5b5d8f91", - "roles": [ - {"name": "admin"}, - {"name": "KeystoneServiceAdmin"}, - {"name": "KeystoneAdmin"} +{ + "access": { + "token": { + "expires": "2012-08-01T13:08:52Z", + "id": "946b8ad1ede4422f87ab21dcba27896d", + "tenant": { + "enabled": true, + "description": null, + "name": "admin", + "id": "2fdc88ae152948c690b97ba307acae9b" + } + }, + "serviceCatalog": [ + { + "endpoints": [ + { + "adminURL": "http://10.0.1.13:8774/v2/2fdc88ae152948c690b97ba307acae9b";, + "region": "RegionOne", + "publicURL": "http://10.0.1.13:8774/v2/2fdc88ae152948c690b97ba307acae9b";, + "internalURL": "http://10.0.1.13:8774/v2/2fdc88ae152948c690b97ba307acae9b"; + } + ], + "endpoints_links": [], + "type": "compute", + "name": "Compute Service" + }, + { + "endpoints": [ + { + "adminURL": "http://10.0.1.13:3333";, + "region": "RegionOne", + "publicURL": "http://10.0.1.13:3333";, + "internalURL": "http://10.0.1.13:3333"; + } + ], + "endpoints_links": [], + "type": "s3", + "name": "S3 Service" + }, + { + "endpoints": [ + { + "adminURL": "http://10.0.1.13:9292";, + "region": "RegionOne", + "publicURL": "http://10.0.1.13:9292";, + "internalURL": "http://10.0.1.13:9292"; + } + ], + "endpoints_links": [], + "type": "image", + "name": "Image Service" + }, + { + "endpoints": [ + { + "adminURL": "http://10.0.1.13:8776/v1/2fdc88ae152948c690b97ba307acae9b";, + "region": "RegionOne", + "publicURL": "http://10.0.1.13:8776/v1/2fdc88ae152948c690b97ba307acae9b";, + "internalURL": "http://10.0.1.13:8776/v1/2fdc88ae152948c690b97ba307acae9b"; + } + ], + "endpoints_links": [], + "type": "volume", + "name": "Volume Service" + }, + { + "endpoints": [ + { + "adminURL": "http://10.0.1.13:8773/services/Admin";, + "region": "RegionOne", + "publicURL": "http://10.0.1.13:8773/services/Cloud";, + "internalURL": "http://10.0.1.13:8773/services/Cloud"; + } + ], + "endpoints_links": [], + "type": "ec2", + "name": "EC2 Service" + }, + { + "endpoints": [ + { + "adminURL": "http://10.0.1.13:35357/v2.0";, + "region": "RegionOne", + "publicURL": "http://10.0.1.13:5000/v2.0";, + "internalURL": "http://10.0.1.13:5000/v2.0"; + } + ], + "endpoints_links": [], + "type": "identity", + "name": "Identity Service" + } ], - "name": "admin" - }, - "metadata": { - "is_admin": 0, - "roles": [ - "a2bb9cb209f14ec18d0f747ccdef4bb6", "27cb69f42476498cb11e83b7d90fc419", "7758efbae00a480385493f77f7860c29" - ] + "user": { + "username": "admin", + "roles_links": [], + "id": "b4d134cfe3cf43ad8ba0c2fc5b5d8f91", + "roles": [ + { + "name": "admin" + }, + { + "name": "KeystoneServiceAdmin" + }, + { + "name": "KeystoneAdmin" + } + ], + "name": "admin" + }, + "metadata": { + "is_admin": 0, + "roles": [ + "a2bb9cb209f14ec18d0f747ccdef4bb6", + "27cb69f42476498cb11e83b7d90fc419", + "7758efbae00a480385493f77f7860c29" + ] + } } -}} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/admin_extensions.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/admin_extensions.json b/apis/openstack-keystone/src/test/resources/admin_extensions.json index 65eae4a..48361b8 100644 --- a/apis/openstack-keystone/src/test/resources/admin_extensions.json +++ b/apis/openstack-keystone/src/test/resources/admin_extensions.json @@ -1 +1,11 @@ -{"extensions":[{"name":"OS-KSADM","alias":"OS-KSADM","namespace":"http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0","updated":"2011-08-08T00:00:00+00:00","description":"Keystone Administration Extension"}]} \ No newline at end of file +{ + "extensions": [ + { + "name": "OS-KSADM", + "alias": "OS-KSADM", + "namespace": "http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0";, + "updated": "2011-08-08T00:00:00+00:00", + "description": "Keystone Administration Extension" + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/devstackVersion.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/devstackVersion.json b/apis/openstack-keystone/src/test/resources/devstackVersion.json index e2aa677..5425613 100644 --- a/apis/openstack-keystone/src/test/resources/devstackVersion.json +++ b/apis/openstack-keystone/src/test/resources/devstackVersion.json @@ -1 +1,33 @@ -{"version": {"status": "beta", "updated": "2011-11-19T00:00:00Z", "media-types": [{"base": "application/json", "type": "application/vnd.openstack.identity-v2.0+json"}, {"base": "application/xml", "type": "application/vnd.openstack.identity-v2.0+xml"}], "id": "v2.0", "links": [{"href": "http://172.16.89.167:5000/v2.0/";, "rel": "self"}, {"href": "http://docs.openstack.org/api/openstack-identity-service/2.0/content/";, "type": "text/html", "rel": "describedby"}, {"href": "http://docs.openstack.org/api/openstack-identity-service/2.0/identity-dev-guide-2.0.pdf";, "type": "application/pdf", "rel": "describedby"}]}} \ No newline at end of file +{ + "version": { + "status": "beta", + "updated": "2011-11-19T00:00:00Z", + "media-types": [ + { + "base": "application/json", + "type": "application/vnd.openstack.identity-v2.0+json" + }, + { + "base": "application/xml", + "type": "application/vnd.openstack.identity-v2.0+xml" + } + ], + "id": "v2.0", + "links": [ + { + "href": "http://172.16.89.167:5000/v2.0/";, + "rel": "self" + }, + { + "href": "http://docs.openstack.org/api/openstack-identity-service/2.0/content/";, + "type": "text/html", + "rel": "describedby" + }, + { + "href": "http://docs.openstack.org/api/openstack-identity-service/2.0/identity-dev-guide-2.0.pdf";, + "type": "application/pdf", + "rel": "describedby" + } + ] + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json index 220969b..e20670f 100644 --- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json +++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse.json @@ -158,11 +158,11 @@ "type": "database", "name": "trove", "endpoints": [ - { - "publicURL": "http://172.16.0.1:8776/v1/3456";, - "tenantId": "123123", - "region": "RegionOne" - } + { + "publicURL": "http://172.16.0.1:8776/v1/3456";, + "tenantId": "123123", + "region": "RegionOne" + } ] }, { @@ -191,4 +191,4 @@ } ] } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json index 469734f..214be22 100644 --- a/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json +++ b/apis/openstack-keystone/src/test/resources/keystoneAuthResponse_openstack.json @@ -8,42 +8,54 @@ "name": "508151008" } }, - "serviceCatalog": [{ - "endpoints": [{ - "adminURL": "https://nova-api.openstack.org:9774/v1.1/3456";, - "region": "RegionOne", - "internalURL": "https://nova-api.openstack.org:9774/v1.1/3456";, - "publicURL": "https://nova-api.openstack.org:9774/v1.1/3456"; - }], - "type": "compute", - "name": "nova" - }, { - "endpoints": [{ - "adminURL": "https://GLANCE_API_IS_NOT_DISCLOSED/v1.1/3456";, - "region": "RegionOne", - "internalURL": "https://GLANCE_API_IS_NOT_DISCLOSED/v1.1/3456";, - "publicURL": "https://GLANCE_API_IS_NOT_DISCLOSED/v1.1/3456"; - }], - "type": "image", - "name": "glance" - }, { - "endpoints": [{ - "adminURL": "https://nova-api.openstack.org:5443/v2.0";, - "region": "RegionOne", - "internalURL": "https://keystone.thefreecloud.org:5000/v2.0";, - "publicURL": "https://keystone.thefreecloud.org:5000/v2.0"; - }], - "type": "identity", - "name": "keystone" - }], + "serviceCatalog": [ + { + "endpoints": [ + { + "adminURL": "https://nova-api.openstack.org:9774/v1.1/3456";, + "region": "RegionOne", + "internalURL": "https://nova-api.openstack.org:9774/v1.1/3456";, + "publicURL": "https://nova-api.openstack.org:9774/v1.1/3456"; + } + ], + "type": "compute", + "name": "nova" + }, + { + "endpoints": [ + { + "adminURL": "https://GLANCE_API_IS_NOT_DISCLOSED/v1.1/3456";, + "region": "RegionOne", + "internalURL": "https://GLANCE_API_IS_NOT_DISCLOSED/v1.1/3456";, + "publicURL": "https://GLANCE_API_IS_NOT_DISCLOSED/v1.1/3456"; + } + ], + "type": "image", + "name": "glance" + }, + { + "endpoints": [ + { + "adminURL": "https://nova-api.openstack.org:5443/v2.0";, + "region": "RegionOne", + "internalURL": "https://keystone.thefreecloud.org:5000/v2.0";, + "publicURL": "https://keystone.thefreecloud.org:5000/v2.0"; + } + ], + "type": "identity", + "name": "keystone" + } + ], "user": { "id": "43", - "roles": [{ - "tenantId": "3456", - "id": "2", - "name": "Member" - }], + "roles": [ + { + "tenantId": "3456", + "id": "2", + "name": "Member" + } + ], "name": "508151008" } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/raxAuth.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/raxAuth.json b/apis/openstack-keystone/src/test/resources/raxAuth.json index 42a78a4..c88ec21 100644 --- a/apis/openstack-keystone/src/test/resources/raxAuth.json +++ b/apis/openstack-keystone/src/test/resources/raxAuth.json @@ -8,116 +8,153 @@ "name": "40806637803162" } }, - "serviceCatalog": [{ - "endpoints": [{ - "region": "DFW", - "tenantId": "40806637803162", - "publicURL": "https:\/\/dfw.databases.api.rackspacecloud.com\/v1.0\/40806637803162" - }, { - "region": "ORD", - "tenantId": "40806637803162", - "publicURL": "https:\/\/ord.databases.api.rackspacecloud.com\/v1.0\/40806637803162" - }], - "name": "cloudDatabases", - "type": "rax:database" - }, { - "endpoints": [{ - "tenantId": "40806637803162", - "publicURL": "https:\/\/servers.api.rackspacecloud.com\/v1.0\/40806637803162", - "versionInfo": "https:\/\/servers.api.rackspacecloud.com\/v1.0", - "versionList": "https:\/\/servers.api.rackspacecloud.com\/", - "versionId": "1.0" - }], - "name": "cloudServers", - "type": "compute" - }, { - "endpoints": [{ - "region": "DFW", - "tenantId": "MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22", - "publicURL": "https:\/\/storage101.dfw1.clouddrive.com\/v1\/MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22", - "internalURL": "https:\/\/snet-storage101.dfw1.clouddrive.com\/v1\/MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22" - }], - "name": "cloudFiles", - "type": "object-store" - }, { - "endpoints": [{ - "region": "DFW", - "tenantId": "40806637803162", - "publicURL": "https:\/\/dfw.servers.api.rackspacecloud.com\/v2\/40806637803162", - "versionInfo": "https:\/\/dfw.servers.api.rackspacecloud.com\/v2", - "versionList": "https:\/\/dfw.servers.api.rackspacecloud.com\/", - "versionId": "2" - }], - "name": "cloudServersOpenStack", - "type": "compute" - }, { - "endpoints": [{ - "region": "ORD", - "tenantId": "40806637803162", - "publicURL": "https:\/\/ord.loadbalancers.api.rackspacecloud.com\/v1.0\/40806637803162" - }, { - "region": "DFW", - "tenantId": "40806637803162", - "publicURL": "https:\/\/dfw.loadbalancers.api.rackspacecloud.com\/v1.0\/40806637803162" - }], - "name": "cloudLoadBalancers", - "type": "rax:load-balancer" - }, { - "endpoints": [{ - "publicURL": "https:\/\/dfw.blockstorage.api.rackspacecloud.com\/v1\/40806637803162", - "tenantId": "40806637803162", - "region": "DFW" - }, { - "publicURL": "https:\/\/ord.blockstorage.api.rackspacecloud.com\/v1\/40806637803162", - "tenantId": "40806637803162", - "region": "ORD" - }], - "type": "volume", - "name": "cloudBlockStorage" - }, { - "endpoints": [{ - "tenantId": "40806637803162", - "publicURL": "https:\/\/monitoring.api.rackspacecloud.com\/v1.0\/40806637803162" - }], - "name": "cloudMonitoring", - "type": "rax:monitor" - }, { - "endpoints": [{ - "tenantId": "40806637803162", - "publicURL": "https:\/\/dns.api.rackspacecloud.com\/v1.0\/40806637803162" - }], - "name": "cloudDNS", - "type": "rax:dns" - }, { - "endpoints": [{ - "region": "DFW", - "tenantId": "MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22", - "publicURL": "https:\/\/cdn1.clouddrive.com\/v1\/MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22" - }], - "name": "cloudFilesCDN", - "type": "rax:object-cdn" - }, { - "endpoints": [{ - "internalURL": "https:\/\/snet-dfw.queues.api.rackspacecloud.com/v1/40806637803162", - "publicURL": "https:\/\/dfw.queues.api.rackspacecloud.com\/v1\/40806637803162", - "tenantId": "40806637803162", - "region": "DFW" - }, { - "internalURL": "https:\/\/snet-ord.queues.api.rackspacecloud.com/v1/40806637803162", - "publicURL": "https:\/\/ord.queues.api.rackspacecloud.com\/v1\/40806637803162", - "tenantId": "40806637803162", - "region": "ORD" - }], - "type": "rax:queues", - "name": "cloudQueues" - }], + "serviceCatalog": [ + { + "endpoints": [ + { + "region": "DFW", + "tenantId": "40806637803162", + "publicURL": "https://dfw.databases.api.rackspacecloud.com/v1.0/40806637803162"; + }, + { + "region": "ORD", + "tenantId": "40806637803162", + "publicURL": "https://ord.databases.api.rackspacecloud.com/v1.0/40806637803162"; + } + ], + "name": "cloudDatabases", + "type": "rax:database" + }, + { + "endpoints": [ + { + "tenantId": "40806637803162", + "publicURL": "https://servers.api.rackspacecloud.com/v1.0/40806637803162";, + "versionInfo": "https://servers.api.rackspacecloud.com/v1.0";, + "versionList": "https://servers.api.rackspacecloud.com/";, + "versionId": "1.0" + } + ], + "name": "cloudServers", + "type": "compute" + }, + { + "endpoints": [ + { + "region": "DFW", + "tenantId": "MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22", + "publicURL": "https://storage101.dfw1.clouddrive.com/v1/MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22";, + "internalURL": "https://snet-storage101.dfw1.clouddrive.com/v1/MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22"; + } + ], + "name": "cloudFiles", + "type": "object-store" + }, + { + "endpoints": [ + { + "region": "DFW", + "tenantId": "40806637803162", + "publicURL": "https://dfw.servers.api.rackspacecloud.com/v2/40806637803162";, + "versionInfo": "https://dfw.servers.api.rackspacecloud.com/v2";, + "versionList": "https://dfw.servers.api.rackspacecloud.com/";, + "versionId": "2" + } + ], + "name": "cloudServersOpenStack", + "type": "compute" + }, + { + "endpoints": [ + { + "region": "ORD", + "tenantId": "40806637803162", + "publicURL": "https://ord.loadbalancers.api.rackspacecloud.com/v1.0/40806637803162"; + }, + { + "region": "DFW", + "tenantId": "40806637803162", + "publicURL": "https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/40806637803162"; + } + ], + "name": "cloudLoadBalancers", + "type": "rax:load-balancer" + }, + { + "endpoints": [ + { + "publicURL": "https://dfw.blockstorage.api.rackspacecloud.com/v1/40806637803162";, + "tenantId": "40806637803162", + "region": "DFW" + }, + { + "publicURL": "https://ord.blockstorage.api.rackspacecloud.com/v1/40806637803162";, + "tenantId": "40806637803162", + "region": "ORD" + } + ], + "type": "volume", + "name": "cloudBlockStorage" + }, + { + "endpoints": [ + { + "tenantId": "40806637803162", + "publicURL": "https://monitoring.api.rackspacecloud.com/v1.0/40806637803162"; + } + ], + "name": "cloudMonitoring", + "type": "rax:monitor" + }, + { + "endpoints": [ + { + "tenantId": "40806637803162", + "publicURL": "https://dns.api.rackspacecloud.com/v1.0/40806637803162"; + } + ], + "name": "cloudDNS", + "type": "rax:dns" + }, + { + "endpoints": [ + { + "region": "DFW", + "tenantId": "MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22", + "publicURL": "https://cdn1.clouddrive.com/v1/MossoCloudFS_dc1f419c-5059-4c87-a389-3f2e33a77b22"; + } + ], + "name": "cloudFilesCDN", + "type": "rax:object-cdn" + }, + { + "endpoints": [ + { + "internalURL": "https://snet-dfw.queues.api.rackspacecloud.com/v1/40806637803162";, + "publicURL": "https://dfw.queues.api.rackspacecloud.com/v1/40806637803162";, + "tenantId": "40806637803162", + "region": "DFW" + }, + { + "internalURL": "https://snet-ord.queues.api.rackspacecloud.com/v1/40806637803162";, + "publicURL": "https://ord.queues.api.rackspacecloud.com/v1/40806637803162";, + "tenantId": "40806637803162", + "region": "ORD" + } + ], + "type": "rax:queues", + "name": "cloudQueues" + } + ], "user": { "id": "54321", - "roles": [{ - "id": "3", - "description": "User Admin Role.", - "name": "identity:user-admin" - }], + "roles": [ + { + "id": "3", + "description": "User Admin Role.", + "name": "identity:user-admin" + } + ], "name": "joe" } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/raxVersion.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/raxVersion.json b/apis/openstack-keystone/src/test/resources/raxVersion.json index 13d99de..92f47c5 100644 --- a/apis/openstack-keystone/src/test/resources/raxVersion.json +++ b/apis/openstack-keystone/src/test/resources/raxVersion.json @@ -3,26 +3,33 @@ "id": "v2.0", "updated": "2012-01-21T11:33:21-06:00", "status": "BETA", - "links": [{ - "rel": "self", - "href": "https:\/\/identity.api.rackspacecloud.com\/v2.0" - }, { - "rel": "describedby", - "type": "application\/pdf", - "href": "http:\/\/docs.rackspacecloud.com\/auth\/api\/v2.0\/auth-client-devguide-latest.pdf" - }, { - "rel": "describedby", - "type": "application\/vnd.sun.wadl+xml", - "href": "http:\/\/docs.rackspacecloud.com\/auth\/api\/v2.0\/auth.wadl" - }], + "links": [ + { + "rel": "self", + "href": "https://identity.api.rackspacecloud.com/v2.0"; + }, + { + "rel": "describedby", + "type": "application/pdf", + "href": "http://docs.rackspacecloud.com/auth/api/v2.0/auth-client-devguide-latest.pdf"; + }, + { + "rel": "describedby", + "type": "application/vnd.sun.wadl+xml", + "href": "http://docs.rackspacecloud.com/auth/api/v2.0/auth.wadl"; + } + ], "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" - }] + "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" + } + ] } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/role_create_response.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/role_create_response.json b/apis/openstack-keystone/src/test/resources/role_create_response.json index 0826512..6350251 100644 --- a/apis/openstack-keystone/src/test/resources/role_create_response.json +++ b/apis/openstack-keystone/src/test/resources/role_create_response.json @@ -1 +1,6 @@ -{"role":{"id":"r1000","name":"jclouds-role"}} \ No newline at end of file +{ + "role": { + "id": "r1000", + "name": "jclouds-role" + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/role_list_response.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/role_list_response.json b/apis/openstack-keystone/src/test/resources/role_list_response.json index 3cf9f8f..9bb978b 100644 --- a/apis/openstack-keystone/src/test/resources/role_list_response.json +++ b/apis/openstack-keystone/src/test/resources/role_list_response.json @@ -1 +1,14 @@ -{"roles": [{"id": "22529316b2384072b2e8946af5e8cfb6", "name": "admin"}, {"enabled": "True", "description": "Default role for project membership", "name": "_member_", "id": "9fe2ff9ee4384b1894a90878d3e92bab"}]} \ No newline at end of file +{ + "roles": [ + { + "id": "22529316b2384072b2e8946af5e8cfb6", + "name": "admin" + }, + { + "enabled": "True", + "description": "Default role for project membership", + "name": "_member_", + "id": "9fe2ff9ee4384b1894a90878d3e92bab" + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/service_create_response.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/service_create_response.json b/apis/openstack-keystone/src/test/resources/service_create_response.json index d80d5bd..f64443e 100644 --- a/apis/openstack-keystone/src/test/resources/service_create_response.json +++ b/apis/openstack-keystone/src/test/resources/service_create_response.json @@ -1 +1,8 @@ -{"OS-KSADM:service": {"id": "s1000", "type": "jclouds-service-type", "name": "jclouds-service-test", "description": "jclouds-service-description"}} \ No newline at end of file +{ + "OS-KSADM:service": { + "id": "s1000", + "type": "jclouds-service-type", + "name": "jclouds-service-test", + "description": "jclouds-service-description" + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/service_list_response.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/service_list_response.json b/apis/openstack-keystone/src/test/resources/service_list_response.json index 3d7d52e..4432a5b 100644 --- a/apis/openstack-keystone/src/test/resources/service_list_response.json +++ b/apis/openstack-keystone/src/test/resources/service_list_response.json @@ -1 +1,16 @@ -{"OS-KSADM:services": [{"id": "150a35a1e24547fdb4122b7fc90929b0", "type": "network", "name": "neutron", "description": "Network Service"}, {"id": "313b229fcede4a148f5bd11199264f8e", "type": "volume", "name": "cinder", "description": "OpenStack Volume Service"}]} \ No newline at end of file +{ + "OS-KSADM:services": [ + { + "id": "150a35a1e24547fdb4122b7fc90929b0", + "type": "network", + "name": "neutron", + "description": "Network Service" + }, + { + "id": "313b229fcede4a148f5bd11199264f8e", + "type": "volume", + "name": "cinder", + "description": "OpenStack Volume Service" + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/tenant_create_response.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/tenant_create_response.json b/apis/openstack-keystone/src/test/resources/tenant_create_response.json index f55ec03..deaed4d 100644 --- a/apis/openstack-keystone/src/test/resources/tenant_create_response.json +++ b/apis/openstack-keystone/src/test/resources/tenant_create_response.json @@ -1 +1,8 @@ -{"tenant":{"id":"t1000","name":"jclouds-tenant","description":"jclouds-description","enabled":true}} \ No newline at end of file +{ + "tenant": { + "id": "t1000", + "name": "jclouds-tenant", + "description": "jclouds-description", + "enabled": true + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/tenant_details.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/tenant_details.json b/apis/openstack-keystone/src/test/resources/tenant_details.json index 12cdc27..923a880 100644 --- a/apis/openstack-keystone/src/test/resources/tenant_details.json +++ b/apis/openstack-keystone/src/test/resources/tenant_details.json @@ -1 +1,8 @@ -{"tenant": {"enabled": true, "description": null, "name": "admin", "id": "013ba41150a14830bec85ffe93353bcc"}} \ No newline at end of file +{ + "tenant": { + "enabled": true, + "description": null, + "name": "admin", + "id": "013ba41150a14830bec85ffe93353bcc" + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/tenant_list.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/tenant_list.json b/apis/openstack-keystone/src/test/resources/tenant_list.json index aadcd70..543eafa 100644 --- a/apis/openstack-keystone/src/test/resources/tenant_list.json +++ b/apis/openstack-keystone/src/test/resources/tenant_list.json @@ -1 +1,17 @@ -{"tenants_links": [], "tenants": [{"enabled": true, "description": null, "name": "demo", "id": "05d1dc7af71646deba64cfc17b81bec0"}, {"enabled": true, "description": null, "name": "admin", "id": "7aa2e17ec29f44d193c48feaba0852cc"}]} \ No newline at end of file +{ + "tenants_links": [], + "tenants": [ + { + "enabled": true, + "description": null, + "name": "demo", + "id": "05d1dc7af71646deba64cfc17b81bec0" + }, + { + "enabled": true, + "description": null, + "name": "admin", + "id": "7aa2e17ec29f44d193c48feaba0852cc" + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/tenant_list_att.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/tenant_list_att.json b/apis/openstack-keystone/src/test/resources/tenant_list_att.json index 4804f4c..e3f68e8 100644 --- a/apis/openstack-keystone/src/test/resources/tenant_list_att.json +++ b/apis/openstack-keystone/src/test/resources/tenant_list_att.json @@ -1 +1,13 @@ -{"tenants": {"values": [{"enabled": true, "description": "None", "name": "this-is-a-test", "id": "14"}], "links": []}} \ No newline at end of file +{ + "tenants": { + "values": [ + { + "enabled": true, + "description": "None", + "name": "this-is-a-test", + "id": "14" + } + ], + "links": [] + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/tenant_update_response.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/tenant_update_response.json b/apis/openstack-keystone/src/test/resources/tenant_update_response.json index 4fb042f..5c8f637 100644 --- a/apis/openstack-keystone/src/test/resources/tenant_update_response.json +++ b/apis/openstack-keystone/src/test/resources/tenant_update_response.json @@ -1 +1,8 @@ -{"tenant":{"id":"t1000","name":"jclouds-tenant-modified","description":"jclouds-description-modified","enabled":false}} \ No newline at end of file +{ + "tenant": { + "id": "t1000", + "name": "jclouds-tenant-modified", + "description": "jclouds-description-modified", + "enabled": false + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/token_details.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/token_details.json b/apis/openstack-keystone/src/test/resources/token_details.json index 530fb59..f4f5d4f 100644 --- a/apis/openstack-keystone/src/test/resources/token_details.json +++ b/apis/openstack-keystone/src/test/resources/token_details.json @@ -1 +1,26 @@ -{"access": {"token": {"expires": "2012-04-28T12:42:50Z", "id": "167eccdc790946969ced473732e8109b", "tenant": {"id": "4cea93f5464b4f1c921fb3e0461d72b5", "enabled": true, "description": null, "name": "demo"}}, "user": {"username": "admin", "roles_links": [], "id": "2b9b606181634ae9ac86fd95a8bc2cde", "roles": [{"id": "79cada5c02814b57a52e0eed4dd388cb", "name": "admin"}], "name": "admin"}}} +{ + "access": { + "token": { + "expires": "2012-04-28T12:42:50Z", + "id": "167eccdc790946969ced473732e8109b", + "tenant": { + "id": "4cea93f5464b4f1c921fb3e0461d72b5", + "enabled": true, + "description": null, + "name": "demo" + } + }, + "user": { + "username": "admin", + "roles_links": [], + "id": "2b9b606181634ae9ac86fd95a8bc2cde", + "roles": [ + { + "id": "79cada5c02814b57a52e0eed4dd388cb", + "name": "admin" + } + ], + "name": "admin" + } + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/user_create_response.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/user_create_response.json b/apis/openstack-keystone/src/test/resources/user_create_response.json index 7fb82ee..78c8dfe 100644 --- a/apis/openstack-keystone/src/test/resources/user_create_response.json +++ b/apis/openstack-keystone/src/test/resources/user_create_response.json @@ -1 +1,8 @@ -{"user":{"id":"u1000","name":"jqsmith","email":"[email protected]","enabled":true}} \ No newline at end of file +{ + "user": { + "id": "u1000", + "name": "jqsmith", + "email": "[email protected]", + "enabled": true + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/user_details.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/user_details.json b/apis/openstack-keystone/src/test/resources/user_details.json index 17f1ae6..59f04d6 100644 --- a/apis/openstack-keystone/src/test/resources/user_details.json +++ b/apis/openstack-keystone/src/test/resources/user_details.json @@ -1 +1,9 @@ -{"user": {"name": "nova", "enabled": true, "email": "[email protected]", "id": "e021dfd758eb44a89f1c57c8ef3be8e2", "tenantId": "ab1da202f5774cceb5da2aeff1f0aa87"}} \ No newline at end of file +{ + "user": { + "name": "nova", + "enabled": true, + "email": "[email protected]", + "id": "e021dfd758eb44a89f1c57c8ef3be8e2", + "tenantId": "ab1da202f5774cceb5da2aeff1f0aa87" + } +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/user_endpoints.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/user_endpoints.json b/apis/openstack-keystone/src/test/resources/user_endpoints.json index 1e73bda..d7e60d8 100644 --- a/apis/openstack-keystone/src/test/resources/user_endpoints.json +++ b/apis/openstack-keystone/src/test/resources/user_endpoints.json @@ -1,10 +1,12 @@ -{"endpoints": [ - { - "adminURL": "https://csnode.jclouds.org:35357/v2.0/";, - "publicURL": "https://csnode.jclouds.org/v2.0/";, - "region": "region-a.geo-1", - "id": "2.0", - "versionId":"2.0", - "list": "https://csnode.jclouds.org/extension"; - } - ]} \ No newline at end of file +{ + "endpoints": [ + { + "adminURL": "https://csnode.jclouds.org:35357/v2.0/";, + "publicURL": "https://csnode.jclouds.org/v2.0/";, + "region": "region-a.geo-1", + "id": "2.0", + "versionId": "2.0", + "list": "https://csnode.jclouds.org/extension"; + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/user_list.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/user_list.json b/apis/openstack-keystone/src/test/resources/user_list.json index 641a557..54165b0 100644 --- a/apis/openstack-keystone/src/test/resources/user_list.json +++ b/apis/openstack-keystone/src/test/resources/user_list.json @@ -1 +1,32 @@ -{"users": [{"name": "admin", "enabled": true, "email": "[email protected]", "id": "2b9b606181634ae9ac86fd95a8bc2cde", "tenantId": null}, {"name": "demo", "enabled": true, "email": "[email protected]", "id": "667b2e1420604df8b67cd8ea57d4ee64", "tenantId": null}, {"name": "nova", "enabled": true, "email": "[email protected]", "id": "e021dfd758eb44a89f1c57c8ef3be8e2", "tenantId": "ab1da202f5774cceb5da2aeff1f0aa87"}, {"name": "glance", "enabled": true, "email": "[email protected]", "id": "3f6c1c9ba993495ead7d2eb2192e284f", "tenantId": "ab1da202f5774cceb5da2aeff1f0aa87"}]} \ No newline at end of file +{ + "users": [ + { + "name": "admin", + "enabled": true, + "email": "[email protected]", + "id": "2b9b606181634ae9ac86fd95a8bc2cde", + "tenantId": null + }, + { + "name": "demo", + "enabled": true, + "email": "[email protected]", + "id": "667b2e1420604df8b67cd8ea57d4ee64", + "tenantId": null + }, + { + "name": "nova", + "enabled": true, + "email": "[email protected]", + "id": "e021dfd758eb44a89f1c57c8ef3be8e2", + "tenantId": "ab1da202f5774cceb5da2aeff1f0aa87" + }, + { + "name": "glance", + "enabled": true, + "email": "[email protected]", + "id": "3f6c1c9ba993495ead7d2eb2192e284f", + "tenantId": "ab1da202f5774cceb5da2aeff1f0aa87" + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/user_role_list.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/user_role_list.json b/apis/openstack-keystone/src/test/resources/user_role_list.json index ee90ff9..b355290 100644 --- a/apis/openstack-keystone/src/test/resources/user_role_list.json +++ b/apis/openstack-keystone/src/test/resources/user_role_list.json @@ -1 +1,8 @@ -{"roles": [{"id": "79cada5c02814b57a52e0eed4dd388cb", "name": "admin"}]} \ No newline at end of file +{ + "roles": [ + { + "id": "79cada5c02814b57a52e0eed4dd388cb", + "name": "admin" + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/user_tenant_role_list.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/user_tenant_role_list.json b/apis/openstack-keystone/src/test/resources/user_tenant_role_list.json index 0a25228..4456378 100644 --- a/apis/openstack-keystone/src/test/resources/user_tenant_role_list.json +++ b/apis/openstack-keystone/src/test/resources/user_tenant_role_list.json @@ -1 +1,16 @@ -{"roles": [{"id": "31c451195aac49b386039341e2c92a16", "name": "KeystoneServiceAdmin"}, {"id": "79cada5c02814b57a52e0eed4dd388cb", "name": "admin"}, {"id": "6ea17ddd37a6447794cb0e164d4db894", "name": "KeystoneAdmin"}]} \ No newline at end of file +{ + "roles": [ + { + "id": "31c451195aac49b386039341e2c92a16", + "name": "KeystoneServiceAdmin" + }, + { + "id": "79cada5c02814b57a52e0eed4dd388cb", + "name": "admin" + }, + { + "id": "6ea17ddd37a6447794cb0e164d4db894", + "name": "KeystoneAdmin" + } + ] +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/a6c89d91/apis/openstack-keystone/src/test/resources/user_update_response.json ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/test/resources/user_update_response.json b/apis/openstack-keystone/src/test/resources/user_update_response.json index 244b45d..aee59aa 100644 --- a/apis/openstack-keystone/src/test/resources/user_update_response.json +++ b/apis/openstack-keystone/src/test/resources/user_update_response.json @@ -1 +1,8 @@ -{"user":{"id":"u1000","name":"jqsmith-renamed","email":"[email protected]","enabled":false}} \ No newline at end of file +{ + "user": { + "id": "u1000", + "name": "jqsmith-renamed", + "email": "[email protected]", + "enabled": false + } +}
